From d8c2ec321c1f7e2f10e0599244b8af7d20d6d8fb Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Wed, 28 Jun 2023 21:08:42 -0600
Subject: [wallet] Show suspend/resume only in devMode and rename "fail" to
 "cancel" in UI

---
 .../net/taler/wallet/transactions/TransactionPeerFragment.kt |  2 +-
 .../taler/wallet/transactions/TransactionRefreshFragment.kt  |  4 +---
 .../net/taler/wallet/transactions/TransactionTipFragment.kt  |  4 +---
 .../net/taler/wallet/transactions/TransitionsComposable.kt   | 12 +++++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'wallet/src/main/java/net/taler/wallet/transactions')

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
index d3fe7fd..2d79d77 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
@@ -86,7 +86,7 @@ fun TransactionPeerComposable(t: Transaction, devMode: Boolean?, onTransition: (
             is TransactionPeerPushDebit -> TransactionPeerPushDebitComposable(t)
             else -> error("unexpected transaction: ${t::class.simpleName}")
         }
-        TransitionsComposable(t, onTransition)
+        TransitionsComposable(t, devMode == true, onTransition)
         if (devMode == true && t.error != null) {
             ErrorTransactionButton(error = t.error!!)
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
index fce10e3..f1f1ad7 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
@@ -92,9 +92,7 @@ private fun TransactionRefreshComposable(
             amount = t.amountEffective,
             amountType = AmountType.Negative,
         )
-        t.txActions.forEach {
-            TransitionComposable(it, onTransition)
-        }
+        TransitionsComposable(t, devMode, onTransition)
         if (devMode && t.error != null) {
             ErrorTransactionButton(error = t.error)
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
index 8e3e0ad..0870281 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
@@ -105,9 +105,7 @@ fun TransactionTipComposable(t: TransactionTip, devMode: Boolean?, onTransition:
             label = stringResource(id = R.string.tip_merchant_url),
             info = t.merchantBaseUrl,
         )
-        t.txActions.forEach {
-            TransitionComposable(it, onTransition)
-        }
+        TransitionsComposable(t, devMode == true, onTransition)
         if (devMode == true && t.error != null) {
             ErrorTransactionButton(error = t.error)
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
index 3fb43fe..cead75d 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransitionsComposable.kt
@@ -36,18 +36,20 @@ import net.taler.wallet.transactions.TransactionAction.*
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun TransitionsComposable(t: Transaction, onTransition: (t: TransactionAction) -> Unit) {
+fun TransitionsComposable(t: Transaction, devMode: Boolean, onTransition: (t: TransactionAction) -> Unit) {
     FlowRow {
         t.txActions.forEach {
-            TransitionComposable(it, onTransition)
+            if (it in arrayOf(Resume, Suspend)) {
+                if(devMode) TransitionComposable(it, onTransition)
+            } else {
+                TransitionComposable(it, onTransition)
+            }
         }
     }
 }
 
 @Composable
 fun TransitionComposable(t: TransactionAction, onClick: (t: TransactionAction) -> Unit) {
-    // TODO: handle more transitions!
-    if (t !in arrayOf(Delete, Retry, Abort, Fail, Resume, Suspend)) return
     Button(
         modifier = Modifier.padding(16.dp),
         colors = ButtonDefaults.buttonColors(containerColor = when(t) {
@@ -86,7 +88,7 @@ fun TransitionComposable(t: TransactionAction, onClick: (t: TransactionAction) -
                     Delete -> stringResource(R.string.transactions_delete)
                     Retry -> stringResource(R.string.transactions_retry)
                     Abort -> stringResource(R.string.transactions_abort)
-                    Fail -> stringResource(id = R.string.transactions_fail)
+                    Fail -> stringResource(R.string.transactions_fail)
                     Resume -> stringResource(R.string.transactions_resume)
                     Suspend -> stringResource(R.string.transactions_suspend)
                 },
-- 
cgit v1.2.3