taler-android

commit 44f2b2f9d97c4953bba7bce40ba94a51ed721279
parent 7135ea57049df862762fcb40bc5bf5b8767a3fce
Author: Iván Ávalos <avalos@disroot.org>
Date:   Sat,  2 Nov 2024 03:40:44 +0100

[wallet] refactor AmountInputField with better logic

Diffstat:
M
wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
 | 
21
++++++---------------

1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -151,25 +151,16 @@ class PromptWithdrawFragment: Fragment() {
                 }
             }
 
-            LaunchedEffect(exchange) {
-                exchangeBaseUrl?.let {
-                    withdrawManager.getWithdrawalDetails(exchangeBaseUrl = it)
-                }
-            }
-
-            LaunchedEffect(Unit) {
+            LaunchedEffect(exchange?.exchangeBaseUrl) {
                 if (withdrawUri != null) {
                     // get withdrawal details for taler:// URI
                     withdrawManager.getWithdrawalDetails(withdrawUri, loading = true)
-                } else if (exchangeBaseUrl != null) {
-                    // get withdrawal details for exchange URL
-                    withdrawManager.setWithdrawalExchange(exchangeBaseUrl)
-                } else if (amount != null) {
-                    // get withdrawal details for amount/currency
-                    withdrawManager.getWithdrawalDetails(amount = amount, loading = true)
                 } else {
-                    // get withdrawal details for default currency
-                    withdrawManager.getWithdrawalDetails(amount = Amount.zero(defaultCurrency), loading = true)
+                    withdrawManager.getWithdrawalDetails(
+                        amount = amount ?: Amount.zero(defaultCurrency),
+                        exchangeBaseUrl = exchange?.exchangeBaseUrl ?: exchangeBaseUrl,
+                        loading = true,
+                    )
                 }
             }
         }