- fix UI crash on closing trade

bisq-network · Jan 14, 2025 · a80b06e · a80b06e
1 parent eae85ab
commit a80b06e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/BasePresenter.kt b/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/BasePresenter.kt
@@ -93,7 +93,7 @@ abstract class BasePresenter(private val rootPresenter: MainPresenter?): ViewPre
     }
 
     override fun showSnackbar(message: String, isError: Boolean) {
-        uiScope.launch {
+        uiScope.launch(Dispatchers.Main) {
             snackbarHostState.showSnackbar(message, withDismissAction = true)
         }
     }
@@ -175,13 +175,16 @@ abstract class BasePresenter(private val rootPresenter: MainPresenter?): ViewPre
     }
 
     override fun goBack(): Boolean {
-        try {
-            log.i { "goBack default implementation" }
-            return rootNavigator.popBackStack()
-        } catch (e: Exception) {
-            log.e(e) { "Failed to navigate back" }
-            return false
+        var wentBack = false
+        uiScope.launch {
+            try {
+                log.i { "goBack default implementation" }
+                wentBack = rootNavigator.popBackStack()
+            } catch (e: Exception) {
+                log.e(e) { "Failed to navigate back" }
+            }
         }
+        return wentBack;
     }
 
     @CallSuper

diff --git a/...k/bisq/mobile/presentation/ui/uicases/open_trades/selected/states/BuyerState4Presenter.kt b/...k/bisq/mobile/presentation/ui/uicases/open_trades/selected/states/BuyerState4Presenter.kt
@@ -28,10 +28,22 @@ class BuyerState4Presenter(
 
     fun onCloseTrade() {
         jobs.add(CoroutineScope(BackgroundDispatcher).launch {
-            tradesServiceFacade.closeTrade()
+            val result = tradesServiceFacade.closeTrade()
+            when {
+                // TODO review
+                result.isFailure -> leaveScreen()
+                result.isSuccess -> leaveScreen()
+            }
         })
     }
 
+
+    fun leaveScreen() {
+        presenterScope.launch {
+            navigateBack()
+        }
+    }
+
     fun onExportTradeDate() {
         jobs.add(CoroutineScope(BackgroundDispatcher).launch {
             tradesServiceFacade.exportTradeDate()

diff --git a/...bisq/mobile/presentation/ui/uicases/open_trades/selected/states/SellerState3aPresenter.kt b/...bisq/mobile/presentation/ui/uicases/open_trades/selected/states/SellerState3aPresenter.kt
@@ -49,7 +49,7 @@ class SellerState3aPresenter(
 
     fun onConfirmedBtcSent() {
         require(paymentProof.value.isNotEmpty())
-        job = CoroutineScope(BackgroundDispatcher).launch {
+        job = backgroundScope.launch {
             tradesServiceFacade.sellerConfirmBtcSent(paymentProof.value)
         }
     }

diff --git a/.../bisq/mobile/presentation/ui/uicases/open_trades/selected/states/SellerState4Presenter.kt b/.../bisq/mobile/presentation/ui/uicases/open_trades/selected/states/SellerState4Presenter.kt
@@ -29,10 +29,21 @@ class SellerState4Presenter(
 
     fun onCloseTrade() {
         jobs.add(CoroutineScope(BackgroundDispatcher).launch {
-            tradesServiceFacade.closeTrade()
+            val result = tradesServiceFacade.closeTrade()
+            when {
+                // TODO review
+                result.isFailure -> leaveScreen()
+                result.isSuccess -> leaveScreen()
+            }
         })
     }
 
+    fun leaveScreen() {
+        presenterScope.launch {
+            navigateBack()
+        }
+    }
+
     fun onExportTradeDate() {
         jobs.add(CoroutineScope(BackgroundDispatcher).launch {
             tradesServiceFacade.exportTradeDate()