Add fallback close for Send Confirm view

horizontalsystems · Nov 27, 2023 · 4625b12 · 4625b12
1 parent 8665527
commit 4625b12
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendConfirmationScreen.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/SendConfirmationScreen.kt
@@ -30,6 +30,7 @@ import io.horizontalsystems.bankwallet.modules.contacts.model.Contact
 import io.horizontalsystems.bankwallet.modules.fee.HSFeeInputRaw
 import io.horizontalsystems.bankwallet.modules.hodler.HSHodler
 import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
+import io.horizontalsystems.bankwallet.ui.compose.DisposableLifecycleCallbacks
 import io.horizontalsystems.bankwallet.ui.compose.components.AppBar
 import io.horizontalsystems.bankwallet.ui.compose.components.ButtonPrimaryYellow
 import io.horizontalsystems.bankwallet.ui.compose.components.CellUniversalLawrenceSection
@@ -106,10 +107,19 @@ fun SendConfirmationScreen(
     LaunchedEffect(sendResult) {
         if (sendResult == SendResult.Sent) {
             delay(1200)
-            navController.popBackStack(closeUntilDestId, true)
+            navController.popBackStack(closeUntilDestId, true).not()
         }
     }
 
+    DisposableLifecycleCallbacks(
+        //additional close for cases when user closes app immediately after sending
+        onResume = {
+            if (sendResult == SendResult.Sent) {
+                navController.popBackStack(closeUntilDestId, true)
+            }
+        }
+    )
+
     Column(Modifier.background(color = ComposeAppTheme.colors.tyler)) {
         AppBar(
             title = stringResource(R.string.Send_Confirmation_Title),

diff --git a/...main/java/io/horizontalsystems/bankwallet/modules/send/tron/SendTronConfirmationScreen.kt b/...main/java/io/horizontalsystems/bankwallet/modules/send/tron/SendTronConfirmationScreen.kt
@@ -38,6 +38,7 @@ import io.horizontalsystems.bankwallet.modules.send.ConfirmAmountCell
 import io.horizontalsystems.bankwallet.modules.send.MemoCell
 import io.horizontalsystems.bankwallet.modules.send.SendResult
 import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
+import io.horizontalsystems.bankwallet.ui.compose.DisposableLifecycleCallbacks
 import io.horizontalsystems.bankwallet.ui.compose.components.AppBar
 import io.horizontalsystems.bankwallet.ui.compose.components.ButtonPrimaryYellow
 import io.horizontalsystems.bankwallet.ui.compose.components.CellUniversalLawrenceSection
@@ -127,6 +128,15 @@ fun SendTronConfirmationScreen(
         }
     }
 
+    DisposableLifecycleCallbacks(
+        //additional close for cases when user closes app immediately after sending
+        onResume = {
+            if (sendResult == SendResult.Sent) {
+                navController.popBackStack(closeUntilDestId, true)
+            }
+        }
+    )
+
     Column(Modifier.background(color = ComposeAppTheme.colors.tyler)) {
         AppBar(
             title = stringResource(R.string.Send_Confirmation_Title),