From ae5ac71040e969a6ec9570018399e71748ecd3c6 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Tue, 16 Apr 2024 23:47:37 +0200
Subject: [PATCH] fix(setup wallet): wallet plate hardcode issue, redirects and
 mnemonic button (#3203)

---
 .../SetupWallet/common/useStrings.tsx         |   5 +-
 .../VerifyRecoveryPhraseScreen.tsx            | 135 ++--
 .../CreateWallet/WalletDetailsScreen.tsx      |  86 ++-
 .../RestoreWalletDetailsScreen.tsx            |  77 ++-
 .../wallet-mobile/src/i18n/locales/en-US.json |   2 +-
 .../messages/src/AppNavigator.json            |  16 +-
 .../ApplicationSettingsScreen.json            |  68 +--
 .../SetupWallet/common/useStrings.json        | 578 +++++++++---------
 .../messages/src/yoroi-wallets/auth/auth.json |  12 +-
 9 files changed, 520 insertions(+), 459 deletions(-)

diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
index 274fb40154..f62fb8d52b 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
@@ -72,7 +72,8 @@ export const useStrings = () => {
     walletPasswordModalCardSecondItem: intl.formatMessage(messages.walletPasswordModalCardSecondItem),
     walletChecksumModalCardTitle: intl.formatMessage(messages.walletChecksumModalCardTitle),
     walletChecksumModalCardFirstItem: intl.formatMessage(messages.walletChecksumModalCardFirstItem),
-    walletChecksumModalCardSecondItem: intl.formatMessage(messages.walletChecksumModalCardSecondItem),
+    walletChecksumModalCardSecondItem: (checksum: string) =>
+      intl.formatMessage(messages.walletChecksumModalCardSecondItem, {checksum}),
     walletChecksumModalCardThirdItem: intl.formatMessage(messages.walletChecksumModalCardThirdItem),
     stepWalletDetails: intl.formatMessage(messages.stepWalletDetails),
     walletDetailsTitle: (options: {b: (content: React.ReactNode[]) => React.ReactNode}) =>
@@ -320,7 +321,7 @@ export const messages = Object.freeze(
     },
     walletChecksumModalCardSecondItem: {
       id: 'components.walletinit.walletDetails.walletChecksumModalCardItem.second',
-      defaultMessage: '!!!Plate number BONE-0770 is a auto-generated sign of four letters and four digits.',
+      defaultMessage: '!!!Plate number {checksum} is a auto-generated sign of four letters and four digits.',
     },
     walletChecksumModalCardThirdItem: {
       id: 'components.walletinit.walletDetails.walletChecksumModalCardItem.third',
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
index 25eb005156..0fc006188e 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
@@ -198,46 +198,44 @@ const MnemonicInput = ({defaultMnemonic, userEntries, onPress}: MnemonicInputPro
             const recoveryWordError = !isLastWordValid() && lastUserEntry?.id === entry.id
 
             return (
-              <Animated.View
+              <TouchableOpacity
                 key={entry.id}
-                style={styles.wordBadgeView}
-                layout={Layout}
-                entering={FadeIn}
-                exiting={FadeOut}
+                activeOpacity={0.5}
+                onPress={onPress}
+                disabled={!isLast || !recoveryWordError}
+                style={styles.wordBadge}
               >
-                <WordBadge
-                  word={`${(index + 1).toString()}.`}
-                  used
-                  disabled={!isLast || !recoveryWordError}
-                  onPress={onPress}
-                  recoveryWordError={recoveryWordError}
-                  defaultMnemonic={defaultMnemonic}
-                />
-
-                <Animated.View
-                  layout={Layout}
-                  entering={FadeIn}
-                  exiting={FadeOut}
-                  style={[styles.wordBadgeContainerOutline, recoveryWordError && styles.errorBadgeBackground]}
-                >
-                  {!recoveryWordError && (
-                    <LinearGradient
-                      style={[StyleSheet.absoluteFill, {opacity: 1}]}
-                      start={isPhraseComplete && isPhraseValid ? {x: 0, y: 0} : {x: 1, y: 0}}
-                      end={isPhraseComplete && isPhraseValid ? {x: 0, y: 1} : {x: 0, y: 0}}
-                      colors={isPhraseComplete && isPhraseValid ? colors.gradientGreen : colors.gradientBlueGreen}
-                    />
-                  )}
-
+                <Animated.View style={styles.wordBadgeView} layout={Layout} entering={FadeIn} exiting={FadeOut}>
                   <WordBadge
-                    word={entry.word}
-                    disabled={!isLast || !recoveryWordError}
-                    onPress={onPress}
+                    word={`${(index + 1).toString()}.`}
+                    used
                     recoveryWordError={recoveryWordError}
                     defaultMnemonic={defaultMnemonic}
                   />
+
+                  <Animated.View
+                    layout={Layout}
+                    entering={FadeIn}
+                    exiting={FadeOut}
+                    style={[styles.wordBadgeContainerOutline, recoveryWordError && styles.errorBadgeBackground]}
+                  >
+                    {!recoveryWordError && (
+                      <LinearGradient
+                        style={[StyleSheet.absoluteFill, {opacity: 1}]}
+                        start={isPhraseComplete && isPhraseValid ? {x: 0, y: 0} : {x: 1, y: 0}}
+                        end={isPhraseComplete && isPhraseValid ? {x: 0, y: 1} : {x: 0, y: 0}}
+                        colors={isPhraseComplete && isPhraseValid ? colors.gradientGreen : colors.gradientBlueGreen}
+                      />
+                    )}
+
+                    <WordBadge
+                      word={entry.word}
+                      recoveryWordError={recoveryWordError}
+                      defaultMnemonic={defaultMnemonic}
+                    />
+                  </Animated.View>
                 </Animated.View>
-              </Animated.View>
+              </TouchableOpacity>
             )
           })}
         </View>
@@ -293,32 +291,26 @@ const WordBadges = ({
         const usedError = isUsed && !isLastWordValid() && lastUserEntry?.id === entry.id
 
         return (
-          <Animated.View
+          <TouchableOpacity
+            testID={isUsed ? `wordBadgeTapped-${entry.word}` : `wordBadgeNonTapped-${entry.word}`}
             key={entry.id}
-            layout={Layout}
-            entering={FadeIn}
-            exiting={FadeOut}
-            style={[styles.wordBadgeContainer]}
+            activeOpacity={0.5}
+            disabled={isUsed}
+            onPress={() => selectWord(entry)}
           >
-            <LinearGradient
-              style={[StyleSheet.absoluteFill, {opacity: 1}]}
-              start={{x: 1, y: 0}}
-              end={{x: 0, y: 0}}
-              colors={!usedError ? colors.gradientBlueGreen : [colors.error, colors.error]}
-            />
-
-            {isUsed && <View style={styles.usedWordBackground} />}
-
-            <WordBadge
-              word={entry.word}
-              onPress={() => selectWord(entry)}
-              disabled={isUsed}
-              used={isUsed}
-              usedError={usedError}
-              testID={isUsed ? `wordBadgeTapped-${entry.word}` : `wordBadgeNonTapped-${entry.word}`}
-              defaultMnemonic={defaultMnemonic}
-            />
-          </Animated.View>
+            <Animated.View layout={Layout} entering={FadeIn} exiting={FadeOut} style={[styles.wordBadgeContainer]}>
+              <LinearGradient
+                style={[StyleSheet.absoluteFill, {opacity: 1}]}
+                start={{x: 1, y: 0}}
+                end={{x: 0, y: 0}}
+                colors={!usedError ? colors.gradientBlueGreen : [colors.error, colors.error]}
+              />
+
+              {isUsed && <View style={styles.usedWordBackground} />}
+
+              <WordBadge word={entry.word} used={isUsed} usedError={usedError} defaultMnemonic={defaultMnemonic} />
+            </Animated.View>
+          </TouchableOpacity>
         )
       })}
     </Animated.View>
@@ -327,34 +319,23 @@ const WordBadges = ({
 
 type WordBadgeProps = {
   word: string
-  disabled?: boolean
   used?: boolean
   usedError?: boolean
   recoveryWordError?: boolean
-  onPress?: () => void
-  testID?: string
   defaultMnemonic: Array<Entry>
 }
-const WordBadge = ({word, onPress, disabled, testID, used, usedError, recoveryWordError}: WordBadgeProps) => {
+const WordBadge = ({word, used, usedError, recoveryWordError}: WordBadgeProps) => {
   const {styles} = useStyles()
   return (
-    <Animated.View layout={Layout} entering={FadeIn} exiting={FadeOut}>
-      <TouchableOpacity
-        testID={testID}
-        activeOpacity={0.5}
-        onPress={onPress}
-        disabled={disabled}
-        style={styles.wordBadge}
+    <Animated.View layout={Layout} entering={FadeIn} exiting={FadeOut} style={styles.wordBadge}>
+      <Animated.Text
+        layout={Layout}
+        entering={FadeIn}
+        exiting={FadeOut}
+        style={[styles.wordBadgeText, used && !usedError && styles.usedWord, recoveryWordError && styles.errorBadge]}
       >
-        <Animated.Text
-          layout={Layout}
-          entering={FadeIn}
-          exiting={FadeOut}
-          style={[styles.wordBadgeText, used && !usedError && styles.usedWord, recoveryWordError && styles.errorBadge]}
-        >
-          {word}
-        </Animated.Text>
-      </TouchableOpacity>
+        {word}
+      </Animated.Text>
     </Animated.View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
index 613953ef2a..47b014cfb4 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
@@ -1,5 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native'
-import {NetworkError} from '@yoroi/common'
+import {NetworkError, useAsyncStorage} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
@@ -26,8 +26,10 @@ import {useMetrics} from '../../../../metrics/metricsManager'
 import {useWalletNavigation} from '../../../../navigation'
 import {isEmptyString} from '../../../../utils'
 import {AddressMode} from '../../../../wallet-manager/types'
+import {parseWalletMeta} from '../../../../wallet-manager/validators'
 import {useWalletManager} from '../../../../wallet-manager/WalletManagerContext'
-import {useCreateWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
+import {InvalidState} from '../../../../yoroi-wallets/cardano/errors'
+import {useCreateWallet, useOpenWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
 import {WalletImplementationId} from '../../../../yoroi-wallets/types'
 import {
   getWalletNameError,
@@ -36,6 +38,7 @@ import {
   validateWalletName,
 } from '../../../../yoroi-wallets/utils'
 import {debugWalletInfo, features} from '../../..'
+import {useSetSelectedWallet, useSetSelectedWalletMeta} from '../../../WalletManager/Context'
 import {CardAboutPhrase} from '../../common/CardAboutPhrase/CardAboutPhrase'
 import {YoroiZendeskLink} from '../../common/contants'
 import {LearnMoreButton} from '../../common/LearnMoreButton/LearnMoreButton'
@@ -63,11 +66,20 @@ export const WalletDetailsScreen = () => {
   const {styles} = useStyles()
   const {HEIGHT_MODAL_NAME_PASSWORD, HEIGHT_MODAL_CHECKSUM} = useSizeModal()
   const {openModal, closeModal} = useModal()
-  const {resetToWalletSelection} = useWalletNavigation()
+  const {navigateToTxHistory} = useWalletNavigation()
   const strings = useStrings()
   const walletManager = useWalletManager()
   const {walletNames} = useWalletNames(walletManager)
   const {track} = useMetrics()
+  const intl = useIntl()
+  const selectWalletMeta = useSetSelectedWalletMeta()
+  const selectWallet = useSetSelectedWallet()
+  const storage = useAsyncStorage()
+  const {mnemonic, networkId, publicKeyHex, walletImplementationId} = useSetupWallet()
+  const plate = usePlate({networkId, publicKeyHex})
+  const [name, setName] = React.useState(features.prefillWalletInfo ? debugWalletInfo.WALLET_NAME : '')
+  const passwordRef = React.useRef<RNTextInput>(null)
+  const [password, setPassword] = React.useState(features.prefillWalletInfo ? debugWalletInfo.PASSWORD : '')
 
   useFocusEffect(
     React.useCallback(() => {
@@ -75,20 +87,6 @@ export const WalletDetailsScreen = () => {
     }, [track]),
   )
 
-  const {mnemonic, networkId, publicKeyHex, walletImplementationId} = useSetupWallet()
-  const plate = usePlate({networkId, publicKeyHex})
-
-  const [name, setName] = React.useState(features.prefillWalletInfo ? debugWalletInfo.WALLET_NAME : '')
-
-  const nameErrors = validateWalletName(name, null, walletNames ?? [])
-  const walletNameErrorText = getWalletNameError(
-    {tooLong: strings.tooLong, nameAlreadyTaken: strings.nameAlreadyTaken, mustBeFilled: strings.mustBeFilled},
-    nameErrors,
-  )
-
-  const passwordRef = React.useRef<RNTextInput>(null)
-  const [password, setPassword] = React.useState(features.prefillWalletInfo ? debugWalletInfo.PASSWORD : '')
-
   const passwordConfirmationRef = React.useRef<RNTextInput>(null)
   const [passwordConfirmation, setPasswordConfirmation] = React.useState(
     features.prefillWalletInfo ? debugWalletInfo.PASSWORD : '',
@@ -101,11 +99,40 @@ export const WalletDetailsScreen = () => {
     ? strings.repeatPasswordInputError
     : undefined
 
-  const intl = useIntl()
-  const {createWallet, isLoading, isSuccess} = useCreateWallet({
-    onSuccess: () => {
+  const {
+    openWallet,
+    isLoading: isOpenWalletLoading,
+    isSuccess: isOpenWalletSuccess,
+  } = useOpenWallet({
+    onSuccess: ([wallet, walletMeta]) => {
+      selectWalletMeta(walletMeta)
+      selectWallet(wallet)
+      navigateToTxHistory()
+    },
+    onError: (error) => {
+      InteractionManager.runAfterInteractions(() => {
+        return error instanceof InvalidState
+          ? showErrorDialog(errorMessages.walletStateInvalid, intl)
+          : error instanceof NetworkError
+          ? showErrorDialog(errorMessages.networkError, intl)
+          : showErrorDialog(errorMessages.generalError, intl, {message: error.message})
+      })
+    },
+  })
+
+  const {
+    createWallet,
+    isLoading: isCreateWalletLoading,
+    isSuccess: isCreateWalletSuccess,
+  } = useCreateWallet({
+    onSuccess: async (wallet) => {
+      const walletStorage = storage.join('wallet/')
+      const walletMeta = await walletStorage.getItem(wallet.id, parseWalletMeta)
+
+      if (!walletMeta) throw new Error('invalid wallet meta')
+
+      openWallet(walletMeta)
       track.createWalletDetailsSettled()
-      resetToWalletSelection()
     },
     onError: (error) => {
       InteractionManager.runAfterInteractions(() => {
@@ -116,6 +143,14 @@ export const WalletDetailsScreen = () => {
     },
   })
 
+  const nameErrors = validateWalletName(name, null, walletNames && !isCreateWalletSuccess ? walletNames : [])
+  const walletNameErrorText = getWalletNameError(
+    {tooLong: strings.tooLong, nameAlreadyTaken: strings.nameAlreadyTaken, mustBeFilled: strings.mustBeFilled},
+    nameErrors,
+  )
+
+  const isLoading = isCreateWalletLoading || isOpenWalletLoading
+
   const handleCreateWallet = React.useCallback(() => {
     track.createWalletDetailsSubmitted()
 
@@ -181,7 +216,7 @@ export const WalletDetailsScreen = () => {
               checksumLine={1}
               linesOfText={[
                 strings.walletChecksumModalCardFirstItem,
-                strings.walletChecksumModalCardSecondItem,
+                strings.walletChecksumModalCardSecondItem(plate.accountPlate.TextPart),
                 strings.walletChecksumModalCardThirdItem,
               ]}
             />
@@ -233,6 +268,7 @@ export const WalletDetailsScreen = () => {
           onSubmitEditing={() => passwordRef.current?.focus()}
           testID="walletNameInput"
           autoComplete="off"
+          disabled={isLoading}
           showErrorOnBlur
         />
 
@@ -249,6 +285,7 @@ export const WalletDetailsScreen = () => {
           onSubmitEditing={() => passwordConfirmationRef.current?.focus()}
           testID="walletPasswordInput"
           autoComplete="off"
+          disabled={isLoading}
           showErrorOnBlur
         />
 
@@ -265,6 +302,7 @@ export const WalletDetailsScreen = () => {
           errorText={passwordConfirmationErrorText}
           testID="walletRepeatPasswordInput"
           autoComplete="off"
+          disabled={isLoading}
           showErrorOnBlur
         />
 
@@ -289,8 +327,8 @@ export const WalletDetailsScreen = () => {
         <Button
           title={strings.next}
           style={styles.button}
-          onPress={isLoading || isSuccess ? NOOP : () => handleCreateWallet()}
-          disabled={Object.keys(passwordErrors).length > 0 || Object.keys(nameErrors).length > 0}
+          onPress={isLoading || isOpenWalletSuccess ? NOOP : () => handleCreateWallet()}
+          disabled={isLoading || Object.keys(passwordErrors).length > 0 || Object.keys(nameErrors).length > 0}
         />
 
         <Space height="s" />
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
index bfab406ea2..33d519988a 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
@@ -1,5 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native'
-import {NetworkError} from '@yoroi/common'
+import {NetworkError, useAsyncStorage} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
@@ -26,8 +26,10 @@ import {useMetrics} from '../../../../metrics/metricsManager'
 import {useWalletNavigation} from '../../../../navigation'
 import {isEmptyString} from '../../../../utils'
 import {AddressMode} from '../../../../wallet-manager/types'
+import {parseWalletMeta} from '../../../../wallet-manager/validators'
 import {useWalletManager} from '../../../../wallet-manager/WalletManagerContext'
-import {useCreateWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
+import {InvalidState} from '../../../../yoroi-wallets/cardano/errors'
+import {useCreateWallet, useOpenWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
 import {WalletImplementationId} from '../../../../yoroi-wallets/types'
 import {
   getWalletNameError,
@@ -36,6 +38,7 @@ import {
   validateWalletName,
 } from '../../../../yoroi-wallets/utils'
 import {debugWalletInfo, features} from '../../..'
+import {useSetSelectedWallet, useSetSelectedWalletMeta} from '../../../WalletManager/Context'
 import {CardAboutPhrase} from '../../common/CardAboutPhrase/CardAboutPhrase'
 import {YoroiZendeskLink} from '../../common/contants'
 import {LearnMoreButton} from '../../common/LearnMoreButton/LearnMoreButton'
@@ -65,16 +68,16 @@ export const RestoreWalletDetailsScreen = () => {
   const {HEIGHT_MODAL_NAME_PASSWORD, HEIGHT_MODAL_CHECKSUM} = useSizeModal()
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
-  const {resetToWalletSelection} = useWalletNavigation()
+  const {navigateToTxHistory} = useWalletNavigation()
   const walletManager = useWalletManager()
   const {track} = useMetrics()
   const {walletNames} = useWalletNames(walletManager)
   const [name, setName] = React.useState(features.prefillWalletInfo ? debugWalletInfo.WALLET_NAME : '')
-  const nameErrors = validateWalletName(name, null, walletNames ?? [])
-  const walletNameErrorText = getWalletNameError(
-    {tooLong: strings.tooLong, nameAlreadyTaken: strings.nameAlreadyTaken, mustBeFilled: strings.mustBeFilled},
-    nameErrors,
-  )
+  const selectWalletMeta = useSetSelectedWalletMeta()
+  const selectWallet = useSetSelectedWallet()
+  const storage = useAsyncStorage()
+  const {mnemonic, networkId, publicKeyHex, walletImplementationId} = useSetupWallet()
+  const plate = usePlate({networkId, publicKeyHex})
 
   const passwordRef = React.useRef<RNTextInput>(null)
   const [password, setPassword] = React.useState(features.prefillWalletInfo ? debugWalletInfo.PASSWORD : '')
@@ -85,9 +88,6 @@ export const RestoreWalletDetailsScreen = () => {
   )
   const passwordErrors = validatePassword(password, passwordConfirmation)
 
-  const {mnemonic, networkId, publicKeyHex, walletImplementationId} = useSetupWallet()
-  const plate = usePlate({networkId, publicKeyHex})
-
   const passwordErrorText = passwordErrors.passwordIsWeak
     ? strings.passwordStrengthRequirement({requiredPasswordLength: REQUIRED_PASSWORD_LENGTH})
     : undefined
@@ -95,11 +95,41 @@ export const RestoreWalletDetailsScreen = () => {
     ? strings.repeatPasswordInputError
     : undefined
 
+  const {
+    openWallet,
+    isLoading: isOpenWalletLoading,
+    isSuccess: isOpenWalletSuccess,
+  } = useOpenWallet({
+    onSuccess: ([wallet, walletMeta]) => {
+      selectWalletMeta(walletMeta)
+      selectWallet(wallet)
+      navigateToTxHistory()
+    },
+    onError: (error) => {
+      InteractionManager.runAfterInteractions(() => {
+        return error instanceof InvalidState
+          ? showErrorDialog(errorMessages.walletStateInvalid, intl)
+          : error instanceof NetworkError
+          ? showErrorDialog(errorMessages.networkError, intl)
+          : showErrorDialog(errorMessages.generalError, intl, {message: error.message})
+      })
+    },
+  })
+
   const intl = useIntl()
-  const {createWallet, isLoading, isSuccess} = useCreateWallet({
-    onSuccess: () => {
+  const {
+    createWallet,
+    isLoading: isCreateWalletLoading,
+    isSuccess: isCreateWalletSuccess,
+  } = useCreateWallet({
+    onSuccess: async (wallet) => {
+      const walletStorage = storage.join('wallet/')
+      const walletMeta = await walletStorage.getItem(wallet.id, parseWalletMeta)
+
+      if (!walletMeta) throw new Error('invalid wallet meta')
+
+      openWallet(walletMeta)
       track.restoreWalletDetailsSettled()
-      resetToWalletSelection()
     },
     onError: (error) => {
       InteractionManager.runAfterInteractions(() => {
@@ -110,6 +140,14 @@ export const RestoreWalletDetailsScreen = () => {
     },
   })
 
+  const nameErrors = validateWalletName(name, null, walletNames && !isCreateWalletSuccess ? walletNames : [])
+  const walletNameErrorText = getWalletNameError(
+    {tooLong: strings.tooLong, nameAlreadyTaken: strings.nameAlreadyTaken, mustBeFilled: strings.mustBeFilled},
+    nameErrors,
+  )
+
+  const isLoading = isCreateWalletLoading || isOpenWalletLoading
+
   useFocusEffect(
     React.useCallback(() => {
       track.restoreWalletDetailsStepViewed()
@@ -168,7 +206,7 @@ export const RestoreWalletDetailsScreen = () => {
               checksumLine={1}
               linesOfText={[
                 strings.walletChecksumModalCardFirstItem,
-                strings.walletChecksumModalCardSecondItem,
+                strings.walletChecksumModalCardSecondItem(plate.accountPlate.TextPart),
                 strings.walletChecksumModalCardThirdItem,
               ]}
             />
@@ -226,6 +264,7 @@ export const RestoreWalletDetailsScreen = () => {
             onSubmitEditing={() => passwordRef.current?.focus()}
             testID="walletNameInput"
             autoComplete="off"
+            disabled={isLoading}
             showErrorOnBlur
           />
 
@@ -242,6 +281,7 @@ export const RestoreWalletDetailsScreen = () => {
             onSubmitEditing={() => passwordConfirmationRef.current?.focus()}
             testID="walletPasswordInput"
             autoComplete="off"
+            disabled={isLoading}
             showErrorOnBlur
           />
 
@@ -258,7 +298,8 @@ export const RestoreWalletDetailsScreen = () => {
             errorText={passwordConfirmationErrorText}
             testID="walletRepeatPasswordInput"
             autoComplete="off"
-            showErrorOnBlur
+            disabled={isLoading}
+            showErrorOnBlur={!isOpenWalletSuccess}
           />
 
           <View style={styles.checksum}>
@@ -281,7 +322,7 @@ export const RestoreWalletDetailsScreen = () => {
             title={strings.next}
             style={styles.button}
             onPress={
-              isLoading || isSuccess
+              isCreateWalletLoading || isOpenWalletLoading || isOpenWalletSuccess
                 ? NOOP
                 : () =>
                     createWallet({
@@ -293,7 +334,7 @@ export const RestoreWalletDetailsScreen = () => {
                       addressMode,
                     })
             }
-            disabled={Object.keys(passwordErrors).length > 0 || Object.keys(nameErrors).length > 0}
+            disabled={isLoading || Object.keys(passwordErrors).length > 0 || Object.keys(nameErrors).length > 0}
           />
         </View>
       </KeyboardAvoidingView>
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 0fbeefa350..b360c873c5 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -538,7 +538,7 @@
   "components.walletinit.walletDetails.walletPasswordModalCardItem.second": "Both wallet name and password are stored locally, so you are only person who can change or restore it.",
   "components.walletinit.walletDetails.walletChecksumModalCardTitle.title": "What is wallet checksum and plate number?",
   "components.walletinit.walletDetails.walletChecksumModalCardItem.first": "Wallet checksum is a generic Blockie image that is generated to visually distinguish your wallet from others.",
-  "components.walletinit.walletDetails.walletChecksumModalCardItem.second": "Plate number BONE-0770 is a auto-generated sign of four letters and four digits.",
+  "components.walletinit.walletDetails.walletChecksumModalCardItem.second": "Plate number {checksum} is a auto-generated sign of four letters and four digits.",
   "components.walletinit.walletDetails.walletChecksumModalCardItem.third": "Checksum and plate number are unique to your wallet and represent your public key.",
   "components.walletinit.walletDetails.stepWalletDetails": "Wallet details",
   "components.walletinit.walletDetails.walletDetailsTitle": "<b>Add</b> your <b>wallet name</b> and <b>password</b>. ",
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 3b621e427f..79455e774c 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 189,
       "column": 17,
-      "index": 6484
+      "index": 6488
     },
     "end": {
       "line": 192,
       "column": 3,
-      "index": 6574
+      "index": 6578
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 193,
       "column": 18,
-      "index": 6594
+      "index": 6598
     },
     "end": {
       "line": 196,
       "column": 3,
-      "index": 6692
+      "index": 6696
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 197,
       "column": 25,
-      "index": 6719
+      "index": 6723
     },
     "end": {
       "line": 200,
       "column": 3,
-      "index": 6833
+      "index": 6837
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 201,
       "column": 27,
-      "index": 6862
+      "index": 6866
     },
     "end": {
       "line": 204,
       "column": 3,
-      "index": 6983
+      "index": 6987
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
index eaf4edfc4f..2735bbf225 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 262,
       "column": 11,
-      "index": 9054
+      "index": 9074
     },
     "end": {
       "line": 265,
       "column": 3,
-      "index": 9164
+      "index": 9184
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 266,
       "column": 21,
-      "index": 9187
+      "index": 9207
     },
     "end": {
       "line": 269,
       "column": 3,
-      "index": 9320
+      "index": 9340
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 270,
       "column": 18,
-      "index": 9340
+      "index": 9360
     },
     "end": {
       "line": 273,
       "column": 3,
-      "index": 9452
+      "index": 9472
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 274,
       "column": 22,
-      "index": 9476
+      "index": 9496
     },
     "end": {
       "line": 277,
       "column": 3,
-      "index": 9597
+      "index": 9617
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 278,
       "column": 9,
-      "index": 9608
+      "index": 9628
     },
     "end": {
       "line": 281,
       "column": 3,
-      "index": 9708
+      "index": 9728
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 282,
       "column": 18,
-      "index": 9728
+      "index": 9748
     },
     "end": {
       "line": 285,
       "column": 3,
-      "index": 9855
+      "index": 9875
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 286,
       "column": 13,
-      "index": 9870
+      "index": 9890
     },
     "end": {
       "line": 289,
       "column": 3,
-      "index": 9979
+      "index": 9999
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 290,
       "column": 15,
-      "index": 9996
+      "index": 10016
     },
     "end": {
       "line": 293,
       "column": 3,
-      "index": 10109
+      "index": 10129
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 294,
       "column": 19,
-      "index": 10130
+      "index": 10150
     },
     "end": {
       "line": 297,
       "column": 3,
-      "index": 10291
+      "index": 10311
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 298,
       "column": 20,
-      "index": 10313
+      "index": 10333
     },
     "end": {
       "line": 301,
       "column": 3,
-      "index": 10447
+      "index": 10467
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 302,
       "column": 24,
-      "index": 10473
+      "index": 10493
     },
     "end": {
       "line": 305,
       "column": 3,
-      "index": 10656
+      "index": 10676
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 306,
       "column": 18,
-      "index": 10676
+      "index": 10696
     },
     "end": {
       "line": 309,
       "column": 3,
-      "index": 10807
+      "index": 10827
     }
   },
   {
@@ -186,12 +186,12 @@
     "start": {
       "line": 310,
       "column": 22,
-      "index": 10831
+      "index": 10851
     },
     "end": {
       "line": 313,
       "column": 3,
-      "index": 11012
+      "index": 11032
     }
   },
   {
@@ -201,12 +201,12 @@
     "start": {
       "line": 314,
       "column": 13,
-      "index": 11027
+      "index": 11047
     },
     "end": {
       "line": 317,
       "column": 3,
-      "index": 11135
+      "index": 11155
     }
   },
   {
@@ -216,12 +216,12 @@
     "start": {
       "line": 318,
       "column": 17,
-      "index": 11154
+      "index": 11174
     },
     "end": {
       "line": 321,
       "column": 3,
-      "index": 11271
+      "index": 11291
     }
   },
   {
@@ -231,12 +231,12 @@
     "start": {
       "line": 322,
       "column": 17,
-      "index": 11290
+      "index": 11310
     },
     "end": {
       "line": 325,
       "column": 3,
-      "index": 11413
+      "index": 11433
     }
   },
   {
@@ -246,12 +246,12 @@
     "start": {
       "line": 326,
       "column": 21,
-      "index": 11436
+      "index": 11456
     },
     "end": {
       "line": 330,
       "column": 3,
-      "index": 11654
+      "index": 11674
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
index ddaab173a7..884618adad 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not found",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 14,
-      "index": 7545
+      "index": 7585
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 5,
-      "index": 7666
+      "index": 7706
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Clear all",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 14,
-      "index": 7682
+      "index": 7722
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 5,
-      "index": 7803
+      "index": 7843
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Minimum characters",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 33,
-      "index": 7838
+      "index": 7878
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 5,
-      "index": 7985
+      "index": 8025
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Repeat password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 30,
-      "index": 8017
+      "index": 8057
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 5,
-      "index": 8139
+      "index": 8179
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Passwords do not match",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 30,
-      "index": 8171
+      "index": 8211
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 5,
-      "index": 8300
+      "index": 8340
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Yoroi",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 15,
-      "index": 8317
+      "index": 8357
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 5,
-      "index": 8419
+      "index": 8459
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Light wallet for Cardano assets",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 18,
-      "index": 8439
+      "index": 8479
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 5,
-      "index": 8570
+      "index": 8610
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Learn more on Yoroi Zendesk",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 15,
-      "index": 8587
+      "index": 8627
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 5,
-      "index": 8712
+      "index": 8752
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Continue",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 20,
-      "index": 8734
+      "index": 8774
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 5,
-      "index": 8848
+      "index": 8888
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 10,
-      "index": 8860
+      "index": 8900
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 5,
-      "index": 8966
+      "index": 9006
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Create new wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 28,
-      "index": 8996
+      "index": 9036
     },
     "end": {
-      "line": 146,
+      "line": 147,
       "column": 5,
-      "index": 9124
+      "index": 9164
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Restore Yoroi existing wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 147,
+      "line": 148,
       "column": 29,
-      "index": 9155
+      "index": 9195
     },
     "end": {
-      "line": 150,
+      "line": 151,
       "column": 5,
-      "index": 9296
+      "index": 9336
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Connect hardware wallet device",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 151,
+      "line": 152,
       "column": 29,
-      "index": 9327
+      "index": 9367
     },
     "end": {
-      "line": 154,
+      "line": 155,
       "column": 5,
-      "index": 9469
+      "index": 9509
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Cardano Mainnet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 155,
+      "line": 156,
       "column": 20,
-      "index": 9491
+      "index": 9531
     },
     "end": {
-      "line": 158,
+      "line": 159,
       "column": 5,
-      "index": 9619
+      "index": 9659
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Cardano Preprod Testnet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 159,
+      "line": 160,
       "column": 20,
-      "index": 9641
+      "index": 9681
     },
     "end": {
-      "line": 162,
+      "line": 163,
       "column": 5,
-      "index": 9777
+      "index": 9817
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Cardano SanchoNet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 163,
+      "line": 164,
       "column": 22,
-      "index": 9801
+      "index": 9841
     },
     "end": {
-      "line": 166,
+      "line": 167,
       "column": 5,
-      "index": 9933
+      "index": 9973
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Works with real ADA",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 167,
+      "line": 168,
       "column": 31,
-      "index": 9966
+      "index": 10006
     },
     "end": {
-      "line": 170,
+      "line": 171,
       "column": 5,
-      "index": 10104
+      "index": 10144
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Works with test ADA (tADA)",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 171,
+      "line": 172,
       "column": 31,
-      "index": 10137
+      "index": 10177
     },
     "end": {
-      "line": 174,
+      "line": 175,
       "column": 5,
-      "index": 10282
+      "index": 10322
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Testnet for rolling out governance",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 175,
+      "line": 176,
       "column": 33,
-      "index": 10317
+      "index": 10357
     },
     "end": {
-      "line": 178,
+      "line": 179,
       "column": 5,
-      "index": 10472
+      "index": 10512
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Use your device biometrics for a more convenient access to your Yoroi wallet and transaction confirmation",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 179,
+      "line": 180,
       "column": 26,
-      "index": 10500
+      "index": 10540
     },
     "end": {
-      "line": 183,
+      "line": 184,
       "column": 5,
-      "index": 10733
+      "index": 10773
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Enable biometrics",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 184,
+      "line": 185,
       "column": 18,
-      "index": 10753
+      "index": 10793
     },
     "end": {
-      "line": 187,
+      "line": 188,
       "column": 5,
-      "index": 10876
+      "index": 10916
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Recovery phrase is a unique combination of words",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 188,
+      "line": 189,
       "column": 18,
-      "index": 10896
+      "index": 10936
     },
     "end": {
-      "line": 191,
+      "line": 192,
       "column": 5,
-      "index": 11050
+      "index": 11090
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Read this information carefully before saving your recovery phrase:",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 192,
+      "line": 193,
       "column": 30,
-      "index": 11082
+      "index": 11122
     },
     "end": {
-      "line": 195,
+      "line": 196,
       "column": 5,
-      "index": 11266
+      "index": 11306
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!About recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 196,
+      "line": 197,
       "column": 29,
-      "index": 11297
+      "index": 11337
     },
     "end": {
-      "line": 199,
+      "line": 200,
       "column": 5,
-      "index": 11436
+      "index": 11476
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Recovery phrase is the only way to access your wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 200,
+      "line": 201,
       "column": 38,
-      "index": 11476
+      "index": 11516
     },
     "end": {
-      "line": 203,
+      "line": 204,
       "column": 5,
-      "index": 11654
+      "index": 11694
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!If you lose your Recovery phrase, it will not be possible to recover your wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 204,
+      "line": 205,
       "column": 39,
-      "index": 11695
+      "index": 11735
     },
     "end": {
-      "line": 207,
+      "line": 208,
       "column": 5,
-      "index": 11901
+      "index": 11941
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!You are the only person who knows and stores your Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 208,
+      "line": 209,
       "column": 38,
-      "index": 11941
+      "index": 11981
     },
     "end": {
-      "line": 211,
+      "line": 212,
       "column": 5,
-      "index": 12131
+      "index": 12171
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!You are the only person who knows and stores your Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 212,
+      "line": 213,
       "column": 39,
-      "index": 12172
+      "index": 12212
     },
     "end": {
-      "line": 215,
+      "line": 216,
       "column": 5,
-      "index": 12363
+      "index": 12403
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!Yoroi NEVER asks for your Recovery phrase. Watch out for scammers and impersonators",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 216,
+      "line": 217,
       "column": 38,
-      "index": 12403
+      "index": 12443
     },
     "end": {
-      "line": 219,
+      "line": 220,
       "column": 5,
-      "index": 12611
+      "index": 12651
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!Click “Show recovery phrase” below to reveal and save it.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 220,
+      "line": 221,
       "column": 25,
-      "index": 12638
+      "index": 12678
     },
     "end": {
-      "line": 223,
+      "line": 224,
       "column": 5,
-      "index": 12788
+      "index": 12828
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 224,
+      "line": 225,
       "column": 24,
-      "index": 12814
+      "index": 12854
     },
     "end": {
-      "line": 227,
+      "line": 228,
       "column": 5,
-      "index": 12937
+      "index": 12977
     }
   },
   {
@@ -469,14 +469,14 @@
     "defaultMessage": "!!!Hide recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 228,
+      "line": 229,
       "column": 30,
-      "index": 12969
+      "index": 13009
     },
     "end": {
-      "line": 231,
+      "line": 232,
       "column": 5,
-      "index": 13100
+      "index": 13140
     }
   },
   {
@@ -484,14 +484,14 @@
     "defaultMessage": "!!!Show recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 232,
+      "line": 233,
       "column": 30,
-      "index": 13132
+      "index": 13172
     },
     "end": {
-      "line": 235,
+      "line": 236,
       "column": 5,
-      "index": 13263
+      "index": 13303
     }
   },
   {
@@ -499,14 +499,14 @@
     "defaultMessage": "!!!Tips",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 236,
+      "line": 237,
       "column": 30,
-      "index": 13295
+      "index": 13335
     },
     "end": {
-      "line": 239,
+      "line": 240,
       "column": 5,
-      "index": 13411
+      "index": 13451
     }
   },
   {
@@ -514,14 +514,14 @@
     "defaultMessage": "!!!How to save your recovery phrase?",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 240,
+      "line": 241,
       "column": 29,
-      "index": 13442
+      "index": 13482
     },
     "end": {
-      "line": 243,
+      "line": 244,
       "column": 5,
-      "index": 13586
+      "index": 13626
     }
   },
   {
@@ -529,14 +529,14 @@
     "defaultMessage": "!!!Make sure no one is looking at your screen.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 244,
+      "line": 245,
       "column": 33,
-      "index": 13621
+      "index": 13661
     },
     "end": {
-      "line": 247,
+      "line": 248,
       "column": 5,
-      "index": 13779
+      "index": 13819
     }
   },
   {
@@ -544,14 +544,14 @@
     "defaultMessage": "!!!DO NOT take a screenshot.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 248,
+      "line": 249,
       "column": 34,
-      "index": 13815
+      "index": 13855
     },
     "end": {
-      "line": 251,
+      "line": 252,
       "column": 5,
-      "index": 13956
+      "index": 13996
     }
   },
   {
@@ -559,14 +559,14 @@
     "defaultMessage": "!!!Write the recovery phrase on a piece of paper and store in a secure location like a safety deposit box.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 252,
+      "line": 253,
       "column": 33,
-      "index": 13991
+      "index": 14031
     },
     "end": {
-      "line": 256,
+      "line": 257,
       "column": 5,
-      "index": 14217
+      "index": 14257
     }
   },
   {
@@ -574,14 +574,14 @@
     "defaultMessage": "!!!It is recommended to have 2 or 3 copies of the recovery phrase in different secure locations.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 257,
+      "line": 258,
       "column": 34,
-      "index": 14253
+      "index": 14293
     },
     "end": {
-      "line": 261,
+      "line": 262,
       "column": 5,
-      "index": 14470
+      "index": 14510
     }
   },
   {
@@ -589,14 +589,14 @@
     "defaultMessage": "!!!DO NOT share the recovery phrase as this will allow anyone to access your assets and wallet.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 262,
+      "line": 263,
       "column": 33,
-      "index": 14505
+      "index": 14545
     },
     "end": {
-      "line": 265,
+      "line": 266,
       "column": 5,
-      "index": 14712
+      "index": 14752
     }
   },
   {
@@ -604,14 +604,14 @@
     "defaultMessage": "!!!Select each word in the correct order to confirm your recovery phrase.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 266,
+      "line": 267,
       "column": 31,
-      "index": 14745
+      "index": 14785
     },
     "end": {
-      "line": 269,
+      "line": 270,
       "column": 5,
-      "index": 14913
+      "index": 14953
     }
   },
   {
@@ -619,14 +619,14 @@
     "defaultMessage": "!!!Verify recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 270,
+      "line": 271,
       "column": 30,
-      "index": 14945
+      "index": 14985
     },
     "end": {
-      "line": 273,
+      "line": 274,
       "column": 5,
-      "index": 15087
+      "index": 15127
     }
   },
   {
@@ -634,14 +634,14 @@
     "defaultMessage": "!!!Incorrect order. Try again",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 274,
+      "line": 275,
       "column": 38,
-      "index": 15127
+      "index": 15167
     },
     "end": {
-      "line": 277,
+      "line": 278,
       "column": 5,
-      "index": 15258
+      "index": 15298
     }
   },
   {
@@ -649,14 +649,14 @@
     "defaultMessage": "!!!The recovery phrase is verified",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 278,
+      "line": 279,
       "column": 40,
-      "index": 15300
+      "index": 15340
     },
     "end": {
-      "line": 281,
+      "line": 282,
       "column": 5,
-      "index": 15438
+      "index": 15478
     }
   },
   {
@@ -664,14 +664,14 @@
     "defaultMessage": "!!!Tips",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 282,
+      "line": 283,
       "column": 29,
-      "index": 15469
+      "index": 15509
     },
     "end": {
-      "line": 285,
+      "line": 286,
       "column": 5,
-      "index": 15588
+      "index": 15628
     }
   },
   {
@@ -679,14 +679,14 @@
     "defaultMessage": "!!!What is wallet name",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 286,
+      "line": 287,
       "column": 30,
-      "index": 15620
+      "index": 15660
     },
     "end": {
-      "line": 289,
+      "line": 290,
       "column": 5,
-      "index": 15755
+      "index": 15795
     }
   },
   {
@@ -694,14 +694,14 @@
     "defaultMessage": "!!!It is a wallet identifier that helps you to easier find the exact wallet in your app",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 290,
+      "line": 291,
       "column": 34,
-      "index": 15791
+      "index": 15831
     },
     "end": {
-      "line": 293,
+      "line": 294,
       "column": 5,
-      "index": 15990
+      "index": 16030
     }
   },
   {
@@ -709,14 +709,14 @@
     "defaultMessage": "!!!You can have different wallet names for the same wallet account connected to different devices",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 294,
+      "line": 295,
       "column": 35,
-      "index": 16027
+      "index": 16067
     },
     "end": {
-      "line": 298,
+      "line": 299,
       "column": 5,
-      "index": 16245
+      "index": 16285
     }
   },
   {
@@ -724,14 +724,14 @@
     "defaultMessage": "!!!What is password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 299,
+      "line": 300,
       "column": 34,
-      "index": 16281
+      "index": 16321
     },
     "end": {
-      "line": 302,
+      "line": 303,
       "column": 5,
-      "index": 16417
+      "index": 16457
     }
   },
   {
@@ -739,14 +739,14 @@
     "defaultMessage": "!!!Password is an additional security layer used to confirm transactions from this device",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 303,
+      "line": 304,
       "column": 38,
-      "index": 16457
+      "index": 16497
     },
     "end": {
-      "line": 306,
+      "line": 307,
       "column": 5,
-      "index": 16662
+      "index": 16702
     }
   },
   {
@@ -754,14 +754,14 @@
     "defaultMessage": "!!!Both wallet name and password are stored locally, so you are only person who can change or restore it.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 307,
+      "line": 308,
       "column": 39,
-      "index": 16703
+      "index": 16743
     },
     "end": {
-      "line": 311,
+      "line": 312,
       "column": 5,
-      "index": 16933
+      "index": 16973
     }
   },
   {
@@ -769,14 +769,14 @@
     "defaultMessage": "!!!What is wallet checksum and plate number?",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 312,
+      "line": 313,
       "column": 34,
-      "index": 16969
+      "index": 17009
     },
     "end": {
-      "line": 315,
+      "line": 316,
       "column": 5,
-      "index": 17130
+      "index": 17170
     }
   },
   {
@@ -784,29 +784,29 @@
     "defaultMessage": "!!!Wallet checksum is a generic Blockie image that is generated to visually distinguish your wallet from others.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 316,
+      "line": 317,
       "column": 38,
-      "index": 17170
+      "index": 17210
     },
     "end": {
-      "line": 320,
+      "line": 321,
       "column": 5,
-      "index": 17406
+      "index": 17446
     }
   },
   {
     "id": "components.walletinit.walletDetails.walletChecksumModalCardItem.second",
-    "defaultMessage": "!!!Plate number BONE-0770 is a auto-generated sign of four letters and four digits.",
+    "defaultMessage": "!!!Plate number {checksum} is a auto-generated sign of four letters and four digits.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 321,
+      "line": 322,
       "column": 39,
-      "index": 17447
+      "index": 17487
     },
     "end": {
-      "line": 324,
+      "line": 325,
       "column": 5,
-      "index": 17647
+      "index": 17688
     }
   },
   {
@@ -814,14 +814,14 @@
     "defaultMessage": "!!!Checksum and plate number are unique to your wallet and represent your public key.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 325,
+      "line": 326,
       "column": 38,
-      "index": 17687
+      "index": 17728
     },
     "end": {
-      "line": 328,
+      "line": 329,
       "column": 5,
-      "index": 17888
+      "index": 17929
     }
   },
   {
@@ -829,14 +829,14 @@
     "defaultMessage": "!!!Wallet details",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 329,
+      "line": 330,
       "column": 23,
-      "index": 17913
+      "index": 17954
     },
     "end": {
-      "line": 332,
+      "line": 333,
       "column": 5,
-      "index": 18030
+      "index": 18071
     }
   },
   {
@@ -844,14 +844,14 @@
     "defaultMessage": "!!!Add your wallet name and password.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 333,
+      "line": 334,
       "column": 24,
-      "index": 18056
+      "index": 18097
     },
     "end": {
-      "line": 336,
+      "line": 337,
       "column": 5,
-      "index": 18195
+      "index": 18236
     }
   },
   {
@@ -859,14 +859,14 @@
     "defaultMessage": "!!!Use a combination of letters, numbers and symbols to make your password stronger",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 337,
+      "line": 338,
       "column": 33,
-      "index": 18230
+      "index": 18271
     },
     "end": {
-      "line": 340,
+      "line": 341,
       "column": 5,
-      "index": 18423
+      "index": 18464
     }
   },
   {
@@ -874,14 +874,14 @@
     "defaultMessage": "!!!Enter wallet name",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 341,
+      "line": 342,
       "column": 28,
-      "index": 18453
+      "index": 18494
     },
     "end": {
-      "line": 344,
+      "line": 345,
       "column": 5,
-      "index": 18578
+      "index": 18619
     }
   },
   {
@@ -889,14 +889,14 @@
     "defaultMessage": "!!!Enter password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 345,
+      "line": 346,
       "column": 32,
-      "index": 18612
+      "index": 18653
     },
     "end": {
-      "line": 348,
+      "line": 349,
       "column": 5,
-      "index": 18738
+      "index": 18779
     }
   },
   {
@@ -904,14 +904,14 @@
     "defaultMessage": "!!!Confirm password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 349,
+      "line": 350,
       "column": 39,
-      "index": 18779
+      "index": 18820
     },
     "end": {
-      "line": 352,
+      "line": 353,
       "column": 5,
-      "index": 18914
+      "index": 18955
     }
   },
   {
@@ -919,14 +919,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 353,
+      "line": 354,
       "column": 12,
-      "index": 18928
+      "index": 18969
     },
     "end": {
-      "line": 356,
+      "line": 357,
       "column": 5,
-      "index": 19043
+      "index": 19084
     }
   },
   {
@@ -934,14 +934,14 @@
     "defaultMessage": "!!!Add wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 357,
+      "line": 358,
       "column": 21,
-      "index": 19066
+      "index": 19107
     },
     "end": {
-      "line": 360,
+      "line": 361,
       "column": 5,
-      "index": 19190
+      "index": 19231
     }
   },
   {
@@ -949,14 +949,14 @@
     "defaultMessage": "!!!Add wallet (Jormungandr ITN)",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 361,
+      "line": 362,
       "column": 30,
-      "index": 19222
+      "index": 19263
     },
     "end": {
-      "line": 364,
+      "line": 365,
       "column": 5,
-      "index": 19373
+      "index": 19414
     }
   },
   {
@@ -964,14 +964,14 @@
     "defaultMessage": "!!!Loading wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 365,
+      "line": 366,
       "column": 19,
-      "index": 19394
+      "index": 19435
     },
     "end": {
-      "line": 368,
+      "line": 369,
       "column": 5,
-      "index": 19520
+      "index": 19561
     }
   },
   {
@@ -979,14 +979,14 @@
     "defaultMessage": "!!!Ask our support team",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 369,
+      "line": 370,
       "column": 23,
-      "index": 19545
+      "index": 19586
     },
     "end": {
-      "line": 372,
+      "line": 373,
       "column": 5,
-      "index": 19681
+      "index": 19722
     }
   },
   {
@@ -994,14 +994,14 @@
     "defaultMessage": "!!!Please enter valid mnemonic.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 373,
+      "line": 374,
       "column": 21,
-      "index": 19704
+      "index": 19745
     },
     "end": {
-      "line": 376,
+      "line": 377,
       "column": 5,
-      "index": 19853
+      "index": 19894
     }
   },
   {
@@ -1009,14 +1009,14 @@
     "defaultMessage": "!!!The recovery phrase is verified",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 377,
+      "line": 378,
       "column": 19,
-      "index": 19874
+      "index": 19915
     },
     "end": {
-      "line": 380,
+      "line": 381,
       "column": 5,
-      "index": 20024
+      "index": 20065
     }
   },
   {
@@ -1024,14 +1024,14 @@
     "defaultMessage": "!!!Enter recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 381,
+      "line": 382,
       "column": 29,
-      "index": 20055
+      "index": 20096
     },
     "end": {
-      "line": 384,
+      "line": 385,
       "column": 5,
-      "index": 20205
+      "index": 20246
     }
   },
   {
@@ -1039,14 +1039,14 @@
     "defaultMessage": "!!!15 word recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 385,
+      "line": 386,
       "column": 32,
-      "index": 20239
+      "index": 20280
     },
     "end": {
-      "line": 388,
+      "line": 389,
       "column": 5,
-      "index": 20374
+      "index": 20415
     }
   },
   {
@@ -1054,14 +1054,14 @@
     "defaultMessage": "!!!24 word recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 389,
+      "line": 390,
       "column": 32,
-      "index": 20408
+      "index": 20449
     },
     "end": {
-      "line": 392,
+      "line": 393,
       "column": 5,
-      "index": 20543
+      "index": 20584
     }
   },
   {
@@ -1069,14 +1069,14 @@
     "defaultMessage": "!!!Add the recovery phrase you received upon your wallet creation process.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 393,
+      "line": 394,
       "column": 30,
-      "index": 20575
+      "index": 20616
     },
     "end": {
-      "line": 396,
+      "line": 397,
       "column": 5,
-      "index": 20776
+      "index": 20817
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json b/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json
index 8f191c80e2..fd8fd739ee 100644
--- a/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json
+++ b/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 253,
       "column": 13,
-      "index": 8452
+      "index": 8464
     },
     "end": {
       "line": 256,
       "column": 3,
-      "index": 8559
+      "index": 8571
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 257,
       "column": 19,
-      "index": 8580
+      "index": 8592
     },
     "end": {
       "line": 260,
       "column": 3,
-      "index": 8691
+      "index": 8703
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 261,
       "column": 16,
-      "index": 8709
+      "index": 8721
     },
     "end": {
       "line": 264,
       "column": 3,
-      "index": 8816
+      "index": 8828
     }
   }
 ]
\ No newline at end of file