[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] branch master updated: [wallet] skip ManualWithdra
From: |
gnunet |
Subject: |
[taler-taler-android] branch master updated: [wallet] skip ManualWithdrawFragment when doing a manual withdraw from balances list |
Date: |
Tue, 05 Sep 2023 15:18:15 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
The following commit(s) were added to refs/heads/master by this push:
new cdf0315 [wallet] skip ManualWithdrawFragment when doing a manual
withdraw from balances list
cdf0315 is described below
commit cdf0315436a378b1a63142ecb9ef3c15d5f4db30
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Mon Sep 4 21:02:27 2023 -0600
[wallet] skip ManualWithdrawFragment when doing a manual withdraw from
balances list
---
wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt | 9 +++++----
wallet/src/main/res/navigation/nav_graph.xml | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
index 0e362ac..dbff6ae 100644
--- a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt
@@ -62,6 +62,7 @@ import net.taler.wallet.exchanges.ExchangeItem
class ReceiveFundsFragment : Fragment() {
private val model: MainViewModel by activityViewModels()
private val exchangeManager get() = model.exchangeManager
+ private val withdrawManager get() = model.withdrawManager
private val peerManager get() = model.peerManager
override fun onCreateView(
@@ -99,11 +100,11 @@ class ReceiveFundsFragment : Fragment() {
Toast.makeText(requireContext(), "No exchange available",
LENGTH_LONG).show()
return
}
- exchangeManager.withdrawalExchange = exchange
+
// now that we have the exchange, we can navigate
- val bundle = bundleOf("amount" to amount.toJSONString())
- findNavController().navigate(
- R.id.action_receiveFunds_to_nav_exchange_manual_withdrawal, bundle)
+ exchangeManager.withdrawalExchange = exchange
+ withdrawManager.getWithdrawalDetails(exchange.exchangeBaseUrl, amount)
+
findNavController().navigate(R.id.action_receiveFunds_to_nav_prompt_withdraw)
}
private fun onPeerPull(amount: Amount) {
diff --git a/wallet/src/main/res/navigation/nav_graph.xml
b/wallet/src/main/res/navigation/nav_graph.xml
index 9fd6578..bc35f34 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -38,8 +38,8 @@
android:name="net.taler.wallet.ReceiveFundsFragment"
android:label="@string/transactions_receive_funds">
<action
-
android:id="@+id/action_receiveFunds_to_nav_exchange_manual_withdrawal"
- app:destination="@id/nav_exchange_manual_withdrawal" />
+ android:id="@+id/action_receiveFunds_to_nav_prompt_withdraw"
+ app:destination="@id/promptWithdraw" />
<action
android:id="@+id/action_receiveFunds_to_nav_peer_pull"
app:destination="@id/nav_peer_pull" />
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-android] branch master updated: [wallet] skip ManualWithdrawFragment when doing a manual withdraw from balances list,
gnunet <=