Fix app crash during restore on SendConfirm screen

horizontalsystems · Nov 20, 2024 · 2c88259 · 2c88259
1 parent 835694f
commit 2c88259
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainFragment.kt
@@ -86,10 +86,7 @@ class MainFragment : BaseComposeFragment() {
             )
         } ?: run {
             // Back stack entry doesn't exist, restart activity
-            val intent = requireActivity().intent
-            intent.data = null
-            requireActivity().finishAffinity()
-            startActivity(intent)
+            requireActivity().recreate()
         }
     }
 

diff --git a/...horizontalsystems/bankwallet/modules/send/evm/confirmation/SendEvmConfirmationFragment.kt b/...horizontalsystems/bankwallet/modules/send/evm/confirmation/SendEvmConfirmationFragment.kt
@@ -42,7 +42,13 @@ class SendEvmConfirmationFragment : BaseComposeFragment() {
 
     @Composable
     override fun GetContent(navController: NavController) {
-        SendEvmConfirmationScreen(navController, navController.requireInput())
+        val input = try {
+            navController.requireInput<Input>()
+        } catch (e: NullPointerException) {
+            navController.popBackStack()
+            return
+        }
+        SendEvmConfirmationScreen(navController, input)
     }
 
     @Parcelize