1 files changed, 58 insertions, 16 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 ae0ef10..01fb566 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushFragment.kt
@@ -20,20 +20,35 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.material.Surface
+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 com.google.android.material.composethemeadapter.MdcTheme
+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) {
+        override fun handleOnBackPressed() {
+            findNavController().navigate(R.id.action_nav_peer_push_to_nav_main)
+        }
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -43,22 +58,49 @@ 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
+        )
+
         return ComposeView(requireContext()).apply {
             setContent {
-                MdcTheme {
-                    Surface {
-                        val state = peerManager.pushState.collectAsStateLifecycleAware()
-                        if (state.value is OutgoingIntro) {
-                            OutgoingPushIntroComposable(
-                                amount = amount,
-                                onSend = this@OutgoingPushFragment::onSend,
-                            )
+                TalerSurface {
+                    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)
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    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 {
-                            OutgoingPushResultComposable(state.value) {
-                                findNavController().popBackStack()
-                            }
+                            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
                 }
             }
         }
@@ -66,7 +108,7 @@ class OutgoingPushFragment : Fragment() {
 
     override fun onStart() {
         super.onStart()
-        activity?.setTitle(R.string.receive_peer_title)
+        activity?.setTitle(R.string.send_peer_title)
     }
 
     override fun onDestroy() {
@@ -74,7 +116,7 @@ class OutgoingPushFragment : Fragment() {
         if (!requireActivity().isChangingConfigurations) peerManager.resetPushPayment()
     }
 
-    private fun onSend(amount: Amount, summary: String) {
-        peerManager.initiatePeerPushPayment(amount, summary)
+    private fun onSend(amount: Amount, summary: String, hours: Long) {
+        peerManager.initiatePeerPushDebit(amount, summary, hours)
     }
 }