Updated on 2026-08-14

2024-02-08 19:56:50 +03:00 · 2024-02-08 19:56:50 +03:00 · 6f22bf53b2
commit 6f22bf53b2
parent 6e7b57a57d
4 changed files with 39 additions and 10 deletions
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@ -129,7 +129,14 @@ internal class SaveWalletMiddleware {
                    }

                    store.dispatchOnMain(SaveWalletAction.Save.Success)
-                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+
+                    store.dispatchOnMain(
+                        if (store.state.navigationState.backStack.contains(AppScreen.Wallet)) {
+                            NavigationAction.PopBackTo(AppScreen.Wallet)
+                        } else {
+                            NavigationAction.NavigateTo(AppScreen.Wallet)
+                        },
+                    )
                }
        }
    }