Merge pull request #1121 from radixdlt/fix/ABW-3668-pop-persona-creat…

…ion-crash

Fix crash when popping persona creation flow.

app/src/main/java/com/babylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaNav.kt

@@ -10,6 +10,7 @@ import com.babylon.wallet.android.presentation.navigation.markAsHighPriority
 import com.babylon.wallet.android.presentation.settings.personas.PersonasScreen
 import com.babylon.wallet.android.presentation.settings.personas.personadetail.ROUTE_PERSONA_DETAIL
 import com.radixdlt.sargon.IdentityAddress
+import rdx.works.core.flatMapError
 
 const val ROUTE_CREATE_PERSONA = "create_persona_route"
 const val ROUTE_PERSONA_INFO = "persona_info_route"
@@ -29,14 +30,15 @@ fun NavController.personaInfoScreen() {
     navigate(ROUTE_PERSONA_INFO)
 }
 
-@Suppress("SwallowedException")
 fun NavController.popPersonaCreation() {
-    val entryToPop = try {
-        getBackStackEntry(ROUTE_PERSONA_INFO)
-    } catch (e: java.lang.IllegalArgumentException) {
-        getBackStackEntry(ROUTE_CREATE_PERSONA)
+    val entryToPop = runCatching { getBackStackEntry(ROUTE_PERSONA_INFO) }.flatMapError {
+        runCatching { getBackStackEntry(ROUTE_CREATE_PERSONA) }
+    }.getOrNull()
+    if (entryToPop == null) {
+        popBackStack()
+    } else {
+        popBackStack(entryToPop.destination.id, true)
     }
-    popBackStack(entryToPop.destination.id, true)
 }
 
 fun NavGraphBuilder.personaInfoScreen(