From e768a687aefc59f51ae9ec55d609404598d3607c Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Mon, 6 May 2024 11:47:36 +0200
Subject: [PATCH] fix(setup wallet): navigation and mnemonic (#3238)

---
 .../RemoveWallet/RemoveWalletScreen.tsx       |  4 +--
 .../common/MnemonicInput/MnemonicInput.tsx    |  1 +
 .../RestoreWallet/RestoreWalletScreen.tsx     |  1 -
 .../RemoveWallet/RemoveWalletScreen.json      | 28 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
index c5a85ed95e..7921b786eb 100644
--- a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
@@ -25,7 +25,7 @@ export const RemoveWalletScreen = () => {
   const styles = useStyles()
   const wallet = useSelectedWallet()
   const walletName = useWalletName(wallet)
-  const {resetToWalletSetup, resetToWalletSelection} = useWalletNavigation()
+  const {resetToWalletSetupInit, resetToWalletSelection} = useWalletNavigation()
   const walletManager = useWalletManager()
   const queryClient = useQueryClient()
 
@@ -41,7 +41,7 @@ export const RemoveWalletScreen = () => {
         return
       }
 
-      resetToWalletSetup()
+      resetToWalletSetupInit()
     },
   })
 
diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/MnemonicInput/MnemonicInput.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/MnemonicInput/MnemonicInput.tsx
index 822afed060..a186e79cc4 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/common/MnemonicInput/MnemonicInput.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/common/MnemonicInput/MnemonicInput.tsx
@@ -290,6 +290,7 @@ const MnemonicWordInput = React.forwardRef<MnemonicWordInputRef, MnemonicWordInp
             onKeyPress(word)
           }
         }}
+        onBlur={() => setSuggestedWords([])}
         keyboardType={Platform.OS === 'android' ? 'visible-password' : undefined} // to hide keyboard suggestions on android
       />
     )
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
index 987e15100a..2e9986b18d 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
@@ -116,7 +116,6 @@ export const RestoreWalletScreen = () => {
   }
 
   const onFocus = (index: number) => {
-    setSuggestedWords([])
     setFocusedIndex(index)
   }
 
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
index 3caa5ed39a..6d3ba4e60d 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 126,
       "column": 25,
-      "index": 4025
+      "index": 4033
     },
     "end": {
       "line": 129,
       "column": 3,
-      "index": 4219
+      "index": 4227
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 130,
       "column": 25,
-      "index": 4246
+      "index": 4254
     },
     "end": {
       "line": 133,
       "column": 3,
-      "index": 4403
+      "index": 4411
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 134,
       "column": 14,
-      "index": 4419
+      "index": 4427
     },
     "end": {
       "line": 137,
       "column": 3,
-      "index": 4523
+      "index": 4531
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 138,
       "column": 19,
-      "index": 4544
+      "index": 4552
     },
     "end": {
       "line": 141,
       "column": 3,
-      "index": 4653
+      "index": 4661
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 142,
       "column": 27,
-      "index": 4682
+      "index": 4690
     },
     "end": {
       "line": 145,
       "column": 3,
-      "index": 4814
+      "index": 4822
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 146,
       "column": 10,
-      "index": 4826
+      "index": 4834
     },
     "end": {
       "line": 149,
       "column": 3,
-      "index": 4928
+      "index": 4936
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 150,
       "column": 26,
-      "index": 4956
+      "index": 4964
     },
     "end": {
       "line": 154,
       "column": 3,
-      "index": 5170
+      "index": 5178
     }
   }
 ]
\ No newline at end of file