diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt index c2b5853228..d522a5b285 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/twins/CreateTwinWalletMiddleware.kt @@ -19,8 +19,11 @@ class CreateTwinWalletMiddleware { when (action) { is DetailsAction.CreateTwinWalletAction.ShowWarning -> { val wallet = store.state.detailsState.wallet - val notEmpty = wallet?.recentTransactions?.isNullOrEmpty() != true || - wallet.amounts.toSendableAmounts().isNotEmpty() + if (wallet == null) { + store.dispatch(NavigationAction.NavigateTo(AppScreen.CreateTwinWalletWarning)) + return + } + val notEmpty = wallet.recentTransactions.isNotEmpty() || wallet.amounts.toSendableAmounts().isNotEmpty() if (notEmpty) { store.dispatch(DetailsAction.CreateTwinWalletAction.NotEmpty) } else { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c90c4534da..05ea986b66 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -197,7 +197,7 @@ Tap to scan Tap the card - You balance on this wallet is not zero, or you have unconfirmed transactions + Your balance on this wallet is not zero, or you have unconfirmed transactions This is the currently active option