From f88f21668a8e8dc14a03b391d8b1f419d274f0a7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 18 Dec 2020 21:10:43 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../details/redux/twins/CreateTwinWalletMiddleware.kt      | 7 +++++--
 app/src/main/res/values/strings.xml                        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 @@
     <string name="initial_message_scan_header">Tap to scan</string>
     <string name="initial_message_tap_header">Tap the card</string>
 
-    <string name="details_notification_erase_wallet_not_possible">You balance on this wallet is not zero, or you have unconfirmed transactions</string>
+    <string name="details_notification_erase_wallet_not_possible">Your balance on this wallet is not zero, or you have unconfirmed transactions</string>
     <string name="details_notification_security_option_already_active">This is the currently active option</string>