1 files changed, 39 insertions, 13 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
index 255aee5..01fb566 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
@@ -24,17 +24,24 @@ import androidx.activity.OnBackPressedCallback
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
+import kotlinx.coroutines.launch
 import net.taler.common.Amount
 import net.taler.wallet.MainViewModel
 import net.taler.wallet.R
 import net.taler.wallet.compose.TalerSurface
 import net.taler.wallet.compose.collectAsStateLifecycleAware
+import net.taler.wallet.showError
 
 class OutgoingPushFragment : Fragment() {
     private val model: MainViewModel by activityViewModels()
     private val peerManager get() = model.peerManager
+    private val transactionManager get() = model.transactionManager
+    private val balanceManager get() = model.balanceManager
 
     // hacky way to change back action until we have navigation for compose
     private val backPressedCallback = object : OnBackPressedCallback(false) {
@@ -51,6 +58,8 @@ class OutgoingPushFragment : Fragment() {
         val amount = arguments?.getString("amount")?.let {
             Amount.fromJSONString(it)
         } ?: error("no amount passed")
+        val scopeInfo = transactionManager.selectedScope
+        val spec = scopeInfo?.let { balanceManager.getSpecForScopeInfo(it) }
 
         requireActivity().onBackPressedDispatcher.addCallback(
             viewLifecycleOwner, backPressedCallback
@@ -59,22 +68,39 @@ class OutgoingPushFragment : Fragment() {
         return ComposeView(requireContext()).apply {
             setContent {
                 TalerSurface {
-                    when (val state = peerManager.pushState.collectAsStateLifecycleAware().value) {
-                        is OutgoingIntro, OutgoingChecking, is OutgoingChecked -> {
-                            backPressedCallback.isEnabled = false
-                            OutgoingPushIntroComposable(
-                                state = state,
-                                amount = amount,
-                                onSend = this@OutgoingPushFragment::onSend,
-                            )
+                    val state = peerManager.pushState.collectAsStateLifecycleAware().value
+                    OutgoingPushComposable(
+                        amount = amount.withSpec(spec),
+                        state = state,
+                        onSend = this@OutgoingPushFragment::onSend,
+                        onClose = {
+                            findNavController().navigate(R.id.action_nav_peer_pull_to_nav_main)
                         }
-                        OutgoingCreating, is OutgoingResponse, is OutgoingError -> {
-                            backPressedCallback.isEnabled = true
-                            OutgoingPushResultComposable(state) {
-                                findNavController().navigate(R.id.action_nav_peer_push_to_nav_main)
-                            }
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                peerManager.pushState.collect {
+                    if (it is OutgoingResponse) {
+                        if (transactionManager.selectTransaction(it.transactionId)) {
+                            findNavController().navigate(R.id.action_nav_peer_push_to_nav_transactions_detail_peer)
+                        } else {
+                            findNavController().navigate(R.id.action_nav_peer_push_to_nav_main)
                         }
                     }
+
+                    if (it is OutgoingError && model.devMode.value == true) {
+                        showError(it.info)
+                    }
+
+                    // Disable back navigation when tx is being created
+                    backPressedCallback.isEnabled = it !is OutgoingCreating
                 }
             }
         }