taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

donation-statements-button-is-wired-to-nothing.diff (4239B)


      1 diff --git a/wallet/src/main/java/net/taler/wallet/balances/BalancesPagerComposable.kt b/wallet/src/main/java/net/taler/wallet/balances/BalancesPagerComposable.kt
      2 index c2a8b928..0a09738c 100644
      3 --- a/wallet/src/main/java/net/taler/wallet/balances/BalancesPagerComposable.kt
      4 +++ b/wallet/src/main/java/net/taler/wallet/balances/BalancesPagerComposable.kt
      5 @@ -193,6 +193,7 @@ fun BalancesPagerComposable(
      6      onShowPendingOutgoing: (ScopeInfo) -> Unit,
      7      onShowDiscounts: (ScopeInfo?) -> Unit,
      8      onShowPasses: (ScopeInfo?) -> Unit,
      9 +    onShowStatements: (host: String?) -> Unit,
     10  ) {
     11      if (state.showWelcome()) {
     12          return EmptyBalancesComposable(
     13 @@ -254,7 +255,7 @@ fun BalancesPagerComposable(
     14                              onWithdrawMoneyClicked = onWithdrawMoney,
     15                              onGetDemoMoneyClicked = onGetDemoMoney,
     16                              onBalanceClicked = onBalanceSelected,
     17 -                            onStatementClicked = { onBalanceSelected(null) }
     18 +                            onStatementClicked = { host -> onShowStatements(host) }
     19                          )
     20                      } else {
     21                          val scope = balance.scopeInfo
     22 @@ -280,7 +281,7 @@ fun BalancesPagerComposable(
     23                              onShowAllTransactions = { onShowAllTransactions(scope) },
     24                              onShowPendingIncoming = { onShowPendingIncoming(scope) },
     25                              onShowPendingOutgoing = { onShowPendingOutgoing(scope) },
     26 -                            onShowStatements = { onBalanceSelected(null) },
     27 +                            onShowStatements = { onShowStatements(null) },
     28                              onShowDiscounts = { onShowDiscounts(scope) },
     29                              onShowPasses = { onShowPasses(scope) },
     30                          )
     31 @@ -801,6 +802,7 @@ fun BalancesPagerComposablePreview() {
     32              onShowPendingOutgoing = {},
     33              onShowDiscounts = {},
     34              onShowPasses = {},
     35 +            onShowStatements = {},
     36          )
     37      }
     38  }
     39 \ No newline at end of file
     40 diff --git a/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt b/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt
     41 index bd913dd9..4d22253d 100644
     42 --- a/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt
     43 +++ b/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt
     44 @@ -59,6 +59,7 @@ import net.taler.wallet.balances.BalanceState
     45  import net.taler.wallet.balances.BalancesPagerComposable
     46  import net.taler.wallet.compose.GlobalScaffold
     47  import net.taler.wallet.compose.collectAsStateLifecycleAware
     48 +import net.taler.wallet.donau.GetDonauStatus
     49  import net.taler.wallet.scan.ScanTab
     50  import net.taler.wallet.transactions.TransactionStateFilter
     51  import net.taler.wallet.transactions.onTransactionClicked
     52 @@ -81,6 +82,7 @@ fun MainScreen(
     53      val balanceState by model.balanceManager.state.observeAsState(BalanceState.None)
     54      val viewMode by model.viewMode.collectAsStateLifecycleAware()
     55      val devMode by model.devMode.observeAsState(false)
     56 +    val donauStatus by model.donauManager.donauStatus.collectAsStateLifecycleAware()
     57      val txResults = remember(balanceState) {
     58          (balanceState as? BalanceState.Success)?.let { state ->
     59              state.balances.associate { balance ->
     60 @@ -214,6 +216,20 @@ fun MainScreen(
     61              onShowPasses = {
     62                  onNavigate(WalletDestination.PassList, false)
     63              },
     64 +            onShowStatements = { host ->
     65 +                // A statement row knows which donau it belongs to; the action
     66 +                // button on a balance does not, so it falls back to the one
     67 +                // the wallet is configured with -- and sends the user to the
     68 +                // setup screen when there is none, rather than doing nothing.
     69 +                val configured = (donauStatus as? GetDonauStatus.Success)
     70 +                    ?.donauInfo?.donauBaseUrl
     71 +                val donau = host ?: configured
     72 +                if (donau != null) {
     73 +                    onNavigate(WalletDestination.DonauStatement(donau), false)
     74 +                } else {
     75 +                    onNavigate(WalletDestination.SetDonau(), false)
     76 +                }
     77 +            },
     78          )
     79      }
     80  }