diff --git a/.tool-versions b/.tool-versions
index d698c578f7..0f29bd47c8 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
-nodejs 16.19.0
+nodejs 18.0.0
 rust 1.69.0
-java adoptopenjdk-11.0.18+10
+java adoptopenjdk-17.0.10+7
 ruby 3.2.2
-python 3.11.3
\ No newline at end of file
+python 3.11.3
diff --git a/apps/wallet-mobile/.tool-versions b/apps/wallet-mobile/.tool-versions
index d698c578f7..0f29bd47c8 100644
--- a/apps/wallet-mobile/.tool-versions
+++ b/apps/wallet-mobile/.tool-versions
@@ -1,5 +1,5 @@
-nodejs 16.19.0
+nodejs 18.0.0
 rust 1.69.0
-java adoptopenjdk-11.0.18+10
+java adoptopenjdk-17.0.10+7
 ruby 3.2.2
-python 3.11.3
\ No newline at end of file
+python 3.11.3
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index c90a3f21cd..30c03cd976 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -148,6 +148,7 @@
     "expo-camera": "^13.2.1",
     "expo-device": "^5.4.0",
     "expo-status-bar": "~1.4.4",
+    "immer": "^10.0.2",
     "jsc-android": "241213.1.0",
     "lodash": "^4.17.21",
     "react": "18.2.0",
@@ -262,6 +263,7 @@
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "extract-react-intl-messages": "^0.14.0",
     "i18n-unused": "^0.8.0",
+    "jest": "^29.7.0",
     "lint-staged": "^13.2.2",
     "metro-react-native-babel-preset": "0.73.9",
     "mockdate": "^3.0.5",
diff --git a/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithHW.tsx b/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithHW.tsx
index e3d0380005..5e765035db 100644
--- a/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithHW.tsx
+++ b/apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithHW.tsx
@@ -4,11 +4,11 @@ import {useIntl} from 'react-intl'
 import {Boundary, TwoActionView} from '../../../components'
 import {LedgerConnect, LedgerTransportSwitch} from '../../../HW'
 import {confirmationMessages, txLabels} from '../../../i18n/global-messages'
+import {walletManager} from '../../../wallet-manager/walletManager'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 import {useSignWithHwAndSubmitTx} from '../../../yoroi-wallets/hooks'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../../yoroi-wallets/hw'
 import {YoroiUnsignedTx} from '../../../yoroi-wallets/types'
-import {walletManager} from '../../../yoroi-wallets/walletManager'
 import {TransferSummary} from '../TransferSummary'
 
 type Props = {
diff --git a/apps/wallet-mobile/src/InitApp.tsx b/apps/wallet-mobile/src/InitApp.tsx
index c1e9c85a46..ec96ac11a0 100644
--- a/apps/wallet-mobile/src/InitApp.tsx
+++ b/apps/wallet-mobile/src/InitApp.tsx
@@ -8,8 +8,9 @@ import uuid from 'uuid'
 import {AppNavigator} from './AppNavigator'
 import {useInitScreenShare} from './features/Settings/ScreenShare'
 import {CONFIG, isProduction} from './legacy/config'
+import {storageVersionMaker} from './migrations/storageVersion'
+import {walletManager} from './wallet-manager/walletManager'
 import {useCrashReportsEnabled} from './yoroi-wallets/hooks'
-import {walletManager} from './yoroi-wallets/walletManager'
 
 if (Platform.OS === 'android') {
   if (UIManager.setLayoutAnimationEnabledExperimental != null) {
@@ -51,11 +52,14 @@ const initInstallationId = async (storage: App.Storage) => {
 
   const newInstallationId = uuid.v4()
   await storage.setItem('appSettings/installationId', newInstallationId, () => newInstallationId) // LEGACY: installationId is not serialized
+
+  // new installation set the storage version to the current version
+  await storageVersionMaker(storage).newInstallation()
 }
 
 export const initApp = async (storage: App.Storage) => {
   await initInstallationId(storage)
-  await walletManager.initialize()
+  await walletManager.removeDeletedWallets()
 }
 
 const useInitSentry = (options: {enabled: boolean}) => {
diff --git a/apps/wallet-mobile/src/SelectedWallet/Context/SelectedWalletMetaContext.tsx b/apps/wallet-mobile/src/SelectedWallet/Context/SelectedWalletMetaContext.tsx
index 7b46253da7..a669a5030c 100644
--- a/apps/wallet-mobile/src/SelectedWallet/Context/SelectedWalletMetaContext.tsx
+++ b/apps/wallet-mobile/src/SelectedWallet/Context/SelectedWalletMetaContext.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import {WalletMeta} from '../../yoroi-wallets/walletManager'
+import {WalletMeta} from '../../wallet-manager/types'
 
 type SelectedWalletMeta = WalletMeta
 type SetSelectedWalletMeta = (selectedWalletMeta?: SelectedWalletMeta) => void
diff --git a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletListItem.tsx b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletListItem.tsx
index 3a1edc50d6..f0a40d85a1 100644
--- a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletListItem.tsx
+++ b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletListItem.tsx
@@ -3,8 +3,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {Icon} from '../../components'
 import {brand, COLORS} from '../../theme'
+import {WalletMeta} from '../../wallet-manager/types'
 import {isByron, isHaskellShelley, isJormun} from '../../yoroi-wallets/cardano/utils'
-import {WalletMeta} from '../../yoroi-wallets/walletManager'
 
 type Props = {
   wallet: WalletMeta
diff --git a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx
index 7c528730e9..71a7e43361 100644
--- a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx
+++ b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.stories.tsx
@@ -2,10 +2,11 @@ import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {WalletManagerProvider} from '../../WalletManager'
+import {WalletMeta} from '../../wallet-manager/types'
+import {mockWalletManager, WalletManager} from '../../wallet-manager/walletManager'
+import {WalletManagerProvider} from '../../wallet-manager/WalletManagerContext'
 import {InvalidState, NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {mocks} from '../../yoroi-wallets/mocks'
-import {mockWalletManager, WalletManager, WalletMeta} from '../../yoroi-wallets/walletManager'
 import {WalletSelectionScreen} from './WalletSelectionScreen'
 
 storiesOf('WalletSelectionScreen', module)
diff --git a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
index 04aef826e0..aaee42f48b 100644
--- a/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
+++ b/apps/wallet-mobile/src/SelectedWallet/WalletSelection/WalletSelectionScreen.tsx
@@ -14,14 +14,14 @@ import {isNightly} from '../../legacy/config'
 import {useMetrics} from '../../metrics/metricsManager'
 import {useWalletNavigation} from '../../navigation'
 import {COLORS} from '../../theme'
-import {useWalletManager} from '../../WalletManager'
+import {WalletMeta} from '../../wallet-manager/types'
+import {useWalletManager} from '../../wallet-manager/WalletManagerContext'
 import * as HASKELL_SHELLEY from '../../yoroi-wallets/cardano/constants/mainnet/constants'
 import * as SANCHONET from '../../yoroi-wallets/cardano/constants/sanchonet/constants'
 import * as HASKELL_SHELLEY_TESTNET from '../../yoroi-wallets/cardano/constants/testnet/constants'
 import {InvalidState, NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {isJormungandr} from '../../yoroi-wallets/cardano/networks'
 import {useOpenWallet, useWalletMetas} from '../../yoroi-wallets/hooks'
-import {WalletMeta} from '../../yoroi-wallets/walletManager'
 import {useSetSelectedWallet, useSetSelectedWalletMeta} from '../Context'
 import {WalletListItem} from './WalletListItem'
 
diff --git a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
index 0e82102e6c..1ef7247fbc 100644
--- a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
@@ -9,7 +9,7 @@ import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated
 
 import {useCopy} from '../../src/legacy/useCopy'
 import {Icon, Spacer, Text} from '../components'
-import {useAddressDerivationManager} from '../features/Receive/common/useAddressDerivationManager'
+import {useReceive} from '../features/Receive/common/ReceiveProvider'
 import {useReceiveAddressesStatus} from '../features/Receive/common/useReceiveAddressesStatus'
 import {messages as receiveMessages} from '../features/Receive/common/useStrings'
 import {useSwapForm} from '../features/Swap/common/SwapFormProvider'
@@ -17,6 +17,7 @@ import {actionMessages} from '../i18n/global-messages'
 import {useMetrics} from '../metrics/metricsManager'
 import {TxHistoryRouteNavigation} from '../navigation'
 import {useSelectedWallet} from '../SelectedWallet'
+import {useAddressModeManager} from '../wallet-manager/useAddressModeManager'
 import {useTokenInfo} from '../yoroi-wallets/hooks'
 
 export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
@@ -24,8 +25,9 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
   const strings = useStrings()
   const navigateTo = useNavigateTo()
 
-  const {isSingle, addressDerivation} = useAddressDerivationManager()
-  const {next: nextReceiveAddress} = useReceiveAddressesStatus(addressDerivation)
+  const {isSingle, addressMode} = useAddressModeManager()
+  const {next: nextReceiveAddress} = useReceiveAddressesStatus(addressMode)
+  const {selectedAddressChanged} = useReceive()
   const [isCopying, copy] = useCopy()
 
   const {reset: resetSendState} = useTransfer()
@@ -71,6 +73,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
 
   const handleOnPressReceive = () => {
     if (isSingle) {
+      selectedAddressChanged(nextReceiveAddress)
       navigateTo.receiveSingleAddress()
     } else {
       navigateTo.receiveMultipleAddresses()
diff --git a/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.stories.tsx b/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.stories.tsx
index 579ed03e0e..a0a6c33130 100644
--- a/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.stories.tsx
+++ b/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.stories.tsx
@@ -4,10 +4,10 @@ import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
 import {debugWalletInfo} from '../../features'
-import {WalletManagerProvider} from '../../WalletManager'
+import {WalletManager, walletManager} from '../../wallet-manager/walletManager'
+import {WalletManagerProvider} from '../../wallet-manager/WalletManagerContext'
 import {NETWORK_ID} from '../../yoroi-wallets/cardano/constants/testnet/constants'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
-import {WalletManager, walletManager} from '../../yoroi-wallets/walletManager'
 import {MnemonicCheckScreen} from './MnemonicCheckScreen'
 
 storiesOf('MnemonicCheckScreen', module)
diff --git a/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx b/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx
index 565f75dca7..7b3e9a52af 100644
--- a/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx
+++ b/apps/wallet-mobile/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx
@@ -10,9 +10,12 @@ import {errorMessages} from '../../i18n/global-messages'
 import {useMetrics} from '../../metrics/metricsManager'
 import {useWalletNavigation, WalletInitRoutes} from '../../navigation'
 import {COLORS} from '../../theme'
+import {AddressMode} from '../../wallet-manager/types'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {useCreateWallet} from '../../yoroi-wallets/hooks'
 
+// when creating, later will be part of the onboarding
+const addressMode: AddressMode = 'single'
 export const MnemonicCheckScreen = () => {
   const strings = useStrings()
   const {resetToWalletSelection} = useWalletNavigation()
@@ -33,6 +36,9 @@ export const MnemonicCheckScreen = () => {
   const isPhraseValid = userEntries.map((entry) => entry.word).join(' ') === mnemonic
 
   const intl = useIntl()
+  const handleOnCreateWallet = () => {
+    createWallet({name, mnemonicPhrase: mnemonic, password, networkId, walletImplementationId, addressMode})
+  }
   const {createWallet, isLoading, isSuccess} = useCreateWallet({
     onSuccess: () => {
       track.createWalletDetailsSettled()
@@ -46,6 +52,7 @@ export const MnemonicCheckScreen = () => {
       })
     },
   })
+  const disabled = !isPhraseComplete || !isPhraseValid || isLoading || isSuccess
 
   return (
     <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.safeAreaView}>
@@ -70,8 +77,8 @@ export const MnemonicCheckScreen = () => {
       <View style={styles.buttons}>
         <Button
           block
-          onPress={() => createWallet({name, mnemonicPhrase: mnemonic, password, networkId, walletImplementationId})}
-          disabled={!isPhraseComplete || !isPhraseValid || isLoading || isSuccess}
+          onPress={handleOnCreateWallet}
+          disabled={disabled}
           title={strings.confirmButton}
           style={styles.confirmButton}
           testID="mnemonicCheckScreen::confirm"
diff --git a/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.stories.tsx b/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.stories.tsx
index 9ab7f7cb5f..e283980382 100644
--- a/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.stories.tsx
+++ b/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.stories.tsx
@@ -4,10 +4,10 @@ import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
 import {WalletInitRoutes} from '../../navigation'
-import {WalletManagerProvider} from '../../WalletManager'
+import {WalletManager, walletManager} from '../../wallet-manager/walletManager'
+import {WalletManagerProvider} from '../../wallet-manager/WalletManagerContext'
 import {NETWORK_ID, WALLET_IMPLEMENTATION_ID} from '../../yoroi-wallets/cardano/constants/testnet/constants'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
-import {WalletManager, walletManager} from '../../yoroi-wallets/walletManager'
 import {SaveNanoXScreen} from './SaveNanoXScreen'
 
 const params: RouteProp<WalletInitRoutes, 'save-nano-x'>['params'] = {
diff --git a/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.tsx b/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.tsx
index e587f92175..d30c213d23 100644
--- a/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.tsx
+++ b/apps/wallet-mobile/src/WalletInit/SaveNanoX/SaveNanoXScreen.tsx
@@ -8,10 +8,13 @@ import {showErrorDialog} from '../../dialogs'
 import {errorMessages} from '../../i18n/global-messages'
 import {useMetrics} from '../../metrics/metricsManager'
 import {useWalletNavigation, WalletInitRoutes} from '../../navigation'
+import {AddressMode} from '../../wallet-manager/types'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {useCreateBip44Wallet} from '../../yoroi-wallets/hooks'
 import {WalletNameForm} from '../WalletNameForm'
 
+// when hw, later will be part of the onboarding
+const addressMode: AddressMode = 'multiple'
 export const SaveNanoXScreen = () => {
   const strings = useStrings()
   const {resetToWalletSelection} = useWalletNavigation()
@@ -44,6 +47,7 @@ export const SaveNanoXScreen = () => {
           implementationId: walletImplementationId,
           hwDeviceInfo,
           readOnly: false,
+          addressMode,
         })
       }
       defaultWalletName={strings.ledgerWalletNameSuggestion}
diff --git a/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx b/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx
index 691150d111..41b0242aec 100644
--- a/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx
+++ b/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx
@@ -3,9 +3,9 @@ import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {WalletManagerProvider} from '../../WalletManager'
+import {WalletManager, walletManager} from '../../wallet-manager/walletManager'
+import {WalletManagerProvider} from '../../wallet-manager/WalletManagerContext'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
-import {WalletManager, walletManager} from '../../yoroi-wallets/walletManager'
 import {SaveReadOnlyWalletScreen} from './SaveReadOnlyWalletScreen'
 
 storiesOf('SaveReadOnlyWalletScreen', module)
diff --git a/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx b/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
index 37d5c57139..105498ab5c 100644
--- a/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
+++ b/apps/wallet-mobile/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
@@ -11,6 +11,7 @@ import {useMetrics} from '../../metrics/metricsManager'
 import {useWalletNavigation, WalletInitRoutes} from '../../navigation'
 import {theme} from '../../theme'
 import {isEmptyString} from '../../utils/utils'
+import {AddressMode} from '../../wallet-manager/types'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {NUMBERS} from '../../yoroi-wallets/cardano/numbers'
 import {useCreateBip44Wallet, usePlate} from '../../yoroi-wallets/hooks'
@@ -18,6 +19,8 @@ import {NetworkId} from '../../yoroi-wallets/types'
 import {WalletAddress} from '../WalletAddress'
 import {WalletNameForm} from '../WalletNameForm'
 
+// when ro, later will be part of the onboarding
+const addressMode: AddressMode = 'multiple'
 export const SaveReadOnlyWalletScreen = () => {
   const intl = useIntl()
   const strings = useStrings()
@@ -55,6 +58,7 @@ export const SaveReadOnlyWalletScreen = () => {
       implementationId: walletImplementationId,
       bip44AccountPublic: publicKeyHex,
       readOnly: true,
+      addressMode,
     })
   }
 
diff --git a/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.stories.tsx b/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.stories.tsx
index d048854e27..6f6d8ae789 100644
--- a/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.stories.tsx
+++ b/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.stories.tsx
@@ -3,9 +3,9 @@ import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {WalletManagerProvider} from '../../WalletManager'
+import {WalletManager, walletManager} from '../../wallet-manager/walletManager'
+import {WalletManagerProvider} from '../../wallet-manager/WalletManagerContext'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
-import {WalletManager, walletManager} from '../../yoroi-wallets/walletManager'
 import {WalletCredentialsScreen} from './WalletCredentialsScreen'
 
 storiesOf('WalletCredentialsScreen', module)
diff --git a/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.tsx b/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.tsx
index b995cbc420..e3d25f78a3 100644
--- a/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.tsx
+++ b/apps/wallet-mobile/src/WalletInit/WalletCredentials/WalletCredentialsScreen.tsx
@@ -9,10 +9,13 @@ import {errorMessages} from '../../i18n/global-messages'
 import {useMetrics} from '../../metrics/metricsManager'
 import {useWalletNavigation, WalletInitRoutes} from '../../navigation'
 import {COLORS} from '../../theme'
+import {AddressMode} from '../../wallet-manager/types'
 import {NetworkError} from '../../yoroi-wallets/cardano/errors'
 import {useCreateWallet} from '../../yoroi-wallets/hooks'
 import {WalletForm} from '../WalletForm'
 
+// when restoring, later will be part of the onboarding
+const addressMode: AddressMode = 'multiple'
 export const WalletCredentialsScreen = () => {
   const {resetToWalletSelection} = useWalletNavigation()
   const {track} = useMetrics()
@@ -41,7 +44,7 @@ export const WalletCredentialsScreen = () => {
           isLoading || isSuccess
             ? NOOP
             : ({name, password}) =>
-                createWallet({name, password, mnemonicPhrase: phrase, networkId, walletImplementationId})
+                createWallet({name, password, mnemonicPhrase: phrase, networkId, walletImplementationId, addressMode})
         }
       />
 
diff --git a/apps/wallet-mobile/src/WalletInit/WalletForm.tsx b/apps/wallet-mobile/src/WalletInit/WalletForm.tsx
index 305c6ceb32..65e2ae7d46 100644
--- a/apps/wallet-mobile/src/WalletInit/WalletForm.tsx
+++ b/apps/wallet-mobile/src/WalletInit/WalletForm.tsx
@@ -7,7 +7,7 @@ import {debugWalletInfo, features} from '../features'
 import globalMessages from '../i18n/global-messages'
 import {COLORS} from '../theme'
 import {isEmptyString} from '../utils/utils'
-import {useWalletManager} from '../WalletManager'
+import {useWalletManager} from '../wallet-manager/WalletManagerContext'
 import {useWalletNames} from '../yoroi-wallets/hooks'
 import {
   getWalletNameError,
diff --git a/apps/wallet-mobile/src/WalletInit/WalletNameForm/WalletNameForm.tsx b/apps/wallet-mobile/src/WalletInit/WalletNameForm/WalletNameForm.tsx
index 52768b3a31..8e5b6ccbf6 100644
--- a/apps/wallet-mobile/src/WalletInit/WalletNameForm/WalletNameForm.tsx
+++ b/apps/wallet-mobile/src/WalletInit/WalletNameForm/WalletNameForm.tsx
@@ -6,7 +6,7 @@ import {ActivityIndicator, Image, ImageSourcePropType, ScrollView, StyleSheet, V
 import {Button, KeyboardAvoidingView, ProgressStep, TextInput} from '../../components'
 import globalMessages from '../../i18n/global-messages'
 import {spacing} from '../../theme'
-import {useWalletManager} from '../../WalletManager'
+import {useWalletManager} from '../../wallet-manager/WalletManagerContext'
 import {useWalletNames} from '../../yoroi-wallets/hooks'
 import {getWalletNameError, validateWalletName} from '../../yoroi-wallets/utils/validators'
 
diff --git a/apps/wallet-mobile/src/WalletManager/index.ts b/apps/wallet-mobile/src/WalletManager/index.ts
deleted file mode 100644
index b3099e411c..0000000000
--- a/apps/wallet-mobile/src/WalletManager/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './WalletManagerContext'
diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
index 802d758739..f82c8be729 100644
--- a/apps/wallet-mobile/src/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -17,11 +17,11 @@ import {InitApp} from './InitApp'
 import {CONFIG} from './legacy/config'
 import {setLogLevel} from './legacy/logging'
 import {makeMetricsManager, MetricsProvider} from './metrics/metricsManager'
+import {useMigrations} from './migrations/useMigrations'
 import {SelectedWalletMetaProvider, SelectedWalletProvider} from './SelectedWallet/Context'
-import {WalletManagerProvider} from './WalletManager'
-import {useMigrations} from './yoroi-wallets/migrations'
+import {walletManager} from './wallet-manager/walletManager'
+import {WalletManagerProvider} from './wallet-manager/WalletManagerContext'
 import {rootStorage} from './yoroi-wallets/storage/rootStorage'
-import {walletManager} from './yoroi-wallets/walletManager'
 
 enableScreens(true)
 enableFreeze(true)
@@ -43,8 +43,10 @@ const metricsManager = makeMetricsManager()
 
 export const YoroiApp = () => {
   const migrated = useMigrations(rootStorage)
-  // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-  return migrated ? (
+
+  if (!migrated) return null
+
+  return (
     <AsyncStorageProvider storage={rootStorage}>
       <MetricsProvider metricsManager={metricsManager}>
         <WalletManagerProvider walletManager={walletManager}>
@@ -74,5 +76,5 @@ export const YoroiApp = () => {
         </WalletManagerProvider>
       </MetricsProvider>
     </AsyncStorageProvider>
-  ) : null
+  )
 }
diff --git a/apps/wallet-mobile/src/auth/hooks.test.ts b/apps/wallet-mobile/src/auth/hooks.test.ts
index 599175747c..83530ebabe 100644
--- a/apps/wallet-mobile/src/auth/hooks.test.ts
+++ b/apps/wallet-mobile/src/auth/hooks.test.ts
@@ -1,9 +1,9 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import {parseSafe} from '@yoroi/common'
 
+import {WalletMeta} from '../wallet-manager/types'
 import {disableAllEasyConfirmation, enableAuthWithOs} from '../yoroi-wallets/auth'
 import {rootStorage} from '../yoroi-wallets/storage/rootStorage'
-import {WalletMeta} from '../yoroi-wallets/walletManager'
 
 describe('enableAuthWithOs', () => {
   beforeEach(() => AsyncStorage.clear())
@@ -72,6 +72,7 @@ describe('disableAllEasyConfirmations', () => {
         name: 'my-wallet',
         networkId: 1,
         walletImplementationId: 'haskell-shelley-24',
+        addressMode: 'multiple',
       },
 
       '/wallet/1/data': {
@@ -91,6 +92,7 @@ describe('disableAllEasyConfirmations', () => {
         name: 'my-wallet',
         networkId: 1,
         walletImplementationId: 'haskell-shelley-24',
+        addressMode: 'multiple',
       },
 
       '/wallet/2/data': {
@@ -121,6 +123,7 @@ const mockWalletMeta: WalletMeta = {
       'b04dc22991594170974bbbb5908cc50b48f236d680a9ebfe6c1d00f52f8f4813341943eb66dec48cfe7f3be5beec705b91300a07641e668ff19dfa2fbeccbfba',
   },
   walletImplementationId: 'haskell-shelley-24',
+  addressMode: 'multiple',
 }
 
 const mockWalletJSON = {isEasyConfirmationEnabled: true}
diff --git a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
index df232980ac..c14389343d 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
@@ -10,13 +10,13 @@ import LocalizableError from '../../i18n/LocalizableError'
 import {useSelectedWallet} from '../../SelectedWallet'
 import {COLORS} from '../../theme'
 import {isEmptyString} from '../../utils/utils'
+import {walletManager} from '../../wallet-manager/walletManager'
 import {useAuthOsWithEasyConfirmation} from '../../yoroi-wallets/auth'
 import {WrongPassword} from '../../yoroi-wallets/cardano/errors'
 import {useSubmitTx} from '../../yoroi-wallets/hooks'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../yoroi-wallets/hw'
 import {YoroiSignedTx, YoroiUnsignedTx} from '../../yoroi-wallets/types'
 import {delay} from '../../yoroi-wallets/utils/timeUtils'
-import {walletManager} from '../../yoroi-wallets/walletManager'
 import {Button, ButtonProps, ValidatedTextInput} from '..'
 import {Dialog, Step as DialogStep} from './Dialog'
 
diff --git a/apps/wallet-mobile/src/components/ConfirmTxWithHwModal/ConfirmTxWithHwModal.tsx b/apps/wallet-mobile/src/components/ConfirmTxWithHwModal/ConfirmTxWithHwModal.tsx
index 5f0557fd5b..a8a672258d 100644
--- a/apps/wallet-mobile/src/components/ConfirmTxWithHwModal/ConfirmTxWithHwModal.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTxWithHwModal/ConfirmTxWithHwModal.tsx
@@ -5,10 +5,10 @@ import {ActivityIndicator, ScrollView, StyleSheet, View} from 'react-native'
 import {LedgerTransportSwitch} from '../../features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch'
 import {LedgerConnect} from '../../HW'
 import {useSelectedWallet} from '../../SelectedWallet'
+import {walletManager} from '../../wallet-manager/walletManager'
 import {useSignTxWithHW, useSubmitTx} from '../../yoroi-wallets/hooks'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../yoroi-wallets/hw'
 import {YoroiSignedTx, YoroiUnsignedTx} from '../../yoroi-wallets/types'
-import {walletManager} from '../../yoroi-wallets/walletManager'
 import {ModalError} from '../ModalError/ModalError'
 import {Text} from '../Text'
 import {useStrings} from './strings'
diff --git a/apps/wallet-mobile/src/features/Receive/common/useAddressDerivationManager.tsx b/apps/wallet-mobile/src/features/Receive/common/useAddressDerivationManager.tsx
deleted file mode 100644
index cd20737310..0000000000
--- a/apps/wallet-mobile/src/features/Receive/common/useAddressDerivationManager.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import {parseSafe, useAsyncStorage, useMutationWithInvalidations} from '@yoroi/common'
-import _ from 'lodash'
-import {UseMutationOptions, useQuery} from 'react-query'
-
-import {useSelectedWallet} from '../../../SelectedWallet'
-
-const keyAddressDerivationType = 'addressDerivationType'
-
-const useAddressDerivationMode = () => {
-  const storage = useAsyncStorage()
-  const wallet = useSelectedWallet()
-  const walletStorage = storage.join(`wallet/${wallet.id}/`)
-
-  const query = useQuery<AddressDerivation, Error>({
-    queryKey: [wallet.id, keyAddressDerivationType],
-    queryFn: async () => {
-      const addressDerivationType = await walletStorage.getItem(keyAddressDerivationType, parseAddressDerivation)
-
-      return addressDerivationType ?? initialAddressDerivation
-    },
-    suspense: true,
-  })
-
-  if (query.data == null) throw new Error('Invalid state')
-
-  return query.data
-}
-
-const useSetAddressDerivationMode = (options?: UseMutationOptions<void, Error, AddressDerivation>) => {
-  const storage = useAsyncStorage()
-  const wallet = useSelectedWallet()
-  const walletStorage = storage.join(`wallet/${wallet.id}/`)
-
-  const mutation = useMutationWithInvalidations({
-    mutationFn: (addressDerivationMode) => walletStorage.setItem(keyAddressDerivationType, addressDerivationMode),
-    invalidateQueries: [[wallet.id, keyAddressDerivationType]],
-    ...options,
-  })
-
-  return mutation.mutate
-}
-
-const useToogleAddressDerivationMode = ({...options}: UseMutationOptions<void, Error, void> = {}) => {
-  const storage = useAsyncStorage()
-  const wallet = useSelectedWallet()
-  const walletStorage = storage.join(`wallet/${wallet.id}/`)
-
-  const addressDerivationMode = useAddressDerivationMode()
-
-  const mutation = useMutationWithInvalidations({
-    mutationFn: () =>
-      walletStorage.setItem(keyAddressDerivationType, addressDerivationMode === 'single' ? 'multiple' : 'single'),
-    invalidateQueries: [[wallet.id, keyAddressDerivationType]],
-    ...options,
-  })
-
-  return {
-    toggle: mutation.mutate,
-    isToggleLoading: mutation.isLoading,
-  }
-}
-
-export type AddressDerivation = 'single' | 'multiple'
-const initialAddressDerivation: AddressDerivation = 'multiple'
-
-const parseAddressDerivation = (data: unknown) => {
-  const isAddressDerivation = (data: unknown): data is AddressDerivation => data === 'single' || data === 'multiple'
-  const parsed = parseSafe(data)
-
-  return isAddressDerivation(parsed) ? parsed : undefined
-}
-
-export const useAddressDerivationManager = () => {
-  const addressDerivation = useAddressDerivationMode()
-  const {toggle, isToggleLoading} = useToogleAddressDerivationMode()
-  const setAddressDerivationMode = useSetAddressDerivationMode()
-
-  const isSingle = addressDerivation === 'single'
-  const isMultiple = addressDerivation === 'multiple'
-
-  return {
-    isMultiple,
-    isSingle,
-    isToggleLoading,
-    addressDerivation,
-    toggle,
-    enableSingleMode: () => setAddressDerivationMode('single'),
-    enableMultipleMode: () => setAddressDerivationMode('multiple'),
-  }
-}
diff --git a/apps/wallet-mobile/src/features/Receive/common/useReceiveAddressesStatus.tsx b/apps/wallet-mobile/src/features/Receive/common/useReceiveAddressesStatus.tsx
index f61659842d..c21e5b8fe1 100644
--- a/apps/wallet-mobile/src/features/Receive/common/useReceiveAddressesStatus.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/useReceiveAddressesStatus.tsx
@@ -1,19 +1,19 @@
 import * as React from 'react'
 
 import {useSelectedWallet} from '../../../SelectedWallet'
+import {AddressMode} from '../../../wallet-manager/types'
 import {useReceiveAddresses} from '../../../yoroi-wallets/hooks'
-import {AddressDerivation} from './useAddressDerivationManager'
 
 type ReceiveAddressesStatus = {
   used: string[]
   unused: string[]
   next: string
 }
-export const useReceiveAddressesStatus = (addressDerivation: AddressDerivation): Readonly<ReceiveAddressesStatus> => {
+export const useReceiveAddressesStatus = (addressMode: AddressMode): Readonly<ReceiveAddressesStatus> => {
   const wallet = useSelectedWallet()
   const receiveAddresses = useReceiveAddresses(wallet)
 
-  const isSingle = addressDerivation === 'single'
+  const isSingle = addressMode === 'single'
   const singleAddress = receiveAddresses[0]
 
   return React.useMemo(() => {
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
index f96bc7b25d..6797276736 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
@@ -8,11 +8,11 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Button, Spacer, useModal} from '../../../components'
 import {useMetrics} from '../../../metrics/metricsManager'
 import {useSelectedWallet} from '../../../SelectedWallet'
+import {useAddressModeManager} from '../../../wallet-manager/useAddressModeManager'
 import {BIP32_HD_GAP_LIMIT} from '../common/contants'
 import {useReceive} from '../common/ReceiveProvider'
 import {ShowAddressLimitInfo} from '../common/ShowAddressLimitInfo/ShowAddressLimitInfo'
 import {SmallAddressCard} from '../common/SmallAddressCard/SmallAddressCard'
-import {useAddressDerivationManager} from '../common/useAddressDerivationManager'
 import {useMultipleAddressesInfo} from '../common/useMultipleAddressesInfo'
 import {useNavigateTo} from '../common/useNavigateTo'
 import {useReceiveAddressesStatus} from '../common/useReceiveAddressesStatus'
@@ -31,8 +31,8 @@ export const ListMultipleAddressesScreen = () => {
   const navigate = useNavigateTo()
   const {track} = useMetrics()
 
-  const {addressDerivation} = useAddressDerivationManager()
-  const addresses = useReceiveAddressesStatus(addressDerivation)
+  const {addressMode} = useAddressModeManager()
+  const addresses = useReceiveAddressesStatus(addressMode)
   const {selectedAddressChanged} = useReceive()
 
   React.useEffect(() => {
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
index f7bdd4cd3b..32df350ef2 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
@@ -10,11 +10,11 @@ import {useCopy} from '../../../legacy/useCopy'
 import {useMetrics} from '../../../metrics/metricsManager'
 import {useSelectedWallet} from '../../../SelectedWallet'
 import {isEmptyString} from '../../../utils'
+import {useAddressModeManager} from '../../../wallet-manager/useAddressModeManager'
 import {editedFormatter} from '../../../yoroi-wallets/utils'
 import {useReceive} from '../common/ReceiveProvider'
 import {ShareQRCodeCard} from '../common/ShareQRCodeCard/ShareQRCodeCard'
 import {SkeletonAdressDetail} from '../common/SkeletonAddressDetail/SkeletonAddressDetail'
-import {useAddressDerivationManager} from '../common/useAddressDerivationManager'
 import {useStrings} from '../common/useStrings'
 
 export const RequestSpecificAmountScreen = () => {
@@ -25,7 +25,7 @@ export const RequestSpecificAmountScreen = () => {
   const hasAmount = !isEmptyString(amount)
 
   const {selectedAddress} = useReceive()
-  const {isSingle} = useAddressDerivationManager()
+  const {isSingle} = useAddressModeManager()
 
   const screenHeight = useWindowDimensions().height
   const modalHeight = (screenHeight / 100) * 80
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx b/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
index de9668a02e..2acd512eb1 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ChangeWalletName/ChangeWalletName.tsx
@@ -9,7 +9,7 @@ import {Button, KeyboardAvoidingView, TextInput} from '../../../components'
 import globalMessages from '../../../i18n/global-messages'
 import {useSelectedWallet} from '../../../SelectedWallet'
 import {isEmptyString} from '../../../utils/utils'
-import {useWalletManager} from '../../../WalletManager'
+import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
 import {useChangeWalletName, useWalletName, useWalletNames} from '../../../yoroi-wallets/hooks'
 import {getWalletNameError, validateWalletName} from '../../../yoroi-wallets/utils/validators'
 
diff --git a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx b/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx
index adf38e4aad..24589a6617 100644
--- a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx
@@ -13,12 +13,12 @@ import {confirmationMessages} from '../../../i18n/global-messages'
 import {SettingsRouteNavigation, useWalletNavigation} from '../../../navigation'
 import {useSelectedWallet, useSetSelectedWallet, useSetSelectedWalletMeta} from '../../../SelectedWallet'
 import {lightPalette} from '../../../theme'
+import {useAddressModeManager} from '../../../wallet-manager/useAddressModeManager'
 import {useAuthSetting} from '../../../yoroi-wallets/auth'
 import {getNetworkConfigById} from '../../../yoroi-wallets/cardano/networks'
 import {isByron, isHaskellShelley} from '../../../yoroi-wallets/cardano/utils'
 import {useEasyConfirmationEnabled, useResync} from '../../../yoroi-wallets/hooks'
 import {NetworkId, WalletImplementationId} from '../../../yoroi-wallets/types'
-import {useAddressDerivationManager} from '../../Receive/common/useAddressDerivationManager'
 import {useNavigateTo} from '../common/navigation'
 import {
   NavigatedSettingsItem,
@@ -40,7 +40,7 @@ export const WalletSettingsScreen = () => {
   const {resetToWalletSelection} = useWalletNavigation()
   const wallet = useSelectedWallet()
   const authSetting = useAuthSetting()
-  const addressDerivation = useAddressDerivationManager()
+  const addressMode = useAddressModeManager()
 
   const logout = useLogout()
   const settingsNavigation = useNavigation<SettingsRouteNavigation>()
@@ -124,9 +124,9 @@ export const WalletSettingsScreen = () => {
             icon={<Icon.Qr {...iconProps} />}
             label={strings.multipleAddresses}
             info={strings.multipleAddressesInfo}
-            disabled={addressDerivation.isToggleLoading}
+            disabled={addressMode.isToggleLoading}
           >
-            <AddresseDerivationSwitcher isSingle={addressDerivation.isSingle} />
+            <AddressModeSwitcher isSingle={addressMode.isSingle} />
           </SettingsItem>
         </SettingsSection>
 
@@ -190,16 +190,16 @@ const ResyncButton = () => {
   )
 }
 
-const AddresseDerivationSwitcher = (props: {isSingle: boolean}) => {
-  const addressDerivation = useAddressDerivationManager()
+const AddressModeSwitcher = (props: {isSingle: boolean}) => {
+  const addressMode = useAddressModeManager()
   const [isSingleLocal, setIsSingleLocal] = React.useState(props.isSingle)
 
-  const handleOnSwitchAddressDerivation = () => {
+  const handleOnSwitchAddressMode = () => {
     setIsSingleLocal((prevState) => {
       if (prevState) {
-        addressDerivation.enableMultipleMode()
+        addressMode.enableMultipleMode()
       } else {
-        addressDerivation.enableSingleMode()
+        addressMode.enableSingleMode()
       }
 
       return !prevState
@@ -207,11 +207,7 @@ const AddresseDerivationSwitcher = (props: {isSingle: boolean}) => {
   }
 
   return (
-    <Switch
-      value={!isSingleLocal}
-      onValueChange={handleOnSwitchAddressDerivation}
-      disabled={addressDerivation.isToggleLoading}
-    />
+    <Switch value={!isSingleLocal} onValueChange={handleOnSwitchAddressMode} disabled={addressMode.isToggleLoading} />
   )
 }
 
diff --git a/apps/wallet-mobile/src/features/Swap/common/ConfirmRawTx/ConfirmRawTxWithHW.tsx b/apps/wallet-mobile/src/features/Swap/common/ConfirmRawTx/ConfirmRawTxWithHW.tsx
index 77c89b4912..0374fb4415 100644
--- a/apps/wallet-mobile/src/features/Swap/common/ConfirmRawTx/ConfirmRawTxWithHW.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/ConfirmRawTx/ConfirmRawTxWithHW.tsx
@@ -6,8 +6,8 @@ import {ActivityIndicator, ScrollView, StyleSheet, View} from 'react-native'
 import {Text} from '../../../../components'
 import {LedgerConnect} from '../../../../HW'
 import {useSelectedWallet} from '../../../../SelectedWallet'
+import {walletManager} from '../../../../wallet-manager/walletManager'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../../../yoroi-wallets/hw'
-import {walletManager} from '../../../../yoroi-wallets/walletManager'
 import {LedgerTransportSwitch} from '../../useCases/ConfirmTxScreen/LedgerTransportSwitch'
 import {useCancelOrderWithHw} from '../helpers'
 import {useStrings} from '../strings'
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
index c84e043e71..19585e1ee8 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
@@ -3,11 +3,11 @@ import {ActivityIndicator, ScrollView, StyleSheet, View} from 'react-native'
 
 import {Text} from '../../../../components'
 import {LedgerConnect} from '../../../../HW'
+import {walletManager} from '../../../../wallet-manager/walletManager'
 import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
 import {useSignWithHwAndSubmitTx} from '../../../../yoroi-wallets/hooks'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../../../yoroi-wallets/hw'
 import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types'
-import {walletManager} from '../../../../yoroi-wallets/walletManager'
 import {useStrings} from '../../common/strings'
 import {LedgerTransportSwitch} from './LedgerTransportSwitch'
 
diff --git a/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx b/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx
index 60582d3e05..e002dd4f4b 100644
--- a/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx
@@ -8,19 +8,20 @@ import React from 'react'
 import {useIntl} from 'react-intl'
 import {Alert, InteractionManager, SafeAreaView, ScrollView, StyleSheet, TouchableOpacity} from 'react-native'
 import config from 'react-native-config'
-import * as Keychain from 'react-native-keychain'
 
 import {useAuth} from '../auth/AuthProvider'
 import {Button, StatusBar, Text, TextInput} from '../components'
 import {showErrorDialog} from '../dialogs'
 import {useLegalAgreement, useResetLegalAgreement} from '../features/Initialization/common'
 import {errorMessages} from '../i18n/global-messages'
+import {storageVersionMaker} from '../migrations/storageVersion'
 import {AppRoutes, useWalletNavigation} from '../navigation'
 import {useSelectedWalletContext} from '../SelectedWallet'
 import {isEmptyString} from '../utils/utils'
 import {NetworkError} from '../yoroi-wallets/cardano/errors'
 import {generateAdaMnemonic} from '../yoroi-wallets/cardano/mnemonic'
 import {useCreateWallet} from '../yoroi-wallets/hooks'
+import {rootStorage} from '../yoroi-wallets/storage/rootStorage'
 import {NetworkId} from '../yoroi-wallets/types'
 import {CONFIG} from './config'
 
@@ -101,9 +102,9 @@ export const DeveloperScreen = () => {
         </TouchableOpacity>
 
         <Button
-          title="All kc"
+          title="reset storage version"
           style={styles.button}
-          onPress={() => Keychain.getAllGenericPasswordServices().then(console.log)}
+          onPress={() => storageVersionMaker(rootStorage).remove()}
         />
 
         <Button
@@ -135,6 +136,7 @@ export const DeveloperScreen = () => {
               networkId: Number(config['WALLET_1_NETWORK_ID'] ?? 300) as NetworkId,
               password: '1234567890',
               walletImplementationId: 'haskell-shelley',
+              addressMode: 'multiple',
             })
           }
           testID="btnRestoreWallet1"
@@ -151,6 +153,7 @@ export const DeveloperScreen = () => {
               networkId: Number(config['WALLET_2_NETWORK_ID'] ?? 300) as NetworkId,
               password: '1234567890',
               walletImplementationId: 'haskell-shelley',
+              addressMode: 'multiple',
             })
           }
           testID="btnRestoreWallet2"
@@ -167,6 +170,7 @@ export const DeveloperScreen = () => {
               networkId: 1,
               password: '1234567890',
               walletImplementationId: 'haskell-shelley',
+              addressMode: 'single',
             })
           }
           title="RO Mainnet For Forced Addresses"
diff --git a/apps/wallet-mobile/src/migrations/4_26_0.test.ts b/apps/wallet-mobile/src/migrations/4_26_0.test.ts
new file mode 100644
index 0000000000..cf9ccbf47f
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/4_26_0.test.ts
@@ -0,0 +1,107 @@
+import {App} from '@yoroi/types'
+
+import {isWalletMetaV1, migrateAddressMode} from './4_26_0'
+
+describe('4_26_0 migrations', () => {
+  let storage: App.Storage
+
+  beforeEach(() => {
+    storage = {
+      join: jest.fn().mockReturnThis(),
+      removeItem: jest.fn(),
+      getAllKeys: jest.fn(),
+      multiGet: jest.fn(),
+      setItem: jest.fn(),
+    } as never
+  })
+
+  afterEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should migrate address mode for wallet metas', async () => {
+    const pwdWalletMeta = {
+      id: '1',
+      name: 'Wallet 1',
+      networkId: 1,
+      isHW: false,
+      isEasyConfirmationEnabled: true,
+      checksum: {},
+      walletImplementationId: 'haskell-shelley',
+    }
+
+    const hwWalletMeta = {
+      id: '2',
+      name: 'Wallet 2',
+      networkId: 2,
+      isHW: true,
+      isEasyConfirmationEnabled: false,
+      checksum: {},
+      walletImplementationId: 'haskell-shelley',
+    }
+
+    const bioAuthWalletMeta = {
+      id: '3',
+      name: 'Wallet 3',
+      networkId: 3,
+      isHW: false,
+      isEasyConfirmationEnabled: true,
+      checksum: {},
+      walletImplementationId: 'haskell-shelley',
+    }
+
+    const walletMetas = [pwdWalletMeta, hwWalletMeta, bioAuthWalletMeta]
+
+    jest.spyOn(storage, 'getAllKeys').mockResolvedValue(walletMetas.map((meta) => meta.id))
+    jest.spyOn(storage, 'multiGet').mockResolvedValue(walletMetas.map((meta) => [meta.id, meta]))
+    jest.spyOn(storage, 'setItem')
+    jest.spyOn(storage, 'removeItem')
+
+    await migrateAddressMode(storage)
+
+    expect(storage.multiGet).toHaveBeenCalledWith(['1', '2', '3'])
+    expect(storage.removeItem).toHaveBeenCalledWith('deletedWalletIds')
+    expect(storage.setItem).toHaveBeenCalledTimes(3)
+    expect(storage.setItem).toHaveBeenCalledWith('1', {
+      ...pwdWalletMeta,
+      addressMode: 'multiple',
+    })
+    expect(storage.setItem).toHaveBeenCalledWith('2', {
+      ...hwWalletMeta,
+      addressMode: 'multiple',
+    })
+    expect(storage.setItem).toHaveBeenCalledWith('3', {
+      ...bioAuthWalletMeta,
+      addressMode: 'multiple',
+    })
+  })
+
+  it('should correctly identify wallet meta v1', () => {
+    const walletMeta = {
+      id: '1',
+      name: 'Wallet 1',
+      networkId: 1,
+      isHW: false,
+      isEasyConfirmationEnabled: true,
+      checksum: {},
+      walletImplementationId: 'haskell-shelley',
+    }
+
+    expect(isWalletMetaV1(walletMeta)).toBe(true)
+  })
+
+  it('should correctly identify non-wallet meta v1', () => {
+    const walletMeta = {
+      id: '1',
+      name: 'Wallet 1',
+      networkId: 1,
+      isHW: false,
+      isEasyConfirmationEnabled: true,
+      checksum: {},
+      walletImplementationId: 'haskell-shelley',
+      addressMode: 'single',
+    }
+
+    expect(isWalletMetaV1(walletMeta)).toBe(false)
+  })
+})
diff --git a/apps/wallet-mobile/src/migrations/4_26_0.ts b/apps/wallet-mobile/src/migrations/4_26_0.ts
new file mode 100644
index 0000000000..11d0412692
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/4_26_0.ts
@@ -0,0 +1,59 @@
+import {App} from '@yoroi/types'
+
+import {WalletMeta} from '../wallet-manager/types'
+import {WALLET_IMPLEMENTATION_REGISTRY} from '../yoroi-wallets/types/other'
+
+export const migrateAddressMode = async (rootStorage: App.Storage) => {
+  const walletsRootStorage = rootStorage.join('wallet/')
+  const addAddressMode = addAddressModeWrapper(walletsRootStorage)
+
+  // moved from /wallet/ -> /
+  await walletsRootStorage.removeItem('deletedWalletIds')
+
+  // add the addressMode defaulted to 'multiple' to all wallet metas
+  const walletIds = await walletsRootStorage.getAllKeys()
+  const walletMetas = await walletsRootStorage
+    .multiGet(walletIds)
+    .then((tuples) => tuples.map(([_, walletMeta]) => walletMeta))
+
+  const metasToMigrate = walletMetas.filter(isWalletMetaV1)
+  const migrations = metasToMigrate.map(addAddressMode)
+  await Promise.all(migrations)
+}
+
+const addAddressModeWrapper = (walletsRootStorage: App.Storage) => async (walletMetaToMigrate: WalletMeta) => {
+  return walletsRootStorage.setItem(walletMetaToMigrate.id, {...walletMetaToMigrate, addressMode: 'multiple'})
+}
+
+export const to4_26_0 = migrateAddressMode
+
+export function isWalletMetaV1(walletMeta: unknown): walletMeta is WalletMeta {
+  if (walletMeta == null) return false
+  if (typeof walletMeta !== 'object') return false
+  return (
+    // prettier-ignore
+    !!walletMeta &&
+    'id' in walletMeta
+      && typeof walletMeta.id === 'string' &&
+    'name' in walletMeta
+      && typeof walletMeta.name === 'string' &&
+    'networkId' in walletMeta
+      && typeof walletMeta.networkId === 'number' &&
+    'isHW' in walletMeta
+      && typeof walletMeta.isHW === 'boolean' &&
+    'isEasyConfirmationEnabled' in walletMeta
+      && typeof walletMeta.isEasyConfirmationEnabled === 'boolean' &&
+    'checksum' in walletMeta
+      && typeof walletMeta.checksum === 'object' &&
+    ('provider' in walletMeta
+      && typeof walletMeta.provider === 'string'
+      || !('provider' in walletMeta)) &&
+    'walletImplementationId' in walletMeta
+      && typeof walletMeta.walletImplementationId === 'string'
+      && Object.values(WALLET_IMPLEMENTATION_REGISTRY).includes(walletMeta?.walletImplementationId as never) &&
+    ('isShelley' in walletMeta
+      && typeof walletMeta.isShelley === 'boolean'
+      || !('isShelley' in walletMeta)) && 
+    (!('addressMode' in walletMeta) || typeof walletMeta.addressMode !== 'string')
+  )
+}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.test.ts b/apps/wallet-mobile/src/migrations/4_9_0.test.ts
similarity index 97%
rename from apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.test.ts
rename to apps/wallet-mobile/src/migrations/4_9_0.test.ts
index b461d87404..65af0600eb 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.test.ts
+++ b/apps/wallet-mobile/src/migrations/4_9_0.test.ts
@@ -1,4 +1,4 @@
-import {rootStorage} from '../storage/rootStorage'
+import {rootStorage} from '../yoroi-wallets/storage/rootStorage'
 import {migrateAuthSetting, OLD_OS_AUTH_KEY} from './4_9_0'
 describe('migrateAuthSetting', () => {
   const installationId = 'uuidv4'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.ts b/apps/wallet-mobile/src/migrations/4_9_0.ts
similarity index 95%
rename from apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.ts
rename to apps/wallet-mobile/src/migrations/4_9_0.ts
index 3859a92ea6..ac41e3c067 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/4_9_0.ts
+++ b/apps/wallet-mobile/src/migrations/4_9_0.ts
@@ -1,7 +1,7 @@
 import {parseBoolean} from '@yoroi/common'
 import {App} from '@yoroi/types'
 
-import {AUTH_WITH_OS, AUTH_WITH_PIN, disableAllEasyConfirmation, getAuthSetting} from '../auth/auth'
+import {AUTH_WITH_OS, AUTH_WITH_PIN, disableAllEasyConfirmation, getAuthSetting} from '../yoroi-wallets/auth/auth'
 
 export const migrateAuthSetting = async (storage: App.Storage) => {
   const authSetting = await getAuthSetting(storage)
diff --git a/apps/wallet-mobile/src/migrations/errors.ts b/apps/wallet-mobile/src/migrations/errors.ts
new file mode 100644
index 0000000000..3aa9f759c8
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/errors.ts
@@ -0,0 +1 @@
+export class ErrorMigrationVersion extends Error {}
diff --git a/apps/wallet-mobile/src/migrations/storageVersion.test.ts b/apps/wallet-mobile/src/migrations/storageVersion.test.ts
new file mode 100644
index 0000000000..e55dfef276
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/storageVersion.test.ts
@@ -0,0 +1,58 @@
+import {App} from '@yoroi/types'
+
+import {storageVersionMaker} from './storageVersion'
+
+describe('storageVersion', () => {
+  let storage: App.Storage
+
+  beforeEach(() => {
+    storage = {
+      getItem: jest.fn(),
+      setItem: jest.fn(),
+    } as never
+  })
+
+  afterEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('should save storage version', async () => {
+    const version = 1
+    const {save} = storageVersionMaker(storage)
+    await save(version)
+    expect(storage.setItem).toHaveBeenCalledWith('storageVersion', version)
+  })
+
+  it('should read storage version', async () => {
+    const version = 1
+    jest.spyOn(storage, 'getItem').mockResolvedValueOnce(version)
+    const {read} = storageVersionMaker(storage)
+    const result = await read()
+    expect(storage.getItem).toHaveBeenCalledWith('storageVersion')
+    expect(result).toBe(version)
+  })
+
+  it('should return 0 if storage version is not a number', async () => {
+    const version = 'invalid'
+    jest.spyOn(storage, 'getItem').mockResolvedValueOnce(version)
+    const {read} = storageVersionMaker(storage)
+    const result = await read()
+    expect(storage.getItem).toHaveBeenCalledWith('storageVersion')
+    expect(result).toBe(0)
+  })
+
+  it('should throw an error if saving storage version constant is lt provided version', async () => {
+    const version = Infinity
+    jest.spyOn(storage, 'setItem')
+    const {save} = storageVersionMaker(storage)
+    await expect(save(version)).rejects.toThrow()
+    expect(storage.setItem).not.toHaveBeenCalled()
+  })
+
+  it('should save a new installation with currentStorageVersion', async () => {
+    jest.spyOn(storage, 'setItem')
+    const {newInstallation} = storageVersionMaker(storage)
+    await newInstallation()
+    expect(storage.setItem).toHaveBeenCalled()
+  })
+})
diff --git a/apps/wallet-mobile/src/migrations/storageVersion.ts b/apps/wallet-mobile/src/migrations/storageVersion.ts
new file mode 100644
index 0000000000..8ffd52dc0b
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/storageVersion.ts
@@ -0,0 +1,32 @@
+import {isNumber} from '@yoroi/common'
+import {App} from '@yoroi/types'
+import {freeze} from 'immer'
+
+import {ErrorMigrationVersion} from './errors'
+
+const currentVersion = 2
+const keyStorageVersion = 'storageVersion'
+
+export const storageVersionMaker = (storage: App.Storage) => {
+  return freeze(
+    {
+      async save(storageVersion: number) {
+        // should save the last version always after migration, can't be higher than currentVersion
+        if (storageVersion > currentVersion) throw new ErrorMigrationVersion()
+        return storage.setItem(keyStorageVersion, storageVersion)
+      },
+      async read() {
+        return storage.getItem(keyStorageVersion).then((version) => (isNumber(version) ? version : 0))
+      },
+      async newInstallation() {
+        return storage.setItem(keyStorageVersion, currentVersion)
+      },
+      async remove() {
+        return storage.removeItem(keyStorageVersion)
+      },
+      key: keyStorageVersion,
+      current: currentVersion,
+    },
+    true,
+  )
+}
diff --git a/apps/wallet-mobile/src/migrations/useMigrations.ts b/apps/wallet-mobile/src/migrations/useMigrations.ts
new file mode 100644
index 0000000000..6ef156c4c1
--- /dev/null
+++ b/apps/wallet-mobile/src/migrations/useMigrations.ts
@@ -0,0 +1,36 @@
+import {App} from '@yoroi/types'
+import * as React from 'react'
+
+import {to4_9_0} from './4_9_0'
+import {to4_26_0} from './4_26_0'
+import {ErrorMigrationVersion} from './errors'
+import {storageVersionMaker} from './storageVersion'
+
+export const useMigrations = (storage: App.Storage) => {
+  const [done, setDone] = React.useState(false)
+  React.useEffect(() => {
+    const storageVersion = storageVersionMaker(storage)
+
+    const runMigrations = async () => {
+      const currentVersion = await storageVersion.read()
+
+      if (currentVersion < 1) {
+        await to4_9_0(storage)
+        await storageVersion.save(1)
+      }
+
+      if (currentVersion < 2) {
+        await to4_26_0(storage)
+        await storageVersion.save(2)
+      }
+
+      const savedVersion = await storageVersion.read()
+      if (savedVersion != storageVersion.current) throw new ErrorMigrationVersion()
+
+      setDone(true)
+    }
+    runMigrations()
+  }, [storage])
+
+  return done
+}
diff --git a/apps/wallet-mobile/src/WalletManager/WalletManagerContext.tsx b/apps/wallet-mobile/src/wallet-manager/WalletManagerContext.tsx
similarity index 81%
rename from apps/wallet-mobile/src/WalletManager/WalletManagerContext.tsx
rename to apps/wallet-mobile/src/wallet-manager/WalletManagerContext.tsx
index 9895d72329..68db239804 100644
--- a/apps/wallet-mobile/src/WalletManager/WalletManagerContext.tsx
+++ b/apps/wallet-mobile/src/wallet-manager/WalletManagerContext.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import {WalletManager} from '../yoroi-wallets/walletManager'
+import {WalletManager} from './walletManager'
 
 const WalletManagerContext = React.createContext<WalletManager | undefined>(undefined)
 
@@ -13,8 +13,6 @@ export const WalletManagerProvider: React.FC<React.PropsWithChildren<{walletMana
 
 export const useWalletManager = () => React.useContext(WalletManagerContext) || missingProvider()
 
-// //////////////////////////////////////////////////////////////
-
 const missingProvider = () => {
   throw new Error('WalletManagerProvider is missing')
 }
diff --git a/apps/wallet-mobile/src/wallet-manager/types.ts b/apps/wallet-mobile/src/wallet-manager/types.ts
new file mode 100644
index 0000000000..b5000ec2b7
--- /dev/null
+++ b/apps/wallet-mobile/src/wallet-manager/types.ts
@@ -0,0 +1,24 @@
+import {CardanoTypes} from '../yoroi-wallets/cardano/types'
+import {HWDeviceInfo} from '../yoroi-wallets/hw/hw'
+import {NetworkId, WalletImplementationId} from '../yoroi-wallets/types/other'
+
+export type WalletMeta = {
+  id: string
+  name: string
+  networkId: NetworkId
+  walletImplementationId: WalletImplementationId
+  isHW: boolean
+  isEasyConfirmationEnabled: boolean
+  checksum: CardanoTypes.WalletChecksum
+  addressMode: AddressMode
+  // legacy jormungandr
+  isShelley?: boolean | null | undefined
+}
+
+export type AddressMode = 'single' | 'multiple'
+
+export type WalletManagerEvent =
+  | {type: 'easy-confirmation'; enabled: boolean}
+  | {type: 'hw-device-info'; hwDeviceInfo: HWDeviceInfo}
+
+export type WalletManagerSubscription = (event: WalletManagerEvent) => void
diff --git a/apps/wallet-mobile/src/wallet-manager/useAddressModeManager.tsx b/apps/wallet-mobile/src/wallet-manager/useAddressModeManager.tsx
new file mode 100644
index 0000000000..3b4a2b8aa6
--- /dev/null
+++ b/apps/wallet-mobile/src/wallet-manager/useAddressModeManager.tsx
@@ -0,0 +1,97 @@
+import {useAsyncStorage, useMutationWithInvalidations} from '@yoroi/common'
+import {UseMutationOptions, useQuery} from 'react-query'
+
+import {useSelectedWallet} from '../SelectedWallet'
+import {AddressMode} from './types'
+import {parseWalletMeta} from './validators'
+
+const useAddressMode = () => {
+  const storage = useAsyncStorage()
+  const wallet = useSelectedWallet()
+  const rootWalletStorage = storage.join('wallet/')
+
+  const query = useQuery<AddressMode, Error>({
+    queryKey: [wallet.id, 'addressMode'],
+    queryFn: async () => {
+      const walletMeta = await rootWalletStorage.getItem(wallet.id, parseWalletMeta)
+      if (!walletMeta) throw new Error('Invalid wallet id')
+
+      return walletMeta.addressMode ?? initialAddressMode
+    },
+    suspense: true,
+  })
+
+  if (query.data == null) throw new Error('Invalid state')
+
+  return query.data
+}
+
+const useSaveAddressMode = (options?: UseMutationOptions<void, Error, AddressMode>) => {
+  const storage = useAsyncStorage()
+  const wallet = useSelectedWallet()
+  const rootWalletStorage = storage.join('wallet/')
+
+  const mutation = useMutationWithInvalidations<void, Error, AddressMode>({
+    mutationFn: async (addressMode) => {
+      const walletMeta = await rootWalletStorage.getItem(wallet.id, parseWalletMeta)
+      if (!walletMeta) throw new Error('Invalid wallet id')
+
+      return rootWalletStorage.setItem(wallet.id, {...walletMeta, addressMode})
+    },
+    invalidateQueries: [[wallet.id, 'addressMode'], ['walletMetas']],
+    ...options,
+  })
+
+  return mutation.mutate
+}
+
+const useToogleAddressMode = (options?: UseMutationOptions<void, Error, void>) => {
+  const storage = useAsyncStorage()
+  const wallet = useSelectedWallet()
+  const rootWalletStorage = storage.join(`wallet/`)
+
+  const addressMode = useAddressMode()
+
+  const mutation = useMutationWithInvalidations({
+    mutationFn: async () => {
+      const walletMeta = await rootWalletStorage.getItem(wallet.id, parseWalletMeta)
+      if (!walletMeta) throw new Error('Invalid wallet id')
+
+      return rootWalletStorage.setItem(wallet.id, {
+        ...walletMeta,
+        addressMode: addressMode === 'single' ? 'multiple' : 'single',
+      })
+    },
+    invalidateQueries: [[wallet.id, 'addressMode'], ['walletMetas']],
+    ...options,
+  })
+
+  return {
+    toggle: mutation.mutate,
+    isToggleLoading: mutation.isLoading,
+  }
+}
+
+const initialAddressMode: AddressMode = 'multiple'
+
+export const useAddressModeManager = () => {
+  const addressMode = useAddressMode()
+  const {toggle, isToggleLoading} = useToogleAddressMode()
+
+  const saveAddressMode = useSaveAddressMode()
+  const enableMultipleMode = () => saveAddressMode('multiple')
+  const enableSingleMode = () => saveAddressMode('single')
+
+  const isSingle = addressMode === 'single'
+  const isMultiple = addressMode === 'multiple'
+
+  return {
+    isMultiple,
+    isSingle,
+    isToggleLoading,
+    addressMode,
+    toggle,
+    enableSingleMode,
+    enableMultipleMode,
+  }
+}
diff --git a/apps/wallet-mobile/src/wallet-manager/validators.ts b/apps/wallet-mobile/src/wallet-manager/validators.ts
new file mode 100644
index 0000000000..c6008c1295
--- /dev/null
+++ b/apps/wallet-mobile/src/wallet-manager/validators.ts
@@ -0,0 +1,52 @@
+import {parseSafe} from '@yoroi/common'
+
+import {WALLET_IMPLEMENTATION_REGISTRY} from '../yoroi-wallets/types/other'
+import {AddressMode, WalletMeta} from './types'
+
+export const parseWalletMeta = (data: unknown) => {
+  const parsed = parseSafe(data)
+
+  return isWalletMeta(parsed) ? parsed : undefined
+}
+
+const addressModes: ReadonlyArray<AddressMode> = ['single', 'multiple'] as const
+export function isWalletMeta(walletMeta: unknown): walletMeta is WalletMeta {
+  if (walletMeta == null) return false
+  if (typeof walletMeta !== 'object') return false
+  return (
+    // prettier-ignore
+    !!walletMeta &&
+      'id' in walletMeta
+        && typeof walletMeta.id === 'string' &&
+      'name' in walletMeta
+        && typeof walletMeta.name === 'string' &&
+      'networkId' in walletMeta
+        && typeof walletMeta.networkId === 'number' &&
+      'isHW' in walletMeta
+        && typeof walletMeta.isHW === 'boolean' &&
+      'isEasyConfirmationEnabled' in walletMeta
+        && typeof walletMeta.isEasyConfirmationEnabled === 'boolean' &&
+      'checksum' in walletMeta
+        && typeof walletMeta.checksum === 'object' &&
+      ('provider' in walletMeta
+        && typeof walletMeta.provider === 'string'
+        || !('provider' in walletMeta)) &&
+      'walletImplementationId' in walletMeta
+        && typeof walletMeta.walletImplementationId === 'string'
+        && Object.values(WALLET_IMPLEMENTATION_REGISTRY).includes(walletMeta?.walletImplementationId as never) &&
+      ('isShelley' in walletMeta
+        && typeof walletMeta.isShelley === 'boolean'
+        || !('isShelley' in walletMeta)) && 
+      ('addressMode' in walletMeta 
+        && typeof walletMeta.addressMode === 'string' 
+        && addressModes.includes(walletMeta.addressMode as never))
+  )
+}
+
+export const isAddressMode = (data: unknown): data is AddressMode => data === 'single' || data === 'multiple'
+
+export const parseAddressMode = (data: unknown) => {
+  const parsed = parseSafe(data)
+
+  return isAddressMode(parsed) ? parsed : undefined
+}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.test.ts b/apps/wallet-mobile/src/wallet-manager/walletManager.test.ts
similarity index 90%
rename from apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.test.ts
rename to apps/wallet-mobile/src/wallet-manager/walletManager.test.ts
index 376460262c..810dc5b639 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.test.ts
+++ b/apps/wallet-mobile/src/wallet-manager/walletManager.test.ts
@@ -2,7 +2,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import {parseSafe} from '@yoroi/common'
 
-import {isYoroiWallet} from '../cardano/types'
+import {isYoroiWallet} from '../yoroi-wallets/cardano/types'
 import {WalletManager} from './walletManager'
 
 // ! Actually hitting the API
@@ -11,7 +11,6 @@ describe('walletMananger', () => {
 
   it('creates a wallet', async () => {
     const walletManager = new WalletManager()
-    await walletManager.initialize()
     await expect(walletManager.listWallets()).resolves.toEqual([])
 
     const name = 'name'
@@ -22,8 +21,16 @@ describe('walletMananger', () => {
     ].join(' ')
     const networkId = 300
     const walletImplementationId = 'haskell-shelley'
+    const addressMode = 'single'
 
-    const wallet = await walletManager.createWallet(name, mnemonic, 'password', networkId, walletImplementationId)
+    const wallet = await walletManager.createWallet(
+      name,
+      mnemonic,
+      'password',
+      networkId,
+      walletImplementationId,
+      addressMode,
+    )
     expect(isYoroiWallet(wallet)).toBe(true)
 
     before: {
@@ -49,6 +56,7 @@ describe('walletMananger', () => {
           name: 'name',
           networkId: 300,
           walletImplementationId: 'haskell-shelley',
+          addressMode: 'single',
         },
       ])
     }
@@ -62,7 +70,7 @@ describe('walletMananger', () => {
       const walletManager = new WalletManager()
       expect(await walletManager.listWallets()).toEqual([])
 
-      await walletManager.initialize()
+      await walletManager.removeDeletedWallets()
 
       const shot = await snapshot()
       const walletMeta = getWalletMeta(wallet.id, shot)
@@ -78,7 +86,6 @@ describe('walletMananger', () => {
 
   it('creates a readonly wallet', async () => {
     const walletManager = new WalletManager()
-    await walletManager.initialize()
     await expect(walletManager.listWallets()).resolves.toEqual([])
 
     const name = 'name'
@@ -86,6 +93,7 @@ describe('walletMananger', () => {
       '1ba2332dca14d6f1f5a5282512e725852a34d3aee1cc26057e9cfb2c2730f1665934fa0b0fa42e16ded504fa81198e45dc22d10dab69398e730542a198dcbfcf'
     const networkId = 300
     const walletImplementationId = 'haskell-shelley'
+    const addressMode = 'single'
 
     const wallet = await walletManager.createWalletWithBip44Account(
       name,
@@ -94,6 +102,7 @@ describe('walletMananger', () => {
       walletImplementationId,
       null,
       true,
+      addressMode,
     )
     expect(isYoroiWallet(wallet)).toBe(true)
 
@@ -105,11 +114,11 @@ describe('walletMananger', () => {
     expect(walletMeta.networkId).toEqual(networkId)
     expect(walletMeta.walletImplementationId).toEqual(walletImplementationId)
     expect(walletMeta.isHW).toEqual(false)
+    expect(walletMeta.addressMode).toEqual(addressMode)
   })
 
   it('creates a hw wallet', async () => {
     const walletManager = new WalletManager()
-    await walletManager.initialize()
     await expect(walletManager.listWallets()).resolves.toEqual([])
 
     const name = 'name'
@@ -127,6 +136,7 @@ describe('walletMananger', () => {
         vendor: 'ledger.com',
       },
     }
+    const addressMode = 'single'
 
     const wallet = await walletManager.createWalletWithBip44Account(
       name,
@@ -135,6 +145,7 @@ describe('walletMananger', () => {
       walletImplementationId,
       hwDeviceInfo,
       true,
+      addressMode,
     )
     expect(isYoroiWallet(wallet)).toBe(true)
 
@@ -146,6 +157,7 @@ describe('walletMananger', () => {
     expect(walletMeta.networkId).toEqual(networkId)
     expect(walletMeta.walletImplementationId).toEqual(walletImplementationId)
     expect(walletMeta.isHW).toEqual(true)
+    expect(walletMeta.addressMode).toEqual(addressMode)
   })
 })
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.ts b/apps/wallet-mobile/src/wallet-manager/walletManager.ts
similarity index 65%
rename from apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.ts
rename to apps/wallet-mobile/src/wallet-manager/walletManager.ts
index e1a92ee64d..74c706a715 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/walletManager/walletManager.ts
+++ b/apps/wallet-mobile/src/wallet-manager/walletManager.ts
@@ -1,51 +1,34 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import {parseSafe} from '@yoroi/common'
 import {App} from '@yoroi/types'
-import ExtendableError from 'es6-error'
 import uuid from 'uuid'
 
-import {getCardanoWalletFactory} from '../cardano/getWallet'
-import {CardanoTypes, isYoroiWallet, YoroiWallet} from '../cardano/types'
-import {HWDeviceInfo} from '../hw'
-import {Logger} from '../logging'
-import {isWalletMeta, migrateWalletMetas, parseWalletMeta} from '../migrations/walletMeta'
-import {makeWalletEncryptedStorage} from '../storage'
-import {Keychain} from '../storage/Keychain'
-import {rootStorage} from '../storage/rootStorage'
-import {NetworkId, WalletImplementationId} from '../types'
-
-export class WalletClosed extends ExtendableError {}
-
-export type WalletMeta = {
-  id: string
-  name: string
-  networkId: NetworkId
-  walletImplementationId: WalletImplementationId
-  isHW: boolean
-  isShelley?: boolean | null | undefined
-  // legacy jormungandr
-  isEasyConfirmationEnabled: boolean
-  checksum: CardanoTypes.WalletChecksum
-}
-
-export type WalletManagerEvent =
-  | {type: 'easy-confirmation'; enabled: boolean}
-  | {type: 'hw-device-info'; hwDeviceInfo: HWDeviceInfo}
-
-export type WalletManagerSubscription = (event: WalletManagerEvent) => void
+import {getCardanoWalletFactory} from '../yoroi-wallets/cardano/getWallet'
+import {isYoroiWallet, YoroiWallet} from '../yoroi-wallets/cardano/types'
+import {HWDeviceInfo} from '../yoroi-wallets/hw'
+import {Logger} from '../yoroi-wallets/logging'
+import {makeWalletEncryptedStorage} from '../yoroi-wallets/storage'
+import {Keychain} from '../yoroi-wallets/storage/Keychain'
+import {rootStorage} from '../yoroi-wallets/storage/rootStorage'
+import {NetworkId, WalletImplementationId} from '../yoroi-wallets/types'
+import {AddressMode, WalletManagerEvent, WalletManagerSubscription, WalletMeta} from './types'
+import {isWalletMeta, parseWalletMeta} from './validators'
 
 export class WalletManager {
   private subscriptions: Array<WalletManagerSubscription> = []
-  storage: App.Storage
+  walletsRootStorage: App.Storage
+  rootStorage: App.Storage
 
   constructor() {
-    this.storage = rootStorage.join('wallet/')
+    this.walletsRootStorage = rootStorage.join('wallet/')
+    this.rootStorage = rootStorage
   }
 
   async listWallets() {
     const deletedWalletIds = await this.deletedWalletIds()
-    const walletIds = await this.storage.getAllKeys().then((ids) => ids.filter((id) => !deletedWalletIds.includes(id)))
-    const walletMetas = await this.storage
+    const walletIds = await this.walletsRootStorage
+      .getAllKeys()
+      .then((ids) => ids.filter((id) => !deletedWalletIds.includes(id)))
+    const walletMetas = await this.walletsRootStorage
       .multiGet(walletIds, parseWalletMeta)
       .then((tuples) => tuples.map(([_, walletMeta]) => walletMeta))
       .then((walletMetas) => walletMetas.filter(isWalletMeta)) // filter corrupted wallet metas)
@@ -53,25 +36,13 @@ export class WalletManager {
     return walletMetas
   }
 
-  // note(v-almonacid): This method retrieves all the wallets' metadata from
-  // storage. Unfortunately, as new metadata is added over time (eg. networkId),
-  // we need to infer some values for wallets created in older versions,
-  // which may induce errors and leave us with this ugly method.
-  // The responsibility to check data consistency is left to the each wallet
-  // implementation.
-  async initialize() {
-    await this.removeDeletedWallets()
-    const _storedWalletMetas = await this.listWallets()
-    return migrateWalletMetas(_storedWalletMetas)
-  }
-
   async deletedWalletIds() {
-    const ids = await this.storage.getItem('deletedWalletIds', parseDeletedWalletIds)
+    const ids = await this.rootStorage.getItem('deletedWalletIds', parseDeletedWalletIds)
 
     return ids ?? []
   }
 
-  private async removeDeletedWallets() {
+  async removeDeletedWallets() {
     const deletedWalletsIds = await this.deletedWalletIds()
     if (!deletedWalletsIds) return
 
@@ -79,14 +50,14 @@ export class WalletManager {
       deletedWalletsIds.map(async (id) => {
         const encryptedStorage = makeWalletEncryptedStorage(id)
 
-        await this.storage.removeItem(id) // remove wallet meta
-        await this.storage.removeFolder(`${id}/`) // remove wallet folder
+        await this.walletsRootStorage.removeItem(id) // remove wallet meta
+        await this.walletsRootStorage.removeFolder(`${id}/`) // remove wallet folder
         await encryptedStorage.rootKey.remove() // remove auth with password
         await Keychain.removeWalletKey(id) // remove auth with os
       }),
     )
 
-    await this.storage.setItem('deletedWalletIds', [])
+    await this.rootStorage.setItem('deletedWalletIds', [])
   }
 
   // Note(ppershing): needs 'this' to be bound
@@ -135,6 +106,7 @@ export class WalletManager {
     wallet: YoroiWallet,
     networkId: NetworkId,
     walletImplementationId: WalletImplementationId,
+    addressMode: AddressMode,
   ) {
     await wallet.save()
     if (!wallet.checksum) throw new Error('invalid wallet')
@@ -143,12 +115,13 @@ export class WalletManager {
       name,
       networkId,
       walletImplementationId,
+      addressMode,
       isHW: wallet.isHW,
       checksum: wallet.checksum,
       isEasyConfirmationEnabled: false,
     }
 
-    await this.storage.setItem(id, walletMeta)
+    await this.walletsRootStorage.setItem(id, walletMeta)
 
     Logger.debug('WalletManager::saveWallet::wallet', wallet)
 
@@ -164,11 +137,11 @@ export class WalletManager {
     const walletFactory = getWalletFactory({networkId, implementationId: walletImplementationId})
 
     const wallet = await walletFactory.restore({
-      storage: this.storage.join(`${id}/`),
+      storage: this.walletsRootStorage.join(`${id}/`),
       walletMeta,
     })
 
-    wallet.subscribe((event) => this._notify(event as any))
+    wallet.subscribe((event) => this._notify(event as never))
     wallet.startSync()
 
     return wallet
@@ -176,14 +149,14 @@ export class WalletManager {
 
   async removeWallet(id: string) {
     const deletedWalletIds = await this.deletedWalletIds()
-    await this.storage.setItem('deletedWalletIds', [...deletedWalletIds, id])
+    await this.rootStorage.setItem('deletedWalletIds', [...deletedWalletIds, id])
   }
 
   // TODO(ppershing): how should we deal with race conditions?
   async _updateMetadata(id: string, newMeta: {isEasyConfirmationEnabled: boolean}) {
-    const walletMeta = await this.storage.getItem(id, parseWalletMeta)
+    const walletMeta = await this.walletsRootStorage.getItem(id, parseWalletMeta)
     const merged = {...walletMeta, ...newMeta}
-    return this.storage.setItem(id, merged)
+    return this.walletsRootStorage.setItem(id, merged)
   }
 
   async updateHWDeviceInfo(wallet: YoroiWallet, hwDeviceInfo: HWDeviceInfo) {
@@ -198,18 +171,20 @@ export class WalletManager {
     password: string,
     networkId: NetworkId,
     implementationId: WalletImplementationId,
+    addressMode: AddressMode,
   ) {
     const walletFactory = getWalletFactory({networkId, implementationId})
     const id = uuid.v4()
+    const storage = this.walletsRootStorage.join(`${id}/`)
 
     const wallet = await walletFactory.create({
-      storage: this.storage.join(`${id}/`),
+      storage,
       id,
       mnemonic,
       password,
     })
 
-    return this.saveWallet(id, name, wallet, networkId, implementationId)
+    return this.saveWallet(id, name, wallet, networkId, implementationId, addressMode)
   }
 
   async createWalletWithBip44Account(
@@ -219,21 +194,21 @@ export class WalletManager {
     implementationId: WalletImplementationId,
     hwDeviceInfo: null | HWDeviceInfo,
     isReadOnly: boolean,
+    addressMode: AddressMode,
   ) {
     const walletFactory = getWalletFactory({networkId, implementationId})
     const id = uuid.v4()
+    const storage = this.walletsRootStorage.join(`${id}/`)
 
     const wallet = await walletFactory.createBip44({
-      storage: this.storage.join(`${id}/`),
+      storage,
       id,
       accountPubKeyHex,
       hwDeviceInfo,
       isReadOnly,
     })
 
-    Logger.debug('creating wallet...', wallet)
-
-    return this.saveWallet(id, name, wallet, networkId, implementationId)
+    return this.saveWallet(id, name, wallet, networkId, implementationId, addressMode)
   }
 }
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/auth/auth.ts b/apps/wallet-mobile/src/yoroi-wallets/auth/auth.ts
index ab1296dc8d..4b130890c2 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/auth/auth.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/auth/auth.ts
@@ -7,11 +7,11 @@ import RNKeychain from 'react-native-keychain'
 import {useMutation, UseMutationOptions, useQuery, useQueryClient, UseQueryOptions} from 'react-query'
 
 import globalMessages from '../../i18n/global-messages'
-import {useWalletManager} from '../../WalletManager'
+import {parseWalletMeta} from '../../wallet-manager/validators'
+import {useWalletManager} from '../../wallet-manager/WalletManagerContext'
 import {WrongPassword} from '../cardano/errors'
 import {YoroiWallet} from '../cardano/types'
 import {decryptData, encryptData} from '../encryption'
-import {parseWalletMeta} from '../migrations'
 import {AuthenticationPrompt, Keychain} from '../storage'
 
 export const useAuthOsEnabled = (options?: UseQueryOptions<boolean, Error>) => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
index cefede720a..0f300d5a36 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
@@ -13,6 +13,7 @@ import DeviceInfo from 'react-native-device-info'
 import {defaultMemoize} from 'reselect'
 
 import LocalizableError from '../../../i18n/LocalizableError'
+import {WalletMeta} from '../../../wallet-manager/types'
 import {HWDeviceInfo} from '../../hw'
 import {Logger} from '../../logging'
 import {makeMemosManager, MemosManager} from '../../memos'
@@ -43,7 +44,6 @@ import {
 import {asQuantity, isMainnetNetworkId, Quantities} from '../../utils'
 import {genTimeToSlot} from '../../utils/timeUtils'
 import {validatePassword} from '../../utils/validators'
-import {WalletMeta} from '../../walletManager'
 import {Cardano, CardanoMobile} from '../../wallets'
 import * as legacyApi from '../api'
 import {encryptWithPassword} from '../catalyst/catalystCipher'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
index aa08257017..49aa2e25c8 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
@@ -13,6 +13,7 @@ import DeviceInfo from 'react-native-device-info'
 import {defaultMemoize} from 'reselect'
 
 import LocalizableError from '../../../i18n/LocalizableError'
+import {WalletMeta} from '../../../wallet-manager/types'
 import {HWDeviceInfo} from '../../hw'
 import {Logger} from '../../logging'
 import {makeMemosManager, MemosManager} from '../../memos'
@@ -35,7 +36,6 @@ import type {
 import {NETWORK_REGISTRY, StakingInfo, YoroiSignedTx, YoroiUnsignedTx} from '../../types'
 import {asQuantity, Quantities} from '../../utils'
 import {validatePassword} from '../../utils/validators'
-import {WalletMeta} from '../../walletManager'
 import {Cardano, CardanoMobile} from '../../wallets'
 import * as legacyApi from '../api'
 import {encryptWithPassword} from '../catalyst/catalystCipher'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
index a271e3e58c..d9bd22f487 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
@@ -3,11 +3,11 @@ import {Address} from '@emurgo/cross-csl-core'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import {Balance} from '@yoroi/types'
 
+import {WalletMeta} from '../../../../../wallet-manager/types'
 import {HWDeviceInfo} from '../../../../hw'
 import {EncryptedStorage, EncryptedStorageKeys} from '../../../../storage'
 import {rootStorage} from '../../../../storage/rootStorage'
 import {DefaultAsset} from '../../../../types'
-import {WalletMeta} from '../../../../walletManager'
 import {ShelleyAddressGeneratorJSON} from '../../../chain'
 import {YoroiWallet} from '../../../types'
 import {WalletJSON} from '../../ShelleyWallet'
@@ -416,6 +416,7 @@ const walletMeta: WalletMeta = {
     TextPart: 'OSEC-2869',
   },
   isEasyConfirmationEnabled: false,
+  addressMode: 'multiple',
 }
 
 const data: WalletJSON = {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
index 39118925d1..dba03f5dd9 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
@@ -3,11 +3,11 @@ import {Address} from '@emurgo/cross-csl-core'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import {Balance} from '@yoroi/types'
 
+import {WalletMeta} from '../../../../../wallet-manager/types'
 import {HWDeviceInfo} from '../../../../hw'
 import {EncryptedStorage, EncryptedStorageKeys} from '../../../../storage'
 import {rootStorage} from '../../../../storage/rootStorage'
 import {DefaultAsset} from '../../../../types'
-import {WalletMeta} from '../../../../walletManager'
 import {ShelleyAddressGeneratorJSON} from '../../../chain'
 import {WalletJSON} from '../../../shelley/ShelleyWallet'
 import {ShelleyWalletTestnet} from '../../../shelley/wallets'
@@ -354,6 +354,7 @@ const walletMeta: WalletMeta = {
     TextPart: 'OSEC-2869',
   },
   isEasyConfirmationEnabled: false,
+  addressMode: 'multiple',
 }
 
 const data: WalletJSON = {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
index c5c88ef883..663f4febfd 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
@@ -19,13 +19,15 @@ import {
 } from 'react-query'
 
 import {CONFIG} from '../../legacy/config'
-import {useWalletManager} from '../../WalletManager'
+import {AddressMode, WalletMeta} from '../../wallet-manager/types'
+import {parseWalletMeta} from '../../wallet-manager/validators'
+import {WalletManager} from '../../wallet-manager/walletManager'
+import {useWalletManager} from '../../wallet-manager/WalletManagerContext'
 import {getSpendingKey, getStakingKey} from '../cardano/addressInfo/addressInfo'
 import {calcLockedDeposit} from '../cardano/assetUtils'
 import {generateShelleyPlateFromKey} from '../cardano/shelley/plate'
 import {WalletEvent, YoroiWallet} from '../cardano/types'
 import {HWDeviceInfo} from '../hw'
-import {parseWalletMeta} from '../migrations/walletMeta'
 import {
   TRANSACTION_DIRECTION,
   TRANSACTION_STATUS,
@@ -36,7 +38,6 @@ import {
 import {CurrencySymbol, NetworkId, TipStatusResponse, TxSubmissionStatus, WalletImplementationId} from '../types/other'
 import {delay} from '../utils/timeUtils'
 import {Amounts, Quantities, Utxos} from '../utils/utils'
-import {WalletManager, WalletMeta} from '../walletManager'
 
 const crashReportsStorageKey = 'sendCrashReports'
 
@@ -727,12 +728,13 @@ type CreateBip44WalletInfo = {
   implementationId: WalletImplementationId
   hwDeviceInfo?: null | HWDeviceInfo
   readOnly: boolean
+  addressMode: AddressMode
 }
 
 export const useCreateBip44Wallet = (options?: UseMutationOptions<YoroiWallet, Error, CreateBip44WalletInfo>) => {
   const walletManager = useWalletManager()
   const mutation = useMutationWithInvalidations<YoroiWallet, Error, CreateBip44WalletInfo>({
-    mutationFn: ({name, bip44AccountPublic, networkId, implementationId, hwDeviceInfo, readOnly}) =>
+    mutationFn: ({name, bip44AccountPublic, networkId, implementationId, hwDeviceInfo, readOnly, addressMode}) =>
       walletManager.createWalletWithBip44Account(
         name,
         bip44AccountPublic,
@@ -740,6 +742,7 @@ export const useCreateBip44Wallet = (options?: UseMutationOptions<YoroiWallet, E
         implementationId,
         hwDeviceInfo || null,
         readOnly,
+        addressMode,
       ),
     invalidateQueries: [['walletMetas']],
     ...options,
@@ -757,13 +760,14 @@ export type CreateWalletInfo = {
   password: string
   networkId: NetworkId
   walletImplementationId: WalletImplementationId
+  addressMode: AddressMode
 }
 
 export const useCreateWallet = (options?: UseMutationOptions<YoroiWallet, Error, CreateWalletInfo>) => {
   const walletManager = useWalletManager()
   const mutation = useMutationWithInvalidations({
-    mutationFn: ({name, mnemonicPhrase, password, networkId, walletImplementationId}) =>
-      walletManager.createWallet(name, mnemonicPhrase, password, networkId, walletImplementationId),
+    mutationFn: ({name, mnemonicPhrase, password, networkId, walletImplementationId, addressMode}) =>
+      walletManager.createWallet(name, mnemonicPhrase, password, networkId, walletImplementationId, addressMode),
     invalidateQueries: [['walletMetas']],
     ...options,
   })
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/hooks.ts b/apps/wallet-mobile/src/yoroi-wallets/migrations/hooks.ts
deleted file mode 100644
index 50160b4859..0000000000
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/hooks.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {App} from '@yoroi/types'
-import * as React from 'react'
-
-import {to4_9_0} from './4_9_0'
-
-export const useMigrations = (storage: App.Storage) => {
-  const [done, setDone] = React.useState(false)
-  React.useEffect(() => {
-    const runMigrations = async () => {
-      await to4_9_0(storage)
-
-      setDone(true)
-    }
-    runMigrations()
-  }, [storage])
-
-  return done
-}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/index.ts b/apps/wallet-mobile/src/yoroi-wallets/migrations/index.ts
deleted file mode 100644
index cf3cfae747..0000000000
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './hooks'
-export * from './walletMeta'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.test.ts b/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.test.ts
deleted file mode 100644
index a6f4230f39..0000000000
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.test.ts
+++ /dev/null
@@ -1,341 +0,0 @@
-import AsyncStorage from '@react-native-async-storage/async-storage'
-import assert from 'assert'
-import {expect} from 'chai'
-
-import {WALLET_CONFIG_24 as HASKELL_SHELLEY_24} from '../cardano/constants/mainnet/constants'
-import {WALLETS} from '../cardano/utils'
-import {rootStorage} from '../storage/rootStorage'
-import {NETWORK_REGISTRY} from '../types'
-import {WalletMeta} from '../walletManager'
-import {migrateWalletMetas} from './walletMeta'
-
-describe('migrateWalletMetas()', () => {
-  beforeEach(() => AsyncStorage.clear())
-
-  describe('networkId && walletImplementationId', () => {
-    describe('when networkId is missing and isShelley is present', () => {
-      it('should set networkId and walletImplementationId as JORMUNGANDR if isShelley is true', async () => {
-        const {networkId: _, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expected = [
-          {
-            ...mockedWalletMeta,
-            networkId: NETWORK_REGISTRY.JORMUNGANDR,
-            walletImplementationId: WALLETS.JORMUNGANDR_ITN.WALLET_IMPLEMENTATION_ID,
-          },
-        ]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set networkId and walletImplementationId as HASKELL_SHELLEY if isShelley is false', async () => {
-        const {networkId: _, ...meta} = {...mockedWalletMeta, isShelley: false}
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expected = [
-          {
-            ...mockedWalletMeta,
-            isShelley: false,
-            networkId: NETWORK_REGISTRY.HASKELL_SHELLEY,
-            walletImplementationId: WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID,
-          },
-        ]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-    })
-
-    describe('when networkId is present or isShelley is missing', () => {
-      it('should keep walletImplementationId if it is not null', async () => {
-        const meta = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expected = [mockedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set walletImplementationId as BYRON if it is null', async () => {
-        const {walletImplementationId: _, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expected = [{...mockedWalletMeta, walletImplementationId: WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID}]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set networkId as HASKELL_SHELLEY if it is null', async () => {
-        const {networkId: _networkId, isShelley: _isShelley, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, networkId: NETWORK_REGISTRY.HASKELL_SHELLEY}
-        delete expectedWalletMeta.isShelley
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set networkId as HASKELL_SHELLEY if it is BYRON_MAINNET', async () => {
-        const {isShelley: _isShelley, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, networkId: NETWORK_REGISTRY.HASKELL_SHELLEY}
-        delete expectedWalletMeta.isShelley
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should keep networkId if it is not BYRON_MAINNET and not NULL', async () => {
-        const meta = {...mockedWalletMeta, networkId: NETWORK_REGISTRY.HASKELL_SHELLEY_TESTNET}
-        delete meta.isShelley
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, networkId: NETWORK_REGISTRY.HASKELL_SHELLEY_TESTNET}
-        delete expectedWalletMeta.isShelley
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-    })
-
-    describe('when checksum is missing or undefined', () => {
-      it('should set checksum with data when the addressGenerator is present in the wallet/data HASKELL', async () => {
-        const {checksum: _, ...meta} = mockedWalletMeta
-
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = mockedWalletMeta
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set checksum with legacy data when the addressGenerator is present in the wallet/data BYRON', async () => {
-        const {checksum: _, ...meta} = {
-          ...mockedWalletMeta,
-          walletImplementationId: WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID,
-        }
-
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {
-          ...mockedWalletMeta,
-          walletImplementationId: WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID,
-          checksum: {
-            TextPart: 'ATPE-6458',
-            ImagePart:
-              '1dda96f3e8a39341da9549bef4be416c173eeb940f092cfc98d5c63a06c6007d326c77a599b1fd36ddf57507b8ea52537f129dac7bceb18c674bc3baab90411f',
-          },
-        }
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set checksum with legacy data when the addressGenerator is present in the wallet/data JORMUNGANDR', async () => {
-        const {checksum: _, ...meta} = {
-          ...mockedWalletMeta,
-          walletImplementationId: WALLETS.JORMUNGANDR_ITN.WALLET_IMPLEMENTATION_ID,
-        }
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {
-          ...mockedWalletMeta,
-          walletImplementationId: WALLETS.JORMUNGANDR_ITN.WALLET_IMPLEMENTATION_ID,
-          checksum: {
-            TextPart: 'SKBE-5478',
-            ImagePart:
-              '61942e0a01bd7eccff636a468e4d04bd05fe2169c2d26f83236ade661860d93e22c07ff007117555c6a15a92ac43f88e453d31c3b7a240dcd11ca3a7eba29321',
-          },
-        }
-
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set checksum with empty data when there is no addressGenerator in the wallet/data ', async () => {
-        const {checksum: _, ...meta} = mockedWalletMeta
-        const data = {...mockedWalletData, externalChain: {}}
-
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', data)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {
-          ...mockedWalletMeta,
-          checksum: {
-            TextPart: '',
-            ImagePart: '',
-          },
-        }
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-    })
-
-    describe('when isHW is missing', () => {
-      it('should set isHW according to the wallet/data when false', async () => {
-        const {isHW: _, ...meta} = mockedWalletMeta
-        const data = {...mockedWalletData, isHW: false}
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', data)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, isHW: false}
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set isHW according to the wallet/data when true', async () => {
-        const {isHW: _, ...meta} = mockedWalletMeta
-        const data = {...mockedWalletData, isHW: true}
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', data)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, isHW: true}
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-
-      it('should set isHW to false when it is not present in wallet/data', async () => {
-        const {isHW: _, ...meta} = mockedWalletMeta
-        const data = {...mockedWalletData, isHW: null}
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', data)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, isHW: false}
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-    })
-
-    describe('wallet meta type check', () => {
-      it('should throw when there is no id', async () => {
-        const {id: _, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(mockedWalletMeta.id, meta)
-        await rootStorage.join('wallet/').join(`${mockedWalletMeta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-
-        try {
-          await migrateWalletMetas(walletMetas)
-        } catch (_e) {
-          assert.rejects(() => migrateWalletMetas(walletMetas))
-        }
-      })
-
-      it('should not throw when optional fields are not present', async () => {
-        const {isShelley: _isShelley, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-
-        assert.doesNotReject(() => migrateWalletMetas(walletMetas))
-      })
-
-      it('should throw when safeguard fails', async () => {
-        const {isShelley: _isShelley, ...meta} = {...mockedWalletMeta, walletImplementationId: 'invalid'}
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        try {
-          // @ts-expect-error test
-          await migrateWalletMetas(walletMetas)
-        } catch (_e) {
-          // @ts-expect-error test
-          assert.rejects(() => migrateWalletMetas(walletMetas))
-        }
-      })
-    })
-
-    describe('when isEasyConfirmationEnabled is missing', () => {
-      it('should set isEasyConfirmationEnabled to false', async () => {
-        const {isEasyConfirmationEnabled: _, ...meta} = mockedWalletMeta
-        await rootStorage.join('wallet/').setItem(meta.id, meta)
-        await rootStorage.join('wallet/').join(`${meta.id}/`).setItem('data', mockedWalletData)
-        const walletMetas = [meta]
-        const expectedWalletMeta = {...mockedWalletMeta, isEasyConfirmationEnabled: false}
-        const expected = [expectedWalletMeta]
-
-        const result = await migrateWalletMetas(walletMetas)
-
-        expect(result).to.be.eql(expected)
-      })
-    })
-  })
-})
-
-const mockedWalletMeta: WalletMeta = {
-  id: 'wallet-id',
-  name: 'my-wallet',
-  networkId: NETWORK_REGISTRY.HASKELL_SHELLEY,
-  isHW: false,
-  isShelley: true,
-  isEasyConfirmationEnabled: true,
-  checksum: {
-    TextPart: 'JHKT-8080',
-    ImagePart:
-      'b04dc22991594170974bbbb5908cc50b48f236d680a9ebfe6c1d00f52f8f4813341943eb66dec48cfe7f3be5beec705b91300a07641e668ff19dfa2fbeccbfba',
-  },
-  walletImplementationId: HASKELL_SHELLEY_24.WALLET_IMPLEMENTATION_ID,
-}
-
-// legacy wallet data is any
-const mockedWalletData = {
-  id: 'wallet-id',
-  externalChain: {
-    addressGenerator: {
-      account: {
-        derivation_scheme: 'V2',
-        root_cached_key:
-          '7f53efa3c08093db3824235769079e96ef96b6680fc254f6c021ec420e4d1555' +
-          'b5bafb0b1fc6c8040cc8f69f7c1948dfb4dcadec4acd09730c0efb39c6159362',
-      },
-      accountPubKeyHex:
-        '8e4e2f11b6ac2a269913286e26339779ab8767579d18d173cdd324929d94e2c43e3ec212cc8a36ed9860579dfe1e3ef4d6de778c5dbdd981623b48727cd96247',
-    },
-  },
-  isHW: false,
-}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.ts b/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.ts
deleted file mode 100644
index cd8298950d..0000000000
--- a/apps/wallet-mobile/src/yoroi-wallets/migrations/walletMeta.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import {parseSafe} from '@yoroi/common'
-
-import {Logger} from '../../legacy/logging'
-import {CardanoTypes, legacyWalletChecksum, walletChecksum} from '../cardano/types'
-import {WALLETS} from '../cardano/utils'
-import {rootStorage} from '../storage/rootStorage'
-import type {NetworkId, WalletImplementationId} from '../types/other'
-import {NETWORK_REGISTRY, WALLET_IMPLEMENTATION_REGISTRY} from '../types/other'
-import {WalletMeta} from '../walletManager'
-
-async function toShelleyWalletMeta(currentWalletMeta: Partial<WalletMeta>): Promise<WalletMeta> {
-  if (!currentWalletMeta.id) throw new Error(`Wallet meta stored is corrupted. ${JSON.stringify(currentWalletMeta)}`)
-  const walletData: any = await rootStorage.join('wallet/').join(`${currentWalletMeta.id}/`).getItem('data')
-  const walletMetaUpdate: Partial<WalletMeta> = {...currentWalletMeta}
-
-  // new fields added over time
-  let networkId: NetworkId
-  let walletImplementationId: WalletImplementationId
-  let checksum: CardanoTypes.WalletChecksum
-
-  // migrate networkId and walletImplementationId
-  if (currentWalletMeta.networkId == null && currentWalletMeta.isShelley != null) {
-    networkId = currentWalletMeta.isShelley ? NETWORK_REGISTRY.JORMUNGANDR : NETWORK_REGISTRY.HASKELL_SHELLEY
-    walletImplementationId = currentWalletMeta.isShelley
-      ? WALLETS.JORMUNGANDR_ITN.WALLET_IMPLEMENTATION_ID
-      : WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID
-  } else {
-    // if wallet implementation/network is not defined, assume Byron
-    walletImplementationId =
-      currentWalletMeta.walletImplementationId != null
-        ? currentWalletMeta.walletImplementationId
-        : WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID
-    networkId =
-      currentWalletMeta.networkId != null
-        ? currentWalletMeta.networkId === NETWORK_REGISTRY.BYRON_MAINNET
-          ? NETWORK_REGISTRY.HASKELL_SHELLEY
-          : currentWalletMeta.networkId
-        : NETWORK_REGISTRY.HASKELL_SHELLEY
-  }
-
-  // migrate checksum
-  if (!currentWalletMeta.checksum || !currentWalletMeta.checksum?.ImagePart) {
-    if (walletData != null && walletData?.externalChain?.addressGenerator != null) {
-      const {accountPubKeyHex, account} = walletData.externalChain.addressGenerator
-      switch (walletImplementationId) {
-        case WALLETS.HASKELL_BYRON.WALLET_IMPLEMENTATION_ID:
-          checksum = legacyWalletChecksum(accountPubKeyHex || account.root_cached_key)
-          break
-        case WALLETS.HASKELL_SHELLEY_24.WALLET_IMPLEMENTATION_ID:
-        case WALLETS.HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID:
-          checksum = walletChecksum(accountPubKeyHex)
-          break
-        case WALLETS.JORMUNGANDR_ITN.WALLET_IMPLEMENTATION_ID:
-          checksum = legacyWalletChecksum(account?.root_cached_key || '')
-          break
-        default:
-          checksum = {ImagePart: '', TextPart: ''}
-      }
-    } else {
-      checksum = {ImagePart: '', TextPart: ''}
-    }
-    // missing checksum
-    walletMetaUpdate.checksum = checksum
-    await migrateAttribute('checksum', walletMetaUpdate)
-  }
-
-  // resolving to a different implementation id
-  if (currentWalletMeta?.walletImplementationId !== walletImplementationId) {
-    walletMetaUpdate.walletImplementationId = walletImplementationId
-    await migrateAttribute('walletImplementationId', walletMetaUpdate)
-  }
-
-  // resolving to a different network
-  if (currentWalletMeta?.networkId !== networkId) {
-    walletMetaUpdate.networkId = networkId
-    await migrateAttribute('networkId', walletMetaUpdate)
-  }
-
-  // missing isHW
-  if (!('isHW' in currentWalletMeta)) {
-    walletMetaUpdate.isHW = walletData != null && walletData?.isHW != null ? walletData.isHW : false
-    await migrateAttribute('isHW', walletMetaUpdate)
-  }
-
-  // missing isEasyConfirmationEnabled
-  if (!('isEasyConfirmationEnabled' in currentWalletMeta)) {
-    walletMetaUpdate.isEasyConfirmationEnabled = false
-    await migrateAttribute('isEasyConfirmationEnabled', walletMetaUpdate)
-  }
-
-  if (isWalletMeta(walletMetaUpdate)) return walletMetaUpdate as WalletMeta
-
-  Logger.error(`Invalid wallet meta `, JSON.stringify(walletMetaUpdate))
-  throw new Error(`Wallet meta stored is corrupted. ${JSON.stringify(walletMetaUpdate)}`)
-}
-
-export async function migrateWalletMetas(currentWalletMetas: Array<Partial<WalletMeta>>): Promise<Array<WalletMeta>> {
-  return Promise.all(currentWalletMetas.map(toShelleyWalletMeta))
-}
-
-function migrateAttribute(attr: keyof WalletMeta, walletMetaUpdated: Partial<WalletMeta>): Promise<void> {
-  const id = walletMetaUpdated?.id
-  if (id == null) throw new Error('invalid wallet id')
-  Logger.warn(`migrateAttribute::${attr} of wallet ${id}`)
-  return rootStorage.join('wallet/').setItem(id, walletMetaUpdated)
-}
-
-export const parseWalletMeta = (data: unknown) => {
-  const parsed = parseSafe(data)
-
-  return isWalletMeta(parsed) ? parsed : undefined
-}
-
-export function isWalletMeta(walletMeta: any): walletMeta is WalletMeta {
-  return (
-    // prettier-ignore
-    !!walletMeta &&
-    'id' in walletMeta
-      && typeof walletMeta.id === 'string' &&
-    'name' in walletMeta
-      && typeof walletMeta.name === 'string' &&
-    'networkId' in walletMeta
-      && typeof walletMeta.networkId === 'number' &&
-    'isHW' in walletMeta
-      && typeof walletMeta.isHW === 'boolean' &&
-    'isEasyConfirmationEnabled' in walletMeta
-      && typeof walletMeta.isEasyConfirmationEnabled === 'boolean' &&
-    'checksum' in walletMeta
-      && typeof walletMeta.checksum === 'object' &&
-    ('provider' in walletMeta
-      && typeof walletMeta.provider === 'string'
-      || !('provider' in walletMeta)) &&
-    'walletImplementationId' in walletMeta
-      && typeof walletMeta.walletImplementationId === 'string'
-      && Object.values(WALLET_IMPLEMENTATION_REGISTRY).includes(walletMeta?.walletImplementationId) &&
-    ('isShelley' in walletMeta
-      && typeof walletMeta.isShelley === 'boolean'
-      || !('isShelley' in walletMeta))
-  )
-}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
index 3bd155db0e..bf4c43d77c 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
@@ -6,6 +6,7 @@ import {Balance} from '@yoroi/types'
 import BigNumber from 'bignumber.js'
 
 import {getTokenFingerprint} from '../../legacy/format'
+import {WalletMeta} from '../../wallet-manager/types'
 import {fallbackTokenInfo, toTokenInfo, utf8ToHex} from '../cardano/api/utils'
 import * as HASKELL_SHELLEY_TESTNET from '../cardano/constants/testnet/constants'
 import {
@@ -26,7 +27,6 @@ import {
   YoroiSignedTx,
   YoroiUnsignedTx,
 } from '../types'
-import {WalletMeta} from '../walletManager'
 import {CardanoMobile} from '../wallets'
 import {mockEncryptedStorage} from './storage'
 import {mockTransactionInfo, mockTransactionInfos} from './transaction'
@@ -44,6 +44,7 @@ const walletMeta: WalletMeta = {
       'b04dc22991594170974bbbb5908cc50b48f236d680a9ebfe6c1d00f52f8f4813341943eb66dec48cfe7f3be5beec705b91300a07641e668ff19dfa2fbeccbfba',
   },
   walletImplementationId: 'haskell-shelley-24',
+  addressMode: 'multiple',
 }
 
 const wallet: YoroiWallet = {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/types/yoroi.ts b/apps/wallet-mobile/src/yoroi-wallets/types/yoroi.ts
index 023f190591..0b432005a8 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/types/yoroi.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/types/yoroi.ts
@@ -1,9 +1,9 @@
 import {Datum} from '@emurgo/yoroi-lib'
 import {App, Balance, Resolver} from '@yoroi/types'
 
+import {WalletMeta} from '../../wallet-manager/types'
 import {CardanoTypes, YoroiWallet} from '../cardano/types'
 import {HWDeviceInfo} from '../hw'
-import {WalletMeta} from '../walletManager'
 
 export type YoroiUnsignedTx = YoroiTxInfo & {
   unsignedTx: CardanoTypes.UnsignedTx
diff --git a/apps/wallet-mobile/src/yoroi-wallets/walletManager/index.ts b/apps/wallet-mobile/src/yoroi-wallets/walletManager/index.ts
deleted file mode 100644
index d7286e5490..0000000000
--- a/apps/wallet-mobile/src/yoroi-wallets/walletManager/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './walletManager'
diff --git a/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json b/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
index 200889fb5e..abce08e0c6 100644
--- a/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/SelectedWallet/WalletSelection/WalletSelectionScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 111,
       "column": 10,
-      "index": 4217
+      "index": 4232
     },
     "end": {
       "line": 114,
       "column": 3,
-      "index": 4326
+      "index": 4341
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 115,
       "column": 19,
-      "index": 4347
+      "index": 4362
     },
     "end": {
       "line": 118,
       "column": 3,
-      "index": 4465
+      "index": 4480
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 119,
       "column": 28,
-      "index": 4495
+      "index": 4510
     },
     "end": {
       "line": 122,
       "column": 3,
-      "index": 4640
+      "index": 4655
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 123,
       "column": 17,
-      "index": 4659
+      "index": 4674
     },
     "end": {
       "line": 126,
       "column": 3,
-      "index": 4779
+      "index": 4794
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 127,
       "column": 21,
-      "index": 4802
+      "index": 4817
     },
     "end": {
       "line": 130,
       "column": 3,
-      "index": 4932
+      "index": 4947
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.json b/apps/wallet-mobile/translations/messages/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.json
index a48c468f61..3006bf7862 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletInit/MnemonicCheck/MnemonicCheckScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Tap each word in the correct order to verify your recovery phrase",
     "file": "src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx",
     "start": {
-      "line": 165,
+      "line": 172,
       "column": 16,
-      "index": 5509
+      "index": 5764
     },
     "end": {
-      "line": 168,
+      "line": 175,
       "column": 3,
-      "index": 5685
+      "index": 5940
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx",
     "start": {
-      "line": 169,
+      "line": 176,
       "column": 17,
-      "index": 5704
+      "index": 5959
     },
     "end": {
-      "line": 172,
+      "line": 179,
       "column": 3,
-      "index": 5823
+      "index": 6078
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Recovery phrase does not match",
     "file": "src/WalletInit/MnemonicCheck/MnemonicCheckScreen.tsx",
     "start": {
-      "line": 173,
+      "line": 180,
       "column": 35,
-      "index": 5860
+      "index": 6115
     },
     "end": {
-      "line": 176,
+      "line": 183,
       "column": 3,
-      "index": 6020
+      "index": 6275
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletInit/SaveNanoX/SaveNanoXScreen.json b/apps/wallet-mobile/translations/messages/src/WalletInit/SaveNanoX/SaveNanoXScreen.json
index 39190b0cf0..bcb566a253 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletInit/SaveNanoX/SaveNanoXScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletInit/SaveNanoX/SaveNanoXScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!My Ledger Wallet",
     "file": "src/WalletInit/SaveNanoX/SaveNanoXScreen.tsx",
     "start": {
-      "line": 69,
+      "line": 73,
       "column": 30,
-      "index": 2156
+      "index": 2327
     },
     "end": {
-      "line": 72,
+      "line": 76,
       "column": 3,
-      "index": 2293
+      "index": 2464
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json b/apps/wallet-mobile/translations/messages/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
index 4156a90c2d..925d7a1e43 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!My read-only wallet",
     "file": "src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 135,
+      "line": 139,
       "column": 21,
-      "index": 3880
+      "index": 4047
     },
     "end": {
-      "line": 138,
+      "line": 142,
       "column": 3,
-      "index": 4007
+      "index": 4174
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Checksum label",
     "file": "src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 139,
+      "line": 143,
       "column": 17,
-      "index": 4026
+      "index": 4193
     },
     "end": {
-      "line": 142,
+      "line": 146,
       "column": 3,
-      "index": 4140
+      "index": 4307
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Wallet Address(es):",
     "file": "src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 143,
+      "line": 147,
       "column": 22,
-      "index": 4164
+      "index": 4331
     },
     "end": {
-      "line": 146,
+      "line": 150,
       "column": 3,
-      "index": 4288
+      "index": 4455
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Key:",
     "file": "src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 147,
+      "line": 151,
       "column": 7,
-      "index": 4297
+      "index": 4464
     },
     "end": {
-      "line": 150,
+      "line": 154,
       "column": 3,
-      "index": 4395
+      "index": 4562
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Derivation path:",
     "file": "src/WalletInit/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 151,
+      "line": 155,
       "column": 18,
-      "index": 4415
+      "index": 4582
     },
     "end": {
-      "line": 154,
+      "line": 158,
       "column": 3,
-      "index": 4536
+      "index": 4703
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletInit/WalletForm.json b/apps/wallet-mobile/translations/messages/src/WalletInit/WalletForm.json
index 46c02d5c0e..062296ef6e 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletInit/WalletForm.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletInit/WalletForm.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 133,
       "column": 24,
-      "index": 4992
+      "index": 5014
     },
     "end": {
       "line": 136,
       "column": 3,
-      "index": 5100
+      "index": 5122
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 137,
       "column": 20,
-      "index": 5122
+      "index": 5144
     },
     "end": {
       "line": 140,
       "column": 3,
-      "index": 5232
+      "index": 5254
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 141,
       "column": 18,
-      "index": 5252
+      "index": 5274
     },
     "end": {
       "line": 144,
       "column": 3,
-      "index": 5351
+      "index": 5373
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 145,
       "column": 31,
-      "index": 5384
+      "index": 5406
     },
     "end": {
       "line": 148,
       "column": 3,
-      "index": 5525
+      "index": 5547
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 149,
       "column": 28,
-      "index": 5555
+      "index": 5577
     },
     "end": {
       "line": 152,
       "column": 3,
-      "index": 5671
+      "index": 5693
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 153,
       "column": 28,
-      "index": 5701
+      "index": 5723
     },
     "end": {
       "line": 156,
       "column": 3,
-      "index": 5824
+      "index": 5846
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletInit/WalletNameForm/WalletNameForm.json b/apps/wallet-mobile/translations/messages/src/WalletInit/WalletNameForm/WalletNameForm.json
index bd87631986..d95416acd6 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletInit/WalletNameForm/WalletNameForm.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletInit/WalletNameForm/WalletNameForm.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 124,
       "column": 24,
-      "index": 3656
+      "index": 3678
     },
     "end": {
       "line": 127,
       "column": 3,
-      "index": 3764
+      "index": 3786
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 128,
       "column": 8,
-      "index": 3774
+      "index": 3796
     },
     "end": {
       "line": 131,
       "column": 3,
-      "index": 3877
+      "index": 3899
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
index 5cdc876c11..5eda89b422 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangeWalletName/ChangeWalletName.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 100,
       "column": 16,
-      "index": 3330
+      "index": 3352
     },
     "end": {
       "line": 103,
       "column": 3,
-      "index": 3434
+      "index": 3456
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 104,
       "column": 24,
-      "index": 3460
+      "index": 3482
     },
     "end": {
       "line": 107,
       "column": 3,
-      "index": 3572
+      "index": 3594
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/WalletSettings/WalletSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/WalletSettings/WalletSettingsScreen.json
index d1fa55c53c..1b3c3b9b29 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/WalletSettings/WalletSettingsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/WalletSettings/WalletSettingsScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!General",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 238,
+      "line": 234,
       "column": 11,
-      "index": 7712
+      "index": 7601
     },
     "end": {
-      "line": 241,
+      "line": 237,
       "column": 3,
-      "index": 7810
+      "index": 7699
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Actions",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 242,
+      "line": 238,
       "column": 11,
-      "index": 7823
+      "index": 7712
     },
     "end": {
-      "line": 245,
+      "line": 241,
       "column": 3,
-      "index": 7921
+      "index": 7810
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Switch wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 246,
+      "line": 242,
       "column": 16,
-      "index": 7939
+      "index": 7828
     },
     "end": {
-      "line": 249,
+      "line": 245,
       "column": 3,
-      "index": 8048
+      "index": 7937
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Logout",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 250,
+      "line": 246,
       "column": 10,
-      "index": 8060
+      "index": 7949
     },
     "end": {
-      "line": 253,
+      "line": 249,
       "column": 3,
-      "index": 8156
+      "index": 8045
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 254,
+      "line": 250,
       "column": 14,
-      "index": 8172
+      "index": 8061
     },
     "end": {
-      "line": 257,
+      "line": 253,
       "column": 3,
-      "index": 8277
+      "index": 8166
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Security",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 258,
+      "line": 254,
       "column": 12,
-      "index": 8291
+      "index": 8180
     },
     "end": {
-      "line": 261,
+      "line": 257,
       "column": 3,
-      "index": 8391
+      "index": 8280
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change spending password",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 262,
+      "line": 258,
       "column": 18,
-      "index": 8411
+      "index": 8300
     },
     "end": {
-      "line": 265,
+      "line": 261,
       "column": 3,
-      "index": 8533
+      "index": 8422
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Easy transaction confirmation",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 266,
+      "line": 262,
       "column": 20,
-      "index": 8555
+      "index": 8444
     },
     "end": {
-      "line": 269,
+      "line": 265,
       "column": 3,
-      "index": 8684
+      "index": 8573
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 270,
+      "line": 266,
       "column": 16,
-      "index": 8702
+      "index": 8591
     },
     "end": {
-      "line": 273,
+      "line": 269,
       "column": 3,
-      "index": 8811
+      "index": 8700
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Collateral",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 274,
+      "line": 270,
       "column": 14,
-      "index": 8827
+      "index": 8716
     },
     "end": {
-      "line": 277,
+      "line": 273,
       "column": 3,
-      "index": 8898
+      "index": 8787
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Multiple addresses",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 278,
+      "line": 274,
       "column": 21,
-      "index": 8921
+      "index": 8810
     },
     "end": {
-      "line": 281,
+      "line": 277,
       "column": 3,
-      "index": 9007
+      "index": 8896
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Single addresses",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 282,
+      "line": 278,
       "column": 17,
-      "index": 9026
+      "index": 8915
     },
     "end": {
-      "line": 285,
+      "line": 281,
       "column": 3,
-      "index": 9106
+      "index": 8995
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!By enabling this you can operate with more wallet addresses",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 286,
+      "line": 282,
       "column": 25,
-      "index": 9133
+      "index": 9022
     },
     "end": {
-      "line": 289,
+      "line": 285,
       "column": 3,
-      "index": 9264
+      "index": 9153
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Network:",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 291,
+      "line": 287,
       "column": 11,
-      "index": 9325
+      "index": 9214
     },
     "end": {
-      "line": 294,
+      "line": 290,
       "column": 3,
-      "index": 9391
+      "index": 9280
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Wallet type:",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 295,
+      "line": 291,
       "column": 14,
-      "index": 9407
+      "index": 9296
     },
     "end": {
-      "line": 298,
+      "line": 294,
       "column": 3,
-      "index": 9513
+      "index": 9402
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Byron-era wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 299,
+      "line": 295,
       "column": 15,
-      "index": 9530
+      "index": 9419
     },
     "end": {
-      "line": 302,
+      "line": 298,
       "column": 3,
-      "index": 9641
+      "index": 9530
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Shelley-era wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 303,
+      "line": 299,
       "column": 17,
-      "index": 9660
+      "index": 9549
     },
     "end": {
-      "line": 306,
+      "line": 302,
       "column": 3,
-      "index": 9775
+      "index": 9664
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Unknown Wallet Type",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 307,
+      "line": 303,
       "column": 21,
-      "index": 9798
+      "index": 9687
     },
     "end": {
-      "line": 310,
+      "line": 306,
       "column": 3,
-      "index": 9918
+      "index": 9807
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 311,
+      "line": 307,
       "column": 9,
-      "index": 9929
+      "index": 9818
     },
     "end": {
-      "line": 314,
+      "line": 310,
       "column": 3,
-      "index": 10023
+      "index": 9912
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Resync",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 315,
+      "line": 311,
       "column": 10,
-      "index": 10035
+      "index": 9924
     },
     "end": {
-      "line": 318,
+      "line": 314,
       "column": 3,
-      "index": 10137
+      "index": 10026
     }
   }
 ]
\ 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 f546e35a68..8f191c80e2 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": 8412
+      "index": 8452
     },
     "end": {
       "line": 256,
       "column": 3,
-      "index": 8519
+      "index": 8559
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 257,
       "column": 19,
-      "index": 8540
+      "index": 8580
     },
     "end": {
       "line": 260,
       "column": 3,
-      "index": 8651
+      "index": 8691
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 261,
       "column": 16,
-      "index": 8669
+      "index": 8709
     },
     "end": {
       "line": 264,
       "column": 3,
-      "index": 8776
+      "index": 8816
     }
   }
 ]
\ No newline at end of file