1 files changed, 42 insertions, 21 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
index 24bedc4..8f2fb96 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullFragment.kt
@@ -20,22 +20,27 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.material.Surface
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.findNavController
-import com.google.android.material.composethemeadapter.MdcTheme
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+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.exchanges.ExchangeItem
+import net.taler.wallet.showError
 
 class OutgoingPullFragment : Fragment() {
     private val model: MainViewModel by activityViewModels()
-    private val exchangeManager get() = model.exchangeManager
     private val peerManager get() = model.peerManager
+    private val transactionManager get() = model.transactionManager
+    private val balanceManager get() = model.balanceManager
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -45,26 +50,42 @@ class OutgoingPullFragment : Fragment() {
         val amount = arguments?.getString("amount")?.let {
             Amount.fromJSONString(it)
         } ?: error("no amount passed")
-        val exchangeFlow = exchangeManager.findExchangeForCurrency(amount.currency)
+        val scopeInfo = transactionManager.selectedScope
+        val spec = scopeInfo?.let { balanceManager.getSpecForScopeInfo(it) }
+
         return ComposeView(requireContext()).apply {
             setContent {
-                MdcTheme {
-                    Surface {
-                        val state = peerManager.pullState.collectAsStateLifecycleAware()
-                        if (state.value is OutgoingIntro) {
-                            val exchangeState =
-                                exchangeFlow.collectAsStateLifecycleAware(initial = null)
-                            OutgoingPullIntroComposable(
-                                amount = amount,
-                                exchangeState = exchangeState,
-                                onCreateInvoice = this@OutgoingPullFragment::onCreateInvoice,
-                            )
+                TalerSurface {
+                    val state = peerManager.pullState.collectAsStateLifecycleAware().value
+                    OutgoingPullComposable(
+                        amount = amount.withSpec(spec),
+                        state = state,
+                        onCreateInvoice = this@OutgoingPullFragment::onCreateInvoice,
+                        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.pullState.collect {
+                    if (it is OutgoingResponse) {
+                        if (transactionManager.selectTransaction(it.transactionId)) {
+                            findNavController().navigate(R.id.action_nav_peer_pull_to_nav_transactions_detail_peer)
                         } else {
-                            OutgoingPullResultComposable(state.value) {
-                                findNavController().popBackStack()
-                            }
+                            findNavController().navigate(R.id.action_nav_peer_pull_to_nav_main)
                         }
                     }
+
+                    if (it is OutgoingError && model.devMode.value == true) {
+                        showError(it.info)
+                    }
                 }
             }
         }
@@ -80,7 +101,7 @@ class OutgoingPullFragment : Fragment() {
         if (!requireActivity().isChangingConfigurations) peerManager.resetPullPayment()
     }
 
-    private fun onCreateInvoice(amount: Amount, summary: String, exchange: ExchangeItem) {
-        peerManager.initiatePullPayment(amount, summary, exchange)
+    private fun onCreateInvoice(amount: Amount, summary: String, hours: Long, exchange: ExchangeItem) {
+        peerManager.initiatePeerPullCredit(amount, summary, hours, exchange)
     }
 }