From 7376022cfa0a3a1cad7d2b8b8b18f736b6953af9 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Fri, 11 Oct 2024 12:13:28 +0200
Subject: [PATCH 01/15] refactor(wallet-mobile): Button, IconProps, useCopy
 (#3658)

---
 apps/wallet-mobile/src/AppNavigator.tsx       | 185 +++++-----
 .../src/components/Analytics/Analytics.tsx    |  17 +-
 .../src/components/Boundary/Boundary.tsx      |   3 -
 .../src/components/Button/Button.stories.tsx  | 284 ++++++++++----
 .../src/components/Button/Button.tsx          | 348 +++++++++---------
 .../Clipboard/ClipboardProvider.tsx           |  97 +++++
 .../ConfirmTx/ConfirmTx.stories.tsx           |   1 -
 .../src/components/ConfirmTx/ConfirmTx.tsx    |   1 -
 .../ConfirmTxWithSpendingPasswordModal.tsx    |   1 -
 .../src/components/CopyButton.tsx             | 100 +----
 .../ErrorBoundary/ErrorBoundary.tsx           |   2 +-
 .../src/components/ErrorModal/ErrorModal.tsx  |   8 +-
 .../wallet-mobile/src/components/Icon/Ada.tsx |   6 +-
 .../src/components/Icon/Analytics.tsx         |   6 +-
 .../src/components/Icon/AngleDown.tsx         |   6 +-
 .../src/components/Icon/AngleUp.tsx           |   6 +-
 .../src/components/Icon/ArrowDown.tsx         |   7 +-
 .../src/components/Icon/ArrowRight.tsx        |   7 +-
 .../src/components/Icon/Assets.tsx            |   7 +-
 .../src/components/Icon/Backspace.tsx         |   7 +-
 .../src/components/Icon/Backward.tsx          |   7 +-
 .../wallet-mobile/src/components/Icon/Bio.tsx |   7 +-
 .../src/components/Icon/Bluetooth.tsx         |  11 +-
 .../wallet-mobile/src/components/Icon/Bug.tsx |   4 +-
 .../src/components/Icon/Burger.tsx            |   7 +-
 .../src/components/Icon/Cardano.tsx           |  12 +-
 .../src/components/Icon/Catalyst.tsx          |   7 +-
 .../src/components/Icon/Categories.tsx        |   7 +-
 .../src/components/Icon/Change.tsx            |   8 +-
 .../src/components/Icon/Check.tsx             |   9 +-
 .../src/components/Icon/CheckFilled.tsx       |   7 +-
 .../src/components/Icon/CheckFilled2.tsx      |   7 +-
 .../src/components/Icon/CheckOutlined.tsx     |   7 +-
 .../src/components/Icon/Checkbox.tsx          |  12 +-
 .../src/components/Icon/Chevron.tsx           |   9 +-
 .../src/components/Icon/Clock.tsx             |   7 +-
 .../src/components/Icon/Close.tsx             |   7 +-
 .../src/components/Icon/Coins.tsx             |   7 +-
 .../src/components/Icon/Coins2.tsx            |   7 +-
 .../src/components/Icon/Collateral.tsx        |   7 +-
 .../src/components/Icon/Connection.tsx        |   7 +-
 .../src/components/Icon/Copy.tsx              |   7 +-
 .../src/components/Icon/CopySuccess.tsx       |   7 +-
 .../src/components/Icon/Cross.tsx             |   7 +-
 .../src/components/Icon/CrossCircle.tsx       |   7 +-
 .../src/components/Icon/DApp.tsx              |   7 +-
 .../src/components/Icon/Danger.tsx            |   7 +-
 .../src/components/Icon/DappConnector.tsx     |   7 +-
 .../src/components/Icon/Delete.tsx            |   7 +-
 .../src/components/Icon/Device.tsx            |   7 +-
 .../src/components/Icon/DigitalAsset.tsx      |   7 +-
 .../src/components/Icon/Direction.tsx         |  13 +-
 .../src/components/Icon/Disconnect.tsx        |   7 +-
 .../src/components/Icon/Document.tsx          |  10 +-
 .../src/components/Icon/Drag.tsx              |   7 +-
 .../src/components/Icon/Edit.tsx              |   4 +-
 .../src/components/Icon/EmptyCheckbox.tsx     |  12 +-
 .../src/components/Icon/Emurgo.tsx            |   9 +-
 .../src/components/Icon/Exchange.tsx          |   4 +-
 .../src/components/Icon/Export.tsx            |   4 +-
 .../src/components/Icon/ExternalLink.tsx      |   7 +-
 .../src/components/Icon/EyeOff.tsx            |   7 +-
 .../src/components/Icon/EyeOn.tsx             |   7 +-
 .../src/components/Icon/Facebook.tsx          |   7 +-
 .../src/components/Icon/Forward.tsx           |   7 +-
 .../src/components/Icon/Gear.tsx              |   7 +-
 .../src/components/Icon/Github.tsx            |   7 +-
 .../src/components/Icon/Globe.tsx             |   7 +-
 .../src/components/Icon/Google.tsx            |   6 +-
 .../src/components/Icon/Governance.tsx        |   7 +-
 .../src/components/Icon/HardwareWallet.tsx    |  12 +-
 .../src/components/Icon/Icon.stories.tsx      |  22 +-
 .../src/components/Icon/Image.tsx             |   7 +-
 .../src/components/Icon/Info.tsx              |  11 +-
 .../src/components/Icon/InfoCircle.tsx        |   7 +-
 .../src/components/Icon/Language.tsx          |  11 +-
 .../src/components/Icon/Launchpad.tsx         |   7 +-
 .../src/components/Icon/Ledger.tsx            |  12 +-
 .../src/components/Icon/Lightning.tsx         |   7 +-
 .../src/components/Icon/Link.tsx              |   7 +-
 .../src/components/Icon/Lock.tsx              |   7 +-
 .../src/components/Icon/LockFilled.tsx        |   7 +-
 .../src/components/Icon/Logout.tsx            |   7 +-
 .../src/components/Icon/Magnify.tsx           |   7 +-
 .../src/components/Icon/Megaphone.tsx         |   7 +-
 .../src/components/Icon/Message.tsx           |   7 +-
 .../src/components/Icon/MinSwap.tsx           |   6 +-
 .../src/components/Icon/MuesliSwap.tsx        |   6 +-
 .../src/components/Icon/MultiParty.tsx        |   9 +-
 .../src/components/Icon/MultipleWallets.tsx   |   7 +-
 .../src/components/Icon/NftAsset.tsx          |   7 +-
 .../src/components/Icon/NoNfts.tsx            |   6 +-
 .../wallet-mobile/src/components/Icon/Pin.tsx |   7 +-
 .../src/components/Icon/Placeholder.tsx       |   7 +-
 .../src/components/Icon/PlateNumber.tsx       |   7 +-
 .../src/components/Icon/Plus.tsx              |   7 +-
 .../src/components/Icon/PlusCircle.tsx        |   7 +-
 .../src/components/Icon/Portfolio.tsx         |   7 +-
 apps/wallet-mobile/src/components/Icon/Qr.tsx |   7 +-
 .../src/components/Icon/QuestionMark.tsx      |   7 +-
 .../src/components/Icon/Received.tsx          |   7 +-
 .../src/components/Icon/Refresh.tsx           |   8 +-
 .../src/components/Icon/Reload.tsx            |   7 +-
 .../src/components/Icon/Resync.tsx            |   7 +-
 .../components/Icon/RewardManuallyPayout.tsx  |  10 +-
 .../src/components/Icon/RewardWithdrawn.tsx   |  10 +-
 .../src/components/Icon/Sandbox.tsx           |   7 +-
 .../src/components/Icon/Send.tsx              |   7 +-
 .../src/components/Icon/Settings.tsx          |   7 +-
 .../src/components/Icon/Share.tsx             |   7 +-
 .../src/components/Icon/Share2.tsx            |   7 +-
 .../src/components/Icon/SliderSettings.tsx    |   7 +-
 .../src/components/Icon/SortTable.tsx         |   7 +-
 .../src/components/Icon/SpectrumSwap.tsx      |   6 +-
 .../src/components/Icon/Square.tsx            |   7 +-
 .../src/components/Icon/Staking.tsx           |   7 +-
 .../Icon/StakingKeyDeregistered.tsx           |  10 +-
 .../components/Icon/StakingKeyRegistered.tsx  |  10 +-
 .../src/components/Icon/StarFilled.tsx        |   7 +-
 .../src/components/Icon/StarOutlined.tsx      |   7 +-
 .../src/components/Icon/SundaeSwap.tsx        |   6 +-
 .../src/components/Icon/Support.tsx           |   7 +-
 .../src/components/Icon/Swap.tsx              |   4 +-
 .../src/components/Icon/Switch.tsx            |   4 +-
 .../src/components/Icon/TabDiscover.tsx       |   7 +-
 .../src/components/Icon/TabDiscoverActive.tsx |   7 +-
 .../src/components/Icon/TabMenu.tsx           |   7 +-
 .../src/components/Icon/TabMenuActive.tsx     |   7 +-
 .../src/components/Icon/TabPortfolio.tsx      |   4 +-
 .../components/Icon/TabPortfolioActive.tsx    |   7 +-
 .../src/components/Icon/TabStaking.tsx        |   4 +-
 .../src/components/Icon/TabWallet.tsx         |   7 +-
 .../src/components/Icon/TabWalletActive.tsx   |   7 +-
 .../src/components/Icon/Table.tsx             |   7 +-
 .../src/components/Icon/Telegram.tsx          |   7 +-
 .../src/components/Icon/TermsOfUse.tsx        |   7 +-
 .../src/components/Icon/Theme.tsx             |   7 +-
 .../src/components/Icon/ThumbsUp.tsx          |   7 +-
 .../src/components/Icon/Tokens.tsx            |   7 +-
 .../src/components/Icon/TotalAda.tsx          |  13 +-
 .../src/components/Icon/TotalDelegated.tsx    |  15 +-
 .../src/components/Icon/TotalReward.tsx       |  13 +-
 .../src/components/Icon/Transaction.tsx       |   7 +-
 .../src/components/Icon/Twitter.tsx           |   7 +-
 .../wallet-mobile/src/components/Icon/Usb.tsx |  11 +-
 .../src/components/Icon/Verify.tsx            |   8 +-
 .../src/components/Icon/VyfiSwap.tsx          |   6 +-
 .../src/components/Icon/Wallet.tsx            |   7 +-
 .../src/components/Icon/WalletAvatar.tsx      |   8 +-
 .../src/components/Icon/WalletStack.tsx       |   7 +-
 .../src/components/Icon/Wallets.tsx           |   7 +-
 .../src/components/Icon/Warning.tsx           |   7 +-
 .../src/components/Icon/WingRiders.tsx        |   7 +-
 .../src/components/Icon/YoroiApp.tsx          |   6 +-
 .../src/components/Icon/YoroiNightly.tsx      |   7 +-
 .../src/components/Icon/YoroiWallet.tsx       |  10 +-
 .../wallet-mobile/src/components/Icon/type.ts |   4 +
 .../src/components/ModalError/ModalError.tsx  |   6 +-
 .../ShareQRCodeCard.stories.tsx               |   1 -
 .../ShareQRCodeCard/ShareQRCodeCard.tsx       |  46 +--
 .../TwoActionView/TwoActionView.tsx           |  10 +-
 .../Auth/OsLoginScreen/OsLoginScreen.tsx      |   2 +-
 .../Claim/useCases/AskConfirmation.tsx        |  21 +-
 .../Claim/useCases/ShowSuccessScreen.tsx      |   2 +-
 .../src/features/Dev/DeveloperScreen.tsx      |   1 -
 .../common/ConfirmConnectionModal.stories.tsx |   4 +-
 .../common/ConfirmConnectionModal.tsx         |   2 +-
 .../Discover/common/HWNotSupportedModal.tsx   |   2 +-
 .../common/UnverifiedDappModal.stories.tsx    |   2 +-
 .../Discover/common/UnverifiedDappModal.tsx   |   2 +-
 .../ReviewTransaction/ReviewTransaction.tsx   |   2 +-
 .../SelectDappFromList/WelcomeDAppModal.tsx   |   2 +-
 .../Exchange/common/AmountCard/AmountCard.tsx |   6 +-
 .../common/ShowBuyBanner/BuyBannerBig.tsx     |  15 +-
 .../common/ShowBuyBanner/BuyBannerSmall.tsx   |  76 ++--
 .../ShowBuyBanner/PreprodFaucetBanner.tsx     |  52 ++-
 .../ShowBuyBanner/SanchonetFaucetBanner.tsx   |  52 ++-
 .../common/ShowBuyBanner/ShowBuyBanner.tsx    |  22 +-
 .../CreateExchangeButton.tsx                  |   2 +-
 .../LoadingLink/ErrorScreen.tsx               |   8 +-
 .../ShowExchangeResultOrderScreen.tsx         |   2 +-
 .../ChooseBiometricLoginScreen.tsx            |  12 +-
 .../DarkThemeAnnouncement.tsx                 |   2 +-
 .../InitialScreen/InitialScreen.tsx           |   8 +-
 .../TermsOfServiceChangedScreen.tsx           |   2 +-
 .../AskToOpenAWalletScreen.tsx                |   6 +-
 .../AskToRedirect/AskToRedirectScreen.tsx     |   6 +-
 .../RequestedAdaPaymentWithLinkScreen.tsx     |   6 +-
 .../RequestedBrowserLaunchDappUrlScreen.tsx   |   6 +-
 .../MediaDetailsScreen/MediaDetailsScreen.tsx |  25 +-
 .../common/TokenAmountItem/TokenInfoIcon.tsx  |   2 +-
 .../BuyADABanner/BuyADABanner.tsx             |  15 +-
 .../DashboardTokensList/TradeTokensBanner.tsx |  15 +-
 .../PortfolioTokenDetails/Actions.tsx         |  20 +-
 .../PortfolioTokenInfo/Overview/Overview.tsx  |  17 +-
 .../TradeTokensBannerBig.tsx                  |  15 +-
 .../AddressDetailCard/AddressDetailCard.tsx   |  10 +-
 .../SingleOrMultipleAddressesModal.tsx        |  21 +-
 .../SmallAddressCard/SmallAddressCard.tsx     |  36 +-
 .../DescribeSelectedAddressScreen.tsx         |  49 ++-
 .../useCases/ListMultipleAddressesScreen.tsx  |   3 +-
 .../useCases/RequestSpecificAmountScreen.tsx  |  30 +-
 .../common/InsufficientFundsModal.tsx         |   6 +-
 .../useCases/ConfirmPin/ConfirmPin.tsx        |   2 +-
 .../ConfirmVotingTx/ConfirmVotingTx.tsx       |   2 +-
 .../useCases/DisplayPin/DisplayPin.tsx        |   2 +-
 .../DownloadCatalystAppScreen.tsx             |   7 +-
 .../useCases/ShowQrCode/ShowQrCode.tsx        |  10 +-
 .../features/ReviewTx/common/CopiableText.tsx |   6 +-
 .../features/ReviewTx/common/TokenDetails.tsx |   6 +-
 .../ReviewTxScreen/ReviewTxScreen.tsx         |   2 +-
 .../OpenDeviceAppSettingsButton.tsx           |   4 +-
 .../ShowCameraPermissionDeniedScreen.tsx      |  10 +-
 .../ConfirmTx/FailedTx/FailedTxScreen.tsx     |   7 +-
 .../SubmittedTx/SubmittedTxScreen.tsx         |   2 +-
 .../EditAmount/EditAmountScreen.tsx           |   1 -
 .../ListAmountsToSendScreen.tsx               |   7 +-
 .../StartMultiTokenTxScreen.tsx               |   8 +-
 .../ChangeNetwork/ChangeNetworkScreen.tsx     |   1 -
 .../Settings/ChangeNetwork/NetworkTag.tsx     |   6 +-
 .../ChangePassword/ChangePasswordScreen.tsx   |   1 -
 .../DisableEasyConfirmationScreen.tsx         |   2 +-
 .../EnableEasyConfirmationScreen.tsx          |   1 -
 .../EnableLoginWithOsScreen.tsx               |  20 +-
 .../ConfirmTx/FailedTx/FailedTxScreen.tsx     |   2 +-
 .../SubmittedTx/SubmittedTxScreen.tsx         |   2 +-
 .../InitialCollateralInfoModal.tsx            |   2 +-
 .../ManageCollateralScreen.tsx                |   9 +-
 .../RenameWalletScreen/RenameWalletScreen.tsx |   1 -
 .../Settings/SettingsScreenNavigator.tsx      |   4 +-
 .../common/ButtonCard/ButtonCard.tsx          |   6 +-
 .../CardAboutPhrase/CardAboutPhrase.tsx       |   6 +-
 .../SaveReadOnlyWalletScreen.tsx              |   4 -
 .../legacy/WalletNameForm/WalletNameForm.tsx  |   8 -
 .../ChooseMnemonicTypeScreen.tsx              |   4 +-
 .../ChooseSetupType/ChooseSetupTypeScreen.tsx |   6 +-
 .../AboutRecoveryPhraseScreen.tsx             |   1 -
 .../CreateWallet/RecoveryPhraseScreen.tsx     |  12 +-
 .../VerifyRecoveryPhraseScreen.tsx            |   3 +-
 .../CreateWallet/WalletDetailsScreen.tsx      |   6 +-
 .../RestoreHwWallet/CheckNanoXScreen.tsx      |   2 +-
 .../RestoreHwWallet/SaveNanoXScreen.tsx       |   7 +-
 .../SelectHwConnectionModal.tsx               |  20 +-
 .../MnemonicInput/MnemonicInput.tsx           |   6 +-
 .../RestoreWalletDetailsScreen.tsx            |   7 +-
 .../RestoreWallet/RestoreWalletScreen.tsx     |   7 +-
 .../useCases/ConfirmTx/ConfirmTxScreen.tsx    |   2 +-
 .../EnterDrepIdModal/EnterDrepIdModal.tsx     |   1 -
 .../useCases/FailedTx/FailedTxScreen.tsx      |   6 +-
 .../useCases/NoFunds/NoFundsScreen.tsx        |   6 +-
 .../NotSupportedCardanoAppVersion.tsx         |   2 +-
 .../useCases/SuccessTx/SuccessTxScreen.tsx    |   6 +-
 .../WithdrawWarningModal.tsx                  |   2 +-
 .../Swap/common/AmountCard/AmountCard.tsx     |   8 +-
 .../ConfirmWithSpendingPassword.tsx           |   1 -
 .../ServiceUnavailable/ServiceUnavailable.tsx |   2 +-
 .../ConfirmTxScreen/ConfirmTxScreen.tsx       |   1 -
 .../ConfirmTxScreen/LedgerTransportSwitch.tsx |   8 +-
 .../ShowFailedTxScreen/ShowFailedTxScreen.tsx |   2 +-
 .../ShowSubmittedTxScreen.tsx                 |  22 +-
 .../EditBuyAmount/EditBuyAmount.tsx           |   2 +-
 .../EditSellAmount/EditSellAmount.tsx         |   2 +-
 .../EditSlippageScreen/EditSlippageScreen.tsx |   8 +-
 .../CreateOrder/StartSwapOrderScreen.tsx      |   2 +-
 .../WarnLimitPrice/WarnLimitPrice.tsx         |  17 +-
 .../WarnPriceImpact/WarnPriceImpact.tsx       |  14 +-
 .../CreateOrder/WarnSlippage/WarnSlippage.tsx |  17 +-
 .../ListOrders/OpenOrders.tsx                 |  14 +-
 .../TxDetails/AddressModal/AddressModal.tsx   |  32 +-
 .../useCases/TxDetails/TxDetails.tsx          |  14 +-
 .../useCases/TxHistory/ActionsBanner.tsx      | 178 +++------
 apps/wallet-mobile/src/hooks/useCopy.ts       |  22 --
 .../src/kernel/i18n/global-messages.ts        |   2 +-
 .../src/kernel/i18n/locales/en-US.json        |   2 +-
 .../src/legacy/Dashboard/Dashboard.tsx        |   2 -
 .../src/legacy/Dashboard/StakePoolInfo.tsx    |  54 +--
 .../src/legacy/Dashboard/UserSummary.tsx      |  45 +--
 .../ConfirmTx/ConfirmTxWithPassword.tsx       |  12 +-
 .../WithdrawStakingRewards.tsx                |   1 -
 .../legacy/HW/LedgerConnect/LedgerConnect.tsx |   1 -
 .../LedgerTransportSwitchModal.tsx            |  10 +-
 .../DelegationConfirmation.tsx                |   1 -
 .../Staking/FailedTx/FailedTxScreen.tsx       |   9 +-
 .../Staking/PoolDetails/PoolDetailScreen.tsx  |   1 -
 .../PoolTransition/PoolTransitionModal.tsx    |  27 +-
 .../PoolTransition/PoolTransitionNotice.tsx   |   2 +-
 .../messages/src/AppNavigator.json            |  32 +-
 .../src/components/Analytics/Analytics.json   |  88 ++---
 .../src/components/ErrorModal/ErrorModal.json |  16 +-
 .../Auth/OsLoginScreen/OsLoginScreen.json     |   4 +-
 .../DarkThemeAnnouncement.json                |  16 +-
 .../MediaDetailsScreen.json                   |  88 ++---
 .../ListAmountsToSendScreen.json              |   8 +-
 .../ChangePassword/ChangePasswordScreen.json  |  48 +--
 .../DisableEasyConfirmationScreen.json        |   8 +-
 .../EnableEasyConfirmationScreen.json         |  32 +-
 .../EnableLoginWithOsScreen.json              |  40 +-
 .../RenameWalletScreen.json                   |  16 +-
 .../Settings/SettingsScreenNavigator.json     | 160 ++++----
 .../WalletSettings/WalletSettingsScreen.json  | 168 ++++-----
 .../SaveReadOnlyWalletScreen.json             |  40 +-
 .../legacy/WalletNameForm/WalletNameForm.json |  16 +-
 .../src/kernel/i18n/global-messages.json      | 232 ++++++------
 .../src/legacy/Dashboard/Dashboard.json       |   8 +-
 .../src/legacy/Dashboard/StakePoolInfo.json   |  40 +-
 .../src/legacy/Dashboard/UserSummary.json     |  32 +-
 .../WithdrawStakingRewards.json               |  72 ++--
 .../HW/LedgerConnect/LedgerConnect.json       |  32 +-
 .../LedgerTransportSwitchModal.json           |  64 ++--
 .../DelegationConfirmation.json               |  32 +-
 .../Staking/FailedTx/FailedTxScreen.json      |  32 +-
 .../Staking/PoolDetails/PoolDetailScreen.json |  56 +--
 312 files changed, 2105 insertions(+), 2854 deletions(-)
 create mode 100644 apps/wallet-mobile/src/components/Clipboard/ClipboardProvider.tsx
 create mode 100644 apps/wallet-mobile/src/components/Icon/type.ts
 delete mode 100644 apps/wallet-mobile/src/hooks/useCopy.ts

diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index 69d986fd38..108013fb24 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -9,6 +9,7 @@ import {Alert, AppState, AppStateStatus, InteractionManager, Platform} from 'rea
 import RNBootSplash from 'react-native-bootsplash'
 
 import StorybookScreen from '../.storybook'
+import {ClipboardProvider} from './components/Clipboard/ClipboardProvider'
 import {ModalProvider} from './components/Modal/ModalContext'
 import {ModalScreen} from './components/Modal/ModalScreen'
 import {useAuth} from './features/Auth/AuthProvider'
@@ -99,112 +100,114 @@ export const AppNavigator = () => {
       onReady={onReady}
       ref={navRef}
     >
-      <ModalProvider>
-        <Stack.Navigator
-          screenOptions={{
-            ...navOptions,
-            headerShown: false /* used only for transition */,
-          }}
-        >
-          {/* Not Authenticated */}
-
-          {isLoggedOut && (
-            <Stack.Group>
-              {firstAction === 'first-run' && (
-                <Stack.Screen name="first-run">
-                  {() => (
-                    <SearchProvider>
-                      <InitializationNavigator />
-                    </SearchProvider>
-                  )}
-                </Stack.Screen>
-              )}
-
-              {firstAction === 'show-agreement-changed-notice' && (
-                <Stack.Screen name="agreement-changed-notice">{() => <AgreementChangedNavigator />}</Stack.Screen>
-              )}
-
-              {firstAction === 'auth-with-pin' && (
-                <Stack.Screen
-                  name="custom-pin-auth"
-                  component={PinLoginScreen}
-                  options={{title: strings.loginPinTitle}}
-                />
-              )}
-
-              {firstAction === 'auth-with-os' && (
-                <Stack.Screen name="bio-auth-initial" component={OsLoginScreen} options={{headerShown: false}} />
-              )}
-
-              {firstAction === 'request-new-pin' && (
-                <Stack.Screen //
-                  name="enable-login-with-pin"
-                  component={CreatePinScreenWrapper}
-                  options={{title: strings.customPinTitle}}
-                />
-              )}
-            </Stack.Group>
-          )}
-
-          {/* Authenticated */}
-
-          {isLoggedIn && (
-            <>
+      <ClipboardProvider>
+        <ModalProvider>
+          <Stack.Navigator
+            screenOptions={{
+              ...navOptions,
+              headerShown: false /* used only for transition */,
+            }}
+          >
+            {/* Not Authenticated */}
+
+            {isLoggedOut && (
               <Stack.Group>
-                {afterLoginAction === 'choose-biometric-login' && (
-                  <Stack.Screen //
-                    name="choose-biometric-login"
-                    options={{headerShown: false}}
-                    component={ChooseBiometricLoginScreen}
-                  />
+                {firstAction === 'first-run' && (
+                  <Stack.Screen name="first-run">
+                    {() => (
+                      <SearchProvider>
+                        <InitializationNavigator />
+                      </SearchProvider>
+                    )}
+                  </Stack.Screen>
                 )}
 
-                {afterLoginAction === 'dark-theme-announcement' && (
-                  <Stack.Screen //
-                    name="dark-theme-announcement"
-                    options={{headerShown: false}}
-                    component={DarkThemeAnnouncement}
-                  />
+                {firstAction === 'show-agreement-changed-notice' && (
+                  <Stack.Screen name="agreement-changed-notice">{() => <AgreementChangedNavigator />}</Stack.Screen>
                 )}
 
-                {afterLoginAction === 'setup-wallet' && (
-                  <Stack.Screen //
-                    name="setup-wallet"
-                    options={{headerShown: false}}
-                    component={SetupWalletNavigator}
+                {firstAction === 'auth-with-pin' && (
+                  <Stack.Screen
+                    name="custom-pin-auth"
+                    component={PinLoginScreen}
+                    options={{title: strings.loginPinTitle}}
                   />
                 )}
 
-                {afterLoginAction === 'manage-wallets' && (
-                  <Stack.Screen name="manage-wallets" getComponent={() => WalletNavigator} />
+                {firstAction === 'auth-with-os' && (
+                  <Stack.Screen name="bio-auth-initial" component={OsLoginScreen} options={{headerShown: false}} />
                 )}
-              </Stack.Group>
 
-              <Stack.Group
-                screenOptions={{
-                  presentation: 'transparentModal',
-                  ...(Platform.OS === 'android' && {...TransitionPresets.DefaultTransition}), // overriding general navigation settings
-                  cardStyle: {backgroundColor: 'transparent'}, // this is needed for the modal to be transparent
-                }}
-              >
-                <Stack.Screen name="modal" component={ModalScreen} />
+                {firstAction === 'request-new-pin' && (
+                  <Stack.Screen //
+                    name="enable-login-with-pin"
+                    component={CreatePinScreenWrapper}
+                    options={{title: strings.customPinTitle}}
+                  />
+                )}
               </Stack.Group>
-            </>
-          )}
+            )}
+
+            {/* Authenticated */}
+
+            {isLoggedIn && (
+              <>
+                <Stack.Group>
+                  {afterLoginAction === 'choose-biometric-login' && (
+                    <Stack.Screen //
+                      name="choose-biometric-login"
+                      options={{headerShown: false}}
+                      component={ChooseBiometricLoginScreen}
+                    />
+                  )}
+
+                  {afterLoginAction === 'dark-theme-announcement' && (
+                    <Stack.Screen //
+                      name="dark-theme-announcement"
+                      options={{headerShown: false}}
+                      component={DarkThemeAnnouncement}
+                    />
+                  )}
 
-          {/* Development */}
+                  {afterLoginAction === 'setup-wallet' && (
+                    <Stack.Screen //
+                      name="setup-wallet"
+                      options={{headerShown: false}}
+                      component={SetupWalletNavigator}
+                    />
+                  )}
 
-          {__DEV__ && (
-            <Stack.Group>
-              <Stack.Screen name="developer" component={DeveloperScreen} options={{headerShown: false}} />
+                  {afterLoginAction === 'manage-wallets' && (
+                    <Stack.Screen name="manage-wallets" getComponent={() => WalletNavigator} />
+                  )}
+                </Stack.Group>
+
+                <Stack.Group
+                  screenOptions={{
+                    presentation: 'transparentModal',
+                    ...(Platform.OS === 'android' && {...TransitionPresets.DefaultTransition}), // overriding general navigation settings
+                    cardStyle: {backgroundColor: 'transparent'}, // this is needed for the modal to be transparent
+                  }}
+                >
+                  <Stack.Screen name="modal" component={ModalScreen} />
+                </Stack.Group>
+              </>
+            )}
+
+            {/* Development */}
+
+            {__DEV__ && (
+              <Stack.Group>
+                <Stack.Screen name="developer" component={DeveloperScreen} options={{headerShown: false}} />
 
-              <Stack.Screen name="storybook" component={StorybookScreen} />
+                <Stack.Screen name="storybook" component={StorybookScreen} />
 
-              <Stack.Screen name="playground" component={Playground} />
-            </Stack.Group>
-          )}
-        </Stack.Navigator>
-      </ModalProvider>
+                <Stack.Screen name="playground" component={Playground} />
+              </Stack.Group>
+            )}
+          </Stack.Navigator>
+        </ModalProvider>
+      </ClipboardProvider>
     </NavigationContainer>
   )
 }
diff --git a/apps/wallet-mobile/src/components/Analytics/Analytics.tsx b/apps/wallet-mobile/src/components/Analytics/Analytics.tsx
index 1f580b428f..0e433a0a40 100644
--- a/apps/wallet-mobile/src/components/Analytics/Analytics.tsx
+++ b/apps/wallet-mobile/src/components/Analytics/Analytics.tsx
@@ -4,12 +4,12 @@ import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, TextStyle, TouchableOpacity, useWindowDimensions, View} from 'react-native'
 import {ScrollView} from 'react-native-gesture-handler'
 
-import {Button} from '../../components/Button/Button'
 import {Spacer} from '../../components/Spacer/Spacer'
 import {Text} from '../../components/Text'
 import {YoroiLogo} from '../../components/YoroiLogo/YoroiLogo'
 import {SettingsSwitch} from '../../features/Settings/common/SettingsSwitch'
 import {useMetrics} from '../../kernel/metrics/metricsManager'
+import {Button, ButtonType} from '../Button/Button'
 import {AnalyticsImage} from './AnalyticsImage'
 
 type Props = {
@@ -64,15 +64,13 @@ const Notice = ({onClose, onReadMore}: {onClose?: () => void; onReadMore?: () =>
           <CommonContent onReadMore={onReadMore} showLogo />
 
           <Button // skip button
-            block
-            outlineShelley
+            size="S"
+            type={ButtonType.Text}
             onPress={() => {
               metrics.disable()
               onClose?.()
             }}
             title={strings.skip}
-            style={styles.skip}
-            textStyles={styles.skipText}
           />
         </View>
       </ScrollView>
@@ -90,8 +88,7 @@ const Notice = ({onClose, onReadMore}: {onClose?: () => void; onReadMore?: () =>
         ]}
       >
         <Button // accept button
-          block
-          shelleyTheme
+          size="S"
           onPress={() => {
             metrics.enable()
             onClose?.()
@@ -219,12 +216,6 @@ const useStyles = () => {
       ...atoms.heading_3_medium,
       textAlign: 'center',
     },
-    skip: {
-      borderWidth: 0,
-    },
-    skipText: {
-      color: color.primary_900,
-    },
     tick: {
       color: color.primary_700,
       paddingRight: 8,
diff --git a/apps/wallet-mobile/src/components/Boundary/Boundary.tsx b/apps/wallet-mobile/src/components/Boundary/Boundary.tsx
index b7add7b217..c5b7a0dab1 100644
--- a/apps/wallet-mobile/src/components/Boundary/Boundary.tsx
+++ b/apps/wallet-mobile/src/components/Boundary/Boundary.tsx
@@ -133,7 +133,6 @@ const FullErrorFallback = ({error, resetErrorBoundary, reset = true, debug}: Err
       {reset && (
         <Button
           title="Try again"
-          shelleyTheme
           onPress={() => {
             LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
             resetErrorBoundary()
@@ -163,7 +162,6 @@ const LargeErrorFallback = ({error, resetErrorBoundary, reset = true, debug}: Er
       {reset && (
         <Button
           title="Try again"
-          shelleyTheme
           onPress={() => {
             LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
             resetErrorBoundary()
@@ -190,7 +188,6 @@ const SmallErrorFallback = ({error, resetErrorBoundary, reset = true, debug}: Er
 
       {reset && (
         <Button
-          shelleyTheme
           title="Try again"
           onPress={() => {
             LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
diff --git a/apps/wallet-mobile/src/components/Button/Button.stories.tsx b/apps/wallet-mobile/src/components/Button/Button.stories.tsx
index 43c1c62fe3..e507a01d7f 100644
--- a/apps/wallet-mobile/src/components/Button/Button.stories.tsx
+++ b/apps/wallet-mobile/src/components/Button/Button.stories.tsx
@@ -1,100 +1,258 @@
-import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
 
-import icon from '../../assets/img/icon/dashboard.png'
+import {Accordion} from '../Accordion/Accordion'
 import {Icon} from '../Icon'
-import {Button} from './Button'
+import {Button, ButtonType} from './Button'
 
 storiesOf('Button', module).add('default', () => {
   const {color, isDark, selectThemeName} = useTheme()
+  const [expanded, setExpanded] = React.useState<ButtonType | null>(ButtonType.Primary)
 
   return (
-    <ScrollView style={{backgroundColor: color.bg_color_max}}>
-      <Row>
+    <ScrollView style={{backgroundColor: color.bg_color_max, padding: 16}}>
+      <Grid>
         <Button
           onPress={() => {
             selectThemeName(isDark ? 'default-light' : 'default-dark')
           }}
-          title="Toggle theme"
+          icon={Icon.Theme}
         />
-      </Row>
 
-      <Row>
-        <Button onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+        <View style={{flexDirection: 'row', gap: 16, paddingVertical: 16}}>
+          <Button type={ButtonType.Secondary} title="Cancel" />
 
-      <Row>
-        <Button block onPress={() => action('onPress')()} title="submit" />
-      </Row>
+          <Button title="Continue" icon={Icon.Bluetooth} />
+        </View>
 
-      <Row>
-        <Button block shelleyTheme onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+        <View style={{flexDirection: 'column', gap: 16, paddingVertical: 16}}>
+          <Button type={ButtonType.Secondary} title="Cancel" />
 
-      <Row>
-        <Button outlineOnLight block shelleyTheme onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+          <Button title="Continue" icon={Icon.Bluetooth} />
+        </View>
+      </Grid>
 
-      <Row>
-        <Button outlineOnLight block shelleyTheme disabled onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+      <Accordion
+        label={ButtonType.Primary}
+        expanded={expanded === ButtonType.Primary}
+        onChange={() => setExpanded(expanded === ButtonType.Primary ? null : ButtonType.Primary)}
+      >
+        <Grid>
+          <Button title="Button" />
 
-      <Row>
-        <Button block outlineShelley outlineOnLight disabled onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+          <Button title="Button" isLoading />
 
-      <Row>
-        <Button outlineOnLight block onPress={() => action('onPress')()} title="Submit" />
-      </Row>
+          <Button title="Button" disabled />
+        </Grid>
 
-      <Row>
-        <Button
-          outlineShelley
-          withoutBackground
-          shelleyTheme
-          block
-          onPress={() => action('onPress')()}
-          title="Submit"
-        />
-      </Row>
+        <Grid>
+          <Button title="Button" icon={Icon.Clock} />
 
-      <Row>
-        <Button block shelleyTheme iconImage={icon} onPress={() => action('onPress')()} title="Submit, with image" />
-      </Row>
+          <Button title="Button" icon={Icon.Clock} disabled />
+        </Grid>
 
-      <Row>
-        <Button
-          block
-          shelleyTheme
-          startContent={<Icon.Plus size={24} color="white" />}
-          onPress={() => action('onPress')()}
-          title="Submit, with start content"
-        />
-      </Row>
+        <Grid>
+          <Button title="Button" size="S" />
 
-      <Row>
-        <Button
-          block
-          shelleyTheme
-          endContent={<Icon.Plus size={24} color="white" />}
-          onPress={() => action('onPress')()}
-          title="Submit, with end content"
-        />
-      </Row>
+          <Button title="Button" size="S" isLoading />
+
+          <Button title="Button" size="S" disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" size="S" icon={Icon.Clock} />
+
+          <Button title="Button" size="S" icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.Secondary}
+        expanded={expanded === ButtonType.Secondary}
+        onChange={() => setExpanded(expanded === ButtonType.Secondary ? null : ButtonType.Secondary)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.Secondary} />
+
+          <Button title="Button" type={ButtonType.Secondary} isLoading />
+
+          <Button title="Button" type={ButtonType.Secondary} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Secondary} icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Secondary} icon={Icon.Clock} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Secondary} size="S" />
+
+          <Button title="Button" type={ButtonType.Secondary} size="S" isLoading />
+
+          <Button title="Button" type={ButtonType.Secondary} size="S" disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Secondary} size="S" icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Secondary} size="S" icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.Critical}
+        expanded={expanded === ButtonType.Critical}
+        onChange={() => setExpanded(expanded === ButtonType.Critical ? null : ButtonType.Critical)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.Critical} />
+
+          <Button title="Button" type={ButtonType.Critical} isLoading />
+
+          <Button title="Button" type={ButtonType.Critical} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Critical} icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Critical} icon={Icon.Clock} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Critical} size="S" />
+
+          <Button title="Button" type={ButtonType.Critical} size="S" isLoading />
+
+          <Button title="Button" type={ButtonType.Critical} size="S" disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Critical} size="S" icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Critical} size="S" icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.Text}
+        expanded={expanded === ButtonType.Text}
+        onChange={() => setExpanded(expanded === ButtonType.Text ? null : ButtonType.Text)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.Text} />
+
+          <Button title="Button" type={ButtonType.Text} isLoading />
+
+          <Button title="Button" type={ButtonType.Text} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Text} icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Text} icon={Icon.Clock} rightIcon />
+
+          <Button title="Button" type={ButtonType.Text} icon={Icon.Clock} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Text} size="S" />
+
+          <Button title="Button" type={ButtonType.Text} size="S" isLoading />
+
+          <Button title="Button" type={ButtonType.Text} size="S" disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Text} size="S" icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Text} size="S" icon={Icon.Clock} rightIcon />
+
+          <Button title="Button" type={ButtonType.Text} size="S" icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.SecondaryText}
+        expanded={expanded === ButtonType.SecondaryText}
+        onChange={() => setExpanded(expanded === ButtonType.SecondaryText ? null : ButtonType.SecondaryText)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.SecondaryText} />
+
+          <Button title="Button" type={ButtonType.SecondaryText} isLoading />
+
+          <Button title="Button" type={ButtonType.SecondaryText} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.SecondaryText} icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.SecondaryText} icon={Icon.Clock} rightIcon />
+
+          <Button title="Button" type={ButtonType.SecondaryText} icon={Icon.Clock} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" />
+
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" isLoading />
+
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" icon={Icon.Clock} rightIcon />
+
+          <Button title="Button" type={ButtonType.SecondaryText} size="S" icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.Circle}
+        expanded={expanded === ButtonType.Circle}
+        onChange={() => setExpanded(expanded === ButtonType.Circle ? null : ButtonType.Circle)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.Circle} icon={Icon.Clock} />
+
+          <Button title="Button" type={ButtonType.Circle} icon={Icon.Clock} disabled />
+        </Grid>
+      </Accordion>
+
+      <Accordion
+        label={ButtonType.Link}
+        expanded={expanded === ButtonType.Link}
+        onChange={() => setExpanded(expanded === ButtonType.Link ? null : ButtonType.Link)}
+      >
+        <Grid>
+          <Button title="Button" type={ButtonType.Link} />
+
+          <Button title="Button" type={ButtonType.Link} disabled />
+        </Grid>
+
+        <Grid>
+          <Button title="Button" type={ButtonType.Link} size="S" />
+
+          <Button title="Button" type={ButtonType.Link} size="S" disabled />
+        </Grid>
+      </Accordion>
     </ScrollView>
   )
 })
 
-const Row = (props: ViewProps) => <View {...props} style={styles.row} />
+const Grid = (props: ViewProps) => <View {...props} style={styles.grid} />
 
 const styles = StyleSheet.create({
-  row: {
+  grid: {
     flexDirection: 'row',
+    flexWrap: 'wrap',
+    gap: 16,
+    paddingVertical: 16,
     alignItems: 'center',
-    paddingHorizontal: 16,
-    paddingVertical: 8,
   },
 })
diff --git a/apps/wallet-mobile/src/components/Button/Button.tsx b/apps/wallet-mobile/src/components/Button/Button.tsx
index eb45b20914..4846925a58 100644
--- a/apps/wallet-mobile/src/components/Button/Button.tsx
+++ b/apps/wallet-mobile/src/components/Button/Button.tsx
@@ -1,203 +1,195 @@
-import {isNumber} from '@yoroi/common'
 import {useTheme} from '@yoroi/theme'
-import React, {type ReactNode} from 'react'
-import {Image, StyleSheet, TextStyle, TouchableOpacity, TouchableOpacityProps, View, ViewStyle} from 'react-native'
-import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated'
+import React from 'react'
+import {ActivityIndicator, Pressable, PressableProps, StyleSheet, TextStyle, View, ViewStyle} from 'react-native'
 
+import type {IconProps} from '../Icon/type'
 import {Text} from '../Text'
 
-export type ButtonProps = TouchableOpacityProps & {
-  title: string
-  outline?: boolean
-  outlineOnLight?: boolean
-  containerStyle?: ViewStyle
-  block?: boolean
-  iconImage?: number | ReactNode
-  withoutBackground?: boolean
-  shelleyTheme?: boolean
-  mainTheme?: boolean
-  warningTheme?: boolean
-  outlineShelley?: boolean
-  textStyles?: TextStyle
-  isCopying?: boolean
-  copiedText?: string
-  testId?: string
-  startContent?: ReactNode
-  endContent?: ReactNode
-}
+export const ButtonType = {
+  Primary: 'Primary',
+  Secondary: 'Secondary',
+  Critical: 'Critical',
+  Text: 'Text',
+  SecondaryText: 'SecondaryText',
+  Circle: 'Circle',
+  Link: 'Link',
+} as const
+
+export type ButtonType = (typeof ButtonType)[keyof typeof ButtonType]
+
+export type ButtonProps = {
+  type?: ButtonType
+  size?: 'M' | 'S'
+  title?: string
+  icon?: (p: IconProps) => React.JSX.Element
+  isLoading?: boolean
+  rightIcon?: boolean
+  style?: ViewStyle
+  fontOverride?: TextStyle
+} & Omit<PressableProps, 'style' | 'children'>
 
 export const Button = (props: ButtonProps) => {
-  const {
-    onPress,
-    title,
-    block,
-    style,
-    containerStyle,
-    outline,
-    outlineOnLight,
-    iconImage,
-    withoutBackground,
-    shelleyTheme,
-    mainTheme,
-    outlineShelley,
-    textStyles,
-    isCopying,
-    copiedText,
-    testId,
-    startContent,
-    endContent,
-    warningTheme,
-    ...rest
-  } = props
-
-  const {styles} = useStyles()
-  const {isDark} = useTheme()
+  const {type, size, title, icon: Icon, isLoading, rightIcon, disabled, style, fontOverride, ...rest} = props
+
+  const {styles, iconProps, iconPropsPressed} = useStyles({type, size, rightIcon, disabled, fontOverride})
 
   return (
-    <TouchableOpacity
-      onPress={onPress}
-      style={[block && styles.block, containerStyle]}
-      activeOpacity={0.5}
-      testID={testId}
+    <Pressable
+      disabled={isLoading || disabled}
+      style={({pressed}) => [styles.container, pressed && styles.containerPressed, style]}
       {...rest}
     >
-      {isCopying && (
-        <Animated.View layout={Layout} entering={FadeInDown} exiting={FadeOutDown} style={styles.isCopying}>
-          <Text style={styles.copiedText}>{copiedText}</Text>
-        </Animated.View>
-      )}
+      {isLoading ? (
+        <ActivityIndicator {...iconProps} />
+      ) : (
+        ({pressed}) => (
+          <>
+            {Icon && (
+              <View style={styles.iconWrapper}>
+                <Icon {...(pressed ? iconPropsPressed : iconProps)} />
+              </View>
+            )}
 
-      <View
-        style={[
-          styles.button,
-          outline && styles.buttonOutline,
-          outlineOnLight && styles.buttonOutlineOnLight,
-          props.disabled && styles.buttonDisabled,
-          withoutBackground && styles.buttonTransparent,
-          outlineShelley && styles.buttonOutlineShelley,
-          shelleyTheme && styles.shelleyTheme,
-          mainTheme && styles.mainTheme,
-          warningTheme && styles.warningTheme,
-          outlineOnLight && shelleyTheme && styles.shelleyOutlineOnLight,
-          style,
-        ]}
-      >
-        {isNumber(iconImage) ? <Image source={iconImage} /> : React.isValidElement(iconImage) ? iconImage : null}
-
-        {startContent != null ? startContent : null}
-
-        <Text
-          style={[
-            styles.text,
-            outlineOnLight && styles.textOutlineOnLight,
-            outlineOnLight && shelleyTheme && styles.textShelleyOutlineOnLight,
-            outlineShelley && styles.textOutlineShelley,
-            props.disabled && !outlineOnLight && styles.buttonDisabledText,
-            warningTheme && isDark && styles.warningThemeText,
-            textStyles,
-          ]}
-        >
-          {title}
-        </Text>
-
-        {endContent != null ? endContent : null}
-      </View>
-    </TouchableOpacity>
+            {title != null && type !== ButtonType.Circle && (
+              <Text style={[styles.text, pressed && styles.textPressed]}>{title}</Text>
+            )}
+          </>
+        )
+      )}
+    </Pressable>
   )
 }
 
-const useStyles = () => {
+type Colors = {
+  idle: string
+  pressed: string
+  disabled: string
+}
+
+const useStyles = ({
+  type = ButtonType.Primary,
+  size = 'M',
+  rightIcon,
+  disabled,
+  fontOverride,
+}: Pick<ButtonProps, 'type' | 'size' | 'rightIcon' | 'disabled' | 'fontOverride'>) => {
   const {color, atoms} = useTheme()
 
-  const buttonOutline = {
-    borderWidth: 2,
-    borderColor: color.gray_min,
-    backgroundColor: 'transparent',
+  const backgroundColors: Colors = {
+    [ButtonType.Primary]: {idle: color.primary_500, pressed: color.primary_600, disabled: color.primary_200},
+    [ButtonType.Secondary]: {idle: 'transparent', pressed: color.primary_100, disabled: 'transparent'},
+    [ButtonType.Critical]: {
+      idle: color.sys_magenta_500,
+      pressed: color.sys_magenta_600,
+      disabled: color.sys_magenta_300,
+    },
+    [ButtonType.Text]: {idle: 'transparent', pressed: color.gray_100, disabled: 'transparent'},
+    [ButtonType.SecondaryText]: {idle: 'transparent', pressed: color.gray_100, disabled: 'transparent'},
+    [ButtonType.Circle]: {idle: color.primary_500, pressed: color.primary_600, disabled: color.primary_200},
+    [ButtonType.Link]: {idle: 'transparent', pressed: 'transparent', disabled: 'transparent'},
+  }[type]
+
+  const foregroundColors: Colors = {
+    [ButtonType.Primary]: {idle: color.white_static, pressed: color.white_static, disabled: color.gray_min},
+    [ButtonType.Secondary]: {
+      idle: color.text_primary_medium,
+      pressed: color.text_primary_max,
+      disabled: color.text_primary_min,
+    },
+    [ButtonType.Critical]: {idle: color.white_static, pressed: color.white_static, disabled: color.white_static},
+    [ButtonType.Text]: {
+      idle: color.text_primary_medium,
+      pressed: color.text_primary_max,
+      disabled: color.text_primary_min,
+    },
+    [ButtonType.SecondaryText]: {
+      idle: color.text_gray_medium,
+      pressed: color.text_gray_max,
+      disabled: color.text_gray_min,
+    },
+    [ButtonType.Circle]: {idle: color.white_static, pressed: color.white_static, disabled: color.gray_min},
+    [ButtonType.Link]: {
+      idle: color.text_primary_medium,
+      pressed: color.text_primary_max,
+      disabled: color.text_primary_min,
+    },
+  }[type]
+
+  const backgroundColor = disabled ? backgroundColors.disabled : backgroundColors.idle
+  const foregroundColor = disabled ? foregroundColors.disabled : foregroundColors.idle
+
+  let shape: ViewStyle = {}
+  switch (type) {
+    case ButtonType.Primary:
+    case ButtonType.Secondary:
+    case ButtonType.Critical:
+      shape =
+        size === 'M'
+          ? {maxHeight: 56, ...atoms.py_lg, ...atoms.px_xl, ...atoms.gap_sm, ...atoms.rounded_sm}
+          : {maxHeight: 44, ...atoms.py_md, ...atoms.px_lg, ...atoms.gap_xs, ...atoms.rounded_sm}
+      break
+    case ButtonType.Text:
+    case ButtonType.SecondaryText:
+    case ButtonType.Link:
+      shape =
+        size === 'M'
+          ? {...atoms.p_md, ...atoms.gap_xs, ...atoms.rounded_sm}
+          : {...atoms.p_sm, ...atoms.gap_2xs, ...atoms.rounded_sm}
+      break
+    case ButtonType.Circle:
+      shape = {width: 56, height: 56, ...atoms.align_center, ...atoms.rounded_full}
+      break
   }
+  const font =
+    fontOverride ??
+    (type === ButtonType.Link
+      ? size === 'M'
+        ? atoms.link_1_lg
+        : atoms.link_2_md
+      : size === 'M'
+      ? atoms.button_1_lg
+      : atoms.button_2_md)
+
   const styles = StyleSheet.create({
-    block: {
-      flex: 1,
-    },
-    button: {
-      backgroundColor: color.secondary_500,
-      minHeight: 48,
-      maxHeight: 54,
-      borderRadius: 8,
-      flexDirection: 'row',
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    buttonTransparent: {
-      backgroundColor: 'transparent',
-    },
-    buttonOutline: {
-      ...buttonOutline,
-    },
-    mainTheme: {
-      backgroundColor: color.primary_500,
-    },
-    buttonOutlineOnLight: {
-      ...buttonOutline,
-      borderColor: color.secondary_500,
-    },
-    buttonOutlineShelley: {
-      ...buttonOutline,
-      borderColor: color.el_primary_medium,
+    container: {
+      backgroundColor,
+      ...atoms.flex,
+      ...atoms.flex_grow,
+      ...atoms.flex_row,
+      ...atoms.align_start,
+      ...atoms.justify_center,
+      ...shape,
+      ...(rightIcon && atoms.flex_row_reverse),
+      ...(type === ButtonType.Secondary && {borderWidth: 2, borderColor: foregroundColor}),
+    },
+    containerPressed: {
+      backgroundColor: backgroundColors.pressed,
+      ...(type === ButtonType.Secondary && {borderColor: foregroundColors.pressed}),
+    },
+    iconWrapper: {
+      ...atoms.justify_center,
+      height: font.lineHeight ?? 22,
+      overflow: 'visible',
     },
     text: {
-      color: color.white_static,
-      ...atoms.body_2_md_medium,
-      ...atoms.p_sm,
-      textAlign: 'center',
-      textTransform: 'uppercase',
-    },
-    textOutlineOnLight: {
-      color: color.secondary_500,
-    },
-    textOutlineShelley: {
-      color: color.text_primary_medium,
-    },
-    buttonDisabled: {
-      opacity: 0.5,
-    },
-    buttonDisabledText: {
-      color: color.gray_min,
-    },
-    shelleyTheme: {
-      backgroundColor: color.primary_500,
-    },
-    shelleyOutlineOnLight: {
-      backgroundColor: 'transparent',
-      borderColor: color.primary_600,
-      borderWidth: 2,
+      ...atoms.flex_shrink,
+      color: foregroundColor,
+      ...font,
     },
-    textShelleyOutlineOnLight: {
-      color: color.primary_600,
-      fontWeight: '600',
-    },
-    isCopying: {
-      position: 'absolute',
-      backgroundColor: color.gray_max,
-      alignItems: 'center',
-      justifyContent: 'center',
-      top: -50,
-      alignSelf: 'center',
-      borderRadius: 4,
-      zIndex: 10,
-    },
-    copiedText: {
-      color: color.gray_min,
-      textAlign: 'center',
-      ...atoms.p_sm,
-      ...atoms.body_2_md_medium,
-    },
-    warningTheme: {
-      backgroundColor: color.sys_magenta_500,
-    },
-    warningThemeText: {
-      color: color.gray_min,
+    textPressed: {
+      color: foregroundColors.pressed,
     },
   })
 
-  return {styles} as const
+  const iconProps: IconProps = {
+    size: size === 'M' ? 28 : 24,
+    color: foregroundColor,
+  }
+
+  const iconPropsPressed: IconProps = {
+    size: iconProps.size,
+    color: foregroundColors.pressed,
+  }
+
+  return {styles, iconProps, iconPropsPressed} as const
 }
diff --git a/apps/wallet-mobile/src/components/Clipboard/ClipboardProvider.tsx b/apps/wallet-mobile/src/components/Clipboard/ClipboardProvider.tsx
new file mode 100644
index 0000000000..fabf742b21
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Clipboard/ClipboardProvider.tsx
@@ -0,0 +1,97 @@
+import Clipboard from '@react-native-community/clipboard'
+import {useTheme} from '@yoroi/theme'
+import React from 'react'
+import {GestureResponderEvent, StyleSheet, useWindowDimensions} from 'react-native'
+import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated'
+
+import {Text} from '../Text'
+
+const ClipboardContext = React.createContext<undefined | ClipboardContext>(undefined)
+
+type Props = {
+  children: React.ReactNode
+}
+
+type CopiedState = {
+  feedback: string
+  locationX: number
+  locationY: number
+}
+
+const FEEDBACK_TIMEOUT = 1500
+
+export const ClipboardProvider = ({children}: Props) => {
+  const styles = useStyles()
+  const [copied, setCopied] = React.useState<CopiedState | null>(null)
+  const {height, width} = useWindowDimensions()
+  const copy: ClipboardContext['copy'] = ({text, feedback = 'Copied', event}) => {
+    Clipboard.setString(text)
+    setCopied({
+      feedback,
+      locationY: event ? event.nativeEvent.pageY - 50 : height * 0.85,
+      locationX: (event?.nativeEvent.pageX ?? width * 0.5) - feedback.length * 4,
+    })
+    setTimeout(() => setCopied(null), FEEDBACK_TIMEOUT)
+  }
+
+  return (
+    <ClipboardContext.Provider value={{copy}}>
+      <>
+        {children}
+
+        {copied && (
+          <Animated.View
+            layout={Layout}
+            entering={FadeInDown}
+            exiting={FadeOutDown}
+            style={[styles.isCopying, {top: copied.locationY, left: copied.locationX}]}
+          >
+            <Text style={styles.textCopy}>{copied.feedback}</Text>
+          </Animated.View>
+        )}
+      </>
+    </ClipboardContext.Provider>
+  )
+}
+
+export const useCopy = () => {
+  const {copy: globalCopy} = React.useContext(ClipboardContext) ?? {copy: () => null}
+  const [isCopying, setIsCopying] = React.useState(false)
+  const copy = (props: CopyProps) => {
+    globalCopy(props)
+    setIsCopying(true)
+    setTimeout(() => setIsCopying(false), FEEDBACK_TIMEOUT)
+  }
+
+  return {copy, isCopying}
+}
+
+type CopyProps = {
+  text: string
+  feedback?: string
+  event?: GestureResponderEvent
+}
+type ClipboardContext = {
+  copy: (a: CopyProps) => void
+}
+
+const useStyles = () => {
+  const {atoms, color} = useTheme()
+  const styles = StyleSheet.create({
+    isCopying: {
+      position: 'absolute',
+      backgroundColor: color.gray_max,
+      alignItems: 'center',
+      justifyContent: 'center',
+      borderRadius: 4,
+      zIndex: 10,
+    },
+    textCopy: {
+      textAlign: 'center',
+      ...atoms.p_sm,
+      ...atoms.body_2_md_medium,
+      color: color.gray_min,
+    },
+  })
+  return styles
+}
diff --git a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.stories.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.stories.tsx
index 5a846330d3..7feb653892 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.stories.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.stories.tsx
@@ -47,7 +47,6 @@ storiesOf('ConfirmTx', module)
           useUSB={false}
           buttonProps={{
             title: 'DELEGATE',
-            shelleyTheme: true,
           }}
         />
       </WalletManagerProviderMock>
diff --git a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
index df591661cb..50a236f92e 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
@@ -290,7 +290,6 @@ export const ConfirmTx = ({
           {...buttonProps}
           disabled={isConfirmationDisabled || isProcessing || disabled}
           testID="confirmTxButton"
-          shelleyTheme
         />
       </View>
 
diff --git a/apps/wallet-mobile/src/components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal.tsx b/apps/wallet-mobile/src/components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal.tsx
index 7114b3880a..4ba1158fc7 100644
--- a/apps/wallet-mobile/src/components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal.tsx
@@ -73,7 +73,6 @@ export const ConfirmTxWithSpendingPasswordModal = ({onSuccess, unsignedTx, onErr
       <View style={styles.actions}>
         <Button
           testID="confirmButton"
-          shelleyTheme
           title={strings.sign}
           onPress={() => onSubmit?.(spendingPassword)}
           disabled={spendingPassword.length === 0}
diff --git a/apps/wallet-mobile/src/components/CopyButton.tsx b/apps/wallet-mobile/src/components/CopyButton.tsx
index 525e73235e..3528a50606 100644
--- a/apps/wallet-mobile/src/components/CopyButton.tsx
+++ b/apps/wallet-mobile/src/components/CopyButton.tsx
@@ -1,14 +1,13 @@
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
-import {StyleProp, StyleSheet, TouchableOpacity, View, ViewStyle} from 'react-native'
-import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated'
+import {StyleProp, ViewStyle} from 'react-native'
 
-import {Text} from '../../../wallet-mobile/src/components/Text'
 import {Icon} from '../components/Icon'
-import {useCopy} from '../hooks/useCopy'
-import {isEmptyString} from '../kernel/utils'
+import {Button, ButtonType} from './Button/Button'
+import {useCopy} from './Clipboard/ClipboardProvider'
 
 type CopyButtonProps = {
+  title?: string
   value: string
   onCopy?: () => void
   children?: React.ReactNode
@@ -16,87 +15,22 @@ type CopyButtonProps = {
   message?: string
 }
 
-export const CopyButton = ({value, onCopy, children, style, message}: CopyButtonProps) => {
-  const [isCopying, copy] = useCopy()
+export const CopyButton = ({title, value, onCopy, message}: CopyButtonProps) => {
+  const {isCopying, copy} = useCopy()
+  const {atoms} = useTheme()
 
   return (
-    <AnimatedCopyButton
-      style={style}
-      isCopying={isCopying}
-      message={message}
-      onCopy={() => {
-        copy(value)
+    <Button
+      type={ButtonType.SecondaryText}
+      fontOverride={atoms.body_1_lg_regular}
+      style={{...atoms.p_0, ...atoms.justify_between}}
+      title={title}
+      icon={isCopying ? Icon.CopySuccess : Icon.Copy}
+      rightIcon
+      onPress={(event) => {
+        copy({text: value, feedback: message, event})
         onCopy?.()
       }}
-    >
-      {children}
-    </AnimatedCopyButton>
+    />
   )
 }
-
-const AnimatedCopyButton = ({
-  onCopy,
-  children,
-  style,
-  isCopying,
-  message,
-}: Omit<CopyButtonProps, 'value'> & {isCopying: boolean; message?: string}) => {
-  const {styles, colors} = useStyles()
-
-  return (
-    <TouchableOpacity onPress={onCopy} disabled={isCopying} testID="copyButton" style={style}>
-      {isCopying ? (
-        <View style={styles.rowContainer}>
-          {!isEmptyString(message) ? (
-            <Animated.View layout={Layout} entering={FadeInDown} exiting={FadeOutDown} style={styles.isCopying}>
-              <Text style={styles.copiedText}>{message}</Text>
-            </Animated.View>
-          ) : (
-            <View />
-          )}
-
-          <Icon.CopySuccess size={26} color={colors.gray} />
-        </View>
-      ) : (
-        <Icon.Copy size={26} color={colors.gray} />
-      )}
-
-      {children}
-    </TouchableOpacity>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-
-  const colors = {
-    gray: color.gray_900,
-  }
-
-  const styles = StyleSheet.create({
-    isCopying: {
-      position: 'absolute',
-      backgroundColor: color.gray_max,
-      alignItems: 'center',
-      justifyContent: 'center',
-      bottom: 20,
-      right: 10,
-      alignSelf: 'center',
-      borderRadius: 4,
-      zIndex: 10,
-    },
-    copiedText: {
-      color: color.gray_min,
-      textAlign: 'center',
-      padding: 8,
-      flex: 1,
-      ...atoms.body_2_md_medium,
-    },
-    rowContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-    },
-  })
-
-  return {styles, colors} as const
-}
diff --git a/apps/wallet-mobile/src/components/ErrorBoundary/ErrorBoundary.tsx b/apps/wallet-mobile/src/components/ErrorBoundary/ErrorBoundary.tsx
index e33dfb5582..3dd1b2104c 100644
--- a/apps/wallet-mobile/src/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/apps/wallet-mobile/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -84,7 +84,7 @@ const ErrorView = ({state}: {state: State}) => {
 
       {Platform.OS === 'android' && (
         <View style={{padding: 16}}>
-          <Button shelleyTheme onPress={() => BackHandler.exitApp()} title="OK" style={{width: '100%'}} />
+          <Button onPress={() => BackHandler.exitApp()} title="OK" style={{width: '100%'}} />
         </View>
       )}
     </View>
diff --git a/apps/wallet-mobile/src/components/ErrorModal/ErrorModal.tsx b/apps/wallet-mobile/src/components/ErrorModal/ErrorModal.tsx
index 172b54691c..c4066210bb 100644
--- a/apps/wallet-mobile/src/components/ErrorModal/ErrorModal.tsx
+++ b/apps/wallet-mobile/src/components/ErrorModal/ErrorModal.tsx
@@ -63,13 +63,7 @@ export const ErrorView = ({title, errorMessage, errorLogs, onDismiss}: ErrorView
         </View>
       )}
 
-      <Button
-        block
-        shelleyTheme
-        onPress={onDismiss}
-        title={intl.formatMessage(globalMessages.close)}
-        testID="closeErrorModalButton"
-      />
+      <Button onPress={onDismiss} title={intl.formatMessage(globalMessages.close)} testID="closeErrorModalButton" />
     </ScrollView>
   )
 }
diff --git a/apps/wallet-mobile/src/components/Icon/Ada.tsx b/apps/wallet-mobile/src/components/Icon/Ada.tsx
index e48bf52ddf..1d6b148e7b 100644
--- a/apps/wallet-mobile/src/components/Icon/Ada.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Ada.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size: number; color?: string}
+import {IconProps} from './type'
 
-export const Ada = ({size, color}: Props) => (
+export const Ada = ({size = 20, color = '#000000'}: IconProps) => (
   <Svg viewBox="0 0 36.993 44" width={size} height={size}>
     <Path
-      fill={color != null ? color : '#000000'}
+      fill={color}
       d="M36.991 26.538c-.053-1.006-.952-1.773-1.984-1.773h-5.61l-1.534-3.89h3.466c1.005 0
       1.931-.74 1.984-1.772a1.838 1.838 0 0 0-1.825-1.932h-5.08l-6.35-16.007A1.848 1.848 0
       0 0 18.338 0c-.74 0-1.429.476-1.72 1.164l-6.085 15.981H5.559c-1.006 0-1.932.74-1.985
diff --git a/apps/wallet-mobile/src/components/Icon/Analytics.tsx b/apps/wallet-mobile/src/components/Icon/Analytics.tsx
index 821260f892..5e0a8c717a 100644
--- a/apps/wallet-mobile/src/components/Icon/Analytics.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Analytics.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Analytics = ({size = 24, color = '#000'}: Props) => {
+export const Analytics = ({size = 24, color = '#000'}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Svg width={size} height={size} viewBox="0 0 24 24">
       <Path
         d="M18.065 10.849l-.077-.031a3.019 3.019 0 00-.75-.194l-.825-.1-.158-.018.086-.135 4.925-7.75h0a.826.826 0 01.552-.382.821.821 0 01.665.155s0 0 0 0l-.058.081c.167.117.27.275.313.475a.68.68 0 01-.113.55l-4.56 7.349zm0 0l.044-.07 4.6-7.223-4.644 7.293zM5.912 12.044l2.262 2.646h0l.002.002c.188.207.43.301.718.283a.805.805 0 00.666-.398h0l3.193-5.215 1.038 1.593.045.068.076-.03c.247-.1.495-.186.742-.26.244-.073.497-.126.758-.159l.162-.02-.091-.135-2.075-3.074a.788.788 0 00-.724-.382.785.785 0 00-.695.41l-3.302 5.333-2.236-2.62h0l-.002-.003A.853.853 0 005.73 9.8a.805.805 0 00-.666.397s0 0 0 0L1.29 16.223h0v.002a.885.885 0 00-.114.617.798.798 0 00.34.54c.206.15.431.198.67.141a.872.872 0 00.548-.393v-.001l3.178-5.084zm11.556 8.276a4.276 4.276 0 001.096-.54l2.765 2.74s0 0 0 0a.834.834 0 00.608.255c.236 0 .44-.086.609-.254a.777.777 0 00.241-.6.868.868 0 00-.266-.592l-2.744-2.743c.218-.353.394-.725.53-1.116.145-.419.218-.85.218-1.295 0-1.21-.423-2.24-1.267-3.083-.844-.844-1.874-1.267-3.083-1.267-1.21 0-2.24.423-3.083 1.267-.844.844-1.267 1.874-1.267 3.083 0 1.21.423 2.24 1.267 3.083.844.844 1.873 1.267 3.083 1.267.444 0 .875-.068 1.293-.205zm.586-2.266a2.554 2.554 0 01-1.879.771c-.74 0-1.365-.256-1.88-.77a2.553 2.553 0 01-.77-1.88c0-.74.256-1.365.77-1.88a2.554 2.554 0 011.88-.77c.74 0 1.365.256 1.88.77.514.515.77 1.14.77 1.88s-.256 1.365-.77 1.88z"
         fill={color}
diff --git a/apps/wallet-mobile/src/components/Icon/AngleDown.tsx b/apps/wallet-mobile/src/components/Icon/AngleDown.tsx
index 26b9d5ed6f..03b1821548 100644
--- a/apps/wallet-mobile/src/components/Icon/AngleDown.tsx
+++ b/apps/wallet-mobile/src/components/Icon/AngleDown.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size: number; color?: string}
+import {IconProps} from './type'
 
-export const AngleDown = ({size, color}: Props) => (
+export const AngleDown = ({size = 16, color = '#CF053A'}: IconProps) => (
   <Svg viewBox="0 0 16 16" width={size} height={size}>
     <Path
-      fill={color != null ? color : '#CF053A'}
+      fill={color}
       d="M7.4985 10.7599C7.76411 11.0635 8.23633 11.0635 8.50194 10.7599L11.6994 7.10567C12.0766 6.67461 11.7705 6 11.1977 6H4.80273C4.22996 6 3.92384 6.67461 4.30101 7.10567L7.4985 10.7599Z"
     />
   </Svg>
diff --git a/apps/wallet-mobile/src/components/Icon/AngleUp.tsx b/apps/wallet-mobile/src/components/Icon/AngleUp.tsx
index 1296859192..6bf0b3c4ae 100644
--- a/apps/wallet-mobile/src/components/Icon/AngleUp.tsx
+++ b/apps/wallet-mobile/src/components/Icon/AngleUp.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size: number; color?: string}
+import {IconProps} from './type'
 
-export const AngleUp = ({size, color}: Props) => (
+export const AngleUp = ({size = 16, color = '#12705D'}: IconProps) => (
   <Svg viewBox="0 0 16 16" width={size} height={size}>
     <Path
-      fill={color != null ? color : '#12705D'}
+      fill={color}
       d="M4.30077 8.89366C3.92359 9.32471 4.22971 9.99932 4.80249 9.99932H11.1975C11.7702 9.99932 12.0764 9.32471 11.6992 8.89365L8.50169 5.23938C8.23608 4.93583 7.76386 4.93583 7.49826 5.23938L4.30077 8.89366Z"
     />
   </Svg>
diff --git a/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx b/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
index 22cefe9816..d582f8c94c 100644
--- a/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
+++ b/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const ArrowDown = ({size, color = '#000'}: Props) => {
+export const ArrowDown = ({size = 17, color = '#000'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 15 17" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/ArrowRight.tsx b/apps/wallet-mobile/src/components/Icon/ArrowRight.tsx
index b4bc0ed1dd..080d7b100a 100644
--- a/apps/wallet-mobile/src/components/Icon/ArrowRight.tsx
+++ b/apps/wallet-mobile/src/components/Icon/ArrowRight.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const ArrowRight = ({size, color = '#000000'}: Props) => {
+export const ArrowRight = ({size = 24, color = '#000000'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Assets.tsx b/apps/wallet-mobile/src/components/Icon/Assets.tsx
index 7fce43123e..e74a19f43f 100644
--- a/apps/wallet-mobile/src/components/Icon/Assets.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Assets.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Assets = ({size = 36, color = 'black'}: Props) => (
+export const Assets = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Backspace.tsx b/apps/wallet-mobile/src/components/Icon/Backspace.tsx
index 80fd1a7167..55aa026327 100644
--- a/apps/wallet-mobile/src/components/Icon/Backspace.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Backspace.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Backspace = ({color = 'black', size}: Props) => (
+export const Backspace = ({color = 'black', size = 24}: IconProps) => (
   <Svg width={size ?? 24} height={size ?? 17} viewBox="0 0 24 17" fill="none">
     <Path
       d="M11.0476 6.02515C10.7548 5.73224 10.7548 5.25739 11.0476 4.96448C11.3406 4.67157 11.8154 4.67157 12.1083 4.96448L14.5833 7.43939L17.0581 4.96448C17.351 4.67157 17.8258 4.67157 18.1188 4.96448C18.4116 5.25732 18.4116 5.73224 18.1188 6.02515L15.6438 8.5L18.1188 10.9749C18.4116 11.2678 18.4116 11.7427 18.1188 12.0355C17.8258 12.3284 17.351 12.3284 17.0581 12.0355L14.5833 9.56067L12.1083 12.0355C11.8154 12.3284 11.3406 12.3284 11.0477 12.0355C10.7548 11.7426 10.7548 11.2678 11.0477 10.9749L13.5226 8.50006L11.0476 6.02515Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Backward.tsx b/apps/wallet-mobile/src/components/Icon/Backward.tsx
index dd0e904ec0..128d84628a 100644
--- a/apps/wallet-mobile/src/components/Icon/Backward.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Backward.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Backward = ({size = 24, color = 'black'}: Props) => (
+export const Backward = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M12.707 5.707a1 1 0 00-1.414-1.414l-7 7a1 1 0 000 1.414l7 7a1 1 0 001.414-1.414L7.414 13H19a1 1 0 100-2H7.414l5.293-5.293z"
diff --git a/apps/wallet-mobile/src/components/Icon/Bio.tsx b/apps/wallet-mobile/src/components/Icon/Bio.tsx
index 7f13157e10..0819218b49 100644
--- a/apps/wallet-mobile/src/components/Icon/Bio.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Bio.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Bio = ({size = 36, color = 'black'}: Props) => (
+export const Bio = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M5 4C4.73478 4 4.48043 4.10536 4.29289 4.29289C4.10536 4.48043 4 4.73478 4 5V7C4 7.55228 3.55228 8 3 8C2.44772 8 2 7.55228 2 7V5C2 4.20435 2.31607 3.44129 2.87868 2.87868C3.44129 2.31607 4.20435 2 5 2H7C7.55228 2 8 2.44772 8 3C8 3.55228 7.55228 4 7 4H5Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Bluetooth.tsx b/apps/wallet-mobile/src/components/Icon/Bluetooth.tsx
index e96c89d088..0f0b1ccbb5 100644
--- a/apps/wallet-mobile/src/components/Icon/Bluetooth.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Bluetooth.tsx
@@ -1,14 +1,11 @@
 import * as React from 'react'
-import Svg, {Path, SvgProps} from 'react-native-svg'
+import Svg, {Path} from 'react-native-svg'
 
-type Props = SvgProps & {
-  color?: string
-  size?: number
-}
+import {IconProps} from './type'
 
-export const Bluetooth = ({color = '#4B6DDE', size = 25, ...props}: Props) => {
+export const Bluetooth = ({color = '#4B6DDE', size = 25}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 25 25" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 25 25" fill="none">
       <Path
         fillRule="evenodd"
         clipRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Bug.tsx b/apps/wallet-mobile/src/components/Icon/Bug.tsx
index 4eb9bf78e7..6bf5afc156 100644
--- a/apps/wallet-mobile/src/components/Icon/Bug.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Bug.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Bug = ({size = 40, color = 'black'}: Props) => {
+export const Bug = ({size = 40, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="-2 -2 28 28">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Burger.tsx b/apps/wallet-mobile/src/components/Icon/Burger.tsx
index b1b46a81b8..bdbe1eace4 100644
--- a/apps/wallet-mobile/src/components/Icon/Burger.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Burger.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Burger = ({size = 36, color = 'black'}: Props) => (
+export const Burger = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Cardano.tsx b/apps/wallet-mobile/src/components/Icon/Cardano.tsx
index 73fd5128bc..0d071ad984 100644
--- a/apps/wallet-mobile/src/components/Icon/Cardano.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Cardano.tsx
@@ -1,15 +1,11 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  width: number
-  height: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Cardano = ({width, height, color}: Props) => (
-  <Svg viewBox="0 0 2000 1848" {...{width, height}}>
-    <G fill={color != null ? color : '#000000'}>
+export const Cardano = ({size = 20, color = '#000000'}: IconProps) => (
+  <Svg viewBox="0 0 2000 1848" width={size} height={size}>
+    <G fill={color}>
       <Path d="M975.46 5.46c43.59-22.73 96.8 30 73.64 73.55-13.45 35.5-64.45 44.94-90.5 17.88C931 70.92 940 19.59 975.46 5.46M506.61 56c26.48-10.9 60 13.36 57.3 42.22 2.81 31.33-35.5 54.39-62.49 39.5-35.76-13.85-31.67-71.9 5.19-81.72M1466.87 138.6c-41.38-5-47.93-70.06-8.09-83.16 30.9-15.07 59.25 13.19 63.77 42.48-6.48 25.01-27.42 47.91-55.68 40.68M613.29 255.55c44.27-28 107.44 13.7 100.63 65.12-2.3 51.92-71.26 82-110.17 46.9-37.62-27.57-31.92-90.82 9.54-112.02M1289.1 285.26c19.75-50.9 99.78-52.44 122.26-2.89 22.22 38.56-5.11 86.31-44.7 99.42-52.44 9.79-102.25-46.9-77.56-96.53M919 378.9c-.43-43.75 39.42-76.35 81-79.33 27.58 5.53 57.64 17.28 69.47 45.11 22.05 38.39 2.47 91.25-37.37 108.87-18.22 10.21-39.76 6.38-59.6 5.19-30.33-14.89-55.87-44.09-53.5-79.84M221.75 442.65c40.44-24.86 95 20.51 79.69 64.44-8.43 38-59.51 53.46-88.71 29.2-31.17-22.73-26.23-77.38 9.02-93.64M1719 442.57c34.31-26.64 90.93 3.92 86.84 47.24 2.3 39.5-46.65 69.29-80.71 48.95-37.51-16.86-41.34-74.57-6.13-96.19M1115.08 521.22c56.62-20.34 123.87 4 156.14 54.48 42.57 61.71 19.92 155.69-46.14 191.1-68.45 41.88-168.4 6.38-193.68-70.06-28.7-68.43 13.11-154.07 83.68-175.52M782.88 527.95c62.75-29.62 147.2-4.77 177.51 59.42 35.67 62.48 8.09 149.48-55.68 181.74-63.85 36.26-153.93 8.77-184.83-58.31-34.65-64.87-3.88-152.98 63-182.85M450.25 641.67c4.77-40.43 42.91-66.74 81.39-69.46 41.46 5 74.58 37.2 79.09 79.16-2.72 41.54-34.82 82.14-78.84 81.89-48.43 4.17-90.89-44.01-81.64-91.59M1432.73 581c49.72-28.94 118.76 13.19 116.55 70.31 3.41 60.52-73 103.17-122.51 67.67-51.43-29.56-47.42-112.81 5.96-137.98M647.69 794.3c58.15-16 124.64 11.41 153.16 64.86 31.24 53.8 18.47 128.54-30.05 168-62.23 57.88-177 34.64-210.12-44.35-38.06-72.41 8.17-169.45 87.01-188.51M1277.78 794c56.53-16.17 122.94 5.62 153.33 57.12 40.18 58.9 21 146.75-38.82 184.72-62.66 44.09-159.72 20.94-194.2-48-41.8-71.31.26-172.09 79.69-193.84M273.68 861.2c50.23-19 105.91 36.43 85.56 86.23-12.43 45.37-76.37 62.14-109.4 28.69-38.65-31.41-24.34-101.3 23.84-114.92M1635.18 933.47c-1.45-41.62 29-78.48 71.68-80.78 34.4 5.45 67.85 33.2 65.13 70.65 3.15 49.46-56.45 83.08-98.59 59.84-19.75-10.04-29.88-30.3-38.22-49.71M26.7 885.63c30.22-13.19 67.6 13 60.7 46.56-1.62 38-57.72 52.61-78.33 20.86C-9.14 931 1.76 897 26.7 885.63zM1932.13 884.87c21.28-15.15 55.42-4.26 63.85 20.6 14.3 27.15-11.92 64.35-42.48 59.76-42.9 3.91-56.78-61.47-21.37-80.36M811.83 1067.28c79.52-20.68 165 45.63 165.5 127.51 5.19 82.74-79 156.11-160.4 137-62.92-10.13-112.29-70.74-110.25-134.32-.17-60.81 45.72-117.33 105.15-130.19M1126.75 1067.11c80.71-22.56 168.74 44.94 167.46 128.71 4.26 81.21-77.3 152.11-157 136-75-9.7-130.34-92.1-109.4-164.88 10.57-48.5 51.09-87.94 98.94-99.83M519.56 1117.51c55.85-9.53 108.21 52.78 85.56 105.81-16.52 56.51-98.76 71.84-135.12 25.68-42.65-44.33-10.81-125.37 49.56-131.49M1443.11 1120c49.8-20.86 110.93 22.22 107.1 76.27 2 59.5-73.47 100.53-122.17 65.8-55.16-31.18-45.12-122.94 15.07-142.07M1701.25 1378.92c-19.5-36.35 15.92-84.53 56.28-77.8 20.09-.34 34.14 15.49 47 28.77 2.64 21.54 7.07 47.24-10.81 63.84-24.28 30.73-79.28 21.96-92.47-14.81M221.58 1311.24c37.72-25.11 92 12.34 83.52 56.44-4.51 39-53.64 61.29-86 39.16-34.73-20.09-33.45-77.29 2.48-95.6M966.78 1392.88c49.38-21.79 112.29 21.2 107.61 75.59 3.66 60.1-74.15 101.72-122.43 65.63-53.63-30.99-44.69-122.16 14.82-141.22M621.63 1473.4c42.06-22.13 98.5 16.09 94.67 63.16 1.28 38.65-36.44 71.59-74.58 65.88-31.59-.68-52.19-29-62.32-55.93.52-29.35 12.6-62.04 42.23-73.11M1320.77 1474.08c43.25-26.73 104.72 11.66 100.63 62 1.11 52.61-68.36 86.31-108.63 51.75-38.99-27.09-34.23-92.21 8-113.75M1442.35 1774.65c-19.24-29.11 3.41-64.18 34.65-70.82 25.12 5.11 51.68 24 46.4 53.12-3.66 39.41-61.3 51.5-81.05 17.7M477.24 1749.37c7.66-23.07 26.22-46 53.38-40 39.59 2.81 51.34 62.48 16.69 80.87-31.16 21.01-67.31-7.76-70.07-40.87M942.85 1775.84c7.58-34.13 51.76-50.73 80.88-32.6 19.24 8.26 24.86 29.79 29.8 48.09-2.64 9.53-5 19.07-7.32 28.6-11.92 14.13-27.24 28.26-47.08 27.75-36.87 4.32-70.13-37.36-56.28-71.84" />
     </G>
   </Svg>
diff --git a/apps/wallet-mobile/src/components/Icon/Catalyst.tsx b/apps/wallet-mobile/src/components/Icon/Catalyst.tsx
index c9125c1171..b668d1d34f 100644
--- a/apps/wallet-mobile/src/components/Icon/Catalyst.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Catalyst.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Catalyst = ({size = 36, color = 'black'}: Props) => (
+export const Catalyst = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-1 -1 27 27">
     <Path
       d="M3 11.9998C3 7.02996 7.0293 2.99976 12 2.99976C16.9698 2.99976 21 7.02996 21 11.9998H15.9654C15.9654 11.3482 15.7926 10.7425 15.5145 10.1998C15.5145 10.1998 15.4092 9.98826 15.3426 9.88386C15.3321 9.86723 15.3224 9.85003 15.3126 9.83277C15.298 9.80705 15.2833 9.7812 15.2661 9.75696C15.1437 9.57876 15.0042 9.41316 14.8548 9.25836C14.8166 9.21807 14.7757 9.18047 14.7351 9.14306C14.723 9.132 14.711 9.12095 14.6991 9.10986C14.5794 8.99826 14.4552 8.89476 14.3229 8.79936C14.3095 8.78948 14.2962 8.77955 14.283 8.76963C14.2418 8.73888 14.2009 8.70824 14.1573 8.67966C13.9746 8.55996 13.782 8.45466 13.5795 8.36556C13.5471 8.35206 13.5129 8.34036 13.4787 8.32867C13.4635 8.32328 13.4481 8.31784 13.4337 8.31246C13.2627 8.24586 13.0872 8.19186 12.9072 8.14866C12.8877 8.14415 12.8682 8.14027 12.8492 8.1365C12.8454 8.13575 12.8416 8.135 12.8379 8.13426L12.8269 8.13168C12.7884 8.12265 12.7505 8.11375 12.711 8.10636C12.4797 8.06406 12.2439 8.03436 12 8.03436C11.7561 8.03436 11.5203 8.06406 11.2881 8.10636C11.2727 8.10902 11.2575 8.11262 11.2424 8.11624C11.2319 8.11874 11.2214 8.12125 11.2107 8.12346C11.1711 8.13156 11.1324 8.13966 11.0928 8.14866C10.9119 8.19186 10.7364 8.24586 10.5663 8.31246C10.5624 8.31389 10.5586 8.31518 10.5549 8.31644C10.5492 8.31835 10.5438 8.32019 10.5384 8.32236C10.5252 8.32716 10.5119 8.33176 10.4986 8.33636C10.472 8.34556 10.4454 8.35476 10.4196 8.36556C10.218 8.45466 10.0254 8.55996 9.8427 8.67966C9.80209 8.70631 9.76371 8.73475 9.72505 8.7634C9.70888 8.77539 9.69266 8.78741 9.6762 8.79936C9.5448 8.89476 9.4197 8.99826 9.3009 9.10986C9.29483 9.11542 9.28875 9.12096 9.28268 9.12651C9.23569 9.16943 9.18893 9.21213 9.1443 9.25836C8.9949 9.41316 8.8563 9.57876 8.733 9.75696C8.71668 9.78064 8.70221 9.80587 8.68779 9.83101C8.67755 9.84886 8.66734 9.86667 8.6565 9.88386C8.5908 9.98826 8.4855 10.1998 8.4855 10.1998C8.4846 10.2007 8.4846 10.2016 8.4846 10.2016H10.0929C10.5726 9.69396 11.2467 9.37356 12 9.37356C13.4508 9.37356 14.6262 10.549 14.6262 11.9998H12.918C12.918 11.4931 12.5067 11.0818 12 11.0818C11.4933 11.0818 11.082 11.4931 11.082 11.9998H6.2346C6.2346 11.3707 6.3381 10.7668 6.5253 10.1998C6.6171 9.91896 6.7314 9.64986 6.8637 9.39066C6.8664 9.38526 6.86887 9.37986 6.87135 9.37446C6.87382 9.36906 6.8763 9.36366 6.879 9.35826C7.0095 9.10716 7.158 8.86686 7.3227 8.63826C7.33393 8.62174 7.34614 8.6057 7.35824 8.5898C7.36262 8.58404 7.36699 8.5783 7.3713 8.57256C7.7016 8.12706 8.0931 7.73286 8.5359 7.39896C8.5692 7.37376 8.6025 7.34856 8.6367 7.32426C8.8536 7.16676 9.0804 7.02366 9.3189 6.89766C9.33512 6.88904 9.35163 6.88156 9.3681 6.8741C9.38087 6.86832 9.39362 6.86255 9.4062 6.85626C9.6285 6.74376 9.8589 6.64566 10.0965 6.56286C10.1129 6.55714 10.1289 6.55111 10.1449 6.54509C10.1667 6.53689 10.1885 6.52872 10.2108 6.52146C10.4628 6.43866 10.7229 6.37566 10.9884 6.32886C11.0451 6.31896 11.1018 6.31086 11.1585 6.30276C11.4339 6.26226 11.7138 6.23436 12 6.23436C12.2862 6.23436 12.5652 6.26226 12.8406 6.30276L12.8506 6.30419C12.9041 6.31182 12.9582 6.31954 13.0107 6.32886C13.2762 6.37566 13.5372 6.43866 13.7892 6.52146C13.8129 6.52917 13.8359 6.5379 13.8589 6.54661C13.8734 6.55212 13.8879 6.55762 13.9026 6.56286C14.1402 6.64566 14.3715 6.74376 14.5938 6.85626C14.6061 6.86243 14.6185 6.8681 14.6308 6.87378C14.6473 6.88135 14.6637 6.88891 14.6802 6.89766C14.9187 7.02366 15.1455 7.16676 15.3633 7.32426C15.3975 7.34855 15.4308 7.37373 15.4641 7.39892C15.906 7.73282 16.2975 8.12706 16.6278 8.57256C16.6337 8.58037 16.6396 8.58818 16.6456 8.59603C16.6562 8.6099 16.667 8.62389 16.6773 8.63826C16.842 8.86686 16.9905 9.10716 17.1201 9.35826C17.1243 9.36546 17.1277 9.37266 17.1311 9.37986C17.1328 9.38346 17.1345 9.38706 17.1363 9.39066C17.2686 9.64986 17.382 9.91896 17.4747 10.1998H18.9723C18.1704 7.09836 15.3489 4.79976 12 4.79976C8.6511 4.79976 5.8287 7.09836 5.0277 10.1998C4.8819 10.7812 4.7991 11.3572 4.737 11.9998H3Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Categories.tsx b/apps/wallet-mobile/src/components/Icon/Categories.tsx
index 3760183629..d22744135b 100644
--- a/apps/wallet-mobile/src/components/Icon/Categories.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Categories.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Categories = ({size = 36, color = 'black'}: Props) => (
+export const Categories = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M10 3H4C3.73478 3 3.48043 3.10536 3.29289 3.29289C3.10536 3.48043 3 3.73478 3 4V10C3 10.2652 3.10536 10.5196 3.29289 10.7071C3.48043 10.8946 3.73478 11 4 11H10C10.2652 11 10.5196 10.8946 10.7071 10.7071C10.8946 10.5196 11 10.2652 11 10V4C11 3.73478 10.8946 3.48043 10.7071 3.29289C10.5196 3.10536 10.2652 3 10 3ZM9 9H5V5H9V9ZM20 13H14C13.7348 13 13.4804 13.1054 13.2929 13.2929C13.1054 13.4804 13 13.7348 13 14V20C13 20.2652 13.1054 20.5196 13.2929 20.7071C13.4804 20.8946 13.7348 21 14 21H20C20.2652 21 20.5196 20.8946 20.7071 20.7071C20.8946 20.5196 21 20.2652 21 20V14C21 13.7348 20.8946 13.4804 20.7071 13.2929C20.5196 13.1054 20.2652 13 20 13ZM19 19H15V15H19V19ZM17 3C14.794 3 13 4.794 13 7C13 9.206 14.794 11 17 11C19.206 11 21 9.206 21 7C21 4.794 19.206 3 17 3ZM17 9C15.897 9 15 8.103 15 7C15 5.897 15.897 5 17 5C18.103 5 19 5.897 19 7C19 8.103 18.103 9 17 9ZM7 13C4.794 13 3 14.794 3 17C3 19.206 4.794 21 7 21C9.206 21 11 19.206 11 17C11 14.794 9.206 13 7 13ZM7 19C5.897 19 5 18.103 5 17C5 15.897 5.897 15 7 15C8.103 15 9 15.897 9 17C9 18.103 8.103 19 7 19Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Change.tsx b/apps/wallet-mobile/src/components/Icon/Change.tsx
index 8148badfb6..427a3b8c4d 100644
--- a/apps/wallet-mobile/src/components/Icon/Change.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Change.tsx
@@ -1,13 +1,11 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Change = ({color = 'black'}: Props) => {
+export const Change = ({size = 20, color = 'black'}: IconProps) => {
   return (
-    <Svg width={20} height={14} fill="none">
+    <Svg width={size} height={size} fill="none">
       <Path
         fill={color}
         d="M4.707.293a1 1 0 00-1.414 0l-3 3a1 1 0 001.414 1.414L3 3.414V11a3 3 0 003 3h4a1 1 0 100-2H6a1 1 0 01-1-1V3.414l1.293 1.293a1 1 0 001.414-1.414zm7.586 9a1 1 0 011.414 0L15 10.586V3a1 1 0 00-1-1h-4a1 1 0 110-2h4a3 3 0 013 3v7.586l1.293-1.293a1 1 0 111.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414"
diff --git a/apps/wallet-mobile/src/components/Icon/Check.tsx b/apps/wallet-mobile/src/components/Icon/Check.tsx
index b03a5f046d..6e58e172a9 100644
--- a/apps/wallet-mobile/src/components/Icon/Check.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Check.tsx
@@ -1,14 +1,9 @@
 import React from 'react'
-import {ImageStyle} from 'react-native'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  style?: ImageStyle
-}
+import {IconProps} from './type'
 
-export const Check = ({size = 40, color = 'black'}: Props) => (
+export const Check = ({size = 40, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/CheckFilled.tsx b/apps/wallet-mobile/src/components/Icon/CheckFilled.tsx
index a72c8cb542..b81cc264c8 100644
--- a/apps/wallet-mobile/src/components/Icon/CheckFilled.tsx
+++ b/apps/wallet-mobile/src/components/Icon/CheckFilled.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const CheckFilled = ({size = 40, color}: Props) => (
+export const CheckFilled = ({size = 40, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/CheckFilled2.tsx b/apps/wallet-mobile/src/components/Icon/CheckFilled2.tsx
index 8830b3b7d2..1fd87f624e 100644
--- a/apps/wallet-mobile/src/components/Icon/CheckFilled2.tsx
+++ b/apps/wallet-mobile/src/components/Icon/CheckFilled2.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const CheckFilled2 = ({size = 20, color}: Props) => (
+export const CheckFilled2 = ({size = 20, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 20 20">
     <Path
       d="M14.707 8.707a1 1 0 00-1.414-1.414L9 11.586 6.707 9.293a1 1 0 00-1.414 1.414l3 3a1 1 0 001.414 0l5-5z"
diff --git a/apps/wallet-mobile/src/components/Icon/CheckOutlined.tsx b/apps/wallet-mobile/src/components/Icon/CheckOutlined.tsx
index 9737ad5faa..8aca471572 100644
--- a/apps/wallet-mobile/src/components/Icon/CheckOutlined.tsx
+++ b/apps/wallet-mobile/src/components/Icon/CheckOutlined.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const CheckOutlined = ({size = 40, color}: Props) => (
+export const CheckOutlined = ({size = 40, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Checkbox.tsx b/apps/wallet-mobile/src/components/Icon/Checkbox.tsx
index 7045695d9b..ccded103fa 100644
--- a/apps/wallet-mobile/src/components/Icon/Checkbox.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Checkbox.tsx
@@ -1,11 +1,13 @@
 import * as React from 'react'
-import Svg, {ClipPath, Defs, G, Path, Rect, SvgProps} from 'react-native-svg'
+import Svg, {ClipPath, Defs, G, Path, Rect} from 'react-native-svg'
 
-export const Checkbox = (props: SvgProps) => {
+import {IconProps} from './type'
+
+export const Checkbox = ({size = 16, color = '#4B6DDE'}: IconProps) => {
   return (
-    <Svg width={16} height={16} viewBox="0 0 16 16" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 16 16" fill="none">
       <G clipPath="url(#clip0_24683_1099)">
-        <Rect width={16} height={16} rx={2} fill="#4B6DDE" />
+        <Rect width={size} height={size} rx={2} fill={color} />
 
         <Path
           fillRule="evenodd"
@@ -17,7 +19,7 @@ export const Checkbox = (props: SvgProps) => {
 
       <Defs>
         <ClipPath id="clip0_24683_1099">
-          <Rect width={16} height={16} rx={2} fill="#fff" />
+          <Rect width={size} height={size} rx={2} fill="#fff" />
         </ClipPath>
       </Defs>
     </Svg>
diff --git a/apps/wallet-mobile/src/components/Icon/Chevron.tsx b/apps/wallet-mobile/src/components/Icon/Chevron.tsx
index cd9824beb2..ace4baa9c7 100644
--- a/apps/wallet-mobile/src/components/Icon/Chevron.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Chevron.tsx
@@ -1,14 +1,13 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
+import {IconProps} from './type'
+
 export const Chevron = ({
   direction,
-  color,
+  color = 'black',
   size = 40,
-}: {
-  size?: number
-  backgroundColor?: string
-  color?: string
+}: IconProps & {
   direction: 'left' | 'right' | 'up' | 'down'
 }) => {
   const rotate = direction === 'down' ? 0 : direction === 'right' ? 270 : direction === 'left' ? 90 : 180
diff --git a/apps/wallet-mobile/src/components/Icon/Clock.tsx b/apps/wallet-mobile/src/components/Icon/Clock.tsx
index 4a4f0f471f..ad776a72d5 100644
--- a/apps/wallet-mobile/src/components/Icon/Clock.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Clock.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Clock = ({size = 40, color}: Props) => (
+export const Clock = ({size = 40, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M13 8C13 7.44772 12.5523 7 12 7C11.4477 7 11 7.44772 11 8V13C11 13.5523 11.4477 14 12 14H16C16.5523 14 17 13.5523 17 13C17 12.4477 16.5523 12 16 12H13V8Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Close.tsx b/apps/wallet-mobile/src/components/Icon/Close.tsx
index 2a42b9c98d..a3ec08d4cd 100644
--- a/apps/wallet-mobile/src/components/Icon/Close.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Close.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Close = ({size = 40, color}: Props) => (
+export const Close = ({size = 40, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 20 20">
     <Path
       d="M13.7071 6.29289C14.0976 6.68342 14.0976 7.31658 13.7071 7.70711L11.4142 10L13.7071 12.2929C14.0976 12.6834 14.0976 13.3166 13.7071 13.7071C13.3166 14.0976 12.6834 14.0976 12.2929 13.7071L10 11.4142L7.70711 13.7071C7.31658 14.0976 6.68342 14.0976 6.29289 13.7071C5.90237 13.3166 5.90237 12.6834 6.29289 12.2929L8.58579 10L6.29289 7.70711C5.90237 7.31658 5.90237 6.68342 6.29289 6.29289C6.68342 5.90237 7.31658 5.90237 7.70711 6.29289L10 8.58579L12.2929 6.29289C12.6834 5.90237 13.3166 5.90237 13.7071 6.29289Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Coins.tsx b/apps/wallet-mobile/src/components/Icon/Coins.tsx
index 608293fcac..7fbfec7894 100644
--- a/apps/wallet-mobile/src/components/Icon/Coins.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Coins.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Coins = ({size = 36, color = 'black'}: Props) => (
+export const Coins = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M12 22C15.976 22 20 20.626 20 18V6C20 3.374 15.976 2 12 2C8.024 2 4 3.374 4 6V18C4 20.626 8.024 22 12 22ZM12 20C8.278 20 6 18.705 6 18V16.732C7.541 17.57 9.777 18 12 18C14.223 18 16.459 17.57 18 16.732V18C18 18.705 15.722 20 12 20ZM12 4C15.722 4 18 5.295 18 6C18 6.705 15.722 8 12 8C8.278 8 6 6.705 6 6C6 5.295 8.278 4 12 4ZM6 8.732C7.541 9.57 9.777 10 12 10C14.223 10 16.459 9.57 18 8.732V10C18 10.705 15.722 12 12 12C8.278 12 6 10.705 6 10V8.732ZM6 12.732C7.541 13.57 9.777 14 12 14C14.223 14 16.459 13.57 18 12.732V14C18 14.705 15.722 16 12 16C8.278 16 6 14.705 6 14V12.732Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Coins2.tsx b/apps/wallet-mobile/src/components/Icon/Coins2.tsx
index 2d760f6982..6a9a116de4 100644
--- a/apps/wallet-mobile/src/components/Icon/Coins2.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Coins2.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Coins2 = ({size = 24, color = '#7C85A3'}: Props) => {
+export const Coins2 = ({size = 24, color = '#7C85A3'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Collateral.tsx b/apps/wallet-mobile/src/components/Icon/Collateral.tsx
index 4d1a983a5b..ea0a866716 100644
--- a/apps/wallet-mobile/src/components/Icon/Collateral.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Collateral.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Collateral = ({size = 36, color = 'black'}: Props) => {
+export const Collateral = ({size = 36, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Connection.tsx b/apps/wallet-mobile/src/components/Icon/Connection.tsx
index 389cdee819..0bf970c592 100644
--- a/apps/wallet-mobile/src/components/Icon/Connection.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Connection.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Connection = ({size = 36, color = '#000000'}: Props) => {
+export const Connection = ({size = 36, color = '#000000'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 21 20" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Copy.tsx b/apps/wallet-mobile/src/components/Icon/Copy.tsx
index 2f8f444e96..c464d38b00 100644
--- a/apps/wallet-mobile/src/components/Icon/Copy.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Copy.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Copy = ({size = 36, color = 'black'}: Props) => (
+export const Copy = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M4 17C4 17.5523 3.55228 18 3 18C2.44772 18 2 17.5523 2 17V4.6C2 3.87477 2.35255 3.23324 2.79289 2.79289C3.23324 2.35255 3.87477 2 4.6 2H14C14.5523 2 15 2.44771 15 3C15 3.55229 14.5523 4 14 4H4.6C4.52523 4 4.36676 4.04745 4.20711 4.20711C4.04745 4.36676 4 4.52523 4 4.6V17Z"
diff --git a/apps/wallet-mobile/src/components/Icon/CopySuccess.tsx b/apps/wallet-mobile/src/components/Icon/CopySuccess.tsx
index 7e17b33674..6587c75c25 100644
--- a/apps/wallet-mobile/src/components/Icon/CopySuccess.tsx
+++ b/apps/wallet-mobile/src/components/Icon/CopySuccess.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const CopySuccess = ({size = 36, color = 'black'}: Props) => (
+export const CopySuccess = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M3 18C3.55228 18 4 17.5523 4 17V4.6C4 4.52523 4.04745 4.36676 4.20711 4.20711C4.36676 4.04745 4.52523 4 4.6 4H14C14.5523 4 15 3.55229 15 3C15 2.44771 14.5523 2 14 2H4.6C3.87477 2 3.23324 2.35255 2.79289 2.79289C2.35255 3.23324 2 3.87477 2 4.6V17C2 17.5523 2.44772 18 3 18Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Cross.tsx b/apps/wallet-mobile/src/components/Icon/Cross.tsx
index a945f43355..246a50fd41 100644
--- a/apps/wallet-mobile/src/components/Icon/Cross.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Cross.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Cross = ({size = 36, color = 'black'}: Props) => (
+export const Cross = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M19.7071 5.70711C20.0976 5.31658 20.0976 4.68342 19.7071 4.29289C19.3166 3.90237 18.6834 3.90237 18.2929 4.29289L12 10.5858L5.70711 4.29289C5.31658 3.90237 4.68342 3.90237 4.29289 4.29289C3.90237 4.68342 3.90237 5.31658 4.29289 5.70711L10.5858 12L4.29289 18.2929C3.90237 18.6834 3.90237 19.3166 4.29289 19.7071C4.68342 20.0976 5.31658 20.0976 5.70711 19.7071L12 13.4142L18.2929 19.7071C18.6834 20.0976 19.3166 20.0976 19.7071 19.7071C20.0976 19.3166 20.0976 18.6834 19.7071 18.2929L13.4142 12L19.7071 5.70711Z"
diff --git a/apps/wallet-mobile/src/components/Icon/CrossCircle.tsx b/apps/wallet-mobile/src/components/Icon/CrossCircle.tsx
index c338fdb598..e49dc94ead 100644
--- a/apps/wallet-mobile/src/components/Icon/CrossCircle.tsx
+++ b/apps/wallet-mobile/src/components/Icon/CrossCircle.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const CrossCircle = ({size = 36, color = 'black'}: Props) => (
+export const CrossCircle = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M15.7071 8.29289C16.0976 8.68342 16.0976 9.31658 15.7071 9.70711L13.4142 12L15.7071 14.2929C16.0976 14.6834 16.0976 15.3166 15.7071 15.7071C15.3166 16.0976 14.6834 16.0976 14.2929 15.7071L12 13.4142L9.70711 15.7071C9.31658 16.0976 8.68342 16.0976 8.29289 15.7071C7.90237 15.3166 7.90237 14.6834 8.29289 14.2929L10.5858 12L8.29289 9.70711C7.90237 9.31658 7.90237 8.68342 8.29289 8.29289C8.68342 7.90237 9.31658 7.90237 9.70711 8.29289L12 10.5858L14.2929 8.29289C14.6834 7.90237 15.3166 7.90237 15.7071 8.29289Z"
diff --git a/apps/wallet-mobile/src/components/Icon/DApp.tsx b/apps/wallet-mobile/src/components/Icon/DApp.tsx
index 9da78248a8..bbcbbbe98e 100644
--- a/apps/wallet-mobile/src/components/Icon/DApp.tsx
+++ b/apps/wallet-mobile/src/components/Icon/DApp.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const DApp = ({size = 24, color = 'black'}: Props) => {
+export const DApp = ({size = 24, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Danger.tsx b/apps/wallet-mobile/src/components/Icon/Danger.tsx
index b5ac2b5cbc..16fae50d46 100644
--- a/apps/wallet-mobile/src/components/Icon/Danger.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Danger.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Danger = ({size = 36, color = '#000000'}: Props) => {
+export const Danger = ({size = 36, color = '#000000'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 50 50" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/DappConnector.tsx b/apps/wallet-mobile/src/components/Icon/DappConnector.tsx
index acfefd8828..b1d8913abb 100644
--- a/apps/wallet-mobile/src/components/Icon/DappConnector.tsx
+++ b/apps/wallet-mobile/src/components/Icon/DappConnector.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const DappConnector = ({size = 36, color = 'black'}: Props) => (
+export const DappConnector = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M10.3845 7.98476C9.98818 8.12207 9.54895 8.01675 9.25249 7.72029C8.67127 7.13907 8.89674 6.13969 9.67533 5.87444C11.1686 5.36475 12.8029 5.38071 14.2869 5.92286L15.9851 4.22471C16.9494 3.26044 18.647 3.39619 19.7782 4.52742C20.9095 5.65864 21.0452 7.35627 20.0809 8.32054L18.3828 10.0187C18.9248 11.5026 18.9407 13.1368 18.431 14.6301C18.1658 15.4087 17.1664 15.6342 16.5852 15.053C16.2887 14.7565 16.1834 14.3173 16.3207 13.921C16.8895 12.2788 16.5353 10.3892 15.2262 9.0801C13.9163 7.77022 12.0267 7.41603 10.3845 7.98476Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Delete.tsx b/apps/wallet-mobile/src/components/Icon/Delete.tsx
index 347ef6640d..b8047dedfd 100644
--- a/apps/wallet-mobile/src/components/Icon/Delete.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Delete.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Delete = ({size = 36, color = 'black'}: Props) => (
+export const Delete = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Device.tsx b/apps/wallet-mobile/src/components/Icon/Device.tsx
index c4a10ae05e..81b1bc26ad 100644
--- a/apps/wallet-mobile/src/components/Icon/Device.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Device.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Device = ({size = 36, color = 'black'}: Props) => (
+export const Device = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M5 16C5 15.4477 5.44772 15 6 15H6.01C6.56228 15 7.01 15.4477 7.01 16C7.01 16.5523 6.56228 17 6.01 17H6C5.44772 17 5 16.5523 5 16Z"
diff --git a/apps/wallet-mobile/src/components/Icon/DigitalAsset.tsx b/apps/wallet-mobile/src/components/Icon/DigitalAsset.tsx
index f54578f93a..c89ca9c764 100644
--- a/apps/wallet-mobile/src/components/Icon/DigitalAsset.tsx
+++ b/apps/wallet-mobile/src/components/Icon/DigitalAsset.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const DigitalAsset = ({size = 36, color = 'black'}: Props) => (
+export const DigitalAsset = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M6 7C6 6.44772 6.44772 6 7 6H9C9.55228 6 10 6.44772 10 7V10H11C11.5523 10 12 10.4477 12 11C12 11.5523 11.5523 12 11 12H7C6.44772 12 6 11.5523 6 11C6 10.4477 6.44772 10 7 10H8V8H7C6.44772 8 6 7.55228 6 7Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Direction.tsx b/apps/wallet-mobile/src/components/Icon/Direction.tsx
index 7d1e4f714b..71a3def611 100644
--- a/apps/wallet-mobile/src/components/Icon/Direction.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Direction.tsx
@@ -7,14 +7,13 @@ import {Received} from '../Icon/Received'
 import {Send} from '../Icon/Send'
 import {Transaction} from '../Icon/Transaction'
 import {MultiParty} from './MultiParty'
+import {IconProps} from './type'
 
-type Props = {
-  transaction: TransactionInfo
-  size?: number
-  containerStyle?: ViewStyle
-}
-
-export const Direction = ({transaction, size = defaultSize, containerStyle}: Props) => {
+export const Direction = ({
+  transaction,
+  size = defaultSize,
+  containerStyle,
+}: IconProps & {transaction: TransactionInfo; containerStyle?: ViewStyle}) => {
   const {color} = useTheme()
   const {direction} = transaction
 
diff --git a/apps/wallet-mobile/src/components/Icon/Disconnect.tsx b/apps/wallet-mobile/src/components/Icon/Disconnect.tsx
index 76573f7940..15d43d38e8 100644
--- a/apps/wallet-mobile/src/components/Icon/Disconnect.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Disconnect.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Disconnect = ({size = 24, color = 'black'}: Props) => {
+export const Disconnect = ({size = 24, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Document.tsx b/apps/wallet-mobile/src/components/Icon/Document.tsx
index 9a481f3ea3..07198d82be 100644
--- a/apps/wallet-mobile/src/components/Icon/Document.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Document.tsx
@@ -1,13 +1,9 @@
 import React from 'react'
 import Svg, {G, Line, Rect} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  backgroundColor?: string
-}
+import {IconProps} from './type'
 
-export const Document = ({size = 40, color = 'black', backgroundColor = 'transparent'}: Props) => (
+export const Document = ({size = 40, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <G transform="scale(1.25) translateX(-3px) translateY(-3px)">
       <Rect
@@ -19,7 +15,7 @@ export const Document = ({size = 40, color = 'black', backgroundColor = 'transpa
         width="14"
         height="18"
         rx="2"
-        fill={backgroundColor}
+        fill="transparent"
       />
 
       <G id="lines" stroke={color} strokeWidth="1.3" strokeLinecap="round" strokeLinejoin="round">
diff --git a/apps/wallet-mobile/src/components/Icon/Drag.tsx b/apps/wallet-mobile/src/components/Icon/Drag.tsx
index 404368cefd..965a128d75 100644
--- a/apps/wallet-mobile/src/components/Icon/Drag.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Drag.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Drag = ({size = 36, color = 'black'}: Props) => (
+export const Drag = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M9 3C7.89543 3 7 3.89543 7 5C7 6.10457 7.89543 7 9 7C10.1046 7 11 6.10457 11 5C11 3.89543 10.1046 3 9 3Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Edit.tsx b/apps/wallet-mobile/src/components/Icon/Edit.tsx
index 74236b5bd8..d8b5d9ca08 100644
--- a/apps/wallet-mobile/src/components/Icon/Edit.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Edit.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Edit = ({size = 40, color = 'black'}: Props) => {
+export const Edit = ({size = 40, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/EmptyCheckbox.tsx b/apps/wallet-mobile/src/components/Icon/EmptyCheckbox.tsx
index 339d0773e7..6adda3509b 100644
--- a/apps/wallet-mobile/src/components/Icon/EmptyCheckbox.tsx
+++ b/apps/wallet-mobile/src/components/Icon/EmptyCheckbox.tsx
@@ -1,24 +1,26 @@
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import Svg, {ClipPath, Defs, G, Path, Rect, SvgProps} from 'react-native-svg'
+import Svg, {ClipPath, Defs, G, Path, Rect} from 'react-native-svg'
 
-export const EmptyCheckbox = (props: SvgProps) => {
+import {IconProps} from './type'
+
+export const EmptyCheckbox = ({size = 16, color: defaultColor}: IconProps) => {
   const {color} = useTheme()
 
   return (
-    <Svg width={16} height={16} viewBox="0 0 16 16" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 16 16" fill="none">
       <G clipPath="url(#clip0_24683_486)">
         <Path
           fillRule="evenodd"
           clipRule="evenodd"
           d="M13 2H3a1 1 0 00-1 1v10a1 1 0 001 1h10a1 1 0 001-1V3a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"
-          fill={color.gray_900}
+          fill={defaultColor ?? color.gray_900}
         />
       </G>
 
       <Defs>
         <ClipPath id="clip0_24683_486">
-          <Rect width={16} height={16} rx={2} fill="#fff" />
+          <Rect width={size} height={size} rx={2} fill="#fff" />
         </ClipPath>
       </Defs>
     </Svg>
diff --git a/apps/wallet-mobile/src/components/Icon/Emurgo.tsx b/apps/wallet-mobile/src/components/Icon/Emurgo.tsx
index ec9977c244..1137b8f820 100644
--- a/apps/wallet-mobile/src/components/Icon/Emurgo.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Emurgo.tsx
@@ -1,14 +1,11 @@
-import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {width: number; height: number; color?: string}
+import {IconProps} from './type'
 
-export const Emurgo = (props: Props) => {
-  const {color: colors} = useTheme()
-  const {width, height, color = colors.black_static} = props
+export const Emurgo = ({size = 36, color = 'black'}: IconProps) => {
   return (
-    <Svg viewBox="0 0 1671 626.86401" {...{width, height}}>
+    <Svg viewBox="0 0 1671 626.86401" width={size} height={size}>
       <G transform="matrix(1.3333333,0,0,-1.3333333,0,626.864)" id="g10">
         <G fill={color} id="g12">
           <G fill={color} id="g14">
diff --git a/apps/wallet-mobile/src/components/Icon/Exchange.tsx b/apps/wallet-mobile/src/components/Icon/Exchange.tsx
index cb5661251d..998db77f17 100644
--- a/apps/wallet-mobile/src/components/Icon/Exchange.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Exchange.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Exchange = ({size = 36, color = 'black'}: Props) => {
+export const Exchange = ({size = 36, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Export.tsx b/apps/wallet-mobile/src/components/Icon/Export.tsx
index 34af67c1c5..479a26cafe 100644
--- a/apps/wallet-mobile/src/components/Icon/Export.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Export.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Export = ({size = 40, color = 'black'}: Props) => {
+export const Export = ({size = 40, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="-2 -2 28 28">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/ExternalLink.tsx b/apps/wallet-mobile/src/components/Icon/ExternalLink.tsx
index 4f23763aba..bb0c7f9384 100644
--- a/apps/wallet-mobile/src/components/Icon/ExternalLink.tsx
+++ b/apps/wallet-mobile/src/components/Icon/ExternalLink.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const ExternalLink = ({size = 36, color = 'black'}: Props) => {
+export const ExternalLink = ({size = 36, color = 'black'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 12 12">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/EyeOff.tsx b/apps/wallet-mobile/src/components/Icon/EyeOff.tsx
index 3a12773f98..b8e6991674 100644
--- a/apps/wallet-mobile/src/components/Icon/EyeOff.tsx
+++ b/apps/wallet-mobile/src/components/Icon/EyeOff.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const EyeOff = ({size = 36, color = 'black'}: Props) => (
+export const EyeOff = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M12 19C12.946 19 13.81 18.897 14.598 18.719L12.841 16.962C12.568 16.983 12.291 17 12 17C6.64901 17 4.57601 13.154 4.07401 12C4.45096 11.1588 4.96006 10.3833 5.58201 9.70297L4.18401 8.30497C2.64601 9.97197 2.06301 11.651 2.05201 11.684C1.98303 11.8893 1.98303 12.1116 2.05201 12.317C2.07301 12.383 4.36701 19 12 19ZM12 4.99997C10.163 4.99997 8.65401 5.39597 7.39601 5.98097L4.41406 2.99983C4.02355 2.60942 3.39051 2.60947 3.00006 2.99992C2.60957 3.39041 2.60957 4.02352 3.00006 4.41402L19.586 21C19.9765 21.3904 20.6095 21.3904 21 21C21.3905 20.6095 21.3905 19.9764 21 19.586L18.388 16.974C21.002 15.023 21.935 12.359 21.949 12.317C22.018 12.1116 22.018 11.8893 21.949 11.684C21.927 11.617 19.633 4.99997 12 4.99997ZM16.972 15.558L14.692 13.278C14.882 12.888 15 12.459 15 12C15 10.359 13.641 8.99997 12 8.99997C11.541 8.99997 11.112 9.11797 10.723 9.30897L8.91501 7.50097C9.90753 7.16038 10.9507 6.99097 12 6.99997C17.351 6.99997 19.424 10.846 19.926 12C19.624 12.692 18.76 14.342 16.972 15.558Z"
diff --git a/apps/wallet-mobile/src/components/Icon/EyeOn.tsx b/apps/wallet-mobile/src/components/Icon/EyeOn.tsx
index a858e9e3d2..ce1bbb92f5 100644
--- a/apps/wallet-mobile/src/components/Icon/EyeOn.tsx
+++ b/apps/wallet-mobile/src/components/Icon/EyeOn.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const EyeOn = ({size = 36, color = 'black'}: Props) => (
+export const EyeOn = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Facebook.tsx b/apps/wallet-mobile/src/components/Icon/Facebook.tsx
index ae9d26c1b2..0d3659a651 100644
--- a/apps/wallet-mobile/src/components/Icon/Facebook.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Facebook.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Facebook = ({size = 36, color = 'black'}: Props) => (
+export const Facebook = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M12 2C6.47745 2 2 6.50448 2 12.0604C2 17.081 5.65637 21.2424 10.4378 22V14.9691H7.89759V12.0604H10.4378V9.84385C10.4378 7.32046 11.931 5.92897 14.2142 5.92897C15.3083 5.92897 16.4544 6.12516 16.4544 6.12516V8.59926H15.1903C13.9502 8.59926 13.5622 9.37599 13.5622 10.1718V12.0584H16.3334L15.8904 14.9671H13.5622V21.998C18.3436 21.2444 22 17.082 22 12.0604C22 6.50448 17.5226 2 12 2Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Forward.tsx b/apps/wallet-mobile/src/components/Icon/Forward.tsx
index 5728614e6c..108a8d6ffa 100644
--- a/apps/wallet-mobile/src/components/Icon/Forward.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Forward.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Forward = ({size = 24, color = 'black'}: Props) => (
+export const Forward = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M12.707 4.293a1 1 0 10-1.414 1.414L16.586 11H5a1 1 0 100 2h11.586l-5.293 5.293a1 1 0 001.414 1.414l7-7a1 1 0 000-1.414l-7-7z"
diff --git a/apps/wallet-mobile/src/components/Icon/Gear.tsx b/apps/wallet-mobile/src/components/Icon/Gear.tsx
index eef8ef81d6..fbea2fdeaa 100644
--- a/apps/wallet-mobile/src/components/Icon/Gear.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Gear.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Gear = ({size = 36, color = 'black'}: Props) => (
+export const Gear = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-3 -3 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Github.tsx b/apps/wallet-mobile/src/components/Icon/Github.tsx
index 223f54a3d4..8ee843eba6 100644
--- a/apps/wallet-mobile/src/components/Icon/Github.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Github.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Github = ({size = 36, color = 'black'}: Props) => (
+export const Github = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Globe.tsx b/apps/wallet-mobile/src/components/Icon/Globe.tsx
index a9fde60013..4181392985 100644
--- a/apps/wallet-mobile/src/components/Icon/Globe.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Globe.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Globe = ({size = 36, color = 'black'}: Props) => (
+export const Globe = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Google.tsx b/apps/wallet-mobile/src/components/Icon/Google.tsx
index 91da96414a..6389b02b63 100644
--- a/apps/wallet-mobile/src/components/Icon/Google.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Google.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react'
 import Svg, {Defs, Image, Pattern, Rect, Use} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const Google = ({size = 40}: Props) => (
+export const Google = ({size = 40}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 40 40" fill="none">
     <Rect width={40} height={40} rx={8} fill="url(#pattern0_21862_14624)" />
 
diff --git a/apps/wallet-mobile/src/components/Icon/Governance.tsx b/apps/wallet-mobile/src/components/Icon/Governance.tsx
index ea5c472c02..766a9fdfd1 100644
--- a/apps/wallet-mobile/src/components/Icon/Governance.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Governance.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Governance = ({size = 36, color = '#6B7384'}: Props) => (
+export const Governance = ({size = 36, color = '#6B7384'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path
       d="M4.504 17.77v-6.02c0-.289.099-.532.297-.73a.992.992 0 01.728-.295 1 1 0 01.73.296c.2.197.3.44.3.729v6.026a.992.992 0 01-.294.73.983.983 0 01-.725.295c-.287 0-.532-.1-.734-.299a.99.99 0 01-.302-.732zm6.621.006V11.75c0-.289.098-.532.295-.73a.982.982 0 01.725-.295 1 1 0 01.73.296c.2.197.3.44.3.729v6.026a.993.993 0 01-.295.73.983.983 0 01-.725.295c-.287 0-.53-.099-.73-.296a.984.984 0 01-.3-.729zM3.075 22a1.04 1.04 0 01-.764-.31A1.03 1.03 0 012 20.931c0-.3.104-.554.311-.764.208-.21.462-.315.763-.315h18.152c.3 0 .555.103.763.31.207.206.311.459.311.759s-.104.554-.311.764c-.208.21-.462.315-.763.315H3.074zm14.666-4.23v-6.02c0-.289.1-.532.297-.73a.992.992 0 01.728-.295 1 1 0 01.73.296c.2.197.3.44.3.729v6.026a.993.993 0 01-.294.73.983.983 0 01-.725.295c-.287 0-.531-.1-.733-.299a.989.989 0 01-.303-.732zm3.15-8.101H3.26c-.35 0-.648-.123-.893-.367A1.21 1.21 0 012 8.412v-.777c0-.232.063-.456.19-.673.127-.216.297-.374.512-.473l8.496-4.245c.298-.163.615-.244.952-.244.337 0 .654.081.952.244l8.432 4.213c.232.116.418.287.557.512.14.225.209.473.209.744v.54c0 .397-.136.732-.407 1.006-.271.273-.605.41-1.003.41zM5.456 7.52h13.386L12.15 4.187 5.457 7.52z"
diff --git a/apps/wallet-mobile/src/components/Icon/HardwareWallet.tsx b/apps/wallet-mobile/src/components/Icon/HardwareWallet.tsx
index e7cfb8b647..a7efafe265 100644
--- a/apps/wallet-mobile/src/components/Icon/HardwareWallet.tsx
+++ b/apps/wallet-mobile/src/components/Icon/HardwareWallet.tsx
@@ -1,17 +1,13 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color1?: string
-  color2?: string
-}
+import {IconProps} from './type'
 
-export const HardwareWallet = ({size = 36, color1 = 'black', color2 = '#C4CAD7'}: Props) => (
+export const HardwareWallet = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M7.06298 6.24902L10.5223 4.37111C11.2381 3.98253 12.1332 4.23617 12.5388 4.9425L19.4899 17.0491C19.9253 17.8074 19.6225 18.7758 18.8327 19.1509L15.4344 20.7651C14.7339 21.0978 13.8953 20.8417 13.5001 20.1744L6.4879 8.33154C6.05467 7.59984 6.31566 6.65471 7.06298 6.24902Z"
-      fill={color1}
+      fill={color}
       stroke="black"
     />
 
@@ -19,7 +15,7 @@ export const HardwareWallet = ({size = 36, color1 = 'black', color2 = '#C4CAD7'}
       fillRule="evenodd"
       clipRule="evenodd"
       d="M9.5 3C7.01472 3 5 5.01472 5 7.5V20C5 21.1046 5.89543 22 7 22H12C13.1046 22 14 21.1046 14 20V7.5C14 5.01472 11.9853 3 9.5 3ZM9.5 10C10.8807 10 12 8.88071 12 7.5C12 6.11929 10.8807 5 9.5 5C8.11929 5 7 6.11929 7 7.5C7 8.88071 8.11929 10 9.5 10Z"
-      fill={color2}
+      fill="white"
     />
   </Svg>
 )
diff --git a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
index 9b8b6c9ad0..a81b0cb2c7 100644
--- a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
@@ -19,33 +19,33 @@ storiesOf('Icon', module).add('Gallery', () => {
 
         <Item icon={<Icon.Received />} title="Received" />
 
-        <Item icon={<Icon.WalletAvatar image="" />} title="WalletAccount" />
+        <Item icon={<Icon.WalletAvatar />} title="WalletAccount" />
 
-        <Item icon={<Icon.Emurgo width={40} height={40} />} title="Emurgo" />
+        <Item icon={<Icon.Emurgo size={40} />} title="Emurgo" />
 
         <Item icon={<Icon.Check size={40} />} title="Check" />
 
-        <Item mode="dark" icon={<Icon.YoroiWallet height={40} width={40} />} title="YoroiWallet" />
+        <Item mode="dark" icon={<Icon.YoroiWallet size={40} />} title="YoroiWallet" />
 
-        <Item icon={<Icon.Cardano height={40} width={40} />} title="Cardano" />
+        <Item icon={<Icon.Cardano size={40} />} title="Cardano" />
 
         <Item icon={<Icon.Ada size={40} />} title="AdaIcon" />
 
-        <Item icon={<Icon.RewardManuallyPayout height={40} width={40} />} title="RewardManuallyPayout" />
+        <Item icon={<Icon.RewardManuallyPayout size={40} />} title="RewardManuallyPayout" />
 
-        <Item icon={<Icon.RewardWithdrawn height={40} width={40} />} title="RewardWithdrawn" />
+        <Item icon={<Icon.RewardWithdrawn size={40} />} title="RewardWithdrawn" />
 
-        <Item icon={<Icon.StakingKeyDeregistered height={40} width={40} />} title="StakingKeyDeregistered" />
+        <Item icon={<Icon.StakingKeyDeregistered size={40} />} title="StakingKeyDeregistered" />
 
-        <Item icon={<Icon.StakingKeyRegistered height={40} width={40} />} title="StakingKeyRegistered" />
+        <Item icon={<Icon.StakingKeyRegistered size={40} />} title="StakingKeyRegistered" />
 
         <Item icon={<Icon.Transaction size={40} />} title="Transaction" />
 
-        <Item icon={<Icon.TotalAda height={40} width={40} />} title="TotalAdaIcon" />
+        <Item icon={<Icon.TotalAda size={40} />} title="TotalAdaIcon" />
 
-        <Item icon={<Icon.TotalDelegated height={40} width={40} />} title="TotalDelegated" />
+        <Item icon={<Icon.TotalDelegated size={40} />} title="TotalDelegated" />
 
-        <Item icon={<Icon.TotalReward height={40} width={40} />} title="TotalReward" />
+        <Item icon={<Icon.TotalReward size={40} />} title="TotalReward" />
 
         <Item icon={<Icon.Chevron direction="down" />} title="ChevronDown" />
 
diff --git a/apps/wallet-mobile/src/components/Icon/Image.tsx b/apps/wallet-mobile/src/components/Icon/Image.tsx
index 0c2b2c5066..123229df54 100644
--- a/apps/wallet-mobile/src/components/Icon/Image.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Image.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Image = ({size = 36, color = 'black'}: Props) => (
+export const Image = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Info.tsx b/apps/wallet-mobile/src/components/Icon/Info.tsx
index 1ffb8f80f1..fe3b54fb05 100644
--- a/apps/wallet-mobile/src/components/Icon/Info.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Info.tsx
@@ -1,16 +1,11 @@
 import * as React from 'react'
-import {ImageStyle} from 'react-native'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  style?: ImageStyle
-}
+import {IconProps} from './type'
 
-export const Info = ({size = 40, color = 'black', style = {}}: Props) => {
+export const Info = ({size = 40, color = 'black'}: IconProps) => {
   return (
-    <Svg width={size} height={size} {...style} viewBox="-2 -2 25 25">
+    <Svg width={size} height={size} viewBox="-2 -2 25 25">
       <Path
         d="M12 7C11.4477 7 11 7.44771 11 8C11 8.55229 11.4477 9 12 9H12.01C12.5623 9 13.01 8.55229 13.01 8C13.01 7.44771 12.5623 7 12.01 7H12Z"
         fill={color}
diff --git a/apps/wallet-mobile/src/components/Icon/InfoCircle.tsx b/apps/wallet-mobile/src/components/Icon/InfoCircle.tsx
index 6f733afd91..9250af7b3c 100644
--- a/apps/wallet-mobile/src/components/Icon/InfoCircle.tsx
+++ b/apps/wallet-mobile/src/components/Icon/InfoCircle.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const InfoCircle = ({size = 16, color = '#4B6DDE'}: Props) => (
+export const InfoCircle = ({size = 16, color = '#4B6DDE'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 16 16">
     <Path
       d="M8 4.665A.667.667 0 0 0 8 6h.007a.667.667 0 0 0 0-1.334zm0 2a.667.667 0 0 0-.667.667v3.333a.667.667 0 0 0 1.334 0V7.332A.667.667 0 0 0 8 6.665"
diff --git a/apps/wallet-mobile/src/components/Icon/Language.tsx b/apps/wallet-mobile/src/components/Icon/Language.tsx
index d1d01989b8..a87619f057 100644
--- a/apps/wallet-mobile/src/components/Icon/Language.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Language.tsx
@@ -1,16 +1,11 @@
 import * as React from 'react'
-import {ImageStyle} from 'react-native'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  style?: ImageStyle
-}
+import {IconProps} from './type'
 
-export const Language = ({size = 24, color = '#6B7384', ...props}: Props) => {
+export const Language = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <G fill={color}>
         <Path d="M8 2a1 1 0 011 1v2h4.002a.997.997 0 01.995.921.997.997 0 01-.19.67l-.002.002-.022.032a28.803 28.803 0 01-.41.558c-.278.373-.675.897-1.15 1.5a52.525 52.525 0 01-2.82 3.305l1.304 1.305a1 1 0 01-1.414 1.414l-1.306-1.306c-.972.898-1.778 1.492-2.388 1.88-.377.24-.677.4-.894.504a4.552 4.552 0 01-.342.147l-.028.01-.01.004-.005.001-.002.001a1 1 0 11-.623-1.902c.026-.01.076-.031.147-.065.143-.069.373-.19.684-.387.49-.313 1.183-.817 2.045-1.609L4.293 9.707a1 1 0 011.414-1.414l2.28 2.28a50.853 50.853 0 002.666-3.13L10.999 7H3a1 1 0 010-2h4V3a1 1 0 011-1z" />
 
diff --git a/apps/wallet-mobile/src/components/Icon/Launchpad.tsx b/apps/wallet-mobile/src/components/Icon/Launchpad.tsx
index 40e5377e08..9b86fb48bf 100644
--- a/apps/wallet-mobile/src/components/Icon/Launchpad.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Launchpad.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Launchpad = ({size = 36, color = 'black'}: Props) => (
+export const Launchpad = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M5 3C3.89543 3 3 3.89543 3 5C3 6.10457 3.89543 7 5 7C6.10457 7 7 6.10457 7 5C7 3.89543 6.10457 3 5 3Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Ledger.tsx b/apps/wallet-mobile/src/components/Icon/Ledger.tsx
index dda15bcd0b..42562a5694 100644
--- a/apps/wallet-mobile/src/components/Icon/Ledger.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Ledger.tsx
@@ -1,16 +1,14 @@
 import * as React from 'react'
-import Svg, {Path, SvgProps} from 'react-native-svg'
+import Svg, {Path} from 'react-native-svg'
 
-type Props = SvgProps & {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const Ledger = ({size = 24, ...props}: Props) => {
+export const Ledger = ({size = 24, color = '#4B6DDE'}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
       <Path
         d="M10.284 3.932L6.824 5.81a2 2 0 00-.766 2.776L13.07 20.43a2 2 0 002.579.788l3.398-1.614a2 2 0 00.877-2.803L12.972 4.694a2 2 0 00-2.688-.762z"
-        fill="#4B6DDE"
+        fill={color}
       />
 
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Lightning.tsx b/apps/wallet-mobile/src/components/Icon/Lightning.tsx
index 4e96aaa746..9279cf31bc 100644
--- a/apps/wallet-mobile/src/components/Icon/Lightning.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Lightning.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Lightning = ({size = 36, color = 'black'}: Props) => (
+export const Lightning = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Link.tsx b/apps/wallet-mobile/src/components/Icon/Link.tsx
index 65c3ae8b09..ab26e060f5 100644
--- a/apps/wallet-mobile/src/components/Icon/Link.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Link.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Link = ({size = 36, color = 'black'}: Props) => (
+export const Link = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M16.4437 2.00021C14.9719 1.98733 13.5552 2.55719 12.4986 3.58488L12.4882 3.59513L10.7923 5.29339C10.4021 5.68419 10.4025 6.31736 10.7933 6.70761C11.1841 7.09785 11.8173 7.09741 12.2075 6.70661L13.8979 5.01382C14.5778 4.3551 15.4855 3.99191 16.4262 4.00014C17.3692 4.00839 18.2727 4.38923 18.9416 5.06286C19.6108 5.73671 19.9916 6.64971 19.9998 7.6056C20.008 8.55874 19.6452 9.4758 18.9912 10.1607L16.2346 12.9367C15.8688 13.3052 15.429 13.5897 14.9453 13.7714C14.4616 13.9531 13.945 14.0279 13.4304 13.9907C12.9159 13.9536 12.4149 13.8055 11.9616 13.5561C11.5822 13.3473 11.1843 12.9175 10.8027 12.4037C10.4734 11.9603 9.847 11.8679 9.40364 12.1972C8.96029 12.5266 8.86785 13.1529 9.19718 13.5963C9.60661 14.1475 10.218 14.8795 10.9975 15.3084C11.7032 15.6966 12.4838 15.9277 13.2866 15.9856C14.0893 16.0435 14.8949 15.9268 15.6486 15.6437C16.4022 15.3606 17.0861 14.9177 17.654 14.3457L20.4168 11.5635L20.429 11.551C21.4491 10.4874 22.0125 9.0642 21.9997 7.58834C21.987 6.11247 21.3992 4.69931 20.3607 3.65359C19.3221 2.60764 17.9155 2.01309 16.4437 2.00021Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Lock.tsx b/apps/wallet-mobile/src/components/Icon/Lock.tsx
index 27e6a2ce8a..28e496ae8a 100644
--- a/apps/wallet-mobile/src/components/Icon/Lock.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Lock.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Lock = ({size = 36, color = 'black'}: Props) => (
+export const Lock = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/LockFilled.tsx b/apps/wallet-mobile/src/components/Icon/LockFilled.tsx
index d2e27c3538..fe0a960c8f 100644
--- a/apps/wallet-mobile/src/components/Icon/LockFilled.tsx
+++ b/apps/wallet-mobile/src/components/Icon/LockFilled.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const LockFilled = ({size = 16, color = 'black'}: Props) => (
+export const LockFilled = ({size = 16, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 16 16">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Logout.tsx b/apps/wallet-mobile/src/components/Icon/Logout.tsx
index 2a0b3b031d..09b542f285 100644
--- a/apps/wallet-mobile/src/components/Icon/Logout.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Logout.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Logout = ({size = 36, color = 'black'}: Props) => (
+export const Logout = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path
       d="M5 4a1 1 0 00-1 1v14a1 1 0 001 1h4a1 1 0 110 2H5a3 3 0 01-3-3V5a3 3 0 013-3h4a1 1 0 010 2H5z"
diff --git a/apps/wallet-mobile/src/components/Icon/Magnify.tsx b/apps/wallet-mobile/src/components/Icon/Magnify.tsx
index b3d2114f44..1949316ef7 100644
--- a/apps/wallet-mobile/src/components/Icon/Magnify.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Magnify.tsx
@@ -1,12 +1,11 @@
 import * as React from 'react'
-import {ImageStyle} from 'react-native'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string; style?: ImageStyle}
+import {IconProps} from './type'
 
-export const Magnify = ({size = 40, color = 'black', style = {}}: Props) => {
+export const Magnify = ({size = 40, color = 'black'}: IconProps) => {
   return (
-    <Svg width={size} {...style} height={size} viewBox="-2 -2 28 28">
+    <Svg width={size} height={size} viewBox="-2 -2 28 28">
       <Path
         fillRule="evenodd"
         clipRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Megaphone.tsx b/apps/wallet-mobile/src/components/Icon/Megaphone.tsx
index 6f153fe043..ac0bbc9e7f 100644
--- a/apps/wallet-mobile/src/components/Icon/Megaphone.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Megaphone.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Megaphone = ({size = 36, color = 'black'}: Props) => (
+export const Megaphone = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Message.tsx b/apps/wallet-mobile/src/components/Icon/Message.tsx
index 1474b9220a..0f7764f3de 100644
--- a/apps/wallet-mobile/src/components/Icon/Message.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Message.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Message = ({size = 36, color = 'black'}: Props) => (
+export const Message = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/MinSwap.tsx b/apps/wallet-mobile/src/components/Icon/MinSwap.tsx
index 778fdbdcc9..9ad2c5c668 100644
--- a/apps/wallet-mobile/src/components/Icon/MinSwap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/MinSwap.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const MinSwap = ({size = 36}: Props) => (
+export const MinSwap = ({size = 36}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 164 164" fill="none">
     <Path
       fill="#89AAFF"
diff --git a/apps/wallet-mobile/src/components/Icon/MuesliSwap.tsx b/apps/wallet-mobile/src/components/Icon/MuesliSwap.tsx
index dae3bb7846..f96a20e70e 100644
--- a/apps/wallet-mobile/src/components/Icon/MuesliSwap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/MuesliSwap.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const MuesliSwap = ({size = 36}: Props) => (
+export const MuesliSwap = ({size = 36}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 36 36">
     <G fill="none" fillRule="evenodd">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/MultiParty.tsx b/apps/wallet-mobile/src/components/Icon/MultiParty.tsx
index 73c65a7a97..5bc126b45b 100644
--- a/apps/wallet-mobile/src/components/Icon/MultiParty.tsx
+++ b/apps/wallet-mobile/src/components/Icon/MultiParty.tsx
@@ -1,14 +1,11 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const MultiParty = ({size = 40, color = '#242838', ...props}: Props) => {
+export const MultiParty = ({size = 40, color = '#242838'}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 40 40" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 40 40" fill="none">
       <Path
         fillRule="evenodd"
         clipRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/MultipleWallets.tsx b/apps/wallet-mobile/src/components/Icon/MultipleWallets.tsx
index c4daa00593..39bb8a4ae1 100644
--- a/apps/wallet-mobile/src/components/Icon/MultipleWallets.tsx
+++ b/apps/wallet-mobile/src/components/Icon/MultipleWallets.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const MultipleWallets = ({size = 36, color = 'black'}: Props) => (
+export const MultipleWallets = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/NftAsset.tsx b/apps/wallet-mobile/src/components/Icon/NftAsset.tsx
index 7907c05602..2d0e53b92d 100644
--- a/apps/wallet-mobile/src/components/Icon/NftAsset.tsx
+++ b/apps/wallet-mobile/src/components/Icon/NftAsset.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const NftAsset = ({size = 36, color = 'black'}: Props) => (
+export const NftAsset = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M7.70711 6.29289C7.42111 6.00689 6.99099 5.92134 6.61732 6.07612C6.24364 6.2309 6 6.59554 6 7V11C6 11.5523 6.44772 12 7 12C7.55228 12 8 11.5523 8 11V9.41421L10.2929 11.7071C10.5789 11.9931 11.009 12.0787 11.3827 11.9239C11.7564 11.7691 12 11.4045 12 11V7C12 6.44771 11.5523 6 11 6C10.4477 6 10 6.44771 10 7V8.58578L7.70711 6.29289Z"
diff --git a/apps/wallet-mobile/src/components/Icon/NoNfts.tsx b/apps/wallet-mobile/src/components/Icon/NoNfts.tsx
index 3e037ddc7b..7e0779776d 100644
--- a/apps/wallet-mobile/src/components/Icon/NoNfts.tsx
+++ b/apps/wallet-mobile/src/components/Icon/NoNfts.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react'
 import Svg, {Defs, G, LinearGradient, Path, Stop} from 'react-native-svg'
 
-interface Props {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const NoNfts = ({size = 36}: Props) => (
+export const NoNfts = ({size = 36}: IconProps) => (
   <Svg width={size} height={(size / 143) * 101} viewBox="0 0 143 101">
     <G stroke="#1D45BA" strokeWidth={0.5}>
       <Path d="m48.874 99.14 93.081-53.396M13.553 72.55l86.8-49.851M43.506 16.36l98.019 56.136M1.045 52.942 83.175 100" />
diff --git a/apps/wallet-mobile/src/components/Icon/Pin.tsx b/apps/wallet-mobile/src/components/Icon/Pin.tsx
index 08e8f67591..bba9f619f1 100644
--- a/apps/wallet-mobile/src/components/Icon/Pin.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Pin.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Pin = ({size = 36, color = 'black'}: Props) => (
+export const Pin = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M2.6628 14.1571C2.56736 14.1 2.51964 14.019 2.51964 13.9143C2.51964 13.8667 2.54085 13.8048 2.58326 13.7286C2.58326 13.719 2.60978 13.6905 2.6628 13.6429L3.68086 12.8714L2.36056 12.8L2.23331 12.7714C2.14847 12.7524 2.08484 12.7048 2.04242 12.6286C2 12.5429 1.9894 12.4571 2.0106 12.3714L2.47191 11.1C2.49312 11.0238 2.54615 10.9667 2.63099 10.9286C2.72643 10.8905 2.81657 10.881 2.90141 10.9L3.02867 10.9429L4.14217 11.5714L3.83993 10.4286L3.82403 10.3143C3.82403 10.2381 3.85584 10.1667 3.91947 10.1C3.9937 10.0333 4.07854 10 4.17399 10H5.65336C5.7488 10 5.82834 10.0333 5.89196 10.1C5.9662 10.1667 6.00331 10.2381 6.00331 10.3143L5.98741 10.4286L5.65336 11.5857L6.78277 10.9429L6.91003 10.9C6.93123 10.8905 6.95775 10.8857 6.98956 10.8857C7.0744 10.8857 7.14863 10.9048 7.21226 10.9429C7.2865 10.981 7.32892 11.0333 7.33952 11.1L7.81674 12.3714L7.83264 12.4571C7.83264 12.5238 7.80613 12.5905 7.75311 12.6571C7.71069 12.7143 7.65236 12.7524 7.57813 12.7714L7.46678 12.8L6.13057 12.8857L7.16454 13.6429C7.21756 13.6905 7.24408 13.719 7.24408 13.7286C7.2865 13.8048 7.30771 13.8667 7.30771 13.9143C7.30771 14.019 7.25998 14.1 7.16454 14.1571L5.9715 14.9571C5.90787 14.9857 5.83894 15 5.76471 15C5.63745 15 5.542 14.9571 5.47838 14.8714L5.41475 14.7857L4.90572 13.6714L4.41259 14.7857C4.38078 14.8333 4.35427 14.8619 4.33306 14.8714C4.26943 14.9571 4.17399 15 4.04673 15C3.97249 15 3.90356 14.9857 3.83993 14.9571L2.6628 14.1571Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Placeholder.tsx b/apps/wallet-mobile/src/components/Icon/Placeholder.tsx
index 3a7825f537..902f1ec373 100644
--- a/apps/wallet-mobile/src/components/Icon/Placeholder.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Placeholder.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Placeholder = ({size = 36, color = 'black'}: Props) => (
+export const Placeholder = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/PlateNumber.tsx b/apps/wallet-mobile/src/components/Icon/PlateNumber.tsx
index 7318823ba7..040095bd4f 100644
--- a/apps/wallet-mobile/src/components/Icon/PlateNumber.tsx
+++ b/apps/wallet-mobile/src/components/Icon/PlateNumber.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const PlateNumber = ({size = 36, color = 'black'}: Props) => (
+export const PlateNumber = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Plus.tsx b/apps/wallet-mobile/src/components/Icon/Plus.tsx
index be35d3d52e..ccab0c58b2 100644
--- a/apps/wallet-mobile/src/components/Icon/Plus.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Plus.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Plus = ({size = 36, color = 'black'}: Props) => (
+export const Plus = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M13 5C13 4.44772 12.5523 4 12 4C11.4477 4 11 4.44772 11 5V11H5C4.44772 11 4 11.4477 4 12C4 12.5523 4.44772 13 5 13H11V19C11 19.5523 11.4477 20 12 20C12.5523 20 13 19.5523 13 19V13H19C19.5523 13 20 12.5523 20 12C20 11.4477 19.5523 11 19 11H13V5Z"
diff --git a/apps/wallet-mobile/src/components/Icon/PlusCircle.tsx b/apps/wallet-mobile/src/components/Icon/PlusCircle.tsx
index ab0f297a72..bd20b195f5 100644
--- a/apps/wallet-mobile/src/components/Icon/PlusCircle.tsx
+++ b/apps/wallet-mobile/src/components/Icon/PlusCircle.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const PlusCircle = ({size = 36, color = 'black'}: Props) => (
+export const PlusCircle = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M12 7C12.5523 7 13 7.44772 13 8V11H16C16.5523 11 17 11.4477 17 12C17 12.5523 16.5523 13 16 13H13V16C13 16.5523 12.5523 17 12 17C11.4477 17 11 16.5523 11 16V13H8C7.44772 13 7 12.5523 7 12C7 11.4477 7.44772 11 8 11H11V8C11 7.44772 11.4477 7 12 7Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Portfolio.tsx b/apps/wallet-mobile/src/components/Icon/Portfolio.tsx
index b1b2b35726..341c7e3751 100644
--- a/apps/wallet-mobile/src/components/Icon/Portfolio.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Portfolio.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Portfolio = ({size = 36, color = 'black'}: Props) => (
+export const Portfolio = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 20 18" fill="none">
     <Path
       d="M18 4V2C18 0.897 17.103 0 16 0H3C1.346 0 0 1.346 0 3V15C0 17.201 1.794 18 3 18H18C19.103 18 20 17.103 20 16V6C20 4.897 19.103 4 18 4ZM16 13H14V9H16V13ZM3 4C2.74252 3.98848 2.49941 3.87809 2.32128 3.69182C2.14315 3.50554 2.04373 3.25774 2.04373 3C2.04373 2.74226 2.14315 2.49446 2.32128 2.30818C2.49941 2.12191 2.74252 2.01152 3 2H16V4H3Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Qr.tsx b/apps/wallet-mobile/src/components/Icon/Qr.tsx
index 73c29fff12..04c89d7cb6 100644
--- a/apps/wallet-mobile/src/components/Icon/Qr.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Qr.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Qr = ({size = 36, color = 'black'}: Props) => (
+export const Qr = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M6 5C5.44772 5 5 5.44772 5 6C5 6.55228 5.44772 7 6 7H6.01C6.56228 7 7.01 6.55228 7.01 6C7.01 5.44772 6.56228 5 6.01 5H6Z"
diff --git a/apps/wallet-mobile/src/components/Icon/QuestionMark.tsx b/apps/wallet-mobile/src/components/Icon/QuestionMark.tsx
index 00d3b931ac..a9b727c555 100644
--- a/apps/wallet-mobile/src/components/Icon/QuestionMark.tsx
+++ b/apps/wallet-mobile/src/components/Icon/QuestionMark.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const QuestionMark = ({size = 36, color = 'black'}: Props) => (
+export const QuestionMark = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M12.2581 8.02431C11.7926 7.94446 11.3138 8.03194 10.9066 8.27126C10.4994 8.51057 10.1901 8.88628 10.0333 9.33184C9.85006 9.85282 9.27914 10.1266 8.75815 9.94333C8.23716 9.76005 7.96339 9.18914 8.14666 8.66815C8.46013 7.77704 9.07886 7.02562 9.89327 6.54699C10.7077 6.06836 11.6652 5.8934 12.5962 6.0531C13.5273 6.2128 14.3717 6.69685 14.9801 7.41952C15.5883 8.14204 15.9213 9.05647 15.92 10.0009C15.9195 11.5313 14.7849 12.5419 13.9747 13.082C13.5391 13.3725 13.1105 13.586 12.7949 13.7263C12.6356 13.7971 12.5015 13.8508 12.4049 13.8876C12.3565 13.906 12.3173 13.9203 12.2887 13.9305L12.254 13.9427L12.2429 13.9464L12.239 13.9477L12.2375 13.9483L12.2362 13.9487C11.7123 14.1233 11.146 13.8402 10.9713 13.3162C10.7968 12.7926 11.0794 12.2267 11.6027 12.0517L11.6187 12.0461C11.6341 12.0406 11.6593 12.0314 11.6929 12.0186C11.7603 11.9929 11.8606 11.9529 11.9826 11.8987C12.2294 11.789 12.5509 11.6275 12.8653 11.4179C13.5549 10.9582 13.92 10.4691 13.92 9.99999L13.92 9.9985C13.9207 9.52618 13.7542 9.06886 13.45 8.70752C13.1459 8.34618 12.7236 8.10416 12.2581 8.02431Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Received.tsx b/apps/wallet-mobile/src/components/Icon/Received.tsx
index 19d8241269..cab9047a94 100644
--- a/apps/wallet-mobile/src/components/Icon/Received.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Received.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Received = ({size = 24, color = 'black'}: Props) => (
+export const Received = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
     <Path
       d="M12.5 7a1 1 0 011 1v5.586l2.293-2.293a1 1 0 011.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 111.414-1.414l2.293 2.293V8a1 1 0 011-1z"
diff --git a/apps/wallet-mobile/src/components/Icon/Refresh.tsx b/apps/wallet-mobile/src/components/Icon/Refresh.tsx
index 95854b1d3a..60e9f3775f 100644
--- a/apps/wallet-mobile/src/components/Icon/Refresh.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Refresh.tsx
@@ -1,13 +1,9 @@
 import React from 'react'
 import Svg, {ClipPath, Defs, G, Path, Rect} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  active?: boolean
-}
+import {IconProps} from './type'
 
-export const Refresh = ({size = 24, color = '#242838', active = false}: Props) => (
+export const Refresh = ({size = 24, color = '#242838', active = false}: IconProps & {active: boolean}) => (
   <Svg width={size} height={size} viewBox="0 0 32 32" fill="none">
     <G clipPath="url(#clip0_1396_4310)">
       <Rect
diff --git a/apps/wallet-mobile/src/components/Icon/Reload.tsx b/apps/wallet-mobile/src/components/Icon/Reload.tsx
index 8d9e77dfe3..6db11f86bd 100644
--- a/apps/wallet-mobile/src/components/Icon/Reload.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Reload.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Reload = ({size = 24, color = 'black'}: Props) => (
+export const Reload = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M7.555 5.348A8 8 0 0112 4c2.251 0 4.412.892 6.04 2.454l.546.546H16a1 1 0 100 2h5a.997.997 0 001-1V3a1 1 0 10-2 0v2.586l-.553-.553-.014-.014C17.443 3.105 14.786 2 12 2a10 10 0 1010 10 1 1 0 10-2 0A8 8 0 117.555 5.348z"
diff --git a/apps/wallet-mobile/src/components/Icon/Resync.tsx b/apps/wallet-mobile/src/components/Icon/Resync.tsx
index cdd9f9cb3b..da64a12bd0 100644
--- a/apps/wallet-mobile/src/components/Icon/Resync.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Resync.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Resync = ({size = 36, color = 'black'}: Props) => (
+export const Resync = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path
       d="M21 3a1 1 0 10-2 0v3.194l-.997-.898L18 5.294a8.997 8.997 0 00-15 6.705 1 1 0 102 .002 7.013 7.013 0 014.145-6.392 6.993 6.993 0 017.52 1.174l.001.001L18.016 8H14a1 1 0 100 2h6a1 1 0 001-1V3zM3 15a1 1 0 011-1h6a1 1 0 110 2H5.984l1.35 1.216A6.997 6.997 0 0019 12a1 1 0 112 .002 9.013 9.013 0 01-5.33 8.216A8.993 8.993 0 016 18.706l-.003-.002L5 17.805V21a1 1 0 11-2 0v-6z"
diff --git a/apps/wallet-mobile/src/components/Icon/RewardManuallyPayout.tsx b/apps/wallet-mobile/src/components/Icon/RewardManuallyPayout.tsx
index 2c05a12d89..7ccd589365 100644
--- a/apps/wallet-mobile/src/components/Icon/RewardManuallyPayout.tsx
+++ b/apps/wallet-mobile/src/components/Icon/RewardManuallyPayout.tsx
@@ -1,14 +1,10 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  width?: number
-  height?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const RewardManuallyPayout = ({width = 36, height = 36, color = '#6B7384'}: Props) => (
-  <Svg viewBox="0 0 36 36" {...{width, height}}>
+export const RewardManuallyPayout = ({size = 36, color = '#6B7384'}: IconProps) => (
+  <Svg viewBox="0 0 36 36" width={size} height={size}>
     <G stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
       <G transform="translate(-760.000000, -561.000000)" fill={color}>
         <G transform="translate(760.000000, 561.000000)">
diff --git a/apps/wallet-mobile/src/components/Icon/RewardWithdrawn.tsx b/apps/wallet-mobile/src/components/Icon/RewardWithdrawn.tsx
index 44c97b1ba7..ea9d29e828 100644
--- a/apps/wallet-mobile/src/components/Icon/RewardWithdrawn.tsx
+++ b/apps/wallet-mobile/src/components/Icon/RewardWithdrawn.tsx
@@ -1,14 +1,10 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  width?: number
-  height?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const RewardWithdrawn = ({width = 36, height = 36, color = '#6B7384'}: Props) => (
-  <Svg viewBox="0 0 36 36" {...{width, height}}>
+export const RewardWithdrawn = ({size = 36, color = '#6B7384'}: IconProps) => (
+  <Svg viewBox="0 0 36 36" width={size} height={size}>
     <G stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
       <G transform="translate(-760.000000, -425.000000)" fill={color}>
         <G transform="translate(760.000000, 425.000000)">
diff --git a/apps/wallet-mobile/src/components/Icon/Sandbox.tsx b/apps/wallet-mobile/src/components/Icon/Sandbox.tsx
index 5e44a8e706..87f4a38750 100644
--- a/apps/wallet-mobile/src/components/Icon/Sandbox.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Sandbox.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Sandbox = ({size = 36, color = 'black'}: Props) => (
+export const Sandbox = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Send.tsx b/apps/wallet-mobile/src/components/Icon/Send.tsx
index 176304c885..74680a9362 100644
--- a/apps/wallet-mobile/src/components/Icon/Send.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Send.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Send = ({size = 24, color = '#6B7384'}: Props) => (
+export const Send = ({size = 24, color = '#6B7384'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 25 24">
     <Path
       d="M7.793 11.293l4-4a1 1 0 011.414 0l4 4a1 1 0 01-1.414 1.414L13.5 10.414V16a1 1 0 11-2 0v-5.586l-2.293 2.293a1 1 0 01-1.414-1.414z"
diff --git a/apps/wallet-mobile/src/components/Icon/Settings.tsx b/apps/wallet-mobile/src/components/Icon/Settings.tsx
index 0268e0fafe..5e8d779159 100644
--- a/apps/wallet-mobile/src/components/Icon/Settings.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Settings.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Settings = ({size = 36, color = 'black'}: Props) => (
+export const Settings = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M10 5C10 3.89543 10.8954 3 12 3C13.1046 3 14 3.89543 14 5C14 6.10457 13.1046 7 12 7C10.8954 7 10 6.10457 10 5Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Share.tsx b/apps/wallet-mobile/src/components/Icon/Share.tsx
index 370cf830c3..7ab41d6568 100644
--- a/apps/wallet-mobile/src/components/Icon/Share.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Share.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Share = ({size = 36, color = '#000000'}: Props) => {
+export const Share = ({size = 36, color = '#000000'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 24 25" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Share2.tsx b/apps/wallet-mobile/src/components/Icon/Share2.tsx
index 4efc74fcb1..a0b0280f60 100644
--- a/apps/wallet-mobile/src/components/Icon/Share2.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Share2.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Share2 = ({size = 24, color = 'black'}: Props) => (
+export const Share2 = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M11.293 2.293a1 1 0 011.414 0l4 4a1 1 0 01-1.414 1.414L13 5.414V16a1 1 0 11-2 0V5.414L8.707 7.707a1 1 0 01-1.414-1.414l4-4z"
diff --git a/apps/wallet-mobile/src/components/Icon/SliderSettings.tsx b/apps/wallet-mobile/src/components/Icon/SliderSettings.tsx
index dcdce074ed..fe2c987412 100644
--- a/apps/wallet-mobile/src/components/Icon/SliderSettings.tsx
+++ b/apps/wallet-mobile/src/components/Icon/SliderSettings.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const SliderSettings = ({size = 36, color = 'black'}: Props) => (
+export const SliderSettings = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/SortTable.tsx b/apps/wallet-mobile/src/components/Icon/SortTable.tsx
index 19f2ac4b2a..8d33e0acd2 100644
--- a/apps/wallet-mobile/src/components/Icon/SortTable.tsx
+++ b/apps/wallet-mobile/src/components/Icon/SortTable.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const SortTable = ({size = 36, color = 'black'}: Props) => (
+export const SortTable = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M11.5588 18.7626C11.614 18.8372 11.682 18.897 11.758 18.9379C11.834 18.9788 11.9164 19 11.9998 19C12.0832 19 12.1656 18.9788 12.2416 18.9379C12.3177 18.897 12.3856 18.8372 12.4409 18.7626L15.8494 14.1753C16.1883 13.7204 15.9179 13 15.4084 13H8.59124C8.08228 13 7.81187 13.7204 8.15018 14.176L11.5588 18.7626Z"
diff --git a/apps/wallet-mobile/src/components/Icon/SpectrumSwap.tsx b/apps/wallet-mobile/src/components/Icon/SpectrumSwap.tsx
index 502012c011..2434cf3791 100644
--- a/apps/wallet-mobile/src/components/Icon/SpectrumSwap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/SpectrumSwap.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {ClipPath, Defs, G, Path, Rect} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const SpectrumSwap = ({size = 36}: Props) => (
+export const SpectrumSwap = ({size = 36}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 44 41" fill="none">
     <G clipPath="url(#clip0_8294_205086)">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Square.tsx b/apps/wallet-mobile/src/components/Icon/Square.tsx
index 9ae0ae0d95..c65e7241b2 100644
--- a/apps/wallet-mobile/src/components/Icon/Square.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Square.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Square = ({size = 24, color = 'black'}: Props) => (
+export const Square = ({size = 24, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Staking.tsx b/apps/wallet-mobile/src/components/Icon/Staking.tsx
index 0db2bc089e..2e95b2a980 100644
--- a/apps/wallet-mobile/src/components/Icon/Staking.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Staking.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Staking = ({size = 36, color = 'black'}: Props) => (
+export const Staking = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/StakingKeyDeregistered.tsx b/apps/wallet-mobile/src/components/Icon/StakingKeyDeregistered.tsx
index 45bb46e63a..f6824d03ed 100644
--- a/apps/wallet-mobile/src/components/Icon/StakingKeyDeregistered.tsx
+++ b/apps/wallet-mobile/src/components/Icon/StakingKeyDeregistered.tsx
@@ -1,14 +1,10 @@
 import React from 'react'
 import Svg, {Circle, G, Line, Path, Rect} from 'react-native-svg'
 
-type Props = {
-  width?: number
-  height?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const StakingKeyDeregistered = ({width = 36, height = 36, color = '#6B7384'}: Props) => (
-  <Svg viewBox="0 0 36 36" {...{width, height}}>
+export const StakingKeyDeregistered = ({size = 36, color = '#6B7384'}: IconProps) => (
+  <Svg viewBox="0 0 36 36" width={size} height={size}>
     <G stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
       <G transform="translate(-760.000000, -305.000000)">
         <G transform="translate(760.000000, 305.000000)">
diff --git a/apps/wallet-mobile/src/components/Icon/StakingKeyRegistered.tsx b/apps/wallet-mobile/src/components/Icon/StakingKeyRegistered.tsx
index 9c6177c453..8c22891453 100644
--- a/apps/wallet-mobile/src/components/Icon/StakingKeyRegistered.tsx
+++ b/apps/wallet-mobile/src/components/Icon/StakingKeyRegistered.tsx
@@ -1,14 +1,10 @@
 import React from 'react'
 import Svg, {G, Line, Path, Polyline, Rect} from 'react-native-svg'
 
-type Props = {
-  width?: number
-  height?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const StakingKeyRegistered = ({width = 36, height = 36, color = '#6B7384'}: Props) => (
-  <Svg viewBox="0 0 36 36" {...{width, height}}>
+export const StakingKeyRegistered = ({size = 36, color = '#6B7384'}: IconProps) => (
+  <Svg viewBox="0 0 36 36" width={size} height={size}>
     <G stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
       <G transform="translate(-760.000000, -245.000000)">
         <G transform="translate(760.000000, 245.000000)">
diff --git a/apps/wallet-mobile/src/components/Icon/StarFilled.tsx b/apps/wallet-mobile/src/components/Icon/StarFilled.tsx
index 9ff5d7370f..b09a498ae4 100644
--- a/apps/wallet-mobile/src/components/Icon/StarFilled.tsx
+++ b/apps/wallet-mobile/src/components/Icon/StarFilled.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const StarFilled = ({size = 36, color = 'black'}: Props) => (
+export const StarFilled = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/StarOutlined.tsx b/apps/wallet-mobile/src/components/Icon/StarOutlined.tsx
index 7fd88f01c8..44f791ec4f 100644
--- a/apps/wallet-mobile/src/components/Icon/StarOutlined.tsx
+++ b/apps/wallet-mobile/src/components/Icon/StarOutlined.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const StarOutlined = ({size = 36, color = 'black'}: Props) => (
+export const StarOutlined = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/SundaeSwap.tsx b/apps/wallet-mobile/src/components/Icon/SundaeSwap.tsx
index c11744f735..1cf9d1c3bd 100644
--- a/apps/wallet-mobile/src/components/Icon/SundaeSwap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/SundaeSwap.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const SundaeSwap = ({size = 36}: Props) => (
+export const SundaeSwap = ({size = 36}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 85.489 83.521" fill="none">
     <Path
       fill="#6b7495"
diff --git a/apps/wallet-mobile/src/components/Icon/Support.tsx b/apps/wallet-mobile/src/components/Icon/Support.tsx
index db1efa4b0e..9df84e1285 100644
--- a/apps/wallet-mobile/src/components/Icon/Support.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Support.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Support = ({size = 36, color = 'black'}: Props) => (
+export const Support = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Swap.tsx b/apps/wallet-mobile/src/components/Icon/Swap.tsx
index 7881c4d56f..c1e0f69048 100644
--- a/apps/wallet-mobile/src/components/Icon/Swap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Swap.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const Swap = ({size = 24, color}: Props) => (
+export const Swap = ({size = 24, color}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
     <Path
       d="M16.793 2.293a1 1 0 011.414 0l4 4a1 1 0 01-1.414 1.414L18.5 5.414V15a1 1 0 11-2 0V5.414l-2.293 2.293a1 1 0 11-1.414-1.414l4-4zM8.5 9a1 1 0 00-2 0v9.586l-2.293-2.293a1 1 0 00-1.414 1.414l4 4a1 1 0 001.414 0l4-4a1 1 0 00-1.414-1.414L8.5 18.586V9z"
diff --git a/apps/wallet-mobile/src/components/Icon/Switch.tsx b/apps/wallet-mobile/src/components/Icon/Switch.tsx
index 212273fdd8..eb47a890a4 100644
--- a/apps/wallet-mobile/src/components/Icon/Switch.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Switch.tsx
@@ -2,9 +2,9 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size: number; color?: string}
+import {IconProps} from './type'
 
-export const Switch = (props: Props) => {
+export const Switch = (props: IconProps) => {
   const {color: colors} = useTheme()
   const {size, color = colors.primary_500} = props
   return (
diff --git a/apps/wallet-mobile/src/components/Icon/TabDiscover.tsx b/apps/wallet-mobile/src/components/Icon/TabDiscover.tsx
index f8e50ad87d..3c28ed7d6c 100644
--- a/apps/wallet-mobile/src/components/Icon/TabDiscover.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabDiscover.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabDiscover = ({size = 36, color = 'black'}: Props) => (
+export const TabDiscover = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/TabDiscoverActive.tsx b/apps/wallet-mobile/src/components/Icon/TabDiscoverActive.tsx
index bb5b85c702..8a5804eac8 100644
--- a/apps/wallet-mobile/src/components/Icon/TabDiscoverActive.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabDiscoverActive.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabDiscoverActive = ({size = 24, color = '#6B7384'}: Props) => {
+export const TabDiscoverActive = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/TabMenu.tsx b/apps/wallet-mobile/src/components/Icon/TabMenu.tsx
index 875369154a..e227094d30 100644
--- a/apps/wallet-mobile/src/components/Icon/TabMenu.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabMenu.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabMenu = ({size = 36, color = 'black'}: Props) => (
+export const TabMenu = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size - 1} viewBox="0 0 25 24" fill="none">
     <G fill={color}>
       <Path d="M7.125 7a1 1 0 000 2h10a1 1 0 100-2h-10zM6.125 12a1 1 0 011-1h10a1 1 0 110 2h-10a1 1 0 01-1-1zM7.125 15a1 1 0 100 2h10a1 1 0 100-2h-10z" />
diff --git a/apps/wallet-mobile/src/components/Icon/TabMenuActive.tsx b/apps/wallet-mobile/src/components/Icon/TabMenuActive.tsx
index 9d8d8671a7..927f4fe765 100644
--- a/apps/wallet-mobile/src/components/Icon/TabMenuActive.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabMenuActive.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabMenuActive = ({size = 24, color = '#6B7384'}: Props) => {
+export const TabMenuActive = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/TabPortfolio.tsx b/apps/wallet-mobile/src/components/Icon/TabPortfolio.tsx
index 97230c5788..7e3685272f 100644
--- a/apps/wallet-mobile/src/components/Icon/TabPortfolio.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabPortfolio.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const TabPortfolio = ({size = 24, color = '#6B7384'}: Props) => (
+export const TabPortfolio = ({size = 24, color = '#6B7384'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <Path
       d="M10.625 3h-6a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1V4a1 1 0 00-1-1zm-1 6h-4V5h4v4zm11 4h-6a1 1 0 00-1 1v6a1 1 0 001 1h6a1 1 0 001-1v-6a1 1 0 00-1-1zm-1 6h-4v-4h4v4zm-2-16c-2.206 0-4 1.794-4 4s1.794 4 4 4 4-1.794 4-4-1.794-4-4-4zm0 6c-1.103 0-2-.897-2-2s.897-2 2-2 2 .897 2 2-.897 2-2 2zm-10 4c-2.206 0-4 1.794-4 4s1.794 4 4 4 4-1.794 4-4-1.794-4-4-4zm0 6c-1.103 0-2-.897-2-2s.897-2 2-2 2 .897 2 2-.897 2-2 2z"
diff --git a/apps/wallet-mobile/src/components/Icon/TabPortfolioActive.tsx b/apps/wallet-mobile/src/components/Icon/TabPortfolioActive.tsx
index 361d82e17d..bc4cdbf95d 100644
--- a/apps/wallet-mobile/src/components/Icon/TabPortfolioActive.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabPortfolioActive.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabPortfolioActive = ({size = 24, color = '#6B7384'}: Props) => {
+export const TabPortfolioActive = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/TabStaking.tsx b/apps/wallet-mobile/src/components/Icon/TabStaking.tsx
index c7bb50cb83..0b9b9ec88e 100644
--- a/apps/wallet-mobile/src/components/Icon/TabStaking.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabStaking.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import Svg, {G, Path} from 'react-native-svg'
 
-type Props = {size?: number; color?: string}
+import {IconProps} from './type'
 
-export const TabStaking = ({size = 24, color = '#6B7384'}: Props) => (
+export const TabStaking = ({size = 24, color = '#6B7384'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24">
     <G stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
       <G transform="translate(2.751854, 2.000000)" fill={color} fillRule="nonzero">
diff --git a/apps/wallet-mobile/src/components/Icon/TabWallet.tsx b/apps/wallet-mobile/src/components/Icon/TabWallet.tsx
index 18b62b1151..480f8394e2 100644
--- a/apps/wallet-mobile/src/components/Icon/TabWallet.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabWallet.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabWallet = ({size = 24, color = '#6B7384'}: Props) => {
+export const TabWallet = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/TabWalletActive.tsx b/apps/wallet-mobile/src/components/Icon/TabWalletActive.tsx
index 4b05bff9d2..313f37d796 100644
--- a/apps/wallet-mobile/src/components/Icon/TabWalletActive.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TabWalletActive.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TabWalletActive = ({size = 24, color = '#6B7384'}: Props) => {
+export const TabWalletActive = ({size = 24, color = '#6B7384'}: IconProps) => {
   return (
     <Svg width={size} height={size - 1} viewBox="0 0 25 24" fill="none">
       <Path
diff --git a/apps/wallet-mobile/src/components/Icon/Table.tsx b/apps/wallet-mobile/src/components/Icon/Table.tsx
index dd5f73deff..11939d66d9 100644
--- a/apps/wallet-mobile/src/components/Icon/Table.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Table.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Table = ({size = 36, color = 'black'}: Props) => (
+export const Table = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Telegram.tsx b/apps/wallet-mobile/src/components/Icon/Telegram.tsx
index 157a0d3e73..e0b4092e39 100644
--- a/apps/wallet-mobile/src/components/Icon/Telegram.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Telegram.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Telegram = ({size = 36, color = 'black'}: Props) => (
+export const Telegram = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M20.65 4.1052L2.93388 10.6219C1.72482 11.0851 1.73182 11.7285 2.71205 12.0154L7.2605 13.3689L17.7843 7.03519C18.2819 6.74638 18.7365 6.90175 18.3628 7.21819L9.83648 14.5584H9.83448L9.83648 14.5594L9.52273 19.0315C9.98237 19.0315 10.1852 18.8304 10.443 18.5931L12.6523 16.5438L17.2477 19.7817C18.095 20.2268 18.7036 19.998 18.9144 19.0334L21.931 5.47202C22.2398 4.29107 21.4584 3.75635 20.65 4.1052Z"
diff --git a/apps/wallet-mobile/src/components/Icon/TermsOfUse.tsx b/apps/wallet-mobile/src/components/Icon/TermsOfUse.tsx
index 31129e5070..ce7d7e1975 100644
--- a/apps/wallet-mobile/src/components/Icon/TermsOfUse.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TermsOfUse.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TermsOfUse = ({size = 36, color = 'black'}: Props) => (
+export const TermsOfUse = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Theme.tsx b/apps/wallet-mobile/src/components/Icon/Theme.tsx
index 6866c7ed53..df6db5d239 100644
--- a/apps/wallet-mobile/src/components/Icon/Theme.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Theme.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Theme = ({size = 20, color = '#6B7384'}: Props) => (
+export const Theme = ({size = 20, color = '#6B7384'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 20 20" fill="none">
     <Path
       d="M16 8.5C16 9.32843 15.3284 10 14.5 10C13.6716 10 13 9.32843 13 8.5C13 7.67157 13.6716 7 14.5 7C15.3284 7 16 7.67157 16 8.5Z"
diff --git a/apps/wallet-mobile/src/components/Icon/ThumbsUp.tsx b/apps/wallet-mobile/src/components/Icon/ThumbsUp.tsx
index c7eede7d13..0f1f26bb79 100644
--- a/apps/wallet-mobile/src/components/Icon/ThumbsUp.tsx
+++ b/apps/wallet-mobile/src/components/Icon/ThumbsUp.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const ThumbsUp = ({size = 36, color = 'black'}: Props) => (
+export const ThumbsUp = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Tokens.tsx b/apps/wallet-mobile/src/components/Icon/Tokens.tsx
index 4305748546..6878609755 100644
--- a/apps/wallet-mobile/src/components/Icon/Tokens.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Tokens.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Tokens = ({size = 36, color = 'black'}: Props) => (
+export const Tokens = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M9.83203 6.4453C9.64657 6.1671 9.33434 6 8.99998 6C8.66563 6 8.3534 6.1671 8.16793 6.4453L6.16793 9.4453C5.86158 9.90483 5.98576 10.5257 6.44528 10.8321C6.90481 11.1384 7.52568 11.0142 7.83203 10.5547L8.99998 8.80278L10.1679 10.5547C10.4743 11.0142 11.0952 11.1384 11.5547 10.8321C12.0142 10.5257 12.1384 9.90483 11.832 9.4453L9.83203 6.4453Z"
diff --git a/apps/wallet-mobile/src/components/Icon/TotalAda.tsx b/apps/wallet-mobile/src/components/Icon/TotalAda.tsx
index 8b5a05fe75..a23c306fbb 100644
--- a/apps/wallet-mobile/src/components/Icon/TotalAda.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TotalAda.tsx
@@ -1,17 +1,12 @@
 import React from 'react'
 import Svg, {Circle, G, Path} from 'react-native-svg'
 
-type Props = {
-  width: number
-  height: number
-  backgroundColor?: string
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TotalAda = ({width, height, backgroundColor = '#F0F3F5', color = 'black'}: Props) => (
-  <Svg viewBox="0 0 44 44" {...{width, height}}>
+export const TotalAda = ({size = 44, color = 'black'}: IconProps) => (
+  <Svg viewBox="0 0 44 44" width={size} height={size}>
     <G id="icon/total-ada.inline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-      <G id="icon/bg-for-icon" fill={backgroundColor}>
+      <G id="icon/bg-for-icon" fill="#F0F3F5">
         <Circle id="Oval-Copy-4" cx="22" cy="22" r="22" />
       </G>
 
diff --git a/apps/wallet-mobile/src/components/Icon/TotalDelegated.tsx b/apps/wallet-mobile/src/components/Icon/TotalDelegated.tsx
index 0bd68f8611..7bbf2c373d 100644
--- a/apps/wallet-mobile/src/components/Icon/TotalDelegated.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TotalDelegated.tsx
@@ -1,17 +1,12 @@
 import React from 'react'
 import Svg, {Circle, G, Path} from 'react-native-svg'
 
-type Props = {
-  width: number
-  height: number
-  backgroundColor?: string
-  color?: string
-}
-
-export const TotalDelegated = ({width, height, backgroundColor = '#F0F3F5', color = 'black'}: Props) => (
-  <Svg viewBox="0 0 44 44" {...{width, height}}>
+import {IconProps} from './type'
+
+export const TotalDelegated = ({size = 44, color = 'black'}: IconProps) => (
+  <Svg viewBox="0 0 44 44" width={size} height={size}>
     <G id="icon/total-delegated.inline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-      <G id="icon/bg-for-icon" fill={backgroundColor}>
+      <G id="icon/bg-for-icon" fill="#F0F3F5">
         <Circle id="Oval-Copy-4" cx="22" cy="22" r="22" />
       </G>
 
diff --git a/apps/wallet-mobile/src/components/Icon/TotalReward.tsx b/apps/wallet-mobile/src/components/Icon/TotalReward.tsx
index abd57a00df..7a80d8824f 100644
--- a/apps/wallet-mobile/src/components/Icon/TotalReward.tsx
+++ b/apps/wallet-mobile/src/components/Icon/TotalReward.tsx
@@ -1,17 +1,12 @@
 import React from 'react'
 import Svg, {Circle, G, Path} from 'react-native-svg'
 
-type Props = {
-  width: number
-  height: number
-  backgroundColor?: string
-  color?: string
-}
+import {IconProps} from './type'
 
-export const TotalReward = ({width, height, backgroundColor = '#F0F3F5', color = 'black'}: Props) => (
-  <Svg viewBox="0 0 44 44" {...{width, height}}>
+export const TotalReward = ({size = 44, color = 'black'}: IconProps) => (
+  <Svg viewBox="0 0 44 44" width={size} height={size}>
     <G id="icon/total-rewards.inline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-      <G id="icon/bg-for-icon" fill={backgroundColor}>
+      <G id="icon/bg-for-icon" fill="#F0F3F5">
         <Circle id="Oval-Copy-4" cx="22" cy="22" r="22" />
       </G>
 
diff --git a/apps/wallet-mobile/src/components/Icon/Transaction.tsx b/apps/wallet-mobile/src/components/Icon/Transaction.tsx
index 2dd0df696c..cf5b131ab9 100644
--- a/apps/wallet-mobile/src/components/Icon/Transaction.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Transaction.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Transaction = ({size = 24, color = '#242838'}: Props) => (
+export const Transaction = ({size = 24, color = '#242838'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path
       d="M7.445 8.168a1 1 0 00-.277 1.387L8.798 12l-1.63 2.445a1 1 0 101.664 1.11l2-3a1 1 0 000-1.11l-2-3a1 1 0 00-1.387-.277zM16.832 9.555a1 1 0 00-1.664-1.11l-2 3a1 1 0 000 1.11l2 3a1 1 0 001.664-1.11L15.202 12l1.63-2.445z"
diff --git a/apps/wallet-mobile/src/components/Icon/Twitter.tsx b/apps/wallet-mobile/src/components/Icon/Twitter.tsx
index 593e9cbc28..79636b30e5 100644
--- a/apps/wallet-mobile/src/components/Icon/Twitter.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Twitter.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Twitter = ({size = 36, color = 'black'}: Props) => (
+export const Twitter = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M19.9452 7.98747C19.9585 8.16289 19.9585 8.3373 19.9585 8.51172C19.9585 13.8494 15.8337 20 8.29554 20C5.97313 20 3.81559 19.3374 2 18.1867C2.32974 18.2238 2.64726 18.2368 2.99023 18.2368C4.83533 18.2412 6.62818 17.6335 8.07979 16.5117C7.22432 16.4965 6.39505 16.2185 5.70775 15.7166C5.02046 15.2146 4.50945 14.5139 4.24608 13.7121C4.49949 13.7492 4.75392 13.7742 5.02056 13.7742C5.38795 13.7742 5.75738 13.7241 6.10035 13.6369C5.17195 13.4523 4.33714 12.9566 3.73786 12.2342C3.13857 11.5119 2.81182 10.6073 2.81315 9.67448V9.62436C3.35966 9.92407 3.99369 10.1115 4.66538 10.1366C4.10268 9.76828 3.64128 9.26854 3.32235 8.68191C3.00342 8.09528 2.83687 7.44003 2.83757 6.77459C2.83757 6.02481 3.0401 5.33718 3.39528 4.73775C4.42534 5.98574 5.71006 7.0067 7.16623 7.73453C8.6224 8.46235 10.2175 8.88081 11.8484 8.96279C11.7853 8.66207 11.7466 8.35033 11.7466 8.03759C11.7463 7.50729 11.8522 6.98214 12.0581 6.49216C12.264 6.00218 12.5659 5.55697 12.9467 5.182C13.3274 4.80702 13.7794 4.50962 14.2769 4.30681C14.7743 4.10399 15.3075 3.99974 15.8459 4C17.0265 4 18.092 4.48716 18.841 5.27503C19.7588 5.10023 20.6389 4.77025 21.4423 4.29971C21.1364 5.23274 20.4956 6.02391 19.6399 6.525C20.4539 6.43356 21.2494 6.22273 22 5.89951C21.4394 6.70452 20.7447 7.41044 19.9452 7.98747Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Usb.tsx b/apps/wallet-mobile/src/components/Icon/Usb.tsx
index 0ebb57c3aa..601207ae9c 100644
--- a/apps/wallet-mobile/src/components/Icon/Usb.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Usb.tsx
@@ -1,14 +1,11 @@
 import * as React from 'react'
-import Svg, {Path, SvgProps} from 'react-native-svg'
+import Svg, {Path} from 'react-native-svg'
 
-type Props = SvgProps & {
-  color?: string
-  size?: number
-}
+import {IconProps} from './type'
 
-export const Usb = ({color = '#4B6DDE', size = 25, ...props}: Props) => {
+export const Usb = ({color = '#4B6DDE', size = 25}: IconProps) => {
   return (
-    <Svg width={size} height={size} viewBox="0 0 25 25" fill="none" {...props}>
+    <Svg width={size} height={size} viewBox="0 0 25 25" fill="none">
       <Path
         d="M16.5 10h1v2h-4V6h2l-3-4-3 4h2v8h-4v-2.277a1.992 1.992 0 00.414-3.137A2 2 0 004.5 10c0 .738.404 1.376 1 1.723V14c0 1.103.897 2 2 2h4v2.277a1.99 1.99 0 00-.414 3.137A2 2 0 0014.5 20c0-.738-.404-1.376-1-1.723V14h4c1.103 0 2-.897 2-2v-2h1V6h-4v4z"
         fill={color}
diff --git a/apps/wallet-mobile/src/components/Icon/Verify.tsx b/apps/wallet-mobile/src/components/Icon/Verify.tsx
index d75b9027d8..d5828390a6 100644
--- a/apps/wallet-mobile/src/components/Icon/Verify.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Verify.tsx
@@ -1,13 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-  backgroundColor?: string
-}
+import {IconProps} from './type'
 
-export const Verify = ({size = 40, color = 'black'}: Props) => (
+export const Verify = ({size = 40, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M16.7071 10.7071C17.0976 10.3166 17.0976 9.68342 16.7071 9.29289C16.3166 8.90237 15.6834 8.90237 15.2929 9.29289L11 13.5858L8.70711 11.2929C8.31658 10.9024 7.68342 10.9024 7.29289 11.2929C6.90237 11.6834 6.90237 12.3166 7.29289 12.7071L10.2929 15.7071C10.6834 16.0976 11.3166 16.0976 11.7071 15.7071L16.7071 10.7071Z"
diff --git a/apps/wallet-mobile/src/components/Icon/VyfiSwap.tsx b/apps/wallet-mobile/src/components/Icon/VyfiSwap.tsx
index 2aa521ce35..768fd71f63 100644
--- a/apps/wallet-mobile/src/components/Icon/VyfiSwap.tsx
+++ b/apps/wallet-mobile/src/components/Icon/VyfiSwap.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const VyfiSwap = ({size = 36}: Props) => (
+export const VyfiSwap = ({size = 36}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 40 40" fill="none">
     <Path
       d="M21.6886 0C21.7946 0.217 22.0656 0.025 22.1886 0.2C22.3406 0.272 22.4886 0.291 22.6016 0.486C22.8366 0.892 23.2856 1.105 23.6416 1.401C25.1216 2.635 26.6126 3.856 28.1126 5.065C29.7686 6.4 31.4076 7.759 33.1076 9.04C34.7426 10.271 36.3216 11.573 37.9376 12.829C38.1626 13.004 38.3786 13.188 38.6876 13.182C38.9196 13.55 39.0496 13.952 39.0876 14.385C39.0996 14.605 38.9396 14.527 38.8596 14.492C37.3366 13.832 35.8416 13.117 34.4596 12.186C34.3926 12.029 34.2796 11.915 34.1426 11.812C31.7556 10.012 29.4216 8.142 27.0526 6.318C26.1476 5.621 25.3116 4.83 24.3186 4.249C24.0176 4.133 23.9006 3.832 23.6916 3.624C22.6336 2.57 21.6156 1.473 20.4086 0.579C20.2506 0.462 19.9736 0.361 20.1326 0.057C20.3506 0.024 20.5786 0.106 20.7896 0H21.6896H21.6886Z"
diff --git a/apps/wallet-mobile/src/components/Icon/Wallet.tsx b/apps/wallet-mobile/src/components/Icon/Wallet.tsx
index 48e7ed88fe..4de9193d1a 100644
--- a/apps/wallet-mobile/src/components/Icon/Wallet.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Wallet.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Wallet = ({size = 36, color = 'black'}: Props) => (
+export const Wallet = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/WalletAvatar.tsx b/apps/wallet-mobile/src/components/Icon/WalletAvatar.tsx
index b0e0327187..b12a5bff14 100644
--- a/apps/wallet-mobile/src/components/Icon/WalletAvatar.tsx
+++ b/apps/wallet-mobile/src/components/Icon/WalletAvatar.tsx
@@ -3,13 +3,9 @@ import {Image} from 'expo-image'
 import React from 'react'
 import {StyleSheet, View, ViewStyle} from 'react-native'
 
-type Props = {
-  image: string
-  style?: ViewStyle
-  size?: number
-}
+import {IconProps} from './type'
 
-export const WalletAvatar = ({image = '', size = 40, style}: Props) => {
+export const WalletAvatar = ({image = '', size = 40, style}: IconProps & {image?: string; style?: ViewStyle}) => {
   const styles = useStyles()
 
   return (
diff --git a/apps/wallet-mobile/src/components/Icon/WalletStack.tsx b/apps/wallet-mobile/src/components/Icon/WalletStack.tsx
index ee59271f41..e9085b64dc 100644
--- a/apps/wallet-mobile/src/components/Icon/WalletStack.tsx
+++ b/apps/wallet-mobile/src/components/Icon/WalletStack.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const WalletStack = ({size = 36, color = 'black'}: Props) => (
+export const WalletStack = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path d="M8 2C6.89543 2 6 2.89543 6 4H18C18 2.89543 17.1046 2 16 2H8Z" fill={color} />
 
diff --git a/apps/wallet-mobile/src/components/Icon/Wallets.tsx b/apps/wallet-mobile/src/components/Icon/Wallets.tsx
index b7be443805..ff51435988 100644
--- a/apps/wallet-mobile/src/components/Icon/Wallets.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Wallets.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Wallets = ({size = 36, color = 'black'}: Props) => (
+export const Wallets = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       fillRule="evenodd"
diff --git a/apps/wallet-mobile/src/components/Icon/Warning.tsx b/apps/wallet-mobile/src/components/Icon/Warning.tsx
index 8517a9c920..01f6b5fbac 100644
--- a/apps/wallet-mobile/src/components/Icon/Warning.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Warning.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const Warning = ({size = 36, color = 'black'}: Props) => (
+export const Warning = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
     <Path d="M12 8a1 1 0 011 1v4a1 1 0 11-2 0V9a1 1 0 011-1zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z" fill={color} />
 
diff --git a/apps/wallet-mobile/src/components/Icon/WingRiders.tsx b/apps/wallet-mobile/src/components/Icon/WingRiders.tsx
index 6aa8c7656a..5fdf38fd4f 100644
--- a/apps/wallet-mobile/src/components/Icon/WingRiders.tsx
+++ b/apps/wallet-mobile/src/components/Icon/WingRiders.tsx
@@ -2,10 +2,9 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
-export const WingRiders = ({size = 36}: Props) => {
+import {IconProps} from './type'
+
+export const WingRiders = ({size = 36}: IconProps) => {
   const {color} = useTheme()
 
   return (
diff --git a/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx b/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
index 4bcda88191..20aeb40c37 100644
--- a/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
@@ -1,11 +1,9 @@
 import React from 'react'
 import Svg, {Defs, LinearGradient, Path, Rect, Stop} from 'react-native-svg'
 
-type Props = {
-  size?: number
-}
+import {IconProps} from './type'
 
-export const YoroiApp = ({size = 36}: Props) => {
+export const YoroiApp = ({size = 36}: IconProps) => {
   return (
     <Svg width={size} height={size} viewBox="0 0 49 48" fill="none">
       <Rect x={0.5} width={48} height={48} rx={8} fill="url(#paint0_linear_16084_126466)" />
diff --git a/apps/wallet-mobile/src/components/Icon/YoroiNightly.tsx b/apps/wallet-mobile/src/components/Icon/YoroiNightly.tsx
index 64fdfa8715..73c6bdbf27 100644
--- a/apps/wallet-mobile/src/components/Icon/YoroiNightly.tsx
+++ b/apps/wallet-mobile/src/components/Icon/YoroiNightly.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import Svg, {Path} from 'react-native-svg'
 
-type Props = {
-  size?: number
-  color?: string
-}
+import {IconProps} from './type'
 
-export const YoroiNightly = ({size = 36, color = 'black'}: Props) => (
+export const YoroiNightly = ({size = 36, color = 'black'}: IconProps) => (
   <Svg width={size} height={size} viewBox="-2 -2 28 28">
     <Path
       d="M21.4376 16.0369C21.5294 16.0559 21.6134 16.1019 21.6788 16.169C21.7434 16.2373 21.7859 16.3235 21.8009 16.4163C21.816 16.5091 21.8028 16.6043 21.7631 16.6895C21.0174 18.2978 19.8905 19.6996 18.4802 20.7732C17.07 21.8469 15.419 22.5598 13.6707 22.85C11.9224 23.1403 10.1297 22.9991 8.44832 22.4388C6.76696 21.8785 5.2478 20.9159 4.0228 19.6348C2.7978 18.3537 1.90402 16.7927 1.41911 15.0875C0.934202 13.3823 0.872828 11.5845 1.24032 9.85017C1.60781 8.11586 2.39306 6.49754 3.52784 5.1358C4.66262 3.77406 6.1126 2.71009 7.75183 2.03633C7.83918 1.99933 7.93571 1.98975 8.02863 2.00886C8.12154 2.02797 8.20646 2.07487 8.27213 2.14334C8.33781 2.21182 8.38113 2.29863 8.39638 2.39229C8.41162 2.48595 8.39806 2.58204 8.35749 2.66781C7.51042 4.4833 7.23133 6.51242 7.55677 8.4893C7.88222 10.4662 8.79702 12.2986 10.1813 13.7465C11.5656 15.1944 13.3549 16.1902 15.3146 16.6034C17.2743 17.0166 19.3131 16.828 21.1638 16.0623C21.2505 16.0267 21.3459 16.0179 21.4376 16.0369Z"
diff --git a/apps/wallet-mobile/src/components/Icon/YoroiWallet.tsx b/apps/wallet-mobile/src/components/Icon/YoroiWallet.tsx
index e90c453dd9..4f8f337e76 100644
--- a/apps/wallet-mobile/src/components/Icon/YoroiWallet.tsx
+++ b/apps/wallet-mobile/src/components/Icon/YoroiWallet.tsx
@@ -1,15 +1,11 @@
-import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import Svg, {G, Path, Polygon} from 'react-native-svg'
 
-type Props = {width?: number; height?: number; color?: string}
-
-export const YoroiWallet = (props: Props) => {
-  const {color: colors} = useTheme()
-  const {width = 210, height = 60, color = colors.white_static} = props
+import {IconProps} from './type'
 
+export const YoroiWallet = ({color = 'white', size = 210}: IconProps) => {
   return (
-    <Svg width={width} height={height} viewBox="0 0 210 60">
+    <Svg width={size} height={size / 3.5} viewBox="0 0 210 60">
       <G id="logo-yoroi" fill="none">
         <G id="logo">
           <G id="Group">
diff --git a/apps/wallet-mobile/src/components/Icon/type.ts b/apps/wallet-mobile/src/components/Icon/type.ts
new file mode 100644
index 0000000000..2c84766433
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Icon/type.ts
@@ -0,0 +1,4 @@
+export type IconProps = {
+  size?: number
+  color?: string
+}
diff --git a/apps/wallet-mobile/src/components/ModalError/ModalError.tsx b/apps/wallet-mobile/src/components/ModalError/ModalError.tsx
index e3b0766583..f6577e2803 100644
--- a/apps/wallet-mobile/src/components/ModalError/ModalError.tsx
+++ b/apps/wallet-mobile/src/components/ModalError/ModalError.tsx
@@ -9,7 +9,7 @@ import {
   LedgerUserError,
   RejectedByUserError,
 } from '../../yoroi-wallets/hw/hw'
-import {Button} from '../Button/Button'
+import {Button, ButtonType} from '../Button/Button'
 import {Icon} from '../Icon'
 import {Space} from '../Space/Space'
 import {Text} from '../Text'
@@ -37,11 +37,11 @@ export const ModalError = ({error, resetErrorBoundary, onCancel}: Props) => {
       </View>
 
       <View style={styles.buttons}>
-        <Button shelleyTheme outlineOnLight block onPress={onCancel} title={strings.cancel} />
+        <Button size="S" type={ButtonType.Secondary} onPress={onCancel} title={strings.cancel} />
 
         <Space width="lg" />
 
-        <Button shelleyTheme block onPress={resetErrorBoundary} title={strings.tryAgain} />
+        <Button size="S" onPress={resetErrorBoundary} title={strings.tryAgain} />
       </View>
     </>
   )
diff --git a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.stories.tsx b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.stories.tsx
index 9e59d4775c..9b03ef553e 100644
--- a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.stories.tsx
+++ b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.stories.tsx
@@ -17,7 +17,6 @@ storiesOf('Receive ShareQRCodeCard', module)
       onLongPress={action('onLongPress')}
       title="Title"
       shareLabel="share label"
-      copiedText="copied text"
     />
   ))
 
diff --git a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
index 70728ff47e..420672cf98 100644
--- a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
+++ b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
@@ -1,10 +1,16 @@
 import {useTheme} from '@yoroi/theme'
 import _ from 'lodash'
 import * as React from 'react'
-import {StyleSheet, TouchableOpacity, TouchableWithoutFeedback, useWindowDimensions, View} from 'react-native'
+import {
+  GestureResponderEvent,
+  StyleSheet,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  useWindowDimensions,
+  View,
+} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 import QRCode from 'react-native-qrcode-svg'
-import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated'
 import Share from 'react-native-share'
 import ViewShot, {captureRef} from 'react-native-view-shot'
 
@@ -16,24 +22,20 @@ type ShareQRCodeCardProps = {
   qrContent: string
   shareContent: string
   title: string
-  isCopying?: boolean
-  onLongPress: () => void
-  testId?: string
+  onLongPress: (event: GestureResponderEvent) => void
+  testID?: string
   onShare?: () => void
   shareLabel: string
-  copiedText: string
 }
 
 export const ShareQRCodeCard = ({
   qrContent,
   shareContent,
   title,
-  isCopying,
   onLongPress,
-  testId,
+  testID,
   onShare,
   shareLabel,
-  copiedText,
 }: ShareQRCodeCardProps) => {
   const {styles, colors, qrSize} = useStyles()
 
@@ -84,12 +86,12 @@ export const ShareQRCodeCard = ({
 
           <Spacer height={16} />
 
-          <Text style={styles.title} testID={`${testId}-title`}>
+          <Text style={styles.title} testID={`${testID}-title`}>
             {title}
           </Text>
 
           <View style={styles.addressContainer}>
-            <View style={styles.qrCode} testID={`${testId}-qr`}>
+            <View style={styles.qrCode} testID={`${testID}-qr`}>
               <QRCode value={qrContent} size={qrSize} backgroundColor={colors.white} color={colors.black} />
             </View>
 
@@ -102,12 +104,6 @@ export const ShareQRCodeCard = ({
             <Text style={styles.textShareAddress}>{shareLabel}</Text>
           </TouchableOpacity>
         </View>
-
-        {isCopying && (
-          <Animated.View layout={Layout} entering={FadeInDown} exiting={FadeOutDown} style={styles.isCopying}>
-            <Text style={styles.copiedText}>{copiedText}</Text>
-          </Animated.View>
-        )}
       </>
     </TouchableWithoutFeedback>
   )
@@ -156,22 +152,6 @@ const useStyles = () => {
       textTransform: 'uppercase',
       letterSpacing: 0.5,
     },
-    copiedText: {
-      color: color.gray_min,
-      textAlign: 'center',
-      padding: 8,
-      ...atoms.body_2_md_medium,
-    },
-    isCopying: {
-      position: 'absolute',
-      backgroundColor: color.gray_max,
-      alignItems: 'center',
-      justifyContent: 'center',
-      bottom: 60,
-      alignSelf: 'center',
-      borderRadius: 4,
-      zIndex: 10,
-    },
   })
 
   const colors = {
diff --git a/apps/wallet-mobile/src/components/TwoActionView/TwoActionView.tsx b/apps/wallet-mobile/src/components/TwoActionView/TwoActionView.tsx
index b8ae6b5a52..7a0cd900be 100644
--- a/apps/wallet-mobile/src/components/TwoActionView/TwoActionView.tsx
+++ b/apps/wallet-mobile/src/components/TwoActionView/TwoActionView.tsx
@@ -4,7 +4,7 @@ import {useIntl} from 'react-intl'
 import {ScrollView, StyleSheet, View} from 'react-native'
 
 import {confirmationMessages} from '../../kernel/i18n/global-messages'
-import {Button} from '../Button/Button'
+import {Button, ButtonType} from '../Button/Button'
 import {Space} from '../Space/Space'
 import {Spacer} from '../Spacer/Spacer'
 import {Text} from '../Text'
@@ -52,9 +52,8 @@ export const TwoActionView = ({title, children, primaryButton, secondaryButton}:
       <View style={styles.buttons}>
         {secondaryButton != null && (
           <Button
-            block
-            shelleyTheme
-            outlineOnLight
+            size="S"
+            type={ButtonType.Secondary}
             onPress={secondaryButton.onPress}
             title={secondaryButton.label ?? intl.formatMessage(confirmationMessages.commonButtons.cancelButton)}
             disabled={secondaryButton.disabled}
@@ -65,8 +64,7 @@ export const TwoActionView = ({title, children, primaryButton, secondaryButton}:
         <Space width="md" />
 
         <Button
-          block
-          shelleyTheme
+          size="S"
           onPress={primaryButton.onPress}
           title={primaryButton.label}
           disabled={primaryButton.disabled}
diff --git a/apps/wallet-mobile/src/features/Auth/OsLoginScreen/OsLoginScreen.tsx b/apps/wallet-mobile/src/features/Auth/OsLoginScreen/OsLoginScreen.tsx
index c2a517765a..b2dfa77f0c 100644
--- a/apps/wallet-mobile/src/features/Auth/OsLoginScreen/OsLoginScreen.tsx
+++ b/apps/wallet-mobile/src/features/Auth/OsLoginScreen/OsLoginScreen.tsx
@@ -31,7 +31,7 @@ export const OsLoginScreen = () => {
       </MiddleSection>
 
       <BottomSection>
-        <Button title={strings.title} disabled={isLoading} shelleyTheme onPress={() => authWithOs()} />
+        <Button title={strings.title} disabled={isLoading} onPress={() => authWithOs()} />
       </BottomSection>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Claim/useCases/AskConfirmation.tsx b/apps/wallet-mobile/src/features/Claim/useCases/AskConfirmation.tsx
index 794ddc1caa..7290ccadc2 100644
--- a/apps/wallet-mobile/src/features/Claim/useCases/AskConfirmation.tsx
+++ b/apps/wallet-mobile/src/features/Claim/useCases/AskConfirmation.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {Platform, ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import {useModal} from '../../../components/Modal/ModalContext'
 import {Spacer} from '../../../components/Spacer/Spacer'
 import {useStrings} from '../common/useStrings'
@@ -40,18 +40,9 @@ export const AskConfirmation = ({address, url, code, onContinue}: Props) => {
       </ScrollView>
 
       <Actions>
-        <Button
-          title={strings.cancel}
-          onPress={closeModal}
-          withoutBackground
-          outlineShelley
-          block
-          disabled={isLoading}
-        />
-
-        <Spacer width={20} />
-
-        <Button title={strings.continue} onPress={onContinue} shelleyTheme block disabled={isLoading} />
+        <Button size="S" type={ButtonType.Secondary} title={strings.cancel} onPress={closeModal} disabled={isLoading} />
+
+        <Button size="S" title={strings.continue} onPress={onContinue} disabled={isLoading} />
       </Actions>
     </View>
   )
@@ -84,10 +75,8 @@ const useStyles = () => {
     },
     actions: {
       ...atoms.flex_row,
-      ...atoms.align_end,
       ...atoms.pb_lg,
-      minHeight: 48,
-      maxHeight: 54,
+      ...atoms.gap_lg,
     },
     item: {
       ...atoms.self_stretch,
diff --git a/apps/wallet-mobile/src/features/Claim/useCases/ShowSuccessScreen.tsx b/apps/wallet-mobile/src/features/Claim/useCases/ShowSuccessScreen.tsx
index 42def7224c..39a66caca0 100644
--- a/apps/wallet-mobile/src/features/Claim/useCases/ShowSuccessScreen.tsx
+++ b/apps/wallet-mobile/src/features/Claim/useCases/ShowSuccessScreen.tsx
@@ -55,7 +55,7 @@ export const ShowSuccessScreen = () => {
           </>
         )}
 
-        <Button onPress={navigateTo.back} title={strings.ok} shelleyTheme />
+        <Button onPress={navigateTo.back} title={strings.ok} />
 
         <Spacer height={16} />
       </Actions>
diff --git a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
index a9e2072c23..511bd660e0 100644
--- a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
@@ -191,7 +191,6 @@ export const DeveloperScreen = () => {
             <Button
               disabled={isLoading || addresses.split(',').length > 50 || addresses.length === 0}
               style={styles.button}
-              shelleyTheme
               onPress={() => {
                 storage
                   .keys('/wallet/', false)
diff --git a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
index 939811fad4..e2609c068a 100644
--- a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
@@ -50,9 +50,9 @@ const WithButton = () => {
 
   return (
     <View>
-      <Button title="Open modal without warning" shelleyTheme onPress={handleOnPressNoWarning} />
+      <Button title="Open modal without warning" onPress={handleOnPressNoWarning} />
 
-      <Button title="Open modal with warning" shelleyTheme onPress={handleOnPressWarning} />
+      <Button title="Open modal with warning" onPress={handleOnPressWarning} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
index d444741c8f..ee61db03d3 100644
--- a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
@@ -110,7 +110,7 @@ export const ConfirmConnectionModal = ({name, website, onConfirm, logo, showSing
 
       <Spacer height={46} />
 
-      <Button title={strings.confirmConnectionModalConnect} shelleyTheme onPress={onConfirm} />
+      <Button title={strings.confirmConnectionModalConnect} onPress={onConfirm} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/HWNotSupportedModal.tsx b/apps/wallet-mobile/src/features/Discover/common/HWNotSupportedModal.tsx
index 06f7973195..09db09daee 100644
--- a/apps/wallet-mobile/src/features/Discover/common/HWNotSupportedModal.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/HWNotSupportedModal.tsx
@@ -32,7 +32,7 @@ const HWNotSupportedModal = ({onConfirm}: Props) => {
 
       <Spacer fill />
 
-      <Button title={strings.cancel} shelleyTheme onPress={onConfirm} />
+      <Button title={strings.cancel} onPress={onConfirm} />
     </>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.stories.tsx b/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.stories.tsx
index e16ac69616..ce31c553a8 100644
--- a/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.stories.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.stories.tsx
@@ -25,5 +25,5 @@ const WithButton = () => {
     })
   }
 
-  return <Button title="Open Modal" shelleyTheme onPress={handleOnPress} />
+  return <Button title="Open Modal" onPress={handleOnPress} />
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.tsx b/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.tsx
index 0a6c09f3dd..1fc3169cfb 100644
--- a/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/UnverifiedDappModal.tsx
@@ -46,7 +46,7 @@ export const UnverifiedDappModal = ({onConfirm}: Props) => {
       <Spacer fill />
 
       <View style={styles.actions}>
-        <Button title={strings.understand} shelleyTheme onPress={onConfirm} />
+        <Button title={strings.understand} onPress={onConfirm} />
       </View>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx b/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
index 2bd93f55f2..6d503c4850 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
@@ -131,7 +131,7 @@ export const ReviewTransaction = () => {
       </ScrollView>
 
       <View style={[styles.buttonArea, {borderTopWidth: scrollbarShown ? 1 : 0}]}>
-        <Button title={strings.confirm} shelleyTheme onPress={handleOnConfirm} />
+        <Button title={strings.confirm} onPress={handleOnConfirm} />
       </View>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/WelcomeDAppModal.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/WelcomeDAppModal.tsx
index d9fcb5bf60..08542b6399 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/WelcomeDAppModal.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/WelcomeDAppModal.tsx
@@ -73,7 +73,7 @@ const Modal = () => {
       <Text style={styles.welcomeText}>{strings.welcomeToYoroiDAppExplorerDescription}</Text>
 
       <View style={styles.actions}>
-        <Button shelleyTheme onPress={closeModal} title={strings.next} />
+        <Button onPress={closeModal} title={strings.next} />
       </View>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx
index 24e487d36b..3f1afe4cf5 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/AmountCard/AmountCard.tsx
@@ -19,7 +19,7 @@ type AmountCardProps = {
   inputEditable?: boolean
   touched?: boolean
   amount: Portfolio.Token.Amount
-  testId?: string
+  testID?: string
 }
 
 export const AmountCard: React.FC<AmountCardProps> = ({
@@ -31,7 +31,7 @@ export const AmountCard: React.FC<AmountCardProps> = ({
   inputEditable,
   touched,
   amount,
-  testId,
+  testID,
 }: AmountCardProps) => {
   const [isFocused, setIsFocused] = React.useState(false)
 
@@ -75,7 +75,7 @@ export const AmountCard: React.FC<AmountCardProps> = ({
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}
               keyboardAppearance={isDark ? 'dark' : 'light'}
-              testID={testId}
+              testID={testID}
             />
           </Pressable>
 
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.tsx
index 695159cdbb..57ef24707b 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.tsx
@@ -42,14 +42,7 @@ export const BuyBannerBig = () => {
 
         <Space />
 
-        <Button
-          testID="rampOnOffButton"
-          mainTheme
-          title={strings.buyCrypto.toLocaleUpperCase()}
-          onPress={handleExchange}
-          style={styles.spaceButton}
-          textStyles={styles.spaceButtonText}
-        />
+        <Button testID="rampOnOffButton" size="S" title={strings.buyCrypto} onPress={handleExchange} />
       </LinearGradient>
     </View>
   )
@@ -70,9 +63,6 @@ const useStyles = () => {
       flexDirection: 'column',
       alignItems: 'center',
     },
-    spaceButtonText: {
-      ...atoms.p_0,
-    },
     label: {
       ...atoms.heading_3_medium,
       color: color.gray_max,
@@ -84,9 +74,6 @@ const useStyles = () => {
       color: color.gray_max,
       textAlign: 'center',
     },
-    spaceButton: {
-      ...atoms.px_lg,
-    },
   })
   const colors = {
     gradientColor: color.bg_gradient_2,
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.tsx
index b80e9ebe42..e9b4fc2325 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.tsx
@@ -1,12 +1,11 @@
 import {useNavigation} from '@react-navigation/native'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import {StyleSheet, Text, View} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {Icon} from '../../../../components/Icon'
-import {Spacer} from '../../../../components/Spacer/Spacer'
 import {TxHistoryRouteNavigation} from '../../../../kernel/navigation'
 import {useStrings} from '../useStrings'
 
@@ -23,58 +22,48 @@ export const BuyBannerSmall = ({onClose}: SmallBannerProps) => {
     navigation.navigate('exchange-create-order')
   }
   return (
-    <>
-      <View style={styles.root}>
-        <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
-          <View style={styles.viewTitle}>
-            <Text style={styles.title}>{strings.needMoreCrypto}</Text>
+    <LinearGradient style={styles.container} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
+      <View style={styles.viewTitle}>
+        <Text style={styles.title}>{strings.needMoreCrypto}</Text>
 
-            <Spacer width={5} />
-
-            <TouchableOpacity onPress={onClose}>
-              <Icon.Close size={24} color={colors.gray} />
-            </TouchableOpacity>
-          </View>
-
-          <Spacer height={8} />
-
-          <Text style={styles.text}>{strings.ourTrustedPartners}</Text>
-
-          <Spacer height={8} />
-
-          <Button
-            testID="rampOnOffButton"
-            mainTheme
-            title={strings.buyCrypto.toLocaleUpperCase()}
-            onPress={handleExchange}
-            style={styles.spaceButton}
-          />
-        </LinearGradient>
+        <Button type={ButtonType.SecondaryText} icon={Icon.Close} onPress={onClose} style={styles.closeButton} />
       </View>
 
-      <Spacer height={18} />
-    </>
+      <Text style={styles.text}>{strings.ourTrustedPartners}</Text>
+
+      <Button
+        testID="rampOnOffButton"
+        style={styles.button}
+        title={strings.buyCrypto}
+        size="S"
+        onPress={handleExchange}
+      />
+    </LinearGradient>
   )
 }
 
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
-    root: {
-      backgroundColor: color.bg_color_max,
-    },
-    gradient: {
-      flex: 1,
-      opacity: 1,
-      borderRadius: 8,
-      flexDirection: 'column',
+    container: {
+      ...atoms.flex,
+      ...atoms.rounded_sm,
+      ...atoms.flex_col,
       ...atoms.px_lg,
       ...atoms.py_md,
+      ...atoms.gap_sm,
     },
     viewTitle: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      flex: 1,
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+      ...atoms.gap_lg,
+    },
+    closeButton: {
+      ...atoms.p_0,
+      flexGrow: 0,
+    },
+    button: {
+      ...atoms.self_start,
     },
     title: {
       ...atoms.body_1_lg_medium,
@@ -86,9 +75,6 @@ const useStyles = () => {
       ...atoms.body_1_lg_regular,
       color: color.gray_max,
     },
-    spaceButton: {
-      maxWidth: 100,
-    },
   })
   const colors = {
     gradientColor: color.bg_gradient_1,
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.tsx
index 7cdcbe872b..1d11a92c7f 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.tsx
@@ -18,50 +18,40 @@ export const PreprodFaucetBanner = () => {
   }
 
   return (
-    <>
-      <View style={styles.root}>
-        <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
-          <View style={styles.viewTitle}>
-            <Text style={styles.title}>{strings.preprodFaucetBannerTitle}</Text>
+    <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
+      <View style={styles.viewTitle}>
+        <Text style={styles.title}>{strings.preprodFaucetBannerTitle}</Text>
 
-            <Space height="xs" />
-          </View>
+        <Space height="xs" />
+      </View>
 
-          <View style={styles.content}>
-            <View style={styles.contentInner}>
-              <Spacer height={8} />
+      <View style={styles.content}>
+        <View style={styles.contentInner}>
+          <Spacer height={8} />
 
-              <Text style={styles.text}>{strings.preprodFaucetBannerText}</Text>
+          <Text style={styles.text}>{strings.preprodFaucetBannerText}</Text>
 
-              <Space height="lg" />
+          <Space height="lg" />
 
-              <Button
-                testID="rampOnOffButton"
-                shelleyTheme
-                title={strings.preprodFaucetBannerButtonText}
-                onPress={handleOnPress}
-                style={styles.spaceButton}
-              />
-            </View>
+          <Button
+            testID="rampOnOffButton"
+            title={strings.preprodFaucetBannerButtonText}
+            onPress={handleOnPress}
+            style={styles.spaceButton}
+          />
+        </View>
 
-            <View style={styles.logo}>
-              <PreprodFaucetBannerLogo />
-            </View>
-          </View>
-        </LinearGradient>
+        <View style={styles.logo}>
+          <PreprodFaucetBannerLogo />
+        </View>
       </View>
-
-      <Spacer height={18} />
-    </>
+    </LinearGradient>
   )
 }
 
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
-    root: {
-      backgroundColor: color.bg_color_max,
-    },
     gradient: {
       ...atoms.flex_1,
       opacity: 1,
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
index f1a15965c0..1180aae206 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
@@ -18,50 +18,40 @@ export const SanchonetFaucetBanner = () => {
   }
 
   return (
-    <>
-      <View style={styles.root}>
-        <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
-          <View style={styles.viewTitle}>
-            <Text style={styles.title}>{strings.sanchoFaucetBannerTitle}</Text>
+    <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
+      <View style={styles.viewTitle}>
+        <Text style={styles.title}>{strings.sanchoFaucetBannerTitle}</Text>
 
-            <Space height="xs" />
-          </View>
+        <Space height="xs" />
+      </View>
 
-          <View style={styles.content}>
-            <View style={styles.contentInner}>
-              <Spacer height={8} />
+      <View style={styles.content}>
+        <View style={styles.contentInner}>
+          <Spacer height={8} />
 
-              <Text style={styles.text}>{strings.sanchoFaucetBannerText}</Text>
+          <Text style={styles.text}>{strings.sanchoFaucetBannerText}</Text>
 
-              <Space height="lg" />
+          <Space height="lg" />
 
-              <Button
-                testID="rampOnOffButton"
-                shelleyTheme
-                title={strings.sanchoFaucetBannerButtonText}
-                onPress={handleOnPress}
-                style={styles.spaceButton}
-              />
-            </View>
+          <Button
+            testID="rampOnOffButton"
+            title={strings.sanchoFaucetBannerButtonText}
+            onPress={handleOnPress}
+            style={styles.spaceButton}
+          />
+        </View>
 
-            <View style={styles.logo}>
-              <PreprodFaucetBannerLogo />
-            </View>
-          </View>
-        </LinearGradient>
+        <View style={styles.logo}>
+          <PreprodFaucetBannerLogo />
+        </View>
       </View>
-
-      <Spacer height={18} />
-    </>
+    </LinearGradient>
   )
 }
 
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
-    root: {
-      backgroundColor: color.bg_color_max,
-    },
     gradient: {
       ...atoms.flex_1,
       opacity: 1,
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
index 69e03bbcc8..8df63e337a 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
@@ -1,6 +1,7 @@
 import {Chain} from '@yoroi/types'
 import _ from 'lodash'
 import * as React from 'react'
+import {View} from 'react-native'
 
 import {useBalances, useTransactionInfos} from '../../../../yoroi-wallets/hooks'
 import {Amounts, Quantities} from '../../../../yoroi-wallets/utils/utils'
@@ -27,10 +28,21 @@ export const ShowBuyBanner = () => {
   const showSmallBanner = useShowBuyBannerSmall()
   const {resetShowBuyBannerSmall} = useResetShowBuyBannerSmall()
 
-  if (hasZeroPt && hasZeroTx && network === Chain.Network.Preprod) return <PreprodFaucetBanner />
-  if (hasZeroPt && hasZeroTx && network === Chain.Network.Sancho) return <SanchonetFaucetBanner />
-  if (hasZeroPt && hasZeroTx) return <BuyBannerBig />
-  if (showSmallBanner) return <BuyBannerSmall onClose={resetShowBuyBannerSmall} />
+  let banner = null
+  switch (true) {
+    case hasZeroPt && hasZeroTx && network === Chain.Network.Preprod:
+      banner = <PreprodFaucetBanner />
+      break
+    case hasZeroPt && hasZeroTx && network === Chain.Network.Sancho:
+      banner = <SanchonetFaucetBanner />
+      break
+    case hasZeroPt && hasZeroTx:
+      banner = <BuyBannerBig />
+      break
+    case showSmallBanner:
+      banner = <BuyBannerSmall onClose={resetShowBuyBannerSmall} />
+      break
+  }
 
-  return null
+  return banner ? <View style={{paddingBottom: 18}}>{banner}</View> : null
 }
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
index 070984c331..04a3f36e10 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
@@ -52,7 +52,7 @@ export const CreateExchangeButton = ({
 
   return (
     <View style={[styles.actions, style]}>
-      <Button testID="rampOnOffButton" shelleyTheme title={title} onPress={handleOnPress} disabled={disabled} />
+      <Button testID="rampOnOffButton" title={title} onPress={handleOnPress} disabled={disabled} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/LoadingLink/ErrorScreen.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/LoadingLink/ErrorScreen.tsx
index cc0fd2f14b..05de4d472c 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/LoadingLink/ErrorScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/LoadingLink/ErrorScreen.tsx
@@ -23,13 +23,7 @@ export const ErrorScreen = () => {
 
       <Space height="lg" />
 
-      <Button
-        testID="rampOnOffErrorCloseButton"
-        shelleyTheme
-        title={strings.close}
-        style={styles.button}
-        onPress={closeModal}
-      />
+      <Button testID="rampOnOffErrorCloseButton" title={strings.close} style={styles.button} onPress={closeModal} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
index 09cecc90cc..a3e48a878a 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/ShowExchangeResultOrderScreen/ShowExchangeResultOrderScreen.tsx
@@ -108,7 +108,7 @@ export const ShowExchangeResultOrderScreen = () => {
         </View>
 
         <View style={styles.actions}>
-          <Button shelleyTheme onPress={handleOnClose} title={strings.close} />
+          <Button onPress={handleOnClose} title={strings.close} />
         </View>
       </SafeAreaView>
     </ExchangeProvider>
diff --git a/apps/wallet-mobile/src/features/Initialization/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx b/apps/wallet-mobile/src/features/Initialization/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
index 24ef2d1ed6..bd3b45bab9 100644
--- a/apps/wallet-mobile/src/features/Initialization/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
+++ b/apps/wallet-mobile/src/features/Initialization/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
@@ -6,7 +6,7 @@ import DeviceInfo from 'react-native-device-info'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {useQuery, UseQueryOptions} from 'react-query'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import {Space} from '../../../components/Space/Space'
 import {useEnableAuthWithOs} from '../../Auth/common/hooks'
 import {useStrings} from '../common'
@@ -36,9 +36,8 @@ export const ChooseBiometricLoginScreen = () => {
 
       <View>
         <Button
+          type={ButtonType.Text}
           title={strings.ignoreButton}
-          withoutBackground
-          textStyles={styles.textOutlineButton}
           onPress={() => {
             setScreenShown()
           }}
@@ -49,7 +48,6 @@ export const ChooseBiometricLoginScreen = () => {
 
         <Button
           title={strings.enableButton}
-          style={styles.enableButton}
           onPress={async () => {
             const isSimulator = await DeviceInfo.isEmulator()
             if (isSimulator) {
@@ -97,12 +95,6 @@ const useStyles = () => {
       ...atoms.text_center,
       ...atoms.px_lg,
     },
-    textOutlineButton: {
-      color: color.text_gray_max,
-    },
-    enableButton: {
-      backgroundColor: color.primary_500,
-    },
   })
 
   return {styles} as const
diff --git a/apps/wallet-mobile/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.tsx b/apps/wallet-mobile/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.tsx
index 0ca4646f44..c5841ffc61 100644
--- a/apps/wallet-mobile/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.tsx
+++ b/apps/wallet-mobile/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.tsx
@@ -57,7 +57,7 @@ export const DarkThemeAnnouncement = () => {
         </View>
       </ScrollView>
 
-      <Button title={strings.continue} disabled={isSetScreenShownLoading} onPress={navigate} shelleyTheme />
+      <Button title={strings.continue} disabled={isSetScreenShownLoading} onPress={navigate} />
 
       {Platform.OS === 'android' && <Space height="lg" />}
     </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/Initialization/InitialScreen/InitialScreen.tsx b/apps/wallet-mobile/src/features/Initialization/InitialScreen/InitialScreen.tsx
index 69a3ab30b0..93b11374b7 100644
--- a/apps/wallet-mobile/src/features/Initialization/InitialScreen/InitialScreen.tsx
+++ b/apps/wallet-mobile/src/features/Initialization/InitialScreen/InitialScreen.tsx
@@ -81,13 +81,7 @@ export const InitialScreen = () => {
 
         <Spacer fill />
 
-        <Button
-          title={strings.continue}
-          shelleyTheme
-          disabled={!tosAccepted}
-          onPress={onPressContinue}
-          testID="buttonContinue"
-        />
+        <Button title={strings.continue} disabled={!tosAccepted} onPress={onPressContinue} testID="buttonContinue" />
       </ScrollView>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.tsx b/apps/wallet-mobile/src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.tsx
index 38cfe02b85..3f751b4a8a 100644
--- a/apps/wallet-mobile/src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.tsx
+++ b/apps/wallet-mobile/src/features/Initialization/TermsOfServiceChangedScreen/TermsOfServiceChangedScreen.tsx
@@ -68,7 +68,7 @@ export const TermsOfServiceChangedScreen = () => {
 
         <Spacer fill />
 
-        <Button title={strings.continue} shelleyTheme disabled={!accepted} onPress={onPressContinue} />
+        <Button title={strings.continue} disabled={!accepted} onPress={onPressContinue} />
       </ScrollView>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx
index e505b756e1..ccf1580d83 100644
--- a/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToOpenAWalletScreen/AskToOpenAWalletScreen.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useStrings} from '../../common/useStrings'
@@ -30,11 +30,11 @@ export const AskToOpenWalletScreen = () => {
       </ScrollView>
 
       <Actions style={styles.actions}>
-        <Button block outlineShelley onPress={handleOnCancel} title={strings.cancel} />
+        <Button size="S" type={ButtonType.Secondary} onPress={handleOnCancel} title={strings.cancel} />
 
         <Spacer width={16} />
 
-        <Button block shelleyTheme onPress={closeModal} title={strings.ok} />
+        <Button size="S" onPress={closeModal} title={strings.ok} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx
index 60d57b886c..9ad6b2310e 100644
--- a/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx
+++ b/apps/wallet-mobile/src/features/Links/useCases/AskToRedirect/AskToRedirectScreen.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import {Linking, ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useStrings} from '../../common/useStrings'
@@ -28,11 +28,11 @@ export const AskToRedirectScreen = ({link}: {link: string}) => {
       </ScrollView>
 
       <Actions style={styles.actions}>
-        <Button block outlineShelley onPress={closeModal} title={strings.cancel} />
+        <Button size="S" type={ButtonType.Secondary} onPress={closeModal} title={strings.cancel} />
 
         <Spacer width={16} />
 
-        <Button block shelleyTheme onPress={handleOnConfirm} title={strings.ok} />
+        <Button size="S" onPress={handleOnConfirm} title={strings.ok} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx
index 5fb36c33aa..d8f0199d3d 100644
--- a/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedAdaPaymentWithLinkScreen/RequestedAdaPaymentWithLinkScreen.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import {ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {Space} from '../../../../components/Space/Space'
 import {Spacer} from '../../../../components/Spacer/Spacer'
@@ -58,11 +58,11 @@ export const RequestedAdaPaymentWithLinkScreen = ({
       </ScrollView>
 
       <Actions style={styles.actions}>
-        <Button block outlineShelley onPress={handleOnCancel} title={strings.cancel} />
+        <Button size="S" type={ButtonType.Secondary} onPress={handleOnCancel} title={strings.cancel} />
 
         <Spacer width={16} />
 
-        <Button block shelleyTheme onPress={onContinue} title={strings.continue} />
+        <Button size="S" onPress={onContinue} title={strings.continue} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Links/useCases/RequestedBrowserLaunchDappUrlScreen/RequestedBrowserLaunchDappUrlScreen.tsx b/apps/wallet-mobile/src/features/Links/useCases/RequestedBrowserLaunchDappUrlScreen/RequestedBrowserLaunchDappUrlScreen.tsx
index 30ccc680ed..fe81d29915 100644
--- a/apps/wallet-mobile/src/features/Links/useCases/RequestedBrowserLaunchDappUrlScreen/RequestedBrowserLaunchDappUrlScreen.tsx
+++ b/apps/wallet-mobile/src/features/Links/useCases/RequestedBrowserLaunchDappUrlScreen/RequestedBrowserLaunchDappUrlScreen.tsx
@@ -4,7 +4,7 @@ import {Links} from '@yoroi/types'
 import * as React from 'react'
 import {ScrollView, StyleSheet, Text, View, ViewProps} from 'react-native'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {Space} from '../../../../components/Space/Space'
 import {Spacer} from '../../../../components/Spacer/Spacer'
@@ -58,9 +58,9 @@ export const RequestedBrowserLaunchDappUrlScreen = ({
       </ScrollView>
 
       <Actions style={styles.actions}>
-        <Button block outlineShelley onPress={handleOnCancel} title={strings.cancel} />
+        <Button size="S" type={ButtonType.Secondary} onPress={handleOnCancel} title={strings.cancel} />
 
-        <Button block shelleyTheme onPress={onContinue} title={strings.continue} />
+        <Button size="S" onPress={onContinue} title={strings.continue} />
       </Actions>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
index f2cff3c32c..2dfbe43fa6 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
@@ -158,15 +158,11 @@ const SelectableMedia = ({info}: {info: Portfolio.Token.Info}) => {
   )
 }
 
-const MetadataRow = ({title, copyText, children}: {title: string; children: ReactNode; copyText?: string}) => {
+const MetadataRow = ({title, children}: {title: string; children: ReactNode}) => {
   const styles = useStyles()
   return (
     <View style={styles.rowContainer}>
-      <View style={styles.rowBetween}>
-        <Text style={styles.title}>{title}</Text>
-
-        {copyText !== undefined ? <CopyButton value={copyText} /> : null}
-      </View>
+      <Text style={styles.title}>{title}</Text>
 
       <Spacer height={4} />
 
@@ -196,12 +192,12 @@ const NftOverview = ({info, explorers, traits}: NftOverviewProps) => {
         <Text style={styles.name}>{normalizeMetadataString(info.description)}</Text>
       </MetadataRow>
 
-      <MetadataRow title={strings.fingerprint} copyText={info.fingerprint}>
-        <Text style={styles.name}>{info.fingerprint}</Text>
+      <MetadataRow title={strings.fingerprint}>
+        <CopyButton title={info.fingerprint} value={info.fingerprint} />
       </MetadataRow>
 
-      <MetadataRow title={strings.policyId} copyText={policyId}>
-        <Text style={styles.name}>{policyId}</Text>
+      <MetadataRow title={strings.policyId}>
+        <CopyButton title={policyId} value={policyId} />
       </MetadataRow>
 
       {traits?.traits.map((trait) => (
@@ -282,9 +278,7 @@ const NftMetadata = ({discovery}: {discovery: Portfolio.Token.Discovery}) => {
   return (
     <View>
       <View style={styles.copyMetadata}>
-        <CopyButton value={stringifiedMetadata} style={styles.copyButton}>
-          <Text style={styles.copyText}>{strings.copyMetadata}</Text>
-        </CopyButton>
+        <CopyButton title={strings.copyMetadata} value={stringifiedMetadata} style={styles.copyButton} />
       </View>
 
       <Spacer height={14} />
@@ -321,11 +315,6 @@ const useStyles = () => {
       ...atoms.link_1_lg_underline,
       ...atoms.flex_1,
     },
-    copyText: {
-      color: color.gray_900,
-      ...atoms.body_2_md_medium,
-      textTransform: 'uppercase',
-    },
     container: {
       flex: 1,
       backgroundColor: color.bg_color_max,
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenInfoIcon.tsx b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenInfoIcon.tsx
index 7ce268e1fe..268ca39418 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenInfoIcon.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenInfoIcon.tsx
@@ -62,7 +62,7 @@ const PrimaryIcon = ({size = 'md', imageStyle}: {size?: 'sm' | 'md'; imageStyle?
   const {styles} = useStyles()
   return (
     <View style={[size === 'sm' ? styles.iconSmall : styles.iconMedium, styles.primary, imageStyle]}>
-      <Icon.Cardano color="white" height={size === 'sm' ? 20 : 35} width={size === 'sm' ? 20 : 35} />
+      <Icon.Cardano color="white" size={size === 'sm' ? 20 : 35} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/BuyADABanner/BuyADABanner.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/BuyADABanner/BuyADABanner.tsx
index c15e0ec7df..6036cadcbc 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/BuyADABanner/BuyADABanner.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/BuyADABanner/BuyADABanner.tsx
@@ -29,13 +29,7 @@ export const BuyADABanner = () => {
 
         <Spacer height={16} />
 
-        <Button
-          mainTheme
-          title={strings.buyCrypto.toLocaleUpperCase()}
-          onPress={handleExchange}
-          style={styles.spaceButton}
-          textStyles={styles.spaceButtonText}
-        />
+        <Button title={strings.buyCrypto} onPress={handleExchange} />
 
         <View style={styles.assetImageBox}>
           <AssetImage />
@@ -57,13 +51,6 @@ const useStyles = () => {
       ...atoms.overflow_hidden,
       backgroundColor: color.bg_color_max,
     },
-    spaceButtonText: {
-      ...atoms.p_0,
-    },
-    spaceButton: {
-      ...atoms.px_lg,
-      minHeight: 40,
-    },
     title: {
       ...atoms.body_1_lg_medium,
       ...atoms.font_semibold,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/TradeTokensBanner.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/TradeTokensBanner.tsx
index 534c33c636..c6a1e70330 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/TradeTokensBanner.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/TradeTokensBanner.tsx
@@ -22,13 +22,7 @@ export const TradeTokensBanner = () => {
       <LinearGradient style={styles.gradientRoot} colors={colors.gradientColor} start={{x: 0, y: 0}} end={{x: 1, y: 0}}>
         <Text style={styles.title}>{strings.tradeTokens}</Text>
 
-        <Button
-          mainTheme
-          title={strings.swap.toLocaleUpperCase()}
-          style={styles.spaceButton}
-          textStyles={styles.spaceButtonText}
-          onPress={handleSwap}
-        />
+        <Button title={strings.swap} onPress={handleSwap} />
 
         <View style={styles.assetBox}>
           <TradeTokensAsset />
@@ -56,13 +50,6 @@ const useStyles = () => {
       ...atoms.overflow_hidden,
       backgroundColor: color.bg_color_max,
     },
-    spaceButtonText: {
-      ...atoms.p_0,
-    },
-    spaceButton: {
-      ...atoms.px_lg,
-      minHeight: 40,
-    },
     title: {
       ...atoms.body_1_lg_medium,
       ...atoms.font_semibold,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
index 97a7e0e032..7e8455ea56 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -5,7 +5,7 @@ import {Chain, Portfolio} from '@yoroi/types'
 import React from 'react'
 import {StyleSheet, View} from 'react-native'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {Icon} from '../../../../components/Icon'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {useSwapForm} from '../../../Swap/common/SwapFormProvider'
@@ -18,7 +18,7 @@ type Props = {
   tokenInfo: Portfolio.Token.Info
 }
 export const Actions = ({tokenInfo}: Props) => {
-  const {styles, colors} = useStyles()
+  const {styles} = useStyles()
   const strings = useStrings()
   const navigateTo = useNavigateTo()
   const swap = useSwap()
@@ -57,21 +57,13 @@ export const Actions = ({tokenInfo}: Props) => {
     <View style={styles.root}>
       <View style={styles.container}>
         <Button
-          block
-          shelleyTheme
-          outlineOnLight
-          title={strings.send.toLocaleUpperCase()}
-          startContent={<Icon.Send color={colors.primary} size={24} />}
+          type={ButtonType.Secondary}
+          title={strings.send}
+          icon={Icon.Send}
           onPress={navigateTo.resetTabAndSend}
         />
 
-        <Button
-          block
-          shelleyTheme
-          title={strings.swap.toLocaleUpperCase()}
-          startContent={<Icon.Swap color={colors.white} size={24} />}
-          onPress={handleOnSwap}
-        />
+        <Button title={strings.swap} icon={Icon.Swap} onPress={handleOnSwap} />
       </View>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
index 3d34c934b1..2de462d58f 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
@@ -77,9 +77,7 @@ export const Overview = () => {
 
               <Spacer height={4} />
 
-              <CopyButton value={policyId ?? ''} style={styles.copyButton}>
-                <Text style={styles.copyText}>{policyId ?? '--'}</Text>
-              </CopyButton>
+              <CopyButton title={policyId ?? '--'} value={policyId ?? ''} style={styles.copyButton} />
             </View>
 
             <Spacer height={24} />
@@ -89,9 +87,11 @@ export const Overview = () => {
 
               <Spacer height={4} />
 
-              <CopyButton value={tokenInfo.info?.fingerprint ?? ''} style={styles.copyButton}>
-                <Text style={styles.copyText}>{tokenInfo.info?.fingerprint ?? '--'}</Text>
-              </CopyButton>
+              <CopyButton
+                title={tokenInfo.info?.fingerprint ?? '--'}
+                value={tokenInfo.info?.fingerprint ?? ''}
+                style={styles.copyButton}
+              />
             </View>
 
             <Spacer height={24} />
@@ -184,11 +184,6 @@ const useStyles = () => {
       ...atoms.align_start,
       ...atoms.gap_sm,
     },
-    copyText: {
-      ...atoms.flex_1,
-      ...atoms.body_2_md_regular,
-      color: color.gray_600,
-    },
   })
 
   const colors = {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TradeTokensBannerBig.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TradeTokensBannerBig.tsx
index 14c9550fdb..2d446c98e3 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TradeTokensBannerBig.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TradeTokensBannerBig.tsx
@@ -30,13 +30,7 @@ export const TradeTokensBannerBig = () => {
 
         <Spacer height={37} />
 
-        <Button
-          mainTheme
-          title={strings.startSwapping.toLocaleUpperCase()}
-          style={styles.spaceButton}
-          textStyles={styles.spaceButtonText}
-          onPress={handleSwap}
-        />
+        <Button title={strings.startSwapping} onPress={handleSwap} />
 
         <View style={styles.assetBox}>
           <TradeTokensAsset />
@@ -63,13 +57,6 @@ const useStyles = () => {
       ...atoms.overflow_hidden,
       backgroundColor: color.bg_color_max,
     },
-    spaceButtonText: {
-      ...atoms.p_0,
-    },
-    spaceButton: {
-      ...atoms.px_lg,
-      minHeight: 40,
-    },
     title: {
       ...atoms.body_1_lg_medium,
       ...atoms.font_semibold,
diff --git a/apps/wallet-mobile/src/features/Receive/common/AddressDetailCard/AddressDetailCard.tsx b/apps/wallet-mobile/src/features/Receive/common/AddressDetailCard/AddressDetailCard.tsx
index ba119d52eb..9e8e0d7b30 100644
--- a/apps/wallet-mobile/src/features/Receive/common/AddressDetailCard/AddressDetailCard.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/AddressDetailCard/AddressDetailCard.tsx
@@ -3,9 +3,9 @@ import * as React from 'react'
 import {StyleSheet, useWindowDimensions, View} from 'react-native'
 import Animated, {Layout} from 'react-native-reanimated'
 
+import {useCopy} from '../../../../components/Clipboard/ClipboardProvider'
 import {ShareQRCodeCard} from '../../../../components/ShareQRCodeCard/ShareQRCodeCard'
 import {Spacer} from '../../../../components/Spacer/Spacer'
-import {useCopy} from '../../../../hooks/useCopy'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {isEmptyString} from '../../../../kernel/utils'
 import {useKeyHashes} from '../../../../yoroi-wallets/hooks'
@@ -34,7 +34,7 @@ type CardItem = {
 
 export const AddressDetailCard = ({title}: AddressDetailCardProps) => {
   const {styles, colors} = useStyles()
-  const [isCopying, copy] = useCopy()
+  const {copy} = useCopy()
   const {track} = useMetrics()
   const strings = useStrings()
 
@@ -76,12 +76,10 @@ export const AddressDetailCard = ({title}: AddressDetailCardProps) => {
             title={item.title}
             qrContent={item.address}
             shareContent={`${strings.address} ${item.address}`}
-            onLongPress={() => copy(item.address)}
-            isCopying={isCopying}
-            testId="receive:address-detail-card"
+            onLongPress={(event) => copy({text: item.address, feedback: strings.addressCopiedMsg, event})}
+            testID="receive:address-detail-card"
             onShare={() => track.receiveShareAddressClicked()}
             shareLabel={strings.shareLabel}
-            copiedText={strings.addressCopiedMsg}
           />
         )
       case 'Details':
diff --git a/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx b/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx
index ac225d2d06..85796715a3 100644
--- a/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx
@@ -3,7 +3,7 @@ import {Wallet} from '@yoroi/types'
 import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useAddressMode} from '../../../WalletManager/common/hooks/useAddressMode'
@@ -55,14 +55,9 @@ export const SingleOrMultipleAddressesModal = ({onConfirm}: Props) => {
       <Spacer fill height={16} />
 
       <View style={styles.actions}>
-        <Button
-          withoutBackground
-          textStyles={styles.multipleButtonTitle}
-          title={strings.selectMultiple}
-          onPress={handleOnMultiple}
-        />
-
-        <Button shelleyTheme title={strings.singleAddressWallet} onPress={handleOnSingle} />
+        <Button type={ButtonType.Text} title={strings.selectMultiple} onPress={handleOnMultiple} />
+
+        <Button title={strings.singleAddressWallet} onPress={handleOnSingle} />
       </View>
     </View>
   )
@@ -80,7 +75,10 @@ const useStyles = () => {
       ...atoms.py_lg,
     },
     actions: {
-      ...atoms.self_stretch,
+      ...atoms.flex_col,
+      ...atoms.gap_sm,
+      ...atoms.w_full,
+      height: 120,
     },
     details: {
       color: color.text_gray_medium,
@@ -88,9 +86,6 @@ const useStyles = () => {
       ...atoms.justify_center,
       ...atoms.text_center,
     },
-    multipleButtonTitle: {
-      color: color.text_primary_max,
-    },
   })
 
   return {styles} as const
diff --git a/apps/wallet-mobile/src/features/Receive/common/SmallAddressCard/SmallAddressCard.tsx b/apps/wallet-mobile/src/features/Receive/common/SmallAddressCard/SmallAddressCard.tsx
index 494122469c..90024126e7 100644
--- a/apps/wallet-mobile/src/features/Receive/common/SmallAddressCard/SmallAddressCard.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/SmallAddressCard/SmallAddressCard.tsx
@@ -2,10 +2,10 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
-import Animated, {FadeInDown, FadeInUp, FadeOut, FadeOutDown, Layout} from 'react-native-reanimated'
+import Animated, {FadeInUp, FadeOut, Layout} from 'react-native-reanimated'
 
+import {useCopy} from '../../../../components/Clipboard/ClipboardProvider'
 import {Spacer} from '../../../../components/Spacer/Spacer'
-import {useCopy} from '../../../../hooks/useCopy'
 import {SkeletonSmallCardAddress} from '../SkeletonAddressDetail/SkeletonAddressDetail'
 import {useStrings} from '../useStrings'
 
@@ -15,12 +15,12 @@ type SmallAddressCardProps = {
   loading?: boolean
   date?: string
   onPress?: () => void
-  testId?: string
+  testID?: string
 }
 
-export const SmallAddressCard = ({address, isUsed, date, onPress, loading, testId}: SmallAddressCardProps) => {
+export const SmallAddressCard = ({address, isUsed, date, onPress, loading, testID}: SmallAddressCardProps) => {
   const strings = useStrings()
-  const [isCopying, copy] = useCopy()
+  const {copy} = useCopy()
   const {styles, colors} = useStyles()
 
   if (loading) {
@@ -39,9 +39,9 @@ export const SmallAddressCard = ({address, isUsed, date, onPress, loading, testI
         <TouchableOpacity
           style={styles.smallAddressCard}
           activeOpacity={0.6}
-          onLongPress={() => copy(address)}
+          onLongPress={(event) => copy({text: address, feedback: strings.addressCopiedMsg, event})}
           onPress={onPress}
-          testID={testId}
+          testID={testID}
         >
           <LinearGradient
             style={[StyleSheet.absoluteFill, {opacity: 1}]}
@@ -67,12 +67,6 @@ export const SmallAddressCard = ({address, isUsed, date, onPress, loading, testI
       </Animated.View>
 
       <Spacer height={16} />
-
-      {isCopying && (
-        <Animated.View layout={Layout} entering={FadeInDown} exiting={FadeOutDown} style={styles.isCopying}>
-          <Text style={styles.copiedText}>{strings.addressCopiedMsg}</Text>
-        </Animated.View>
-      )}
     </>
   )
 }
@@ -131,22 +125,6 @@ const useStyles = () => {
       ...atoms.body_2_md_regular,
       color: color.gray_700,
     },
-    copiedText: {
-      color: color.gray_min,
-      textAlign: 'center',
-      padding: 8,
-      ...atoms.body_2_md_medium,
-    },
-    isCopying: {
-      position: 'absolute',
-      backgroundColor: color.gray_max,
-      alignItems: 'center',
-      justifyContent: 'center',
-      top: 0,
-      alignSelf: 'center',
-      borderRadius: 4,
-      zIndex: 10,
-    },
   })
 
   const colors = {
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
index cce408cb1a..87ad6ceb4f 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/DescribeSelectedAddressScreen.tsx
@@ -2,13 +2,13 @@ import {useFocusEffect} from '@react-navigation/native'
 import {useTheme} from '@yoroi/theme'
 import {Wallet} from '@yoroi/types'
 import * as React from 'react'
-import {ScrollView, StyleSheet, View} from 'react-native'
+import {GestureResponderEvent, ScrollView, StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import Icon from '../../../assets/img/copy.png'
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
+import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
+import {Icon} from '../../../components/Icon'
 import {useModal} from '../../../components/Modal/ModalContext'
-import {useCopy} from '../../../hooks/useCopy'
 import {useMetrics} from '../../../kernel/metrics/metricsManager'
 import {isEmptyString} from '../../../kernel/utils'
 import {useAddressMode} from '../../WalletManager/common/hooks/useAddressMode'
@@ -26,7 +26,7 @@ import {useStrings} from '../common/useStrings'
 
 export const DescribeSelectedAddressScreen = () => {
   const strings = useStrings()
-  const {styles, colors} = useStyles()
+  const {styles} = useStyles()
   const navigateTo = useNavigateTo()
   const {selectedAddress} = useReceive()
   const {isSingle, addressMode} = useAddressMode()
@@ -37,12 +37,12 @@ export const DescribeSelectedAddressScreen = () => {
 
   const {track} = useMetrics()
 
-  const [isCopying, copy] = useCopy()
+  const {copy} = useCopy()
   const hasAddress = !isEmptyString(selectedAddress)
 
-  const handleOnPressCopy = () => {
+  const onCopy = (event: GestureResponderEvent) => {
     track.receiveCopyAddressClicked({copy_address_location: 'CTA Copy Address'})
-    copy(selectedAddress)
+    copy({text: selectedAddress, feedback: strings.addressCopiedMsg, event})
   }
 
   const handleOnModalConfirm = React.useCallback(
@@ -83,26 +83,17 @@ export const DescribeSelectedAddressScreen = () => {
         </View>
       </ScrollView>
 
-      <Button
-        withoutBackground
-        title={strings.requestSpecificAmountButton}
-        textStyles={{
-          color: colors.requestSpecificAmountTextColor,
-        }}
-        onPress={navigateTo.requestSpecificAmount}
-        disabled={!hasAddress}
-        testID="receive:request-specific-amount-link"
-      />
+      <View style={styles.actions}>
+        <Button
+          type={ButtonType.Text}
+          title={strings.requestSpecificAmountButton}
+          onPress={navigateTo.requestSpecificAmount}
+          disabled={!hasAddress}
+          testID="receive:request-specific-amount-link"
+        />
 
-      <Button
-        shelleyTheme
-        onPress={handleOnPressCopy}
-        disabled={!hasAddress}
-        title={strings.copyAddressButton}
-        iconImage={Icon}
-        isCopying={isCopying}
-        copiedText={strings.addressCopiedMsg}
-      />
+        <Button onPress={onCopy} disabled={!hasAddress} title={strings.copyAddressButton} icon={Icon.Copy} />
+      </View>
     </SafeAreaView>
   )
 }
@@ -121,6 +112,10 @@ const useStyles = () => {
     address: {
       ...atoms.align_center,
     },
+    actions: {
+      ...atoms.flex_col,
+      ...atoms.gap_sm,
+    },
   })
 
   const colors = {
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
index 51d1c359a3..810a542829 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/ListMultipleAddressesScreen.tsx
@@ -59,7 +59,7 @@ export const ListMultipleAddressesScreen = () => {
           selectedAddressChanged(item.address)
           navigate.showAddressDetails()
         }}
-        testId={`receive:small-address-card-${index + 1}`} // Add index + 1 to include count
+        testID={`receive:small-address-card-${index + 1}`} // Add index + 1 to include count
         // date={}  // TODO define with project
       />
     ),
@@ -127,7 +127,6 @@ export const ListMultipleAddressesScreen = () => {
         layout={Layout}
       >
         <Button
-          shelleyTheme
           title={strings.generateButton}
           disabled={hasReachedGapLimit}
           onPress={handleOnGenerateNewReceiveAddress}
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
index 0541ef42bc..21df55fcbe 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
@@ -2,16 +2,24 @@ import {useFocusEffect} from '@react-navigation/native'
 import {configCardanoLegacyTransfer, linksCardanoModuleMaker, linksYoroiModuleMaker} from '@yoroi/links'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {ScrollView as RNScrollView, StyleSheet, Text, useWindowDimensions, View} from 'react-native'
+import {
+  GestureResponderEvent,
+  ScrollView as RNScrollView,
+  StyleSheet,
+  Text,
+  useWindowDimensions,
+  View,
+} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Button} from '../../../components/Button/Button'
+import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
+import {Icon} from '../../../components/Icon'
 import {KeyboardAvoidingView} from '../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
 import {useModal} from '../../../components/Modal/ModalContext'
 import {ScrollView, useScrollView} from '../../../components/ScrollView/ScrollView'
 import {ShareQRCodeCard} from '../../../components/ShareQRCodeCard/ShareQRCodeCard'
 import {TextInput} from '../../../components/TextInput/TextInput'
-import {useCopy} from '../../../hooks/useCopy'
 import {useMetrics} from '../../../kernel/metrics/metricsManager'
 import {isEmptyString} from '../../../kernel/utils'
 import {editedFormatter} from '../../../yoroi-wallets/utils/amountUtils'
@@ -81,7 +89,6 @@ export const RequestSpecificAmountScreen = () => {
 
         <View style={[styles.actions, isScrollBarShown && {borderTopWidth: 1, borderTopColor: colors.lightGray}]}>
           <Button
-            shelleyTheme
             onPress={handleOnGenerateLink}
             disabled={!hasAmount}
             title={strings.generateLink}
@@ -119,8 +126,7 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
   const content = hasAmount ? yoroiPaymentRequestLink : address
   const title = hasAmount ? `${amount} ${portfolioPrimaryTokenInfo.ticker.toLocaleUpperCase()}` : ''
 
-  const [isCopying, copy] = useCopy()
-  const handOnCopy = () => copy(content)
+  const {copy} = useCopy()
 
   return (
     <View style={[styles.container, styles.flex]}>
@@ -130,11 +136,12 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
             title={title}
             shareContent={content}
             qrContent={content}
-            onLongPress={handOnCopy}
-            testId="receive:specific-amount"
+            onLongPress={(event: GestureResponderEvent) =>
+              copy({text: content, feedback: strings.addressCopiedMsg, event})
+            }
+            testID="receive:specific-amount"
             onShare={() => track.receiveShareAddressClicked()}
             shareLabel={strings.shareLabel}
-            copiedText={strings.addressCopiedMsg}
           />
         ) : (
           <View style={styles.root}>
@@ -145,13 +152,10 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
 
       <View style={styles.actions}>
         <Button
-          shelleyTheme
-          onPress={handOnCopy}
+          onPress={(event: GestureResponderEvent) => copy({text: content, feedback: strings.copyLinkMsg, event})}
           disabled={!hasAmount}
           title={strings.copyLinkBtn}
-          iconImage={require('../../../assets/img/copy.png')}
-          isCopying={isCopying}
-          copiedText={strings.copyLinkMsg}
+          icon={Icon.Copy}
           testID="receive:request-specific-amount:copy-link-button"
         />
       </View>
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
index 822046690b..57bbf80c2a 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
@@ -36,7 +36,7 @@ export const InsufficientFundsModal = () => {
         })}
       </Text>
 
-      <Button shelleyTheme title={strings.back} onPress={closeModal} textStyles={styles.button} />
+      <Button title={strings.back} onPress={closeModal} />
 
       {Platform.OS === 'android' && <Space height="lg" />}
     </View>
@@ -63,15 +63,13 @@ const useStyles = () => {
     container: {
       ...atoms.px_lg,
       ...atoms.flex_1,
+      ...atoms.gap_lg,
       ...atoms.justify_between,
     },
     text: {
       color: color.gray_max,
       ...atoms.body_1_lg_regular,
     },
-    button: {
-      ...atoms.button_1_lg,
-    },
   })
 
   return styles
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
index f7cec3c29f..a6a260c154 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
@@ -222,7 +222,7 @@ export const ConfirmPin = () => {
 
       <Padding>
         <Actions>
-          <Button shelleyTheme onPress={() => onNext()} title={strings.continueButton} disabled={!done || isLoading} />
+          <Button onPress={() => onNext()} title={strings.continueButton} disabled={!done || isLoading} />
         </Actions>
       </Padding>
 
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx
index cd4731de73..2ec8266a04 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx
@@ -118,7 +118,7 @@ export const ConfirmVotingTx = () => {
         <Spacer fill />
 
         <Actions>
-          <Button title={strings.confirm} shelleyTheme onPress={onSubmit} />
+          <Button title={strings.confirm} onPress={onSubmit} />
         </Actions>
       </SafeAreaView>
     </KeyboardAvoidingView>
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DisplayPin/DisplayPin.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DisplayPin/DisplayPin.tsx
index ff16e6d147..98263da081 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DisplayPin/DisplayPin.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DisplayPin/DisplayPin.tsx
@@ -60,7 +60,7 @@ export const DisplayPin = () => {
       <Spacer fill />
 
       <Actions>
-        <Button shelleyTheme onPress={() => onNext()} title={strings.continueButton} disabled={!checked} />
+        <Button onPress={() => onNext()} title={strings.continueButton} disabled={!checked} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen.tsx
index 4bd9abf2f9..39fca85356 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen.tsx
@@ -98,7 +98,7 @@ export const DownloadCatalystAppScreen = () => {
       </ScrollView>
 
       <Actions>
-        <Button shelleyTheme onPress={onNext} title={strings.continueButton} disabled={disabled} />
+        <Button onPress={onNext} title={strings.continueButton} disabled={disabled} />
       </Actions>
     </SafeAreaView>
   )
@@ -130,7 +130,7 @@ const WarningModal = () => {
 
       <Space fill />
 
-      <Button shelleyTheme title={strings.iUnderstandButton} onPress={closeModal} textStyles={styles.button} />
+      <Button title={strings.iUnderstandButton} onPress={closeModal} />
 
       {Platform.OS === 'android' && <Space height="lg" />}
     </View>
@@ -201,9 +201,6 @@ const useStyles = () => {
       color: color.text_gray_medium,
       ...atoms.body_1_lg_regular,
     },
-    button: {
-      ...atoms.button_1_lg,
-    },
     subTitle: {
       ...atoms.heading_3_medium,
       ...atoms.text_center,
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.tsx
index 09530bc45b..8970c54a2e 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.tsx
@@ -6,10 +6,10 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Button} from '../../../../components/Button/Button'
 import {Checkbox} from '../../../../components/Checkbox/Checkbox'
+import {useCopy} from '../../../../components/Clipboard/ClipboardProvider'
 import {ShareQRCodeCard} from '../../../../components/ShareQRCodeCard/ShareQRCodeCard'
 import {Space} from '../../../../components/Space/Space'
 import {useAllowScreenshot} from '../../../../hooks/useAllowScreenShot'
-import {useCopy} from '../../../../hooks/useCopy'
 import {useBlockGoBack} from '../../../../kernel/navigation'
 import {useNavigateTo} from '../../CatalystNavigator'
 import {Actions, Description} from '../../common/components'
@@ -26,8 +26,7 @@ export const QrCode = () => {
 
   if (votingKeyEncrypted === null) throw new Error('votingKeyEncrypted cannot be null')
 
-  const [isCopying, copy] = useCopy()
-  const handleOnCopy = () => copy(votingKeyEncrypted)
+  const {copy, isCopying} = useCopy()
 
   const onNext = () => {
     navigateTo.txHistory()
@@ -44,9 +43,8 @@ export const QrCode = () => {
           title={strings.step4QrTitle}
           qrContent={votingKeyEncrypted}
           shareContent={votingKeyEncrypted}
-          onLongPress={handleOnCopy}
+          onLongPress={(event) => copy({text: votingKeyEncrypted, feedback: strings.step4QrCopiedText, event})}
           shareLabel={strings.step4QrShareLabel}
-          copiedText={strings.step4QrCopiedText}
         />
 
         <Space height="lg" />
@@ -59,7 +57,7 @@ export const QrCode = () => {
       </ScrollView>
 
       <Actions style={styles.padding}>
-        <Button shelleyTheme onPress={onNext} title={strings.completeButton} disabled={isCopying || !checked} />
+        <Button onPress={onNext} title={strings.completeButton} disabled={isCopying || !checked} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
index b09812b5a6..9d2865f4c1 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
@@ -2,18 +2,18 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
+import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
 import {Icon} from '../../../components/Icon'
-import {useCopy} from '../../../hooks/useCopy'
 
 export const CopiableText = ({children, textToCopy}: {children: React.ReactNode; textToCopy: string}) => {
   const {styles, colors} = useStyles()
-  const [, copy] = useCopy()
+  const {copy} = useCopy()
 
   return (
     <View style={styles.text}>
       {children}
 
-      <TouchableOpacity onPress={() => copy(textToCopy)} activeOpacity={0.5}>
+      <TouchableOpacity onPress={() => copy({text: textToCopy})} activeOpacity={0.5}>
         <Icon.Copy size={24} color={colors.copy} />
       </TouchableOpacity>
     </View>
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/TokenDetails.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/TokenDetails.tsx
index 6f590decfa..e96569c482 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/TokenDetails.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/TokenDetails.tsx
@@ -4,11 +4,11 @@ import {Portfolio} from '@yoroi/types'
 import * as React from 'react'
 import {Linking, ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
+import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
 import {Icon} from '../../../components/Icon'
 import {MediaPreview} from '../../../components/MediaPreview/MediaPreview'
 import {SimpleTab} from '../../../components/SimpleTab/SimpleTab'
 import {Space} from '../../../components/Space/Space'
-import {useCopy} from '../../../hooks/useCopy'
 import {time} from '../../../kernel/constants'
 import {isEmptyString} from '../../../kernel/utils'
 import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
@@ -99,7 +99,7 @@ const Info = ({info}: {info: Portfolio.Token.Info}) => {
 const Json = ({discovery, isActive}: {discovery?: Portfolio.Token.Discovery; isActive: boolean}) => {
   const {styles, colors} = useStyles()
   const strings = useStrings()
-  const [, copy] = useCopy()
+  const {copy} = useCopy()
 
   if (!isActive || !discovery) return null
 
@@ -110,7 +110,7 @@ const Json = ({discovery, isActive}: {discovery?: Portfolio.Token.Discovery; isA
       <View style={styles.jsonHeader}>
         <Text style={styles.jsonLabel}>{strings.metadata}</Text>
 
-        <TouchableOpacity onPress={() => copy(stringifiedMetadata)} activeOpacity={0.5}>
+        <TouchableOpacity onPress={() => copy({text: stringifiedMetadata})} activeOpacity={0.5}>
           <Icon.Copy size={24} color={colors.copy} />
         </TouchableOpacity>
       </View>
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
index c1d728dbe5..035dc332c2 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
@@ -58,7 +58,7 @@ export const ReviewTxScreen = () => {
       </MaterialTab.Navigator>
 
       <Actions>
-        <Button title={strings.confirm} shelleyTheme onPress={onConfirm} />
+        <Button title={strings.confirm} onPress={onConfirm} />
       </Actions>
     </SafeArea>
   )
diff --git a/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/OpenDeviceAppSettingsButton.tsx b/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/OpenDeviceAppSettingsButton.tsx
index 55faf3176c..36134afdda 100644
--- a/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/OpenDeviceAppSettingsButton.tsx
+++ b/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/OpenDeviceAppSettingsButton.tsx
@@ -4,7 +4,7 @@ import {openSettings} from 'react-native-permissions'
 import {Button, ButtonProps} from '../../../../components/Button/Button'
 import {useStrings} from '../../common/useStrings'
 
-export const OpenDeviceAppSettingsButton = (props: Omit<ButtonProps, 'title' | 'onPress' | 'shelleyTheme'>) => {
+export const OpenDeviceAppSettingsButton = (props: Omit<ButtonProps, 'title' | 'onPress' | ''>) => {
   const strings = useStrings()
-  return <Button onPress={openSettings} title={strings.openAppSettings} shelleyTheme {...props} />
+  return <Button onPress={openSettings} title={strings.openAppSettings} {...props} />
 }
diff --git a/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/ShowCameraPermissionDeniedScreen.tsx b/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/ShowCameraPermissionDeniedScreen.tsx
index d7f9d544e2..57e195d9de 100644
--- a/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/ShowCameraPermissionDeniedScreen.tsx
+++ b/apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/ShowCameraPermissionDeniedScreen.tsx
@@ -1,15 +1,15 @@
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
+import {openSettings} from 'react-native-permissions'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
 import {useBlockGoBack, useWalletNavigation} from '../../../../kernel/navigation'
 import {useStrings} from '../../common/useStrings'
 import {CameraPermissionDeniedIllustration} from '../../illustrations/CameraPermissionDeniedIlustration'
-import {OpenDeviceAppSettingsButton} from './OpenDeviceAppSettingsButton'
 
 export const ShowCameraPermissionDeniedScreen = () => {
   const styles = useStyles()
@@ -29,11 +29,11 @@ export const ShowCameraPermissionDeniedScreen = () => {
       </ScrollView>
 
       <Actions>
-        <ContinueButton onPress={resetToTxHistory} title={strings.continue} outlineShelley />
+        <Button onPress={resetToTxHistory} title={strings.continue} size="S" type={ButtonType.Secondary} />
 
         <Spacer height={16} />
 
-        <OpenDeviceAppSettingsButton />
+        <Button onPress={openSettings} title={strings.openAppSettings} size="S" />
       </Actions>
     </SafeAreaView>
   )
@@ -75,5 +75,3 @@ const useStyles = () => {
   })
   return styles
 }
-
-const ContinueButton = Button
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
index f5c4c5130c..16dc5bf69d 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
@@ -27,12 +27,7 @@ export const FailedTxScreen = () => {
 
       <Space height="xl" />
 
-      <Button
-        onPress={navigateTo.startTxAfterReset}
-        title={strings.failedTxButton}
-        style={styles.button}
-        shelleyTheme
-      />
+      <Button onPress={navigateTo.startTxAfterReset} title={strings.failedTxButton} style={styles.button} />
     </SafeArea>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
index b7c9793401..1be4dc7051 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
@@ -30,7 +30,7 @@ export const SubmittedTxScreen = () => {
 
       <Space height="xl" />
 
-      <Button onPress={resetToTxHistory} title={strings.submittedTxButton} style={styles.button} shelleyTheme />
+      <Button onPress={resetToTxHistory} title={strings.submittedTxButton} style={styles.button} />
     </SafeArea>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
index 44d0d8578c..0951dbc003 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -153,7 +153,6 @@ export const EditAmountScreen = () => {
           <ApplyButton
             onPress={handleOnApply}
             title={strings.apply.toLocaleUpperCase()}
-            shelleyTheme
             disabled={isUnableToSpend || !hasBalance || isZero}
           />
         </Actions>
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
index aa4bfac370..179d075369 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
@@ -138,12 +138,7 @@ export const ListAmountsToSendScreen = () => {
 
         <Spacer height={33} />
 
-        <NextButton
-          onPress={onNext}
-          title={strings.next}
-          shelleyTheme
-          disabled={selectedTokensCounter === 0 || isLoading}
-        />
+        <NextButton onPress={onNext} title={strings.next} disabled={selectedTokensCounter === 0 || isLoading} />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx
index 5b2e08edde..bbef78105f 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx
@@ -114,13 +114,7 @@ export const StartMultiTokenTxScreen = () => {
 
         <Actions style={isScrollBarShown && styles.actionsScroll}>
           <Padding>
-            <NextButton
-              onPress={handleOnNext}
-              title={strings.next}
-              disabled={!canGoNext}
-              testID="nextButton"
-              shelleyTheme
-            />
+            <NextButton onPress={handleOnNext} title={strings.next} disabled={!canGoNext} testID="nextButton" />
           </Padding>
         </Actions>
       </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx b/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx
index 68afc106d7..b6e455d8f9 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx
@@ -68,7 +68,6 @@ export const useHandleOpenNetworkNoticeModal = () => {
 
         <View style={styles.actions}>
           <Button
-            shelleyTheme
             title={strings.networkNoticeButton}
             onPress={() => {
               closeModal()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx b/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx
index 2cd5fca0f9..ab25f38163 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx
@@ -3,7 +3,7 @@ import {Chain} from '@yoroi/types'
 import * as React from 'react'
 import {StyleSheet, Text, TextStyle, TouchableOpacity, useWindowDimensions, View, ViewStyle} from 'react-native'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import {useModal} from '../../../components/Modal/ModalContext'
 import {Space} from '../../../components/Space/Space'
 import {Spacer} from '../../../components/Spacer/Spacer'
@@ -126,11 +126,11 @@ const MainnetWarningDialog = ({onCancel, onOk}: {onCancel: () => void; onOk: ()
       <Spacer fill />
 
       <View style={styles.warningModalActions}>
-        <Button shelleyTheme outlineOnLight title="Cancel" block onPress={onCancel} />
+        <Button size="S" type={ButtonType.Secondary} title="Cancel" onPress={onCancel} />
 
         <Space width="lg" />
 
-        <Button shelleyTheme title="Switch" block onPress={onOk} />
+        <Button size="S" title="Switch" onPress={onOk} />
       </View>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx b/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx
index b3e87d7a45..003c7dd713 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx
@@ -96,7 +96,6 @@ export const ChangePasswordScreen = () => {
             onPress={() => changePassword({currentPassword, newPassword})}
             disabled={hasErrors}
             title={strings.continueButton}
-            shelleyTheme
           />
         </Actions>
       </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx b/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
index e9d442cdb6..cc9b3c57cf 100644
--- a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
@@ -29,7 +29,7 @@ export const DisableEasyConfirmationScreen = () => {
       </View>
 
       <View style={styles.actions}>
-        <Button title={strings.disableButton} onPress={handleOnDisableConfirmation} shelleyTheme />
+        <Button title={strings.disableButton} onPress={handleOnDisableConfirmation} />
       </View>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx b/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
index e9bbcead34..99740f3ff2 100644
--- a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
@@ -61,7 +61,6 @@ export const EnableEasyConfirmationScreen = () => {
             title={strings.enableButton}
             onPress={() => enableEasyConfirmation(rootPassword)}
             disabled={isEmptyString(rootPassword) || isLoading}
-            shelleyTheme
           />
         </Actions>
       </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx b/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
index ac1436a7a7..7030a376ef 100644
--- a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
@@ -1,9 +1,8 @@
 import {useNavigation} from '@react-navigation/native'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
-import {StyleSheet} from 'react-native'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import globalMessages from '../../../kernel/i18n/global-messages'
 import {useEnableAuthWithOs} from '../../Auth/common/hooks'
 import {OsAuthScreen} from '../../Auth/OsAuthScreen/OsAuthScreen'
@@ -22,18 +21,17 @@ export const EnableLoginWithOsScreen = () => {
         <Button
           key="cancel"
           disabled={isLoading}
-          outlineShelley
+          size="S"
+          type={ButtonType.Secondary}
           title={strings.notNowButton}
           onPress={() => navigation.goBack()}
-          containerStyle={styles.cancel}
         />,
         <Button
-          shelleyTheme
+          size="S"
           disabled={isLoading}
           key="link"
           title={strings.linkButton}
           onPress={() => enableAuthWithOs()}
-          containerStyle={styles.link}
         />,
       ]}
     />
@@ -75,13 +73,3 @@ const messages = defineMessages({
     defaultMessage: '!!!to your Yoroi wallet',
   },
 })
-
-const styles = StyleSheet.create({
-  cancel: {
-    flex: 1,
-    marginRight: 15,
-  },
-  link: {
-    flex: 1,
-  },
-})
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
index 89b7ea3453..669a3d070e 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
@@ -25,7 +25,7 @@ export const FailedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={navigation.goBack} title={strings.failedTxButton} style={styles.button} shelleyTheme />
+      <Button onPress={navigation.goBack} title={strings.failedTxButton} style={styles.button} />
     </SafeArea>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
index d7442d96be..49077bb6d7 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
@@ -26,7 +26,7 @@ export const SubmittedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={resetToTxHistory} title={strings.submittedTxButton} style={styles.button} shelleyTheme />
+      <Button onPress={resetToTxHistory} title={strings.submittedTxButton} style={styles.button} />
     </SafeArea>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx b/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx
index 589cd07a1f..4c98f2a468 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx
@@ -20,7 +20,7 @@ export const InitialCollateralInfoModal = ({onConfirm}: {onConfirm: () => void})
       <Space fill />
 
       <View style={styles.actions}>
-        <Button title={strings.initialCollateralInfoModalButton} mainTheme onPress={onConfirm} />
+        <Button title={strings.initialCollateralInfoModalButton} onPress={onConfirm} />
       </View>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
index 2662984730..4b98258c15 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
@@ -180,16 +180,11 @@ export const ManageCollateralScreen = () => {
       </ScrollView>
 
       {shouldShowPrimaryButton && (
-        <Button
-          title={strings.generateCollateral}
-          onPress={handleCollateralInfoModal}
-          shelleyTheme
-          disabled={isLoading}
-        />
+        <Button title={strings.generateCollateral} onPress={handleCollateralInfoModal} disabled={isLoading} />
       )}
 
       {shouldShowBackButton && params?.backButton && (
-        <Button title={params.backButton.content} onPress={params.backButton.onPress} shelleyTheme />
+        <Button title={params.backButton.content} onPress={params.backButton.onPress} />
       )}
 
       <Space height="lg" />
diff --git a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx
index 24fb0921fb..a0029b57fe 100644
--- a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx
@@ -66,7 +66,6 @@ export const RenameWalletScreen = () => {
             onPress={handleOnRename}
             title={strings.changeButton}
             disabled={hasErrors || isEmptyString(newWalletName)}
-            shelleyTheme
           />
         </View>
       </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
index c624d71cda..734bb47a56 100644
--- a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
@@ -137,8 +137,8 @@ export const SettingsScreenNavigator = () => {
         options={{
           title: strings.networkTitle,
           headerRight: () => (
-            <TouchableOpacity onPress={handleOpenModal} activeOpacity={0.5}>
-              <Icon.Info size={24} color={color.gray_900} style={{...atoms.px_lg}} />
+            <TouchableOpacity onPress={handleOpenModal} activeOpacity={0.5} style={{...atoms.px_lg}}>
+              <Icon.Info size={24} color={color.gray_900} />
             </TouchableOpacity>
           ),
         }}
diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/ButtonCard/ButtonCard.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/ButtonCard/ButtonCard.tsx
index a6d46cb892..729ddda6b3 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/common/ButtonCard/ButtonCard.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/common/ButtonCard/ButtonCard.tsx
@@ -10,10 +10,10 @@ type ButtonCardProps = {
   subTitle?: string
   icon?: React.ReactNode
   onPress: () => void
-  testId?: string
+  testID?: string
 }
 
-export const ButtonCard = ({title, subTitle, icon = null, onPress, testId}: ButtonCardProps) => {
+export const ButtonCard = ({title, subTitle, icon = null, onPress, testID}: ButtonCardProps) => {
   const {styles, colors} = useStyles()
 
   return (
@@ -21,7 +21,7 @@ export const ButtonCard = ({title, subTitle, icon = null, onPress, testId}: Butt
       activeOpacity={0.5}
       style={[styles.container, icon !== null && styles.justifySpaceBetween]}
       onPress={onPress}
-      testID={testId}
+      testID={testID}
     >
       <LinearGradient
         style={[StyleSheet.absoluteFill, {opacity: 1}]}
diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.tsx
index 3baaa8f652..11c549c83c 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.tsx
@@ -15,7 +15,7 @@ type CardAboutPhraseProps = {
   includeSpacing?: boolean
   checksumImage?: string
   checksumLine?: number
-  testId?: string
+  testID?: string
 }
 
 export const CardAboutPhrase = ({
@@ -25,7 +25,7 @@ export const CardAboutPhrase = ({
   includeSpacing,
   checksumImage,
   checksumLine,
-  testId,
+  testID,
 }: CardAboutPhraseProps) => {
   const {styles, colors} = useStyles(includeSpacing, showBackgroundColor)
   const strings = useStrings()
@@ -43,7 +43,7 @@ export const CardAboutPhrase = ({
 
       {title !== undefined && (
         <>
-          <Text style={styles.title} testID={testId}>
+          <Text style={styles.title} testID={testID}>
             {title}
           </Text>
 
diff --git a/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
index e6eb1ad670..b8a75da51d 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
@@ -93,7 +93,6 @@ export const SaveReadOnlyWalletScreen = () => {
             <WalletInfoView normalizedPath={normalizedPath} publicKeyHex={publicKeyHex} />
           </Boundary>
         }
-        buttonStyle={styles.walletFormButtonStyle}
         isWaiting={isLoading}
       />
     </SafeAreaView>
@@ -146,9 +145,6 @@ const styles = StyleSheet.create({
     paddingTop: 0,
     paddingHorizontal: 0,
   },
-  walletFormButtonStyle: {
-    marginHorizontal: 0,
-  },
 })
 
 const messages = defineMessages({
diff --git a/apps/wallet-mobile/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx b/apps/wallet-mobile/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx
index 8ad5fb1308..b7dff231e8 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx
@@ -23,7 +23,6 @@ type Props = {
     totalSteps: number
   }
   containerStyle?: ViewStyle
-  buttonStyle?: ViewStyle
   topContent?: React.ReactNode
   bottomContent?: React.ReactNode
   isWaiting?: boolean
@@ -34,7 +33,6 @@ export const WalletNameForm = ({
   image,
   progress,
   containerStyle,
-  buttonStyle,
   topContent,
   bottomContent,
   defaultWalletName,
@@ -92,10 +90,8 @@ export const WalletNameForm = ({
 
         <View style={styles.buttonContainer}>
           <Button
-            block
             onPress={() => onSubmit({name: name.trim()})}
             title={strings.save}
-            style={[styles.button, buttonStyle]}
             disabled={hasErrors || isWaiting}
             testID="saveWalletButton"
           />
@@ -128,10 +124,6 @@ const useStyles = () => {
       flexDirection: 'row',
       marginTop: 12,
     },
-    button: {
-      marginHorizontal: 10,
-      marginVertical: 16,
-    },
   })
 
   return styles
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseMnemonicType/ChooseMnemonicTypeScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseMnemonicType/ChooseMnemonicTypeScreen.tsx
index 2b17322623..f9875cc5d9 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseMnemonicType/ChooseMnemonicTypeScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseMnemonicType/ChooseMnemonicTypeScreen.tsx
@@ -51,7 +51,7 @@ export const ChooseMnemonicTypeScreen = () => {
           title={strings.choose15WordsMnemonicTitle}
           icon={<Mnemonic15Words style={styles.icon} />}
           onPress={handle15Words}
-          testId="mnemonic-15-word"
+          testID="mnemonic-15-word"
         />
 
         <Space height="lg" />
@@ -60,7 +60,7 @@ export const ChooseMnemonicTypeScreen = () => {
           title={strings.choose24WordsMnemonicTitle}
           icon={<Mnemonic24Words style={styles.icon} />}
           onPress={handle24Words}
-          testId="mnemonic-24-word"
+          testID="mnemonic-24-word"
         />
 
         <Space height="lg" />
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
index d9292ce4d2..60b452dc10 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
@@ -64,7 +64,7 @@ export const ChooseSetupTypeScreen = () => {
             title={strings.createWalletButtonCard}
             icon={<CreateWallet style={styles.icon} />}
             onPress={handleCreate}
-            testId="setup-create-new-wallet-button"
+            testID="setup-create-new-wallet-button"
           />
 
           <Space height="lg" />
@@ -73,7 +73,7 @@ export const ChooseSetupTypeScreen = () => {
             title={strings.restoreWalletButtonCard}
             icon={<RestoreWallet style={styles.icon} />}
             onPress={handleRestore}
-            testId="setup-restore-wallet-button"
+            testID="setup-restore-wallet-button"
           />
 
           <Space height="lg" />
@@ -82,7 +82,7 @@ export const ChooseSetupTypeScreen = () => {
             title={strings.connectWalletButtonCard}
             icon={<HardwareWallet style={styles.icon} />}
             onPress={handleHw}
-            testId="setup-connect-HW-wallet-button"
+            testID="setup-connect-HW-wallet-button"
           />
 
           <Space height="lg" />
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/AboutRecoveryPhraseScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/AboutRecoveryPhraseScreen.tsx
index ed9697b0df..deb7a5fe22 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/AboutRecoveryPhraseScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/AboutRecoveryPhraseScreen.tsx
@@ -64,7 +64,6 @@ export const AboutRecoveryPhraseScreen = () => {
         <LearnMoreButton onPress={handleOnLearMoreButtonPress} />
 
         <Button
-          shelleyTheme
           title={strings.next}
           onPress={() => navigation.navigate('setup-wallet-recovery-phrase-mnemonic')}
           testID="setup-step1-next-button"
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/RecoveryPhraseScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/RecoveryPhraseScreen.tsx
index 8baaf54c2b..4c233e9c40 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/RecoveryPhraseScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/RecoveryPhraseScreen.tsx
@@ -66,13 +66,12 @@ export const RecoveryPhraseScreen = () => {
         <Space height="xl" />
 
         <Button
-          shelleyTheme
           title={strings.continueButton}
           onPress={() => {
             closeModal()
             showCreateWalletInfoModalChanged(false)
           }}
-          testId="setup-step2-continue-button"
+          testID="setup-step2-continue-button"
         />
 
         <Space height="_2xl" />
@@ -107,7 +106,7 @@ export const RecoveryPhraseScreen = () => {
         <Text style={styles.title}>
           {strings.recoveryPhraseTitle(bold)}
 
-          <Info onPress={handleOnShowModal} testId="step2-info-icon" />
+          <Info onPress={handleOnShowModal} testID="step2-info-icon" />
         </Text>
 
         <View style={styles.mnemonicWords}>
@@ -147,14 +146,13 @@ export const RecoveryPhraseScreen = () => {
       <Spacer fill />
 
       <Button
-        shelleyTheme
         title={strings.next}
         disabled={isBlur}
         onPress={() => {
           mnemonicChanged(mnemonic)
           navigation.navigate('setup-wallet-verify-recovery-phrase-mnemonic')
         }}
-        testId="setup-step2-next-button"
+        testID="setup-step2-next-button"
       />
 
       <Space height="lg" />
@@ -162,12 +160,12 @@ export const RecoveryPhraseScreen = () => {
   )
 }
 
-const Info = ({onPress, testId}: {onPress: () => void; testId?: string}) => {
+const Info = ({onPress, testID}: {onPress: () => void; testID?: string}) => {
   const {styles} = useStyles()
   const {color, isDark} = useTheme()
   return (
     <TouchableOpacity style={styles.info} onPress={onPress}>
-      <View style={styles.infoIcon} testID={testId}>
+      <View style={styles.infoIcon} testID={testID}>
         <InfoIcon size={24} color={isDark ? color.white_static : color.black_static} />
       </View>
     </TouchableOpacity>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
index a69a998320..e38abc5ac0 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.tsx
@@ -98,7 +98,6 @@ export const VerifyRecoveryPhraseScreen = () => {
 
       <View style={[styles.actions, styles.padding]}>
         <Button
-          shelleyTheme
           title={strings.next}
           disabled={disabled}
           onPress={async () => {
@@ -111,7 +110,7 @@ export const VerifyRecoveryPhraseScreen = () => {
 
             navigation.navigate('setup-wallet-details-form')
           }}
-          testId="setup-next-button"
+          testID="setup-next-button"
         />
       </View>
     </SafeAreaView>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
index eac247960a..b7959041ec 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
@@ -184,13 +184,12 @@ export const WalletDetailsScreen = () => {
           />
 
           <Button
-            shelleyTheme
             title={strings.continueButton}
             onPress={() => {
               closeModal()
               showRestoreWalletInfoModalChanged(false)
             }}
-            testId="setup-modal-continue-button"
+            testID="setup-modal-continue-button"
           />
         </View>
       </View>,
@@ -242,7 +241,7 @@ export const WalletDetailsScreen = () => {
             }}
           />
 
-          <Button title={strings.continueButton} shelleyTheme onPress={closeModal} />
+          <Button title={strings.continueButton} onPress={closeModal} />
         </View>
       </View>,
       HEIGHT_MODAL_CHECKSUM,
@@ -328,7 +327,6 @@ export const WalletDetailsScreen = () => {
 
         <Actions>
           <Button
-            shelleyTheme
             title={strings.next}
             onPress={() => handleCreateWallet()}
             disabled={isLoading || Object.keys(passwordErrors).length > 0 || Object.keys(nameErrors).length > 0}
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/CheckNanoXScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/CheckNanoXScreen.tsx
index 83d0aaaed9..ab81cec717 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/CheckNanoXScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/CheckNanoXScreen.tsx
@@ -54,7 +54,7 @@ export const CheckNanoXScreen = () => {
       </ScrollView>
 
       <Actions>
-        <Button shelleyTheme onPress={onContinue} title={strings.continueButton} testID="continueButton" />
+        <Button onPress={onContinue} title={strings.continueButton} testID="continueButton" />
       </Actions>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SaveNanoXScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SaveNanoXScreen.tsx
index 8b36ebe587..ba2ec7e320 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SaveNanoXScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SaveNanoXScreen.tsx
@@ -151,7 +151,7 @@ export const SaveNanoXScreen = () => {
 
         <Space height="sm" />
 
-        <Button title={strings.continueButton} shelleyTheme onPress={closeModal} />
+        <Button title={strings.continueButton} onPress={closeModal} />
       </View>,
       HEIGHT_MODAL_NAME_PASSWORD,
     )
@@ -186,7 +186,7 @@ export const SaveNanoXScreen = () => {
 
         <Space height="sm" />
 
-        <Button title={strings.continueButton} shelleyTheme onPress={closeModal} />
+        <Button title={strings.continueButton} onPress={closeModal} />
       </View>,
       HEIGHT_MODAL_CHECKSUM,
     )
@@ -243,10 +243,9 @@ export const SaveNanoXScreen = () => {
 
         <View>
           <Button
-            shelleyTheme
             title={strings.next}
             onPress={handleOnSubmit}
-            testId="setup-restore-step2-next-button"
+            testID="setup-restore-step2-next-button"
             disabled={disabled}
           />
         </View>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SelectHwConnectionModal.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SelectHwConnectionModal.tsx
index c07d935055..214968f277 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SelectHwConnectionModal.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreHwWallet/SelectHwConnectionModal.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import {Alert, Platform, StyleSheet, Text, View} from 'react-native'
 import DeviceInfo from 'react-native-device-info'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {Icon} from '../../../../components/Icon'
 import {Space} from '../../../../components/Space/Space'
 import {SetupWalletRouteNavigation} from '../../../../kernel/navigation'
@@ -39,7 +39,6 @@ export const SelectHwConnectionModal = () => {
 }
 
 const SelectBluetoothSection = () => {
-  const {styles, colors} = useStyles()
   const strings = useStrings()
   const {useUSBChanged: USBChanged, walletImplementationChanged, setupTypeChanged} = useSetupWallet()
   const navigation = useNavigation<SetupWalletRouteNavigation>()
@@ -64,11 +63,9 @@ const SelectBluetoothSection = () => {
       <Space height="xl" />
 
       <Button
-        iconImage={<Icon.Bluetooth color={colors.blue} />}
-        textStyles={styles.buttonText}
+        type={ButtonType.Secondary}
         title={strings.hwModalBtButton}
-        outlineOnLight
-        shelleyTheme
+        icon={Icon.Bluetooth}
         onPress={() => request()}
       />
     </>
@@ -76,7 +73,7 @@ const SelectBluetoothSection = () => {
 }
 
 const SelectUsbSection = () => {
-  const {styles, colors} = useStyles()
+  const {styles} = useStyles()
   const strings = useStrings()
   const isAndroidUsbSupported = useIsAndroidUsbSupported()
   const {useUSBChanged: USBChanged, walletImplementationChanged, setupTypeChanged} = useSetupWallet()
@@ -106,11 +103,9 @@ const SelectUsbSection = () => {
       <Space height="xl" />
 
       <Button
-        iconImage={<Icon.Usb color={colors.blue} />}
-        textStyles={styles.buttonText}
+        type={ButtonType.Secondary}
         title={strings.hwModalUsbButton}
-        outlineOnLight
-        shelleyTheme
+        icon={Icon.Usb}
         onPress={() => {
           USBChanged(true)
           navigateHw()
@@ -131,9 +126,6 @@ const useStyles = () => {
       ...atoms.body_1_lg_regular,
       color: color.text_gray_medium,
     },
-    buttonText: {
-      ...atoms.py_lg,
-    },
     iosWarning: {
       color: color.text_gray_low,
       ...atoms.body_2_md_regular,
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx
index 71d088a171..65f33d7c20 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.tsx
@@ -92,7 +92,7 @@ export const MnemonicInput = ({
             mnenonicRefs.forEach((ref) => ref.current?.selectWord(''))
             mnenonicRefs[0].current?.focus()
           }}
-          testId="clearAll-button"
+          testID="clearAll-button"
         />
       )}
 
@@ -101,11 +101,11 @@ export const MnemonicInput = ({
   )
 }
 
-const ClearAllButton = ({onPress, testId}: {onPress: () => void; testId?: string}) => {
+const ClearAllButton = ({onPress, testID}: {onPress: () => void; testID?: string}) => {
   const {styles} = useStyles()
   const strings = useStrings()
   return (
-    <View style={styles.textView} testID={testId}>
+    <View style={styles.textView} testID={testID}>
       <TouchableOpacity activeOpacity={0.5} onPress={onPress}>
         <Text style={styles.clearAll}>{strings.clearAll}</Text>
       </TouchableOpacity>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
index 574750d05e..627618132c 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
@@ -168,7 +168,7 @@ export const RestoreWalletDetailsScreen = () => {
 
         <Space height="sm" />
 
-        <Button title={strings.continueButton} shelleyTheme onPress={closeModal} />
+        <Button title={strings.continueButton} onPress={closeModal} />
       </View>,
       HEIGHT_MODAL_NAME_PASSWORD,
     )
@@ -203,7 +203,7 @@ export const RestoreWalletDetailsScreen = () => {
 
         <Space height="sm" />
 
-        <Button title={strings.continueButton} shelleyTheme onPress={closeModal} />
+        <Button title={strings.continueButton} onPress={closeModal} />
       </View>,
       HEIGHT_MODAL_CHECKSUM,
     )
@@ -296,7 +296,6 @@ export const RestoreWalletDetailsScreen = () => {
 
         <View>
           <Button
-            shelleyTheme
             title={strings.next}
             onPress={() =>
               createWallet({
@@ -308,7 +307,7 @@ export const RestoreWalletDetailsScreen = () => {
                 accountVisual,
               })
             }
-            testId="setup-restore-step2-next-button"
+            testID="setup-restore-step2-next-button"
             disabled={disabled}
           />
         </View>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
index f27582562a..aafd8057b2 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletScreen.tsx
@@ -242,7 +242,7 @@ const WordSuggestionList = ({
 
 const WordSuggestionButton = ({title, onPress}: {title: string; onPress: () => void}) => {
   const {styles} = useStyles()
-  return <Button onPress={onPress} style={styles.suggestion} textStyles={styles.suggestionText} title={title} />
+  return <Button onPress={onPress} style={styles.suggestion} title={title} />
 }
 
 const useBold = () => {
@@ -302,11 +302,6 @@ const useStyles = () => {
       borderRadius: 8,
       backgroundColor: 'transparent',
     },
-    suggestionText: {
-      ...atoms.body_1_lg_regular,
-      textTransform: 'none',
-      color: color.text_primary_medium,
-    },
     suggestionArea: {
       backgroundColor: color.bg_color_max,
       borderColor: color.gray_200,
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx
index a6b086315b..3cc7acdff6 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx
@@ -205,7 +205,7 @@ export const ConfirmTxScreen = () => {
 
       <Spacer fill />
 
-      <Button title={strings.confirm} shelleyTheme onPress={onSubmit} />
+      <Button title={strings.confirm} onPress={onSubmit} />
 
       <Spacer height={26} />
     </View>
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.tsx
index e685663b11..820a929815 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.tsx
@@ -75,7 +75,6 @@ export const EnterDrepIdModal = ({onSubmit}: Props) => {
       <Button
         title={strings.confirm}
         disabled={isNonNullable(error) || drepId.length === 0 || !isFetched || isFetching}
-        shelleyTheme
         onPress={handleOnPress}
       />
 
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.tsx
index d835c4f93f..59daa327ed 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.tsx
@@ -34,7 +34,7 @@ export const FailedTxScreen = () => {
 
         <Spacer height={16} />
 
-        <Button title={strings.tryAgain} textStyles={styles.button} shelleyTheme onPress={handleOnTryAgain} />
+        <Button title={strings.tryAgain} onPress={handleOnTryAgain} />
       </View>
     </SafeArea>
   )
@@ -69,10 +69,6 @@ const useStyles = () => {
       color: color.gray_600,
       textAlign: 'center',
     },
-    button: {
-      paddingHorizontal: 24,
-      paddingVertical: 15,
-    },
   })
 
   return styles
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
index 691d747303..58d2f54c9f 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
@@ -52,7 +52,7 @@ export const NoFundsScreen = () => {
 
         <Space height="lg" />
 
-        <Button title={buttonText} textStyles={styles.button} shelleyTheme onPress={handleOnTryAgain} />
+        <Button title={buttonText} onPress={handleOnTryAgain} />
 
         <Spacer fill />
 
@@ -82,10 +82,6 @@ const useStyles = () => {
       maxWidth: 320,
       color: color.gray_max,
     },
-    button: {
-      ...atoms.px_xl,
-      ...atoms.py_lg,
-    },
   })
 
   return styles
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NotSupportedCardanoAppVersion/NotSupportedCardanoAppVersion.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NotSupportedCardanoAppVersion/NotSupportedCardanoAppVersion.tsx
index ad53f518b8..18664b80df 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NotSupportedCardanoAppVersion/NotSupportedCardanoAppVersion.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NotSupportedCardanoAppVersion/NotSupportedCardanoAppVersion.tsx
@@ -41,7 +41,7 @@ export const NotSupportedCardanoAppVersion = () => {
       <Spacer fill />
 
       <Actions>
-        <Button block title={strings.notSupportedVersionButton} shelleyTheme onPress={handleOnPress} />
+        <Button title={strings.notSupportedVersionButton} onPress={handleOnPress} />
       </Actions>
     </SafeArea>
   )
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/SuccessTx/SuccessTxScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/SuccessTx/SuccessTxScreen.tsx
index 24ac90de05..372cc186d1 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/SuccessTx/SuccessTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/SuccessTx/SuccessTxScreen.tsx
@@ -66,11 +66,7 @@ export const SuccessTxScreen = () => {
 
       <Spacer fill />
 
-      <Button
-        title={navigateToStaking ? strings.goToStaking : strings.goToGovernance}
-        shelleyTheme
-        onPress={handleOnPress}
-      />
+      <Button title={navigateToStaking ? strings.goToStaking : strings.goToGovernance} onPress={handleOnPress} />
 
       <Spacer height={6} />
     </View>
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/WithdrawWarningModal/WithdrawWarningModal.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/WithdrawWarningModal/WithdrawWarningModal.tsx
index 8d126a190d..dcc723b4f4 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/WithdrawWarningModal/WithdrawWarningModal.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/WithdrawWarningModal/WithdrawWarningModal.tsx
@@ -23,7 +23,7 @@ export const WithdrawWarningModal = ({onParticipatePress}: Props) => {
 
       <Spacer fill />
 
-      <Button title={strings.withdrawWarningButton} shelleyTheme onPress={onParticipatePress} />
+      <Button title={strings.withdrawWarningButton} onPress={onParticipatePress} />
 
       <Spacer height={24} />
     </View>
diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
index 1ae9968fc4..21151ed6ae 100644
--- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -23,7 +23,7 @@ type Props = {
   inputRef?: React.RefObject<TextInput>
   inputEditable?: boolean
   error?: string
-  testId?: string
+  testID?: string
 }
 
 export const AmountCard = ({
@@ -36,7 +36,7 @@ export const AmountCard = ({
   inputRef,
   inputEditable = true,
   error,
-  testId,
+  testID,
 }: Props) => {
   const [isFocused, setIsFocused] = React.useState(false)
   const strings = useStrings()
@@ -63,7 +63,7 @@ export const AmountCard = ({
           <Pressable
             style={styles.amountWrapper}
             onPress={() => (!info ? navigateTo?.() : focusInput())}
-            testID={`${testId}-token-input`}
+            testID={`${testID}-token-input`}
           >
             <TextInput
               keyboardType="numeric"
@@ -81,7 +81,7 @@ export const AmountCard = ({
               selectTextOnFocus
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}
-              testID={`${testId}-amount-input`}
+              testID={`${testID}-amount-input`}
               keyboardAppearance={isDark ? 'dark' : 'light'} // ios feature
               {...(!info && {onPressIn: navigateTo})}
             />
diff --git a/apps/wallet-mobile/src/features/Swap/common/ConfirmWithSpendingPassword/ConfirmWithSpendingPassword.tsx b/apps/wallet-mobile/src/features/Swap/common/ConfirmWithSpendingPassword/ConfirmWithSpendingPassword.tsx
index 68c676d35c..114d756e7a 100644
--- a/apps/wallet-mobile/src/features/Swap/common/ConfirmWithSpendingPassword/ConfirmWithSpendingPassword.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/ConfirmWithSpendingPassword/ConfirmWithSpendingPassword.tsx
@@ -57,7 +57,6 @@ export const ConfirmWithSpendingPassword = ({onSubmit, isLoading, error, onPassw
 
       <Button
         testID="swapButton"
-        shelleyTheme
         title={strings.sign}
         onPress={() => onSubmit?.(spendingPassword)}
         disabled={spendingPassword.length === 0}
diff --git a/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx
index 7d631337be..1b248d4aa7 100644
--- a/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx
@@ -29,7 +29,7 @@ export const ServiceUnavailable = ({resetErrorBoundary}: ServiceUnavailableProps
 
         <Spacer height={20} />
 
-        <Button onPress={resetErrorBoundary} title={strings.tryAgain} style={styles.button} shelleyTheme />
+        <Button onPress={resetErrorBoundary} title={strings.tryAgain} style={styles.button} />
       </View>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
index a5122f6f59..7a6d3281a8 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
@@ -132,7 +132,6 @@ export const ConfirmTxScreen = () => {
         <Button
           disabled={isButtonDisabled}
           testID="swapButton"
-          shelleyTheme
           title={strings.confirm}
           onPress={() => {
             if (meta.isEasyConfirmationEnabled) {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
index cffd5ea6ae..bd06825b7f 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/LedgerTransportSwitch.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {Alert, ScrollView, StyleSheet, View} from 'react-native'
 
-import {Button} from '../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
 import {useIsUsbSupported} from '../../../../legacy/HW'
@@ -30,8 +30,7 @@ const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) => {
         <Text style={styles.paragraph}>{strings.bluetoothExplanation}</Text>
 
         <Button
-          outlineOnLight
-          shelleyTheme
+          type={ButtonType.Secondary}
           onPress={() => request()}
           title={strings.bluetoothButton}
           testID="connectWithBLEButton"
@@ -42,8 +41,7 @@ const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) => {
         <Text style={styles.paragraph}>{strings.usbExplanation}</Text>
 
         <Button
-          outlineOnLight
-          shelleyTheme
+          type={ButtonType.Secondary}
           onPress={onSelectUSB}
           title={strings.usbButton}
           disabled={!isUSBSupported || !HARDWARE_WALLETS.LEDGER_NANO.ENABLE_USB_TRANSPORT}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.tsx
index f2fa8dee41..c4503a6a43 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.tsx
@@ -26,7 +26,7 @@ export const ShowFailedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={navigateTo.startSwap} title={strings.failedTxButton} style={styles.button} shelleyTheme />
+      <Button onPress={navigateTo.startSwap} title={strings.failedTxButton} style={styles.button} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
index a2b1504b3b..6fb9a94b7b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
@@ -5,7 +5,7 @@ import {Linking, StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {z} from 'zod'
 
-import {Button} from '../../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../../components/Button/Button'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
 import {Text} from '../../../../../components/Text'
 import {useBlockGoBack, useUnsafeParams, useWalletNavigation} from '../../../../../kernel/navigation'
@@ -46,21 +46,11 @@ export const ShowSubmittedTxScreen = () => {
         <Spacer height={20} />
 
         {isString(params?.txId) && (
-          <Button
-            onPress={navigateToExplorer}
-            title={strings.seeOnExplorer}
-            style={styles.explorerButton}
-            outlineShelley
-          />
+          <Button type={ButtonType.Text} size="S" onPress={navigateToExplorer} title={strings.seeOnExplorer} />
         )}
 
         <View style={styles.bottomFixed}>
-          <Button
-            onPress={() => walletNavigate.navigateToTxHistory()}
-            title={strings.goToTransactions}
-            style={styles.button}
-            shelleyTheme
-          />
+          <Button onPress={() => walletNavigate.navigateToTxHistory()} title={strings.goToTransactions} />
         </View>
       </View>
     </SafeAreaView>
@@ -100,12 +90,6 @@ const useStyles = () => {
       textAlign: 'center',
       maxWidth: 300,
     },
-    button: {
-      paddingHorizontal: 20,
-    },
-    explorerButton: {
-      borderColor: 'transparent',
-    },
   })
 
   return styles
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
index 2e13184692..785ed21a2b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
@@ -39,7 +39,7 @@ export const EditBuyAmount = () => {
       touched={isBuyTouched}
       inputRef={buyInputRef}
       error={buyError}
-      testId="swap:buy-edit"
+      testID="swap:buy-edit"
     />
   )
 }
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
index 93d8f5eea4..2396fe899b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
@@ -32,7 +32,7 @@ export const EditSellAmount = () => {
       touched={isSellTouched}
       inputRef={sellInputRef}
       error={error}
-      testId="swap:sell-edit"
+      testID="swap:sell-edit"
     />
   )
 }
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
index e6cdeabadf..05318f75fc 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
@@ -125,13 +125,7 @@ export const EditSlippageScreen = () => {
           </View>
         </ScrollView>
 
-        <Button
-          testID="applyButton"
-          shelleyTheme
-          title={strings.apply}
-          disabled={isButtonDisabled}
-          onPress={onSubmit}
-        />
+        <Button testID="applyButton" title={strings.apply} disabled={isButtonDisabled} onPress={onSubmit} />
       </SafeAreaView>
     </KeyboardAvoidingView>
   )
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
index 4e0e1f2a87..83748dad30 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
@@ -329,7 +329,7 @@ export const StartSwapOrderScreen = () => {
       </ScrollView>
 
       <Actions style={[(deviceHeight < contentHeight || isKeyboardOpen) && styles.actionBorder]}>
-        <Button testID="swapButton" shelleyTheme title={strings.swapTitle} onPress={handleOnSwap} disabled={disabled} />
+        <Button testID="swapButton" title={strings.swapTitle} onPress={handleOnSwap} disabled={disabled} />
       </Actions>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnLimitPrice/WarnLimitPrice.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnLimitPrice/WarnLimitPrice.tsx
index 2fd35c9a7f..1fb6b1a47c 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnLimitPrice/WarnLimitPrice.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnLimitPrice/WarnLimitPrice.tsx
@@ -4,7 +4,7 @@ import {BigNumber} from 'bignumber.js'
 import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {Button} from '../../../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../../../components/Button/Button'
 import {useModal} from '../../../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../../../components/Spacer/Spacer'
 import {useLanguage} from '../../../../../../kernel/i18n'
@@ -68,19 +68,13 @@ export const WarnLimitPrice = ({onConfirm, orderData}: LimitPriceWarningProps) =
       <View style={styles.buttonsWrapper}>
         <Button
           testID="swapCancelButton"
-          outlineShelley
+          size="S"
+          type={ButtonType.Secondary}
           title={strings.limitPriceWarningBack}
           onPress={closeModal}
-          containerStyle={styles.buttonContainer}
         />
 
-        <Button
-          testID="swapConfirmButton"
-          shelleyTheme
-          title={strings.limitPriceWarningConfirm}
-          onPress={onConfirm}
-          containerStyle={styles.buttonContainer}
-        />
+        <Button size="S" testID="swapConfirmButton" title={strings.limitPriceWarningConfirm} onPress={onConfirm} />
       </View>
     </View>
   )
@@ -89,9 +83,6 @@ export const WarnLimitPrice = ({onConfirm, orderData}: LimitPriceWarningProps) =
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
-    buttonContainer: {
-      ...atoms.flex_1,
-    },
     buttonsWrapper: {
       ...atoms.align_center,
       ...atoms.justify_between,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnPriceImpact/WarnPriceImpact.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnPriceImpact/WarnPriceImpact.tsx
index d59012ead0..91625b45fe 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnPriceImpact/WarnPriceImpact.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnPriceImpact/WarnPriceImpact.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {Button} from '../../../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../../../components/Button/Button'
 import {useModal} from '../../../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../../../components/Spacer/Spacer'
 import {PRICE_IMPACT_HIGH_RISK, PRICE_IMPACT_MODERATE_RISK} from '../../../../common/constants'
@@ -36,14 +36,9 @@ export const WarnPriceImpact = ({onContinue, priceImpactRisk}: Props) => {
       <Spacer fill />
 
       <View style={styles.buttonsWrapper}>
-        <Button outlineShelley title={strings.cancel} onPress={closeModal} containerStyle={styles.buttonContainer} />
+        <Button size="S" type={ButtonType.Secondary} title={strings.cancel} onPress={closeModal} />
 
-        <Button
-          title={strings.continue}
-          onPress={onContinue}
-          style={styles.buttonContinue}
-          containerStyle={styles.buttonContainer}
-        />
+        <Button size="S" title={strings.continue} onPress={onContinue} style={styles.buttonContinue} />
       </View>
     </View>
   )
@@ -52,9 +47,6 @@ export const WarnPriceImpact = ({onContinue, priceImpactRisk}: Props) => {
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
-    buttonContainer: {
-      ...atoms.flex_1,
-    },
     buttonContinue: {
       backgroundColor: color.sys_magenta_500,
       ...atoms.flex_1,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnSlippage/WarnSlippage.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnSlippage/WarnSlippage.tsx
index 3953df601e..e144f0c3ef 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnSlippage/WarnSlippage.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/WarnSlippage/WarnSlippage.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {Button} from '../../../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../../../components/Button/Button'
 import {useModal} from '../../../../../../components/Modal/ModalContext'
 import {Spacer} from '../../../../../../components/Spacer/Spacer'
 import {useStrings} from '../../../../common/strings'
@@ -50,19 +50,13 @@ export const WarnSlippage = ({onConfirm, slippage, ticker}: Props) => {
       <View style={styles.actions}>
         <Button
           testID="swapCancelButton"
-          outlineShelley
+          size="S"
+          type={ButtonType.Secondary}
           title={strings.limitPriceWarningBack}
           onPress={closeModal}
-          containerStyle={styles.buttonContainer}
         />
 
-        <Button
-          testID="swapConfirmButton"
-          shelleyTheme
-          title={strings.limitPriceWarningConfirm}
-          onPress={onConfirm}
-          containerStyle={styles.buttonContainer}
-        />
+        <Button testID="swapConfirmButton" size="S" title={strings.limitPriceWarningConfirm} onPress={onConfirm} />
       </View>
     </View>
   )
@@ -71,9 +65,6 @@ export const WarnSlippage = ({onConfirm, slippage, ticker}: Props) => {
 const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
-    buttonContainer: {
-      ...atoms.flex_1,
-    },
     actions: {
       ...atoms.align_center,
       ...atoms.justify_between,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
index 44c65b02b9..ead8c75e44 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
@@ -10,7 +10,7 @@ import React, {useRef} from 'react'
 import {useIntl} from 'react-intl'
 import {ActivityIndicator, Alert, Linking, StyleSheet, TouchableOpacity, View} from 'react-native'
 
-import {Button} from '../../../../../components/Button/Button'
+import {Button, ButtonType} from '../../../../../components/Button/Button'
 import {
   ExpandableInfoCard,
   ExpandableInfoCardSkeleton,
@@ -661,19 +661,11 @@ const ModalContentButtons = ({onBack, onConfirm}: {onBack: () => void; onConfirm
   const {styles} = useStyles()
   return (
     <View style={styles.buttons}>
-      <Button
-        title={strings.listOrdersSheetBack}
-        style={{backgroundColor: 'transparent'}}
-        onPress={onBack}
-        block
-        withoutBackground
-        outlineShelley
-        shelleyTheme
-      />
+      <Button type={ButtonType.Secondary} title={strings.listOrdersSheetBack} onPress={onBack} />
 
       <Spacer width={20} />
 
-      <Button title={strings.listOrdersSheetConfirm} onPress={onConfirm} warningTheme block />
+      <Button type={ButtonType.Critical} title={strings.listOrdersSheetConfirm} onPress={onConfirm} />
     </View>
   )
 }
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AddressModal/AddressModal.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AddressModal/AddressModal.tsx
index c6c0152a7c..ce28adfb12 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AddressModal/AddressModal.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AddressModal/AddressModal.tsx
@@ -44,13 +44,7 @@ export const AddressModal = ({address, path}: Props) => {
       <View style={styles.info}>
         <Text style={styles.subtitle}>{strings.walletAddress}</Text>
 
-        <View style={styles.row}>
-          <Text style={styles.address}>{address}</Text>
-
-          <Spacer width={16} />
-
-          <CopyButton value={address} />
-        </View>
+        <CopyButton title={address} value={address} />
 
         <Spacer width={8} />
 
@@ -68,25 +62,19 @@ export const AddressModal = ({address, path}: Props) => {
 
         <Text style={styles.subtitle}>{strings.staking}</Text>
 
-        <View style={styles.row}>
-          <Text style={styles.address}>{keyHashes?.staking}</Text>
-
-          <Spacer width={16} />
-
-          <CopyButton value={keyHashes?.staking ?? ''} />
-        </View>
+        {keyHashes?.staking != null && keyHashes.staking !== '' && (
+          <>
+            <CopyButton title={keyHashes.staking} value={keyHashes.staking} />
 
-        <Spacer width={8} />
+            <Spacer width={8} />
+          </>
+        )}
 
         <Text style={styles.subtitle}>{strings.spending}</Text>
 
-        <View style={styles.row}>
-          <Text style={styles.address}>{keyHashes?.spending}</Text>
-
-          <Spacer width={16} />
-
-          <CopyButton value={keyHashes?.spending ?? ''} />
-        </View>
+        {keyHashes?.spending != null && keyHashes.spending !== '' && (
+          <CopyButton title={keyHashes.spending} value={keyHashes.spending} />
+        )}
       </View>
     </ScrollView>
   )
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
index fd582c9dbc..b0f9dcc120 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
@@ -179,13 +179,7 @@ export const TxDetails = () => {
 
           <Label>{strings.transactionId}</Label>
 
-          <View style={styles.dataContainer}>
-            <Text secondary monospace numberOfLines={1} ellipsizeMode="middle">
-              {transaction.id}
-            </Text>
-
-            <CopyButton value={transaction.id} />
-          </View>
+          <CopyButton title={transaction.id} value={transaction.id} />
         </ScrollView>
 
         {network !== Chain.Network.Sancho && (
@@ -193,7 +187,6 @@ export const TxDetails = () => {
             <Button
               onPress={() => Linking.openURL(explorers.cardanoscan.tx(transaction.id))}
               title={strings.openInExplorer}
-              shelleyTheme
             />
           </Actions>
         )}
@@ -398,11 +391,6 @@ const useStyles = () => {
       borderTopWidth: 1,
       borderColor: color.gray_200,
     },
-    dataContainer: {
-      ...atoms.flex_row,
-      paddingRight: 70,
-      marginBottom: 20,
-    },
     address: {
       color: color.text_gray_medium,
       ...atoms.body_2_md_regular,
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
index 1fbf7a7748..b4cbd5ea08 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
@@ -4,13 +4,12 @@ import {useTheme} from '@yoroi/theme'
 import {useTransfer} from '@yoroi/transfer'
 import {Chain} from '@yoroi/types'
 import React from 'react'
-import {StyleSheet, TouchableOpacity, View} from 'react-native'
-import Animated, {FadeInDown, FadeOutDown, Layout} from 'react-native-reanimated'
+import {GestureResponderEvent, StyleSheet, View} from 'react-native'
 
+import {Button, ButtonType} from '../../../../components/Button/Button'
+import {useCopy} from '../../../../components/Clipboard/ClipboardProvider'
 import {Icon} from '../../../../components/Icon'
-import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
-import {useCopy} from '../../../../hooks/useCopy'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {TxHistoryRouteNavigation} from '../../../../kernel/navigation'
 import {useReceive} from '../../../Receive/common/ReceiveProvider'
@@ -23,14 +22,14 @@ import {useWalletManager} from '../../../WalletManager/context/WalletManagerProv
 import {useStrings} from '../../common/strings'
 
 export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
-  const {styles, colors} = useStyles()
+  const {styles} = useStyles()
   const strings = useStrings()
   const navigateTo = useNavigateTo()
 
   const {isSingle, addressMode} = useAddressMode()
   const {next: nextReceiveAddress, used: usedAddresses} = useReceiveAddressesStatus(addressMode)
   const {selectedAddressChanged} = useReceive()
-  const [isCopying, copy] = useCopy()
+  const {copy} = useCopy()
   const {hideMultipleAddressesInfo, isShowingMultipleAddressInfo} = useMultipleAddressesInfo()
 
   const {reset: resetSendState} = useTransfer()
@@ -102,96 +101,65 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
     navigateTo.receiveSingleAddress()
   }
 
-  const handleOnLongPressReceive = () => {
+  const handleOnLongPressReceive = (event: GestureResponderEvent) => {
     track.receiveCopyAddressClicked({copy_address_location: 'Long Press wallet Address'})
-    copy(nextReceiveAddress)
-  }
-
-  const iconProps = {
-    size: 24,
-    color: colors.actionColor,
+    copy({text: nextReceiveAddress, event})
   }
 
   return (
-    <View>
-      <Spacer height={16} />
-
+    <View style={styles.container}>
       <View style={styles.centralized}>
-        <View style={[styles.row, disabled && styles.disabled]}>
-          {isCopying && (
-            <Animated.View layout={Layout} entering={FadeInDown} exiting={FadeOutDown} style={styles.isCopying}>
-              <Text style={styles.textCopy}>{strings.addressCopiedMsg}</Text>
-            </Animated.View>
-          )}
+        <Button
+          type={ButtonType.Circle}
+          icon={Icon.Received}
+          onPress={handleOnPressReceive}
+          testID="receiveButton"
+          disabled={disabled}
+          onLongPress={handleOnLongPressReceive}
+        />
+
+        <Text style={styles.actionLabel}>{strings.receiveLabel}</Text>
+      </View>
 
+      {!meta.isReadOnly && (
+        <>
           <View style={styles.centralized}>
-            <TouchableOpacity
-              style={styles.actionIcon}
-              onPress={handleOnPressReceive}
-              testID="receiveButton"
+            <Button
+              type={ButtonType.Circle}
+              icon={Icon.Send}
+              onPress={handleOnSend}
+              testID="sendButton"
               disabled={disabled}
-              onLongPress={handleOnLongPressReceive}
-            >
-              <Icon.Received {...iconProps} />
-            </TouchableOpacity>
+            />
 
-            <Text style={styles.actionLabel}>{strings.receiveLabel}</Text>
+            <Text style={styles.actionLabel}>{strings.sendLabel}</Text>
           </View>
 
-          {!meta.isReadOnly && <Spacer width={18} />}
-
-          {!meta.isReadOnly && (
-            <View style={styles.centralized}>
-              <TouchableOpacity
-                style={styles.actionIcon}
-                onPress={handleOnSend}
-                testID="sendButton"
-                disabled={disabled}
-              >
-                <Icon.Send {...iconProps} />
-              </TouchableOpacity>
-
-              <Text style={styles.actionLabel}>{strings.sendLabel}</Text>
-            </View>
-          )}
-
-          {!meta.isReadOnly && (
-            <>
-              <Spacer width={18} />
-
-              <View style={styles.centralized}>
-                <TouchableOpacity
-                  style={styles.actionIcon}
-                  onPress={handleOnSwap}
-                  testID="swapButton"
-                  disabled={disabled}
-                >
-                  <Icon.Swap {...iconProps} />
-                </TouchableOpacity>
-
-                <Text style={styles.actionLabel}>{strings.swapLabel}</Text>
-              </View>
-
-              <Spacer width={18} />
+          <View style={styles.centralized}>
+            <Button
+              type={ButtonType.Circle}
+              icon={Icon.Swap}
+              onPress={handleOnSwap}
+              testID="swapButton"
+              disabled={disabled}
+            />
 
-              <View style={styles.centralized}>
-                <TouchableOpacity
-                  style={styles.actionIcon}
-                  onPress={handleOnExchange}
-                  testID="buyButton"
-                  disabled={disabled}
-                >
-                  <Icon.Exchange {...iconProps} />
-                </TouchableOpacity>
+            <Text style={styles.actionLabel}>{strings.swapLabel}</Text>
+          </View>
 
-                <Text style={styles.actionLabel}>{strings.exchange}</Text>
-              </View>
-            </>
-          )}
-        </View>
-      </View>
+          <View style={styles.centralized}>
+            <Button
+              type={ButtonType.Circle}
+              icon={Icon.Exchange}
+              onPress={handleOnExchange}
+              testID="buyButton"
+              disabled={disabled}
+            />
 
-      <Spacer height={21} />
+            <Text style={styles.actionLabel}>{strings.exchange}</Text>
+          </View>
+        </>
+      )}
     </View>
   )
 }
@@ -199,52 +167,24 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
 const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
-    centralized: {
-      alignItems: 'center',
-      justifyContent: 'center',
+    container: {
+      ...atoms.py_xl,
+      ...atoms.flex_row,
+      ...atoms.justify_center,
+      ...atoms.gap_lg,
     },
-    row: {
-      flexDirection: 'row',
-      justifyContent: 'center',
-    },
-    actionIcon: {
-      justifyContent: 'center',
-      alignItems: 'center',
-      height: 56,
-      width: 56,
-      borderRadius: 28,
-      backgroundColor: color.primary_500,
+    centralized: {
+      ...atoms.align_center,
+      ...atoms.justify_center,
     },
     actionLabel: {
       ...atoms.pt_sm,
       ...atoms.body_3_sm_medium,
       color: color.gray_max,
     },
-    disabled: {
-      opacity: 0.5,
-    },
-    isCopying: {
-      position: 'absolute',
-      backgroundColor: color.gray_max,
-      alignItems: 'center',
-      justifyContent: 'center',
-      top: -40,
-      borderRadius: 4,
-      zIndex: 10,
-      left: -25,
-    },
-    textCopy: {
-      textAlign: 'center',
-      ...atoms.p_sm,
-      ...atoms.body_2_md_medium,
-      color: color.gray_min,
-    },
   })
 
-  const colors = {
-    actionColor: color.white_static,
-  }
-  return {styles, colors}
+  return {styles}
 }
 
 const useNavigateTo = () => {
diff --git a/apps/wallet-mobile/src/hooks/useCopy.ts b/apps/wallet-mobile/src/hooks/useCopy.ts
deleted file mode 100644
index 629bac0e2b..0000000000
--- a/apps/wallet-mobile/src/hooks/useCopy.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import Clipboard from '@react-native-community/clipboard'
-import {useEffect, useState} from 'react'
-
-const MESSAGE_TIMEOUT = 1500
-
-export const useCopy = () => {
-  const [text, setText] = useState<string>('')
-
-  useEffect(() => {
-    const isCopying = !!text
-
-    let timeout: ReturnType<typeof setTimeout> | undefined
-    if (isCopying) {
-      Clipboard.setString(text)
-      timeout = setTimeout(() => setText(''), MESSAGE_TIMEOUT)
-    }
-
-    return () => clearTimeout(timeout)
-  }, [text])
-
-  return [!!text, setText, text] as const
-}
diff --git a/apps/wallet-mobile/src/kernel/i18n/global-messages.ts b/apps/wallet-mobile/src/kernel/i18n/global-messages.ts
index 82bb70760d..2669e868d2 100644
--- a/apps/wallet-mobile/src/kernel/i18n/global-messages.ts
+++ b/apps/wallet-mobile/src/kernel/i18n/global-messages.ts
@@ -588,7 +588,7 @@ export const actionMessages = defineMessages({
   },
   exchange: {
     id: 'global.exchange',
-    defaultMessage: '!!!Buy/Sell ADA',
+    defaultMessage: '!!!Buy/Sell',
   },
 })
 
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index d3c8c7e870..ad8c99b4a8 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -854,7 +854,7 @@
   "global.sign": "sign",
   "global.signTransaction": "Sign transaction",
   "global.spendingPassword": "Spending Password",
-  "global.exchange": "Buy/Sell ADA",
+  "global.exchange": "Buy/Sell",
   "global.staking.epochLabel": "Epoch",
   "global.staking.stakePoolHash": "Stake pool hash",
   "global.staking.stakePoolName": "Stake pool name",
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/Dashboard.tsx b/apps/wallet-mobile/src/legacy/Dashboard/Dashboard.tsx
index cb129e703d..00875483f8 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/Dashboard.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/Dashboard.tsx
@@ -156,8 +156,6 @@ export const Dashboard = () => {
             onPress={navigateTo.stakingCenter}
             title={intl.formatMessage(messages.stakingCenterButton)}
             disabled={meta.isReadOnly}
-            shelleyTheme
-            block
             testID="stakingCenterButton"
           />
         </Actions>
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/StakePoolInfo.tsx b/apps/wallet-mobile/src/legacy/Dashboard/StakePoolInfo.tsx
index c2010862e6..5c7a7424e7 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/StakePoolInfo.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/StakePoolInfo.tsx
@@ -4,9 +4,8 @@ import {defineMessages, useIntl} from 'react-intl'
 import {ActivityIndicator, Linking, StyleSheet, View} from 'react-native'
 import {useQuery, UseQueryOptions} from 'react-query'
 
-import {Button} from '../../components/Button/Button'
+import {Button, ButtonType} from '../../components/Button/Button'
 import {CopyButton} from '../../components/CopyButton'
-import {Space} from '../../components/Space/Space'
 import {Text} from '../../components/Text'
 import {TitledCard} from '../../components/TitledCard'
 import {useSelectedWallet} from '../../features/WalletManager/common/hooks/useSelectedWallet'
@@ -27,43 +26,23 @@ export const StakePoolInfo = ({stakePoolId}: {stakePoolId: string}) => {
   return (
     <View>
       <TitledCard title={strings.title} variant="poolInfo" testID="stakePoolInfoTitleCard">
-        <View>
+        <View style={styles.container}>
           <Text bold style={styles.poolName}>
             {formatStakepoolNameWithTicker(stakePoolInfoAndHistory.info.ticker, stakePoolInfoAndHistory.info.name) ??
               strings.unknownPool}
           </Text>
 
-          <Space height="xs" />
+          <CopyButton title={stakePoolId} value={stakePoolId} message={strings.copied} />
 
-          <View style={styles.poolIdBlock}>
-            <Text
-              numberOfLines={1}
-              ellipsizeMode="middle"
-              monospace
-              style={styles.poolId}
-              testID="stakePoolInfoPoolIdText"
-            >
-              {stakePoolId}
-            </Text>
-
-            <CopyButton value={stakePoolId} message={strings.copied} />
-          </View>
+          {!isEmptyString(homepage) && (
+            <Button
+              type={ButtonType.Secondary}
+              size="S"
+              onPress={() => Linking.openURL(homepage)}
+              title={strings.goToWebsiteButtonLabel}
+            />
+          )}
         </View>
-
-        {!isEmptyString(homepage) && (
-          <>
-            <Space height="lg" />
-
-            <View>
-              <Button
-                outlineOnLight
-                shelleyTheme
-                onPress={() => Linking.openURL(homepage)}
-                title={strings.goToWebsiteButtonLabel}
-              />
-            </View>
-          </>
-        )}
       </TitledCard>
 
       <View style={styles.warning}>
@@ -103,18 +82,13 @@ export const useStakePoolInfoAndHistory = (
 const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
+    container: {
+      ...atoms.gap_md,
+    },
     poolName: {
       ...atoms.body_1_lg_medium,
       color: color.text_gray_medium,
     },
-    poolIdBlock: {
-      ...atoms.flex_row,
-    },
-    poolId: {
-      color: color.text_gray_medium,
-      ...atoms.body_2_md_regular,
-      ...atoms.flex_1,
-    },
     warning: {
       ...atoms.p_sm,
     },
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
index 9f1266b3cc..87535c2fed 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, View} from 'react-native'
 
-import {Button} from '../../components/Button/Button'
+import {Button, ButtonType} from '../../components/Button/Button'
 import {Icon} from '../../components/Icon'
 import {Space} from '../../components/Space/Space'
 import {Text} from '../../components/Text'
@@ -37,12 +37,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
       <View style={styles.stats}>
         <View style={styles.row}>
           <View style={styles.icon}>
-            <Icon.TotalAda
-              color={color.el_primary_medium}
-              backgroundColor={color.gray_200}
-              width={ICON_DIM}
-              height={ICON_DIM}
-            />
+            <Icon.TotalAda color={color.el_primary_medium} size={ICON_DIM} />
           </View>
 
           <Space width="lg" />
@@ -64,12 +59,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
 
         <View style={styles.row}>
           <View style={styles.icon}>
-            <Icon.TotalReward
-              color={color.el_primary_medium}
-              backgroundColor={color.gray_200}
-              width={ICON_DIM}
-              height={ICON_DIM}
-            />
+            <Icon.TotalReward color={color.el_primary_medium} size={ICON_DIM} />
           </View>
 
           <Space width="lg" />
@@ -91,12 +81,7 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
 
         <View style={styles.row}>
           <View style={styles.icon}>
-            <Icon.TotalDelegated
-              color={color.el_primary_medium}
-              backgroundColor={color.gray_200}
-              width={ICON_DIM}
-              height={ICON_DIM}
-            />
+            <Icon.TotalDelegated color={color.el_primary_medium} size={ICON_DIM} />
           </View>
 
           <Space width="lg" />
@@ -116,17 +101,15 @@ export const UserSummary = ({totalAdaSum, totalRewards, totalDelegated, onWithdr
 
         <Space height="lg" />
 
-        <View style={styles.row}>
-          <Button
-            disabled={disableWithdraw}
-            outlineOnLight
-            shelleyTheme
-            onPress={onWithdraw}
-            title={strings.withdrawButtonTitle}
-            style={styles.withdrawButton}
-            testID="userSummaryWithdrawButton"
-          />
-        </View>
+        <Button
+          type={ButtonType.Secondary}
+          disabled={disableWithdraw}
+          size="S"
+          style={styles.withdrawButton}
+          onPress={onWithdraw}
+          title={strings.withdrawButtonTitle}
+          testID="userSummaryWithdrawButton"
+        />
       </View>
     </TitledCard>
   )
@@ -157,7 +140,7 @@ const useStyles = () => {
       ...atoms.body_1_lg_medium,
     },
     withdrawButton: {
-      ...atoms.px_lg,
+      ...atoms.self_start,
     },
   })
 
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.tsx b/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.tsx
index 7215493098..df67ab0bc0 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithPassword.tsx
@@ -4,8 +4,7 @@ import {useIntl} from 'react-intl'
 import {ActivityIndicator, StyleSheet, View} from 'react-native'
 import {ScrollView} from 'react-native-gesture-handler'
 
-import {Button} from '../../../../components/Button/Button'
-import {Space} from '../../../../components/Space/Space'
+import {Button, ButtonType} from '../../../../components/Button/Button'
 import {TextInput} from '../../../../components/TextInput/TextInput'
 import {debugWalletInfo, features} from '../../../../kernel/features'
 import {confirmationMessages, txLabels} from '../../../../kernel/i18n/global-messages'
@@ -52,20 +51,14 @@ export const ConfirmTxWithPassword = ({wallet, onSuccess, onCancel, unsignedTx}:
 
       <View style={styles.buttons}>
         <Button
-          block
-          shelleyTheme
-          outlineOnLight
+          type={ButtonType.Secondary}
           onPress={() => onCancel()}
           title={intl.formatMessage(confirmationMessages.commonButtons.cancelButton)}
           disabled={isLoading}
           testID="cancelTxButton"
         />
 
-        <Space width="md" />
-
         <Button
-          block
-          shelleyTheme
           onPress={() => signAndSubmitTx({unsignedTx, password})}
           title={strings.confirmButton}
           disabled={isLoading}
@@ -113,6 +106,7 @@ const useStyles = () => {
       backgroundColor: color.bg_color_max,
       ...atoms.p_lg,
       ...atoms.flex_row,
+      ...atoms.gap_md,
     },
     scroll: {
       ...atoms.flex_1,
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx b/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx
index 4a391c6cfe..c85860ddd7 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx
@@ -122,7 +122,6 @@ const WithdrawalTxForm = ({wallet, onDone}: {wallet: YoroiWallet; onDone: (withd
 
       <View style={[styles.actions, isScrollBarShown && {borderTopWidth: 1, borderTopColor: colors.lightGray}]}>
         <Button
-          shelleyTheme
           onPress={() => setDeregister(false)}
           title={strings.keepButton}
           disabled={!hasRewards || isLoading}
diff --git a/apps/wallet-mobile/src/legacy/HW/LedgerConnect/LedgerConnect.tsx b/apps/wallet-mobile/src/legacy/HW/LedgerConnect/LedgerConnect.tsx
index 38d488b96c..b33fb40ecb 100644
--- a/apps/wallet-mobile/src/legacy/HW/LedgerConnect/LedgerConnect.tsx
+++ b/apps/wallet-mobile/src/legacy/HW/LedgerConnect/LedgerConnect.tsx
@@ -299,7 +299,6 @@ class LedgerConnectInt extends React.Component<Props, State> {
 
         {useUSB === true && (
           <Button
-            shelleyTheme
             onPress={() => {
               if (refreshing || deviceObj == null || waiting) {
                 return Alert.alert(
diff --git a/apps/wallet-mobile/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx b/apps/wallet-mobile/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx
index 6f1dcd4ae7..46f9943d41 100644
--- a/apps/wallet-mobile/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx
+++ b/apps/wallet-mobile/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx
@@ -57,8 +57,6 @@ export const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) =>
       <Space height="md" />
 
       <Button
-        block
-        shelleyTheme
         onPress={onSelectUSB}
         title={getUsbButtonTitle()}
         disabled={!isUSBSupported || !HARDWARE_WALLETS.LEDGER_NANO.ENABLE_USB_TRANSPORT}
@@ -71,13 +69,7 @@ export const LedgerTransportSwitchView = ({onSelectUSB, onSelectBLE}: Props) =>
 
       <Space height="md" />
 
-      <Button
-        block
-        shelleyTheme
-        onPress={() => request()}
-        title={strings.bluetoothButton}
-        testID="connectWithBLEButton"
-      />
+      <Button onPress={() => request()} title={strings.bluetoothButton} testID="connectWithBLEButton" />
     </ScrollView>
   )
 }
diff --git a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx b/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
index 5a76f87b02..a55acad821 100644
--- a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
@@ -110,7 +110,6 @@ export const DelegationConfirmation = () => {
 
       <ConfirmTx
         buttonProps={{
-          shelleyTheme: true,
           title: strings.delegateButtonLabel,
         }}
         isProvidingPassword
diff --git a/apps/wallet-mobile/src/legacy/Staking/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/legacy/Staking/FailedTx/FailedTxScreen.tsx
index 9d302a6657..fdf8dcaa73 100644
--- a/apps/wallet-mobile/src/legacy/Staking/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/FailedTx/FailedTxScreen.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet} from 'react-native'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import {SafeArea} from '../../../components/SafeArea'
 import {Space} from '../../../components/Space/Space'
 import {Spacer} from '../../../components/Spacer/Spacer'
@@ -28,11 +28,11 @@ export const FailedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={navigateTo.buyAda} title={strings.buyAda} shelleyTheme />
+      <Button onPress={navigateTo.buyAda} title={strings.buyAda} />
 
       <Space height="lg" />
 
-      <Button onPress={navigateTo.main} title={strings.goToMain} textStyles={styles.outlineText} outline />
+      <Button type={ButtonType.Text} onPress={navigateTo.main} title={strings.goToMain} />
     </SafeArea>
   )
 }
@@ -86,9 +86,6 @@ const useStyles = () => {
       textAlign: 'center',
       maxWidth: 330,
     },
-    outlineText: {
-      color: color.primary_500,
-    },
   })
   return styles
 }
diff --git a/apps/wallet-mobile/src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx b/apps/wallet-mobile/src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx
index 726cf4b940..c00fed1f1a 100644
--- a/apps/wallet-mobile/src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx
@@ -48,7 +48,6 @@ export const PoolDetailScreen = ({onPressDelegate, disabled = false}: Props) =>
       <Spacer fill />
 
       <Button
-        shelleyTheme
         onPress={handleOnPress}
         title={strings.next}
         style={styles.button}
diff --git a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionModal.tsx b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionModal.tsx
index a95fdd25ea..0fe14733aa 100644
--- a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionModal.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionModal.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {Image, StyleSheet, Text, View, ViewProps} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 
-import {Button} from '../../../components/Button/Button'
+import {Button, ButtonType} from '../../../components/Button/Button'
 import {Icon} from '../../../components/Icon'
 import {useModal} from '../../../components/Modal/ModalContext'
 import {ScrollView, useScrollView} from '../../../components/ScrollView/ScrollView'
@@ -139,20 +139,9 @@ export const PoolTransitionModal = ({
       {isScrollBarShown && <View style={styles.line} />}
 
       <Actions>
-        <Button
-          withoutBackground
-          title={strings.skipNoRewards.toLocaleUpperCase()}
-          textStyles={styles.outlineButton}
-          onPress={handleOnSkip}
-        />
-
-        <Button
-          shelleyTheme
-          title={strings.updateKeepEarning}
-          onPress={handleOnUpdate}
-          textStyles={styles.button}
-          disabled={isLoading}
-        />
+        <Button type={ButtonType.SecondaryText} title={strings.skipNoRewards} onPress={handleOnSkip} />
+
+        <Button title={strings.updateKeepEarning} onPress={handleOnUpdate} disabled={isLoading} />
       </Actions>
 
       <Space height="xl" />
@@ -239,20 +228,12 @@ const useStyles = () => {
     },
     actions: {
       ...atoms.px_lg,
-      alignSelf: 'stretch',
       gap: 4,
     },
     details: {
       ...atoms.body_1_lg_regular,
       color: color.gray_900,
     },
-    outlineButton: {
-      color: color.gray_900,
-      ...atoms.button_2_md,
-    },
-    button: {
-      ...atoms.button_1_lg,
-    },
     arrowDown: {
       ...atoms.flex_1,
       ...atoms.align_center,
diff --git a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionNotice.tsx b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionNotice.tsx
index 0e3dd7555b..fde7c4b413 100644
--- a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionNotice.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/PoolTransitionNotice.tsx
@@ -36,7 +36,7 @@ export const PoolTransitionNotice = () => {
       </Text>
 
       <Actions>
-        <Button style={styles.noticeButton} onPress={navigateToUpdate} title={strings.update} block />
+        <Button style={styles.noticeButton} onPress={navigateToUpdate} title={strings.update} />
 
         <Space fill />
       </Actions>
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 8902a072e3..0d1c6a4daf 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 230,
+      "line": 233,
       "column": 17,
-      "index": 8390
+      "index": 8700
     },
     "end": {
-      "line": 233,
+      "line": 236,
       "column": 3,
-      "index": 8480
+      "index": 8790
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 234,
+      "line": 237,
       "column": 18,
-      "index": 8500
+      "index": 8810
     },
     "end": {
-      "line": 237,
+      "line": 240,
       "column": 3,
-      "index": 8598
+      "index": 8908
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 238,
+      "line": 241,
       "column": 25,
-      "index": 8625
+      "index": 8935
     },
     "end": {
-      "line": 241,
+      "line": 244,
       "column": 3,
-      "index": 8739
+      "index": 9049
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 242,
+      "line": 245,
       "column": 27,
-      "index": 8768
+      "index": 9078
     },
     "end": {
-      "line": 245,
+      "line": 248,
       "column": 3,
-      "index": 8889
+      "index": 9199
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/components/Analytics/Analytics.json b/apps/wallet-mobile/translations/messages/src/components/Analytics/Analytics.json
index 8cc265b059..97f217db65 100644
--- a/apps/wallet-mobile/translations/messages/src/components/Analytics/Analytics.json
+++ b/apps/wallet-mobile/translations/messages/src/components/Analytics/Analytics.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Join the journey to improve Yoroi",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 299,
+      "line": 290,
       "column": 10,
-      "index": 7605
+      "index": 7425
     },
     "end": {
-      "line": 302,
+      "line": 293,
       "column": 3,
-      "index": 7698
+      "index": 7518
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Share user insights to help us fine tune Yoroi to better serve your needs.",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 303,
+      "line": 294,
       "column": 15,
-      "index": 7715
+      "index": 7535
     },
     "end": {
-      "line": 306,
+      "line": 297,
       "column": 3,
-      "index": 7854
+      "index": 7674
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Anonymous analytics data",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 307,
+      "line": 298,
       "column": 13,
-      "index": 7869
+      "index": 7689
     },
     "end": {
-      "line": 310,
+      "line": 301,
       "column": 3,
-      "index": 7956
+      "index": 7776
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!You can always opt-out via Settings",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 311,
+      "line": 302,
       "column": 10,
-      "index": 7968
+      "index": 7788
     },
     "end": {
-      "line": 314,
+      "line": 305,
       "column": 3,
-      "index": 8063
+      "index": 7883
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!We <b>cannot</b> access private keys",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 315,
+      "line": 306,
       "column": 11,
-      "index": 8076
+      "index": 7896
     },
     "end": {
-      "line": 318,
+      "line": 309,
       "column": 3,
-      "index": 8173
+      "index": 7993
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!We <b>are not</b> recording IP addresses",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 319,
+      "line": 310,
       "column": 8,
-      "index": 8183
+      "index": 8003
     },
     "end": {
-      "line": 322,
+      "line": 313,
       "column": 3,
-      "index": 8281
+      "index": 8101
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!We <b>do not</b> sell data",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 323,
+      "line": 314,
       "column": 10,
-      "index": 8293
+      "index": 8113
     },
     "end": {
-      "line": 326,
+      "line": 317,
       "column": 3,
-      "index": 8379
+      "index": 8199
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Learn more about user insights",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 327,
+      "line": 318,
       "column": 8,
-      "index": 8389
+      "index": 8209
     },
     "end": {
-      "line": 330,
+      "line": 321,
       "column": 3,
-      "index": 8477
+      "index": 8297
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Skip",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 331,
+      "line": 322,
       "column": 8,
-      "index": 8487
+      "index": 8307
     },
     "end": {
-      "line": 334,
+      "line": 325,
       "column": 3,
-      "index": 8549
+      "index": 8369
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Accept",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 335,
+      "line": 326,
       "column": 10,
-      "index": 8561
+      "index": 8381
     },
     "end": {
-      "line": 338,
+      "line": 329,
       "column": 3,
-      "index": 8627
+      "index": 8447
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Allow Yoroi analytics",
     "file": "src/components/Analytics/Analytics.tsx",
     "start": {
-      "line": 339,
+      "line": 330,
       "column": 10,
-      "index": 8639
+      "index": 8459
     },
     "end": {
-      "line": 342,
+      "line": 333,
       "column": 3,
-      "index": 8720
+      "index": 8540
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/components/ErrorModal/ErrorModal.json b/apps/wallet-mobile/translations/messages/src/components/ErrorModal/ErrorModal.json
index 532c3fadc1..5b441cf9b4 100644
--- a/apps/wallet-mobile/translations/messages/src/components/ErrorModal/ErrorModal.json
+++ b/apps/wallet-mobile/translations/messages/src/components/ErrorModal/ErrorModal.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Show error message",
     "file": "src/components/ErrorModal/ErrorModal.tsx",
     "start": {
-      "line": 152,
+      "line": 146,
       "column": 13,
-      "index": 4225
+      "index": 4160
     },
     "end": {
-      "line": 155,
+      "line": 149,
       "column": 3,
-      "index": 4325
+      "index": 4260
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Hide error message",
     "file": "src/components/ErrorModal/ErrorModal.tsx",
     "start": {
-      "line": 156,
+      "line": 150,
       "column": 13,
-      "index": 4340
+      "index": 4275
     },
     "end": {
-      "line": 159,
+      "line": 153,
       "column": 3,
-      "index": 4440
+      "index": 4375
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Auth/OsLoginScreen/OsLoginScreen.json b/apps/wallet-mobile/translations/messages/src/features/Auth/OsLoginScreen/OsLoginScreen.json
index bef4514ad1..2af1bea196 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Auth/OsLoginScreen/OsLoginScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Auth/OsLoginScreen/OsLoginScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 64,
       "column": 9,
-      "index": 1678
+      "index": 1665
     },
     "end": {
       "line": 67,
       "column": 3,
-      "index": 1771
+      "index": 1758
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.json b/apps/wallet-mobile/translations/messages/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.json
index e5290e3f22..31eede2914 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 182,
       "column": 10,
-      "index": 5253
+      "index": 5240
     },
     "end": {
       "line": 185,
       "column": 3,
-      "index": 5346
+      "index": 5333
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 186,
       "column": 15,
-      "index": 5363
+      "index": 5350
     },
     "end": {
       "line": 190,
       "column": 3,
-      "index": 5551
+      "index": 5538
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 191,
       "column": 15,
-      "index": 5568
+      "index": 5555
     },
     "end": {
       "line": 194,
       "column": 3,
-      "index": 5665
+      "index": 5652
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 195,
       "column": 12,
-      "index": 5679
+      "index": 5666
     },
     "end": {
       "line": 198,
       "column": 3,
-      "index": 5778
+      "index": 5765
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
index 38ab260df5..d8c3203900 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!NFT Details",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 378,
+      "line": 367,
       "column": 9,
-      "index": 10908
+      "index": 10539
     },
     "end": {
-      "line": 381,
+      "line": 370,
       "column": 3,
-      "index": 10979
+      "index": 10610
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 382,
+      "line": 371,
       "column": 12,
-      "index": 10993
+      "index": 10624
     },
     "end": {
-      "line": 385,
+      "line": 374,
       "column": 3,
-      "index": 11064
+      "index": 10695
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 386,
+      "line": 375,
       "column": 12,
-      "index": 11078
+      "index": 10709
     },
     "end": {
-      "line": 389,
+      "line": 378,
       "column": 3,
-      "index": 11149
+      "index": 10780
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!NFT Name",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 390,
+      "line": 379,
       "column": 11,
-      "index": 11162
+      "index": 10793
     },
     "end": {
-      "line": 393,
+      "line": 382,
       "column": 3,
-      "index": 11232
+      "index": 10863
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Created",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 394,
+      "line": 383,
       "column": 13,
-      "index": 11247
+      "index": 10878
     },
     "end": {
-      "line": 397,
+      "line": 386,
       "column": 3,
-      "index": 11318
+      "index": 10949
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Description",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 398,
+      "line": 387,
       "column": 15,
-      "index": 11335
+      "index": 10966
     },
     "end": {
-      "line": 401,
+      "line": 390,
       "column": 3,
-      "index": 11412
+      "index": 11043
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Author",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 402,
+      "line": 391,
       "column": 10,
-      "index": 11424
+      "index": 11055
     },
     "end": {
-      "line": 405,
+      "line": 394,
       "column": 3,
-      "index": 11491
+      "index": 11122
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Fingerprint",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 406,
+      "line": 395,
       "column": 15,
-      "index": 11508
+      "index": 11139
     },
     "end": {
-      "line": 409,
+      "line": 398,
       "column": 3,
-      "index": 11585
+      "index": 11216
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Policy id",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 410,
+      "line": 399,
       "column": 12,
-      "index": 11599
+      "index": 11230
     },
     "end": {
-      "line": 413,
+      "line": 402,
       "column": 3,
-      "index": 11671
+      "index": 11302
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Details on",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 414,
+      "line": 403,
       "column": 16,
-      "index": 11689
+      "index": 11320
     },
     "end": {
-      "line": 417,
+      "line": 406,
       "column": 3,
-      "index": 11766
+      "index": 11397
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Copy metadata",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 418,
+      "line": 407,
       "column": 16,
-      "index": 11784
+      "index": 11415
     },
     "end": {
-      "line": 421,
+      "line": 410,
       "column": 3,
-      "index": 11864
+      "index": 11495
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
index f08697a91d..0df5b7981c 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Add token",
     "file": "src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx",
     "start": {
-      "line": 226,
+      "line": 221,
       "column": 12,
-      "index": 7420
+      "index": 7359
     },
     "end": {
-      "line": 229,
+      "line": 224,
       "column": 3,
-      "index": 7497
+      "index": 7436
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangePassword/ChangePasswordScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangePassword/ChangePasswordScreen.json
index c3a0851ca0..4ba099abd1 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ChangePassword/ChangePasswordScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ChangePassword/ChangePasswordScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Current password",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 116,
+      "line": 115,
       "column": 25,
-      "index": 4834
+      "index": 4809
     },
     "end": {
-      "line": 119,
+      "line": 118,
       "column": 3,
-      "index": 4956
+      "index": 4931
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!New password",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 120,
+      "line": 119,
       "column": 25,
-      "index": 4983
+      "index": 4958
     },
     "end": {
-      "line": 123,
+      "line": 122,
       "column": 3,
-      "index": 5101
+      "index": 5076
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Minimum {requirePasswordLength} characters",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 124,
+      "line": 123,
       "column": 31,
-      "index": 5134
+      "index": 5109
     },
     "end": {
-      "line": 127,
+      "line": 126,
       "column": 3,
-      "index": 5299
+      "index": 5274
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Repeat new password",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 128,
+      "line": 127,
       "column": 28,
-      "index": 5329
+      "index": 5304
     },
     "end": {
-      "line": 131,
+      "line": 130,
       "column": 3,
-      "index": 5457
+      "index": 5432
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Passwords do not match",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 132,
+      "line": 131,
       "column": 36,
-      "index": 5495
+      "index": 5470
     },
     "end": {
-      "line": 135,
+      "line": 134,
       "column": 3,
-      "index": 5634
+      "index": 5609
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Change password",
     "file": "src/features/Settings/ChangePassword/ChangePasswordScreen.tsx",
     "start": {
-      "line": 136,
+      "line": 135,
       "column": 18,
-      "index": 5654
+      "index": 5629
     },
     "end": {
-      "line": 139,
+      "line": 138,
       "column": 3,
-      "index": 5768
+      "index": 5743
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.json
index fe64562606..0c56181dbe 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 48,
       "column": 18,
-      "index": 1543
+      "index": 1530
     },
     "end": {
       "line": 51,
       "column": 3,
-      "index": 1745
+      "index": 1732
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 52,
       "column": 17,
-      "index": 1764
+      "index": 1751
     },
     "end": {
       "line": 55,
       "column": 3,
-      "index": 1878
+      "index": 1865
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.json
index f6f20b2b18..3c28242e4d 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!This option will allow you to send transactions from your wallet just by confirming with fingerprint or face recognition with standard system fallback option. This makes your wallet less secure. This is a compromise between UX and security!",
     "file": "src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
     "start": {
-      "line": 93,
+      "line": 92,
       "column": 17,
-      "index": 3252
+      "index": 3227
     },
     "end": {
-      "line": 101,
+      "line": 100,
       "column": 3,
-      "index": 3648
+      "index": 3623
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Please remember your master password, as you may need it in case your biometrics data are removed from the device.",
     "file": "src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
     "start": {
-      "line": 102,
+      "line": 101,
       "column": 17,
-      "index": 3667
+      "index": 3642
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3,
-      "index": 3904
+      "index": 3879
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Master password",
     "file": "src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 22,
-      "index": 3928
+      "index": 3903
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3,
-      "index": 4056
+      "index": 4031
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Enable",
     "file": "src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
     "start": {
-      "line": 112,
+      "line": 111,
       "column": 16,
-      "index": 4074
+      "index": 4049
     },
     "end": {
-      "line": 115,
+      "line": 114,
       "column": 3,
-      "index": 4185
+      "index": 4160
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.json
index 9434513269..0b924e7ad0 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not now",
     "file": "src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
     "start": {
-      "line": 57,
+      "line": 55,
       "column": 16,
-      "index": 1725
+      "index": 1645
     },
     "end": {
-      "line": 60,
+      "line": 58,
       "column": 3,
-      "index": 1829
+      "index": 1749
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Link",
     "file": "src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
     "start": {
-      "line": 61,
+      "line": 59,
       "column": 14,
-      "index": 1845
+      "index": 1765
     },
     "end": {
-      "line": 64,
+      "line": 62,
       "column": 3,
-      "index": 1944
+      "index": 1864
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Use your fingerprint",
     "file": "src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
     "start": {
-      "line": 65,
+      "line": 63,
       "column": 11,
-      "index": 1957
+      "index": 1877
     },
     "end": {
-      "line": 68,
+      "line": 66,
       "column": 3,
-      "index": 2069
+      "index": 1989
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!for faster, easier access",
     "file": "src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
     "start": {
-      "line": 69,
+      "line": 67,
       "column": 15,
-      "index": 2086
+      "index": 2006
     },
     "end": {
-      "line": 72,
+      "line": 70,
       "column": 3,
-      "index": 2207
+      "index": 2127
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!to your Yoroi wallet",
     "file": "src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
     "start": {
-      "line": 73,
+      "line": 71,
       "column": 15,
-      "index": 2224
+      "index": 2144
     },
     "end": {
-      "line": 76,
+      "line": 74,
       "column": 3,
-      "index": 2340
+      "index": 2260
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/RenameWalletScreen/RenameWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/RenameWalletScreen/RenameWalletScreen.json
index 4344b5a794..fed6a5cc0f 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/RenameWalletScreen/RenameWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/RenameWalletScreen/RenameWalletScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Change name",
     "file": "src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx",
     "start": {
-      "line": 104,
+      "line": 103,
       "column": 16,
-      "index": 3321
+      "index": 3296
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3,
-      "index": 3425
+      "index": 3400
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 24,
-      "index": 3451
+      "index": 3426
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3,
-      "index": 3563
+      "index": 3538
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
index 98c2c91766..070d220f6c 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 265,
+      "line": 256,
       "column": 18,
-      "index": 8007
+      "index": 7773
     },
     "end": {
-      "line": 268,
+      "line": 259,
       "column": 3,
-      "index": 8105
+      "index": 7871
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Application",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 269,
+      "line": 260,
       "column": 15,
-      "index": 8122
+      "index": 7888
     },
     "end": {
-      "line": 272,
+      "line": 263,
       "column": 3,
-      "index": 8231
+      "index": 7997
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Change PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 273,
+      "line": 264,
       "column": 24,
-      "index": 8257
+      "index": 8023
     },
     "end": {
-      "line": 276,
+      "line": 267,
       "column": 3,
-      "index": 8366
+      "index": 8132
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Change spending password",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 277,
+      "line": 268,
       "column": 23,
-      "index": 8391
+      "index": 8157
     },
     "end": {
-      "line": 280,
+      "line": 271,
       "column": 3,
-      "index": 8505
+      "index": 8271
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 281,
+      "line": 272,
       "column": 21,
-      "index": 8528
+      "index": 8294
     },
     "end": {
-      "line": 284,
+      "line": 275,
       "column": 3,
-      "index": 8629
+      "index": 8395
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Terms of Service Agreement",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 285,
+      "line": 276,
       "column": 23,
-      "index": 8654
+      "index": 8420
     },
     "end": {
-      "line": 288,
+      "line": 279,
       "column": 3,
-      "index": 8770
+      "index": 8536
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change wallet name",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 289,
+      "line": 280,
       "column": 25,
-      "index": 8797
+      "index": 8563
     },
     "end": {
-      "line": 292,
+      "line": 283,
       "column": 3,
-      "index": 8901
+      "index": 8667
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Support",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 293,
+      "line": 284,
       "column": 16,
-      "index": 8919
+      "index": 8685
     },
     "end": {
-      "line": 296,
+      "line": 287,
       "column": 3,
-      "index": 9010
+      "index": 8776
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 297,
+      "line": 288,
       "column": 31,
-      "index": 9043
+      "index": 8809
     },
     "end": {
-      "line": 300,
+      "line": 291,
       "column": 3,
-      "index": 9158
+      "index": 8924
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 301,
+      "line": 292,
       "column": 32,
-      "index": 9192
+      "index": 8958
     },
     "end": {
-      "line": 304,
+      "line": 295,
       "column": 3,
-      "index": 9308
+      "index": 9074
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 305,
+      "line": 296,
       "column": 18,
-      "index": 9328
+      "index": 9094
     },
     "end": {
-      "line": 308,
+      "line": 299,
       "column": 3,
-      "index": 9426
+      "index": 9192
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 309,
+      "line": 300,
       "column": 17,
-      "index": 9445
+      "index": 9211
     },
     "end": {
-      "line": 312,
+      "line": 303,
       "column": 3,
-      "index": 9548
+      "index": 9314
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Language",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 313,
+      "line": 304,
       "column": 17,
-      "index": 9567
+      "index": 9333
     },
     "end": {
-      "line": 316,
+      "line": 307,
       "column": 3,
-      "index": 9665
+      "index": 9431
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Theming",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 317,
+      "line": 308,
       "column": 14,
-      "index": 9681
+      "index": 9447
     },
     "end": {
-      "line": 320,
+      "line": 311,
       "column": 3,
-      "index": 9775
+      "index": 9541
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Network",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 321,
+      "line": 312,
       "column": 16,
-      "index": 9793
+      "index": 9559
     },
     "end": {
-      "line": 324,
+      "line": 315,
       "column": 3,
-      "index": 9889
+      "index": 9655
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!App settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 325,
+      "line": 316,
       "column": 20,
-      "index": 9911
+      "index": 9677
     },
     "end": {
-      "line": 328,
+      "line": 319,
       "column": 3,
-      "index": 10029
+      "index": 9795
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 329,
+      "line": 320,
       "column": 14,
-      "index": 10045
+      "index": 9811
     },
     "end": {
-      "line": 332,
+      "line": 323,
       "column": 3,
-      "index": 10145
+      "index": 9911
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Privacy Policy",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 333,
+      "line": 324,
       "column": 22,
-      "index": 10169
+      "index": 9935
     },
     "end": {
-      "line": 336,
+      "line": 327,
       "column": 3,
-      "index": 10272
+      "index": 10038
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Collateral",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 337,
+      "line": 328,
       "column": 14,
-      "index": 10288
+      "index": 10054
     },
     "end": {
-      "line": 340,
+      "line": 331,
       "column": 3,
-      "index": 10359
+      "index": 10125
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Log",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 341,
+      "line": 332,
       "column": 18,
-      "index": 10379
+      "index": 10145
     },
     "end": {
-      "line": 344,
+      "line": 335,
       "column": 3,
-      "index": 10436
+      "index": 10202
     }
   }
 ]
\ 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 0c242a6bf8..91a15ad429 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": 227,
+      "line": 214,
       "column": 11,
-      "index": 7420
+      "index": 6741
     },
     "end": {
-      "line": 230,
+      "line": 217,
       "column": 3,
-      "index": 7518
+      "index": 6839
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Actions",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 231,
+      "line": 218,
       "column": 11,
-      "index": 7531
+      "index": 6852
     },
     "end": {
-      "line": 234,
+      "line": 221,
       "column": 3,
-      "index": 7629
+      "index": 6950
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Switch wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 235,
+      "line": 222,
       "column": 16,
-      "index": 7647
+      "index": 6968
     },
     "end": {
-      "line": 238,
+      "line": 225,
       "column": 3,
-      "index": 7756
+      "index": 7077
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Logout",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 239,
+      "line": 226,
       "column": 10,
-      "index": 7768
+      "index": 7089
     },
     "end": {
-      "line": 242,
+      "line": 229,
       "column": 3,
-      "index": 7864
+      "index": 7185
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 243,
+      "line": 230,
       "column": 14,
-      "index": 7880
+      "index": 7201
     },
     "end": {
-      "line": 246,
+      "line": 233,
       "column": 3,
-      "index": 7985
+      "index": 7306
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Security",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 247,
+      "line": 234,
       "column": 12,
-      "index": 7999
+      "index": 7320
     },
     "end": {
-      "line": 250,
+      "line": 237,
       "column": 3,
-      "index": 8099
+      "index": 7420
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change spending password",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 251,
+      "line": 238,
       "column": 18,
-      "index": 8119
+      "index": 7440
     },
     "end": {
-      "line": 254,
+      "line": 241,
       "column": 3,
-      "index": 8241
+      "index": 7562
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Easy transaction confirmation",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 255,
+      "line": 242,
       "column": 20,
-      "index": 8263
+      "index": 7584
     },
     "end": {
-      "line": 258,
+      "line": 245,
       "column": 3,
-      "index": 8392
+      "index": 7713
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Skip the password and approve transactions with biometrics",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 259,
+      "line": 246,
       "column": 24,
-      "index": 8418
+      "index": 7739
     },
     "end": {
-      "line": 262,
+      "line": 249,
       "column": 3,
-      "index": 8580
+      "index": 7901
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 263,
+      "line": 250,
       "column": 16,
-      "index": 8598
+      "index": 7919
     },
     "end": {
-      "line": 266,
+      "line": 253,
       "column": 3,
-      "index": 8707
+      "index": 8028
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Collateral",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 267,
+      "line": 254,
       "column": 14,
-      "index": 8723
+      "index": 8044
     },
     "end": {
-      "line": 270,
+      "line": 257,
       "column": 3,
-      "index": 8794
+      "index": 8115
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Multiple addresses",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 271,
+      "line": 258,
       "column": 21,
-      "index": 8817
+      "index": 8138
     },
     "end": {
-      "line": 274,
+      "line": 261,
       "column": 3,
-      "index": 8903
+      "index": 8224
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Single address",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 275,
+      "line": 262,
       "column": 17,
-      "index": 8922
+      "index": 8243
     },
     "end": {
-      "line": 278,
+      "line": 265,
       "column": 3,
-      "index": 9000
+      "index": 8321
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!By enabling this you can operate with more wallet addresses",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 279,
+      "line": 266,
       "column": 25,
-      "index": 9027
+      "index": 8348
     },
     "end": {
-      "line": 282,
+      "line": 269,
       "column": 3,
-      "index": 9158
+      "index": 8479
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Network:",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 284,
+      "line": 271,
       "column": 11,
-      "index": 9219
+      "index": 8540
     },
     "end": {
-      "line": 287,
+      "line": 274,
       "column": 3,
-      "index": 9285
+      "index": 8606
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Wallet type:",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 288,
+      "line": 275,
       "column": 14,
-      "index": 9301
+      "index": 8622
     },
     "end": {
-      "line": 291,
+      "line": 278,
       "column": 3,
-      "index": 9407
+      "index": 8728
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Byron-era wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 292,
+      "line": 279,
       "column": 15,
-      "index": 9424
+      "index": 8745
     },
     "end": {
-      "line": 295,
+      "line": 282,
       "column": 3,
-      "index": 9535
+      "index": 8856
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Shelley-era wallet",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 296,
+      "line": 283,
       "column": 17,
-      "index": 9554
+      "index": 8875
     },
     "end": {
-      "line": 299,
+      "line": 286,
       "column": 3,
-      "index": 9669
+      "index": 8990
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Unknown Wallet Type",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 300,
+      "line": 287,
       "column": 21,
-      "index": 9692
+      "index": 9013
     },
     "end": {
-      "line": 303,
+      "line": 290,
       "column": 3,
-      "index": 9812
+      "index": 9133
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 304,
+      "line": 291,
       "column": 9,
-      "index": 9823
+      "index": 9144
     },
     "end": {
-      "line": 307,
+      "line": 294,
       "column": 3,
-      "index": 9917
+      "index": 9238
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Resync",
     "file": "src/features/Settings/WalletSettings/WalletSettingsScreen.tsx",
     "start": {
-      "line": 308,
+      "line": 295,
       "column": 10,
-      "index": 9929
+      "index": 9250
     },
     "end": {
-      "line": 311,
+      "line": 298,
       "column": 3,
-      "index": 10031
+      "index": 9352
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
index 1169fd38eb..1fb9dbdab4 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!My read-only wallet",
     "file": "src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 155,
+      "line": 151,
       "column": 21,
-      "index": 4929
+      "index": 4821
     },
     "end": {
-      "line": 158,
+      "line": 154,
       "column": 3,
-      "index": 5056
+      "index": 4948
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Checksum label",
     "file": "src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 159,
+      "line": 155,
       "column": 17,
-      "index": 5075
+      "index": 4967
     },
     "end": {
-      "line": 162,
+      "line": 158,
       "column": 3,
-      "index": 5189
+      "index": 5081
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Wallet Address(es):",
     "file": "src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 163,
+      "line": 159,
       "column": 22,
-      "index": 5213
+      "index": 5105
     },
     "end": {
-      "line": 166,
+      "line": 162,
       "column": 3,
-      "index": 5337
+      "index": 5229
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Key:",
     "file": "src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 167,
+      "line": 163,
       "column": 7,
-      "index": 5346
+      "index": 5238
     },
     "end": {
-      "line": 170,
+      "line": 166,
       "column": 3,
-      "index": 5444
+      "index": 5336
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Derivation path:",
     "file": "src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx",
     "start": {
-      "line": 171,
+      "line": 167,
       "column": 18,
-      "index": 5464
+      "index": 5356
     },
     "end": {
-      "line": 174,
+      "line": 170,
       "column": 3,
-      "index": 5585
+      "index": 5477
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.json
index eb276b1507..e036f8c279 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx",
     "start": {
-      "line": 141,
+      "line": 133,
       "column": 24,
-      "index": 4302
+      "index": 4119
     },
     "end": {
-      "line": 144,
+      "line": 136,
       "column": 3,
-      "index": 4410
+      "index": 4227
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Save",
     "file": "src/features/SetupWallet/legacy/WalletNameForm/WalletNameForm.tsx",
     "start": {
-      "line": 145,
+      "line": 137,
       "column": 8,
-      "index": 4420
+      "index": 4237
     },
     "end": {
-      "line": 148,
+      "line": 140,
       "column": 3,
-      "index": 4523
+      "index": 4340
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/kernel/i18n/global-messages.json b/apps/wallet-mobile/translations/messages/src/kernel/i18n/global-messages.json
index 22478a0474..bce771c934 100644
--- a/apps/wallet-mobile/translations/messages/src/kernel/i18n/global-messages.json
+++ b/apps/wallet-mobile/translations/messages/src/kernel/i18n/global-messages.json
@@ -51,12 +51,12 @@
     "start": {
       "line": 831,
       "column": 10,
-      "index": 24297
+      "index": 24293
     },
     "end": {
       "line": 834,
       "column": 3,
-      "index": 24360
+      "index": 24356
     }
   },
   {
@@ -1221,12 +1221,12 @@
     "start": {
       "line": 740,
       "column": 16,
-      "index": 22065
+      "index": 22061
     },
     "end": {
       "line": 743,
       "column": 3,
-      "index": 22149
+      "index": 22145
     }
   },
   {
@@ -1716,17 +1716,17 @@
     "start": {
       "line": 724,
       "column": 14,
-      "index": 21713
+      "index": 21709
     },
     "end": {
       "line": 727,
       "column": 3,
-      "index": 21785
+      "index": 21781
     }
   },
   {
     "id": "global.exchange",
-    "defaultMessage": "!!!Buy/Sell ADA",
+    "defaultMessage": "!!!Buy/Sell",
     "file": "src/kernel/i18n/global-messages.ts",
     "start": {
       "line": 589,
@@ -1736,7 +1736,7 @@
     "end": {
       "line": 592,
       "column": 3,
-      "index": 18549
+      "index": 18545
     }
   },
   {
@@ -1746,12 +1746,12 @@
     "start": {
       "line": 596,
       "column": 29,
-      "index": 18630
+      "index": 18626
     },
     "end": {
       "line": 599,
       "column": 3,
-      "index": 18696
+      "index": 18692
     }
   },
   {
@@ -1761,12 +1761,12 @@
     "start": {
       "line": 600,
       "column": 29,
-      "index": 18727
+      "index": 18723
     },
     "end": {
       "line": 603,
       "column": 3,
-      "index": 18793
+      "index": 18789
     }
   },
   {
@@ -1776,12 +1776,12 @@
     "start": {
       "line": 604,
       "column": 29,
-      "index": 18824
+      "index": 18820
     },
     "end": {
       "line": 607,
       "column": 3,
-      "index": 18890
+      "index": 18886
     }
   },
   {
@@ -1791,12 +1791,12 @@
     "start": {
       "line": 608,
       "column": 29,
-      "index": 18921
+      "index": 18917
     },
     "end": {
       "line": 611,
       "column": 3,
-      "index": 18987
+      "index": 18983
     }
   },
   {
@@ -1806,12 +1806,12 @@
     "start": {
       "line": 612,
       "column": 29,
-      "index": 19018
+      "index": 19014
     },
     "end": {
       "line": 615,
       "column": 3,
-      "index": 19084
+      "index": 19080
     }
   },
   {
@@ -1821,12 +1821,12 @@
     "start": {
       "line": 616,
       "column": 29,
-      "index": 19115
+      "index": 19111
     },
     "end": {
       "line": 619,
       "column": 3,
-      "index": 19181
+      "index": 19177
     }
   },
   {
@@ -1836,12 +1836,12 @@
     "start": {
       "line": 620,
       "column": 29,
-      "index": 19212
+      "index": 19208
     },
     "end": {
       "line": 623,
       "column": 3,
-      "index": 19278
+      "index": 19274
     }
   },
   {
@@ -1851,12 +1851,12 @@
     "start": {
       "line": 624,
       "column": 29,
-      "index": 19309
+      "index": 19305
     },
     "end": {
       "line": 627,
       "column": 3,
-      "index": 19375
+      "index": 19371
     }
   },
   {
@@ -1866,12 +1866,12 @@
     "start": {
       "line": 628,
       "column": 29,
-      "index": 19406
+      "index": 19402
     },
     "end": {
       "line": 631,
       "column": 3,
-      "index": 19472
+      "index": 19468
     }
   },
   {
@@ -1881,12 +1881,12 @@
     "start": {
       "line": 636,
       "column": 28,
-      "index": 19617
+      "index": 19613
     },
     "end": {
       "line": 639,
       "column": 3,
-      "index": 19679
+      "index": 19675
     }
   },
   {
@@ -1896,12 +1896,12 @@
     "start": {
       "line": 640,
       "column": 37,
-      "index": 19718
+      "index": 19714
     },
     "end": {
       "line": 643,
       "column": 3,
-      "index": 19778
+      "index": 19774
     }
   },
   {
@@ -1911,12 +1911,12 @@
     "start": {
       "line": 644,
       "column": 38,
-      "index": 19818
+      "index": 19814
     },
     "end": {
       "line": 647,
       "column": 3,
-      "index": 19880
+      "index": 19876
     }
   },
   {
@@ -1926,12 +1926,12 @@
     "start": {
       "line": 651,
       "column": 12,
-      "index": 19930
+      "index": 19926
     },
     "end": {
       "line": 654,
       "column": 3,
-      "index": 19997
+      "index": 19993
     }
   },
   {
@@ -1941,12 +1941,12 @@
     "start": {
       "line": 655,
       "column": 10,
-      "index": 20009
+      "index": 20005
     },
     "end": {
       "line": 658,
       "column": 3,
-      "index": 20072
+      "index": 20068
     }
   },
   {
@@ -1956,12 +1956,12 @@
     "start": {
       "line": 659,
       "column": 14,
-      "index": 20088
+      "index": 20084
     },
     "end": {
       "line": 662,
       "column": 3,
-      "index": 20159
+      "index": 20155
     }
   },
   {
@@ -1971,12 +1971,12 @@
     "start": {
       "line": 663,
       "column": 11,
-      "index": 20172
+      "index": 20168
     },
     "end": {
       "line": 666,
       "column": 3,
-      "index": 20237
+      "index": 20233
     }
   },
   {
@@ -1986,12 +1986,12 @@
     "start": {
       "line": 667,
       "column": 9,
-      "index": 20248
+      "index": 20244
     },
     "end": {
       "line": 670,
       "column": 3,
-      "index": 20309
+      "index": 20305
     }
   },
   {
@@ -2001,12 +2001,12 @@
     "start": {
       "line": 671,
       "column": 7,
-      "index": 20318
+      "index": 20314
     },
     "end": {
       "line": 674,
       "column": 3,
-      "index": 20375
+      "index": 20371
     }
   },
   {
@@ -2016,12 +2016,12 @@
     "start": {
       "line": 675,
       "column": 11,
-      "index": 20388
+      "index": 20384
     },
     "end": {
       "line": 678,
       "column": 3,
-      "index": 20511
+      "index": 20507
     }
   },
   {
@@ -2031,12 +2031,12 @@
     "start": {
       "line": 679,
       "column": 13,
-      "index": 20526
+      "index": 20522
     },
     "end": {
       "line": 682,
       "column": 3,
-      "index": 20626
+      "index": 20622
     }
   },
   {
@@ -2046,12 +2046,12 @@
     "start": {
       "line": 683,
       "column": 12,
-      "index": 20640
+      "index": 20636
     },
     "end": {
       "line": 686,
       "column": 3,
-      "index": 20708
+      "index": 20704
     }
   },
   {
@@ -2061,12 +2061,12 @@
     "start": {
       "line": 687,
       "column": 26,
-      "index": 20736
+      "index": 20732
     },
     "end": {
       "line": 690,
       "column": 3,
-      "index": 20846
+      "index": 20842
     }
   },
   {
@@ -2076,12 +2076,12 @@
     "start": {
       "line": 691,
       "column": 35,
-      "index": 20883
+      "index": 20879
     },
     "end": {
       "line": 694,
       "column": 3,
-      "index": 21002
+      "index": 20998
     }
   },
   {
@@ -2091,12 +2091,12 @@
     "start": {
       "line": 695,
       "column": 31,
-      "index": 21035
+      "index": 21031
     },
     "end": {
       "line": 698,
       "column": 3,
-      "index": 21128
+      "index": 21124
     }
   },
   {
@@ -2107,12 +2107,12 @@
     "start": {
       "line": 699,
       "column": 14,
-      "index": 21144
+      "index": 21140
     },
     "end": {
       "line": 703,
       "column": 3,
-      "index": 21283
+      "index": 21279
     }
   },
   {
@@ -2122,12 +2122,12 @@
     "start": {
       "line": 704,
       "column": 17,
-      "index": 21302
+      "index": 21298
     },
     "end": {
       "line": 707,
       "column": 3,
-      "index": 21380
+      "index": 21376
     }
   },
   {
@@ -2137,12 +2137,12 @@
     "start": {
       "line": 708,
       "column": 7,
-      "index": 21389
+      "index": 21385
     },
     "end": {
       "line": 711,
       "column": 3,
-      "index": 21462
+      "index": 21458
     }
   },
   {
@@ -2152,12 +2152,12 @@
     "start": {
       "line": 712,
       "column": 6,
-      "index": 21470
+      "index": 21466
     },
     "end": {
       "line": 715,
       "column": 3,
-      "index": 21525
+      "index": 21521
     }
   },
   {
@@ -2167,12 +2167,12 @@
     "start": {
       "line": 716,
       "column": 9,
-      "index": 21536
+      "index": 21532
     },
     "end": {
       "line": 719,
       "column": 3,
-      "index": 21597
+      "index": 21593
     }
   },
   {
@@ -2182,12 +2182,12 @@
     "start": {
       "line": 720,
       "column": 18,
-      "index": 21617
+      "index": 21613
     },
     "end": {
       "line": 723,
       "column": 3,
-      "index": 21697
+      "index": 21693
     }
   },
   {
@@ -2197,12 +2197,12 @@
     "start": {
       "line": 728,
       "column": 14,
-      "index": 21801
+      "index": 21797
     },
     "end": {
       "line": 731,
       "column": 3,
-      "index": 21872
+      "index": 21868
     }
   },
   {
@@ -2212,12 +2212,12 @@
     "start": {
       "line": 732,
       "column": 14,
-      "index": 21888
+      "index": 21884
     },
     "end": {
       "line": 735,
       "column": 3,
-      "index": 21962
+      "index": 21958
     }
   },
   {
@@ -2227,12 +2227,12 @@
     "start": {
       "line": 736,
       "column": 13,
-      "index": 21977
+      "index": 21973
     },
     "end": {
       "line": 739,
       "column": 3,
-      "index": 22047
+      "index": 22043
     }
   },
   {
@@ -2242,12 +2242,12 @@
     "start": {
       "line": 744,
       "column": 9,
-      "index": 22160
+      "index": 22156
     },
     "end": {
       "line": 747,
       "column": 3,
-      "index": 22221
+      "index": 22217
     }
   },
   {
@@ -2257,12 +2257,12 @@
     "start": {
       "line": 748,
       "column": 12,
-      "index": 22235
+      "index": 22231
     },
     "end": {
       "line": 751,
       "column": 3,
-      "index": 22303
+      "index": 22299
     }
   },
   {
@@ -2272,12 +2272,12 @@
     "start": {
       "line": 752,
       "column": 17,
-      "index": 22322
+      "index": 22318
     },
     "end": {
       "line": 755,
       "column": 3,
-      "index": 22409
+      "index": 22405
     }
   },
   {
@@ -2287,12 +2287,12 @@
     "start": {
       "line": 756,
       "column": 17,
-      "index": 22428
+      "index": 22424
     },
     "end": {
       "line": 759,
       "column": 3,
-      "index": 22515
+      "index": 22511
     }
   },
   {
@@ -2302,12 +2302,12 @@
     "start": {
       "line": 760,
       "column": 37,
-      "index": 22554
+      "index": 22550
     },
     "end": {
       "line": 763,
       "column": 3,
-      "index": 22689
+      "index": 22685
     }
   },
   {
@@ -2317,12 +2317,12 @@
     "start": {
       "line": 764,
       "column": 34,
-      "index": 22725
+      "index": 22721
     },
     "end": {
       "line": 767,
       "column": 3,
-      "index": 22873
+      "index": 22869
     }
   },
   {
@@ -2332,12 +2332,12 @@
     "start": {
       "line": 768,
       "column": 15,
-      "index": 22890
+      "index": 22886
     },
     "end": {
       "line": 771,
       "column": 3,
-      "index": 22965
+      "index": 22961
     }
   },
   {
@@ -2347,12 +2347,12 @@
     "start": {
       "line": 772,
       "column": 15,
-      "index": 22982
+      "index": 22978
     },
     "end": {
       "line": 775,
       "column": 3,
-      "index": 23066
+      "index": 23062
     }
   },
   {
@@ -2362,12 +2362,12 @@
     "start": {
       "line": 776,
       "column": 23,
-      "index": 23091
+      "index": 23087
     },
     "end": {
       "line": 782,
       "column": 3,
-      "index": 23339
+      "index": 23335
     }
   },
   {
@@ -2377,12 +2377,12 @@
     "start": {
       "line": 783,
       "column": 8,
-      "index": 23349
+      "index": 23345
     },
     "end": {
       "line": 786,
       "column": 3,
-      "index": 23409
+      "index": 23405
     }
   },
   {
@@ -2392,12 +2392,12 @@
     "start": {
       "line": 787,
       "column": 10,
-      "index": 23421
+      "index": 23417
     },
     "end": {
       "line": 790,
       "column": 3,
-      "index": 23485
+      "index": 23481
     }
   },
   {
@@ -2407,12 +2407,12 @@
     "start": {
       "line": 791,
       "column": 10,
-      "index": 23497
+      "index": 23493
     },
     "end": {
       "line": 794,
       "column": 3,
-      "index": 23561
+      "index": 23557
     }
   },
   {
@@ -2422,12 +2422,12 @@
     "start": {
       "line": 795,
       "column": 13,
-      "index": 23576
+      "index": 23572
     },
     "end": {
       "line": 798,
       "column": 3,
-      "index": 23646
+      "index": 23642
     }
   },
   {
@@ -2437,12 +2437,12 @@
     "start": {
       "line": 799,
       "column": 9,
-      "index": 23657
+      "index": 23653
     },
     "end": {
       "line": 802,
       "column": 3,
-      "index": 23717
+      "index": 23713
     }
   },
   {
@@ -2452,12 +2452,12 @@
     "start": {
       "line": 803,
       "column": 9,
-      "index": 23728
+      "index": 23724
     },
     "end": {
       "line": 806,
       "column": 3,
-      "index": 23790
+      "index": 23786
     }
   },
   {
@@ -2467,12 +2467,12 @@
     "start": {
       "line": 807,
       "column": 7,
-      "index": 23799
+      "index": 23795
     },
     "end": {
       "line": 810,
       "column": 3,
-      "index": 23856
+      "index": 23852
     }
   },
   {
@@ -2482,12 +2482,12 @@
     "start": {
       "line": 811,
       "column": 17,
-      "index": 23875
+      "index": 23871
     },
     "end": {
       "line": 814,
       "column": 3,
-      "index": 23953
+      "index": 23949
     }
   },
   {
@@ -2497,12 +2497,12 @@
     "start": {
       "line": 815,
       "column": 21,
-      "index": 23976
+      "index": 23972
     },
     "end": {
       "line": 818,
       "column": 3,
-      "index": 24063
+      "index": 24059
     }
   },
   {
@@ -2512,12 +2512,12 @@
     "start": {
       "line": 819,
       "column": 12,
-      "index": 24077
+      "index": 24073
     },
     "end": {
       "line": 822,
       "column": 3,
-      "index": 24144
+      "index": 24140
     }
   },
   {
@@ -2527,12 +2527,12 @@
     "start": {
       "line": 823,
       "column": 8,
-      "index": 24154
+      "index": 24150
     },
     "end": {
       "line": 826,
       "column": 3,
-      "index": 24213
+      "index": 24209
     }
   },
   {
@@ -2542,12 +2542,12 @@
     "start": {
       "line": 827,
       "column": 9,
-      "index": 24224
+      "index": 24220
     },
     "end": {
       "line": 830,
       "column": 3,
-      "index": 24285
+      "index": 24281
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/Dashboard.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/Dashboard.json
index 9323db804c..f2d95db721 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/Dashboard.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/Dashboard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Go to Staking Center",
     "file": "src/legacy/Dashboard/Dashboard.tsx",
     "start": {
-      "line": 232,
+      "line": 230,
       "column": 23,
-      "index": 7453
+      "index": 7410
     },
     "end": {
-      "line": 235,
+      "line": 233,
       "column": 3,
-      "index": 7586
+      "index": 7543
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/StakePoolInfo.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/StakePoolInfo.json
index bb34e439ce..f8e93184c7 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/StakePoolInfo.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/StakePoolInfo.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Stake pool delegated",
     "file": "src/legacy/Dashboard/StakePoolInfo.tsx",
     "start": {
-      "line": 131,
+      "line": 105,
       "column": 9,
-      "index": 3779
+      "index": 3212
     },
     "end": {
-      "line": 134,
+      "line": 108,
       "column": 3,
-      "index": 3900
+      "index": 3333
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!If you just delegated to a new stake pool it may  take a couple of minutes for the network to process your request.",
     "file": "src/legacy/Dashboard/StakePoolInfo.tsx",
     "start": {
-      "line": 135,
+      "line": 109,
       "column": 11,
-      "index": 3913
+      "index": 3346
     },
     "end": {
-      "line": 140,
+      "line": 114,
       "column": 3,
-      "index": 4148
+      "index": 3581
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Go to website",
     "file": "src/legacy/Dashboard/StakePoolInfo.tsx",
     "start": {
-      "line": 141,
+      "line": 115,
       "column": 26,
-      "index": 4176
+      "index": 3609
     },
     "end": {
-      "line": 144,
+      "line": 118,
       "column": 3,
-      "index": 4311
+      "index": 3744
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Copied!",
     "file": "src/legacy/Dashboard/StakePoolInfo.tsx",
     "start": {
-      "line": 145,
+      "line": 119,
       "column": 10,
-      "index": 4323
+      "index": 3756
     },
     "end": {
-      "line": 148,
+      "line": 122,
       "column": 3,
-      "index": 4432
+      "index": 3865
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Unknown pool",
     "file": "src/legacy/Dashboard/StakePoolInfo.tsx",
     "start": {
-      "line": 149,
+      "line": 123,
       "column": 15,
-      "index": 4449
+      "index": 3882
     },
     "end": {
-      "line": 152,
+      "line": 126,
       "column": 3,
-      "index": 4568
+      "index": 4001
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
index e6b7b547c6..64526f1453 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Your Summary",
     "file": "src/legacy/Dashboard/UserSummary.tsx",
     "start": {
-      "line": 180,
+      "line": 163,
       "column": 9,
-      "index": 5279
+      "index": 4877
     },
     "end": {
-      "line": 183,
+      "line": 166,
       "column": 3,
-      "index": 5381
+      "index": 4979
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Total Rewards",
     "file": "src/legacy/Dashboard/UserSummary.tsx",
     "start": {
-      "line": 184,
+      "line": 167,
       "column": 16,
-      "index": 5399
+      "index": 4997
     },
     "end": {
-      "line": 187,
+      "line": 170,
       "column": 3,
-      "index": 5509
+      "index": 5107
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Total Delegated",
     "file": "src/legacy/Dashboard/UserSummary.tsx",
     "start": {
-      "line": 188,
+      "line": 171,
       "column": 18,
-      "index": 5529
+      "index": 5127
     },
     "end": {
-      "line": 191,
+      "line": 174,
       "column": 3,
-      "index": 5643
+      "index": 5241
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Withdraw",
     "file": "src/legacy/Dashboard/UserSummary.tsx",
     "start": {
-      "line": 192,
+      "line": 175,
       "column": 23,
-      "index": 5668
+      "index": 5266
     },
     "end": {
-      "line": 195,
+      "line": 178,
       "column": 3,
-      "index": 5780
+      "index": 5378
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.json
index 9be223b2e9..d0e1d39363 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Also deregister staking key?",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 167,
+      "line": 166,
       "column": 21,
-      "index": 6137
+      "index": 6114
     },
     "end": {
-      "line": 170,
+      "line": 169,
       "column": 3,
-      "index": 6265
+      "index": 6242
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!When <b>withdrawing rewards</b>, you also have the option to deregister the staking key.",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 171,
+      "line": 170,
       "column": 16,
-      "index": 6283
+      "index": 6260
     },
     "end": {
-      "line": 174,
+      "line": 173,
       "column": 3,
-      "index": 6466
+      "index": 6443
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!<b>Keeping the staking key</b> will allow you to withdraw the rewards, but continue delegating to the same pool.",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 175,
+      "line": 174,
       "column": 16,
-      "index": 6484
+      "index": 6461
     },
     "end": {
-      "line": 180,
+      "line": 179,
       "column": 3,
-      "index": 6708
+      "index": 6685
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!<b>Deregistering the staking key</b> will give you back your deposit and undelegate the key from any pool.",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 181,
+      "line": 180,
       "column": 16,
-      "index": 6726
+      "index": 6703
     },
     "end": {
-      "line": 185,
+      "line": 184,
       "column": 3,
-      "index": 6933
+      "index": 6910
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!You do NOT need to deregister to delegate to a different stake pool. You can change your delegation preference at any time.",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 186,
+      "line": 185,
       "column": 12,
-      "index": 6947
+      "index": 6924
     },
     "end": {
-      "line": 191,
+      "line": 190,
       "column": 3,
-      "index": 7178
+      "index": 7155
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!You should NOT deregister if this staking key is used as a stake pool's reward account, as this will cause all pool operator rewards to be sent back to the reserve.",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 192,
+      "line": 191,
       "column": 12,
-      "index": 7192
+      "index": 7169
     },
     "end": {
-      "line": 198,
+      "line": 197,
       "column": 3,
-      "index": 7475
+      "index": 7452
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Deregistering means this key will no longer receive rewards until you re-register the staking key (usually by delegating to a pool again)",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 199,
+      "line": 198,
       "column": 12,
-      "index": 7489
+      "index": 7466
     },
     "end": {
-      "line": 204,
+      "line": 203,
       "column": 3,
-      "index": 7734
+      "index": 7711
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Keep registered",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 205,
+      "line": 204,
       "column": 14,
-      "index": 7750
+      "index": 7727
     },
     "end": {
-      "line": 208,
+      "line": 207,
       "column": 3,
-      "index": 7858
+      "index": 7835
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Deregister",
     "file": "src/legacy/Dashboard/WithdrawStakingRewards/WithdrawStakingRewards.tsx",
     "start": {
-      "line": 209,
+      "line": 208,
       "column": 20,
-      "index": 7880
+      "index": 7857
     },
     "end": {
-      "line": 212,
+      "line": 211,
       "column": 3,
-      "index": 7989
+      "index": 7966
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerConnect/LedgerConnect.json b/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerConnect/LedgerConnect.json
index 22361fd10d..6b61d4ec76 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerConnect/LedgerConnect.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerConnect/LedgerConnect.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Scanning bluetooth devices...",
     "file": "src/legacy/HW/LedgerConnect/LedgerConnect.tsx",
     "start": {
-      "line": 329,
+      "line": 328,
       "column": 11,
-      "index": 10151
+      "index": 10126
     },
     "end": {
-      "line": 332,
+      "line": 331,
       "column": 3,
-      "index": 10285
+      "index": 10260
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!You'll need to:",
     "file": "src/legacy/HW/LedgerConnect/LedgerConnect.tsx",
     "start": {
-      "line": 333,
+      "line": 332,
       "column": 13,
-      "index": 10300
+      "index": 10275
     },
     "end": {
-      "line": 336,
+      "line": 335,
       "column": 3,
-      "index": 10422
+      "index": 10397
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!USB device is ready, please tap on Confirm to continue.",
     "file": "src/legacy/HW/LedgerConnect/LedgerConnect.tsx",
     "start": {
-      "line": 337,
+      "line": 336,
       "column": 18,
-      "index": 10442
+      "index": 10417
     },
     "end": {
-      "line": 340,
+      "line": 339,
       "column": 3,
-      "index": 10587
+      "index": 10562
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!An error occurred while trying to connect with your hardware wallet:",
     "file": "src/legacy/HW/LedgerConnect/LedgerConnect.tsx",
     "start": {
-      "line": 341,
+      "line": 340,
       "column": 9,
-      "index": 10598
+      "index": 10573
     },
     "end": {
-      "line": 344,
+      "line": 343,
       "column": 3,
-      "index": 10769
+      "index": 10744
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.json b/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.json
index 8e6000cf84..ce1bb3eeff 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 88,
+      "line": 80,
       "column": 9,
-      "index": 2501
+      "index": 2401
     },
     "end": {
-      "line": 91,
+      "line": 83,
       "column": 3,
-      "index": 2619
+      "index": 2519
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 92,
+      "line": 84,
       "column": 18,
-      "index": 2639
+      "index": 2539
     },
     "end": {
-      "line": 97,
+      "line": 89,
       "column": 3,
-      "index": 2868
+      "index": 2768
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 98,
+      "line": 90,
       "column": 13,
-      "index": 2883
+      "index": 2783
     },
     "end": {
-      "line": 101,
+      "line": 93,
       "column": 3,
-      "index": 2997
+      "index": 2897
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Connect with USB\n(Not supported)",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 102,
+      "line": 94,
       "column": 25,
-      "index": 3024
+      "index": 2924
     },
     "end": {
-      "line": 105,
+      "line": 97,
       "column": 3,
-      "index": 3167
+      "index": 3067
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Connect with USB\n(Blocked by Apple for iOS)",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 106,
+      "line": 98,
       "column": 21,
-      "index": 3190
+      "index": 3090
     },
     "end": {
-      "line": 109,
+      "line": 101,
       "column": 3,
-      "index": 3340
+      "index": 3240
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 110,
+      "line": 102,
       "column": 24,
-      "index": 3366
+      "index": 3266
     },
     "end": {
-      "line": 113,
+      "line": 105,
       "column": 3,
-      "index": 3560
+      "index": 3460
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 114,
+      "line": 106,
       "column": 19,
-      "index": 3581
+      "index": 3481
     },
     "end": {
-      "line": 117,
+      "line": 109,
       "column": 3,
-      "index": 3707
+      "index": 3607
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.tsx",
     "start": {
-      "line": 118,
+      "line": 110,
       "column": 18,
-      "index": 3727
+      "index": 3627
     },
     "end": {
-      "line": 121,
+      "line": 113,
       "column": 3,
-      "index": 3837
+      "index": 3737
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.json b/apps/wallet-mobile/translations/messages/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.json
index 34054662a0..bbcb9ea99a 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx",
     "start": {
-      "line": 188,
+      "line": 187,
       "column": 23,
-      "index": 6026
+      "index": 5996
     },
     "end": {
-      "line": 191,
+      "line": 190,
       "column": 3,
-      "index": 6140
+      "index": 6110
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!of fees",
     "file": "src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx",
     "start": {
-      "line": 192,
+      "line": 191,
       "column": 10,
-      "index": 6152
+      "index": 6122
     },
     "end": {
-      "line": 195,
+      "line": 194,
       "column": 3,
-      "index": 6252
+      "index": 6222
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Current approximation of rewards that you will receive per epoch:",
     "file": "src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx",
     "start": {
-      "line": 196,
+      "line": 195,
       "column": 22,
-      "index": 6276
+      "index": 6246
     },
     "end": {
-      "line": 199,
+      "line": 198,
       "column": 3,
-      "index": 6446
+      "index": 6416
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Unknown pool",
     "file": "src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx",
     "start": {
-      "line": 200,
+      "line": 199,
       "column": 15,
-      "index": 6463
+      "index": 6433
     },
     "end": {
-      "line": 203,
+      "line": 202,
       "column": 3,
-      "index": 6582
+      "index": 6552
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Staking/FailedTx/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/legacy/Staking/FailedTx/FailedTxScreen.json
index b4a907d7d7..cfe184a74b 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Staking/FailedTx/FailedTxScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Staking/FailedTx/FailedTxScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not enough funds",
     "file": "src/legacy/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 108,
+      "line": 105,
       "column": 18,
-      "index": 2707
+      "index": 2631
     },
     "end": {
-      "line": 111,
+      "line": 108,
       "column": 3,
-      "index": 2823
+      "index": 2747
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance",
     "file": "src/legacy/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 112,
+      "line": 109,
       "column": 20,
-      "index": 2845
+      "index": 2769
     },
     "end": {
-      "line": 115,
+      "line": 112,
       "column": 3,
-      "index": 3027
+      "index": 2951
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Buy ada",
     "file": "src/legacy/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 116,
+      "line": 113,
       "column": 10,
-      "index": 3039
+      "index": 2963
     },
     "end": {
-      "line": 119,
+      "line": 116,
       "column": 3,
-      "index": 3138
+      "index": 3062
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Go to main wallet page",
     "file": "src/legacy/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 120,
+      "line": 117,
       "column": 12,
-      "index": 3152
+      "index": 3076
     },
     "end": {
-      "line": 123,
+      "line": 120,
       "column": 3,
-      "index": 3268
+      "index": 3192
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolDetails/PoolDetailScreen.json b/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolDetails/PoolDetailScreen.json
index 67040843a3..c8afdea6c8 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolDetails/PoolDetailScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolDetails/PoolDetailScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 92,
+      "line": 91,
       "column": 12,
-      "index": 2696
+      "index": 2675
     },
     "end": {
-      "line": 95,
+      "line": 94,
       "column": 3,
-      "index": 2810
+      "index": 2789
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 96,
+      "line": 95,
       "column": 8,
-      "index": 2820
+      "index": 2799
     },
     "end": {
-      "line": 99,
+      "line": 98,
       "column": 3,
-      "index": 2879
+      "index": 2858
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Stake pool hash",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 100,
+      "line": 99,
       "column": 12,
-      "index": 2893
+      "index": 2872
     },
     "end": {
-      "line": 103,
+      "line": 102,
       "column": 3,
-      "index": 2980
+      "index": 2959
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Enter test stake pool ID",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 104,
+      "line": 103,
       "column": 10,
-      "index": 2992
+      "index": 2971
     },
     "end": {
-      "line": 107,
+      "line": 106,
       "column": 3,
-      "index": 3086
+      "index": 3065
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Invalid pool ID. Please retype.",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 108,
+      "line": 107,
       "column": 17,
-      "index": 3105
+      "index": 3084
     },
     "end": {
-      "line": 111,
+      "line": 110,
       "column": 3,
-      "index": 3208
+      "index": 3187
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Stake test ADA and support Yoroi 💥",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 112,
+      "line": 111,
       "column": 19,
-      "index": 3229
+      "index": 3208
     },
     "end": {
-      "line": 115,
+      "line": 114,
       "column": 3,
-      "index": 3360
+      "index": 3339
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Experience the mechanism of staking firsthand and help us improve Yoroi's functionality and user experience.",
     "file": "src/legacy/Staking/PoolDetails/PoolDetailScreen.tsx",
     "start": {
-      "line": 116,
+      "line": 115,
       "column": 18,
-      "index": 3380
+      "index": 3359
     },
     "end": {
-      "line": 120,
+      "line": 119,
       "column": 3,
-      "index": 3589
+      "index": 3568
     }
   }
 ]
\ No newline at end of file

From a3103a59f57dbabb52d09b53d6ecd57caf5bd795 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Sat, 12 Oct 2024 11:35:57 +0200
Subject: [PATCH 02/15] fix(wallet-mobile): disabled actions label color
 (#3686)

---
 .../useCases/TxHistory/ActionsBanner.tsx            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
index b4cbd5ea08..b4a4913773 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
@@ -118,7 +118,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
           onLongPress={handleOnLongPressReceive}
         />
 
-        <Text style={styles.actionLabel}>{strings.receiveLabel}</Text>
+        <Text style={[styles.actionLabel, disabled && styles.disabledLabel]}>{strings.receiveLabel}</Text>
       </View>
 
       {!meta.isReadOnly && (
@@ -132,7 +132,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
               disabled={disabled}
             />
 
-            <Text style={styles.actionLabel}>{strings.sendLabel}</Text>
+            <Text style={[styles.actionLabel, disabled && styles.disabledLabel]}>{strings.sendLabel}</Text>
           </View>
 
           <View style={styles.centralized}>
@@ -144,7 +144,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
               disabled={disabled}
             />
 
-            <Text style={styles.actionLabel}>{strings.swapLabel}</Text>
+            <Text style={[styles.actionLabel, disabled && styles.disabledLabel]}>{strings.swapLabel}</Text>
           </View>
 
           <View style={styles.centralized}>
@@ -156,7 +156,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
               disabled={disabled}
             />
 
-            <Text style={styles.actionLabel}>{strings.exchange}</Text>
+            <Text style={[styles.actionLabel, disabled && styles.disabledLabel]}>{strings.exchange}</Text>
           </View>
         </>
       )}
@@ -180,7 +180,10 @@ const useStyles = () => {
     actionLabel: {
       ...atoms.pt_sm,
       ...atoms.body_3_sm_medium,
-      color: color.gray_max,
+      color: color.text_gray_medium,
+    },
+    disabledLabel: {
+      color: color.text_gray_low,
     },
   })
 

From 04329393ae6e31405bd804dd79ff0b2ff4b1f4f7 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Sun, 13 Oct 2024 22:11:55 +0100
Subject: [PATCH 03/15] chore(types): add more api errors (#3687)

---
 packages/types/src/api/errors.ts      | 3 +++
 packages/types/src/api/status-code.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/types/src/api/errors.ts b/packages/types/src/api/errors.ts
index 6a911c3071..c445e8c557 100644
--- a/packages/types/src/api/errors.ts
+++ b/packages/types/src/api/errors.ts
@@ -11,3 +11,6 @@ export class ApiErrorUnknown extends Error {}
 export class ApiErrorNetwork extends Error {}
 export class ApiErrorInvalidState extends Error {}
 export class ApiErrorResponseMalformed extends Error {}
+export class ApiErrorServiceUnavailable extends Error {}
+export class ApiErrorMethodNotAllowed extends Error {}
+export class ApiErrorContentNotAcceptable extends Error {}
diff --git a/packages/types/src/api/status-code.ts b/packages/types/src/api/status-code.ts
index 64e8b80c68..2bbfbd2af9 100644
--- a/packages/types/src/api/status-code.ts
+++ b/packages/types/src/api/status-code.ts
@@ -7,7 +7,10 @@ export enum ApiHttpStatusCode {
   Unauthorized = 401,
   Forbidden = 403,
   NotFound = 404,
+  MethodNotAllowed = 405,
+  ContentNotAcceptable = 406,
   TooEarly = 425,
   TooManyRequests = 429,
   InternalServerError = 500,
+  ServiceUnavailable = 503,
 }

From ea153f9c8473a160bf4d34b6f4a9eb4f3c892559 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:17:25 +0200
Subject: [PATCH 04/15] fix(wallet-mobile): offline crashes (#3664)

---
 .../WalletManager/common/hooks/useBestBlock.tsx        | 10 +++++++++-
 apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts    |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-mobile/src/features/WalletManager/common/hooks/useBestBlock.tsx b/apps/wallet-mobile/src/features/WalletManager/common/hooks/useBestBlock.tsx
index ca667fc087..aae3f8b8f8 100644
--- a/apps/wallet-mobile/src/features/WalletManager/common/hooks/useBestBlock.tsx
+++ b/apps/wallet-mobile/src/features/WalletManager/common/hooks/useBestBlock.tsx
@@ -11,7 +11,15 @@ export const useBestBlock = ({options}: {options?: UseQueryOptions<Chain.Cardano
     retry: 3,
     retryDelay: 1_000,
     queryKey: [network, 'tipStatus'],
-    queryFn: () => networkManager.api.bestBlock(),
+    queryFn: () =>
+      networkManager.api.bestBlock().catch(() => ({
+        // TODO: Without this it break when offline. Needs better fixing
+        epoch: 510,
+        slot: 130081,
+        globalSlot: 135086881,
+        hash: 'ab0093eb78bcb0146355741388632eb50c69407df8fa32de85e5f198d725e8f4',
+        height: 10850697,
+      })),
     ...options,
   })
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
index fb3ee1a9d8..29dbd086a9 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
@@ -440,7 +440,10 @@ export const useFrontendFees = (
     suspense: true,
     queryKey: [wallet.id, 'frontend-fees'],
     ...options,
-    queryFn: () => wallet.api.getFrontendFees(),
+    queryFn: () =>
+      wallet.api.getFrontendFees().catch(() => ({
+        // TODO: Without this it break when offline. Needs better fixing
+      })),
   })
 
   return {

From ef5a10b1a58f7fdff69cdc2cec6ea393dc3fe824 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:56:21 +0200
Subject: [PATCH 05/15] feature(wallet-mobile): new tx review for yoroi swap
 (#3688)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../.storybook/storybook.requires.js          |   39 +-
 apps/wallet-mobile/src/InitApp.tsx            |    2 +-
 apps/wallet-mobile/src/WalletNavigator.tsx    |    4 +-
 apps/wallet-mobile/src/YoroiApp.tsx           |    5 +-
 .../common => components/Divider}/Divider.tsx |    2 +-
 .../HideableText/HideableText.stories.tsx     |    2 +-
 .../components/HideableText/HideableText.tsx  |    2 +-
 .../PairedBalance/PairedBalance.tsx           |    4 +-
 .../features/Discover/DiscoverNavigator.tsx   |    2 +-
 .../SelectDappFromListScreen.tsx              |    2 +-
 apps/wallet-mobile/src/features/Menu/Menu.tsx |    2 +-
 .../src/features/Portfolio/NftsNavigator.tsx  |    2 +-
 .../features/Portfolio/PortfolioNavigator.tsx |    2 +-
 .../TokenAmountItem/TokenAmountItem.tsx       |    2 +-
 .../common/hooks/useGetPortfolioTokenChart.ts |    2 +-
 .../BalanceCard/BalanceCard.tsx               |    2 +-
 .../BalanceCard/BalanceCardContent.tsx        |    4 +-
 .../PortfolioDashboard/BalanceCard/Rate.tsx   |    2 +-
 .../DashboardTokenItem.tsx                    |    4 +-
 .../PortfolioTokenChart/TokenPerformance.tsx  |    2 +-
 .../PortfolioTokenListScreen.tsx              |    2 +-
 .../ListMediaGalleryScreen.tsx                |    2 +-
 .../TokenBalanceItem.tsx                      |    4 +-
 .../TotalTokensValue/TokenValueBalance.tsx    |    4 +-
 .../TokenValuePairedBalance.tsx               |    2 +-
 .../TotalTokensValueContent.tsx               |    4 +-
 .../RegisterCatalyst/CatalystNavigator.tsx    |    2 +-
 .../features/ReviewTx/common/Accordion.tsx    |    4 +-
 .../features/ReviewTx/common/CopiableText.tsx |   31 +-
 .../ReviewTx/common/ReviewTxProvider.tsx      |   29 +
 .../ReviewTx/common/hooks/useAddressType.tsx  |   12 -
 .../common/hooks/useFormattedMetadata.tsx     |   13 +
 .../ReviewTx/common/hooks/useFormattedTx.tsx  |   46 +-
 .../ReviewTx/common/hooks/useStrings.tsx      |   15 +
 .../ReviewTx/common/hooks/useTxBody.tsx       |    3 +-
 .../src/features/ReviewTx/common/types.ts     |    8 +
 .../ReviewTxScreen/Metadata/MetadataTab.tsx   |   90 ++
 .../ReviewTxScreen/Overview/OverviewTab.tsx   |   80 +-
 .../ReviewTxScreen/ReviewTxScreen.tsx         |   61 +-
 .../ReviewTxScreen/UTxOs/UTxOsTab.tsx         |    2 +-
 .../Settings/ApplicationSettings/index.ts     |    1 -
 .../src/features/Settings/SettingsItems.tsx   |    2 +-
 .../Settings/SettingsScreenNavigator.tsx      |   46 +-
 .../features/Settings/WalletSettings/index.ts |    1 -
 .../src/features/Settings/index.ts            |    1 -
 .../About/About.stories.tsx                   |    4 +-
 .../changeAppSettings}/About/About.tsx        |    8 +-
 .../changeAppSettings}/About/index.ts         |    0
 .../ApplicationSettingsScreen.stories.tsx     |    0
 .../ApplicationSettingsScreen.tsx             |   32 +-
 .../ChangeLanguageScreen.stories.tsx          |    2 +-
 .../ChangeLanguage/ChangeLanguageScreen.tsx   |    2 +-
 .../ChangeLanguage/index.ts                   |    0
 .../ChangeNetworkScreen.stories.tsx           |    2 +-
 .../ChangeNetwork/ChangeNetworkScreen.tsx     |   12 +-
 .../ChangeNetwork/NetworkPickerItem.tsx       |    4 +-
 .../ChangeNetwork/NetworkPickerList.tsx       |   14 +-
 .../ChangeNetwork/NetworkTag.tsx              |   18 +-
 .../ChangeNetwork/PreparingNetworkScreen.tsx  |    2 +-
 .../ChangeNetwork/strings.ts                  |    2 +-
 .../useLaunchRouteAfterSyncing.tsx            |    4 +-
 .../ChangeTheme/ChangeThemeScreen.stories.tsx |    2 +-
 .../ChangeTheme/ChangeThemeScreen.tsx         |    2 +-
 .../ChangeTheme/ThemePickerItem.tsx           |    8 +-
 .../ChangeTheme/ThemePickerList.tsx           |    2 +-
 .../Currency/ChangeCurrencyScreen.stories.tsx |    0
 .../Currency/ChangeCurrencyScreen.tsx         |    2 +-
 .../Currency/CurrencyContext.tsx              |    6 +-
 .../Currency/CurrencyPickerItem.tsx           |    8 +-
 .../Currency/CurrencyPickerList.tsx           |    2 +-
 .../EnableLoginWithOsScreen.stories.tsx       |    0
 .../EnableLoginWithOsScreen.tsx               |    8 +-
 .../EnableLoginWithOs/index.ts                |    0
 .../PrivacyMode/PrivacyMode.tsx               |    0
 .../PrivacyPolicyScreen.stories.tsx           |    0
 .../PrivacyPolicy/PrivacyPolicyScreen.tsx     |    4 +-
 .../changeAppSettings}/PrivacyPolicy/index.ts |    0
 .../ScreenShare/ScreenShare.ts                |    0
 .../changeAppSettings}/ScreenShare/index.ts   |    0
 .../SystemLogScreen.stories.tsx               |    4 +-
 .../SystemLogScreen/SystemLogScreen.tsx       |    6 +-
 .../TermsOfServiceScreen.stories.tsx          |    0
 .../TermsOfService/TermsOfServiceScreen.tsx   |    4 +-
 .../TermsOfService/index.ts                   |    0
 .../ChangePasswordScreen.stories.tsx          |    6 +-
 .../ChangePassword/ChangePasswordScreen.tsx   |   16 +-
 .../ChangePassword/index.ts                   |    0
 .../DisableEasyConfirmationScreen.tsx         |    8 +-
 .../EasyConfirmationScreen.stories.tsx        |   12 +-
 .../EnableEasyConfirmationScreen.tsx          |   20 +-
 .../EasyConfirmation/index.ts                 |    0
 .../ManageCollateral/CollateralInfoModal.tsx  |    0
 .../ConfirmTx/FailedTx/FailedTxImage.tsx      |    0
 .../FailedTx/FailedTxScreen.stories.tsx       |    0
 .../ConfirmTx/FailedTx/FailedTxScreen.tsx     |   10 +-
 .../SubmittedTx/SubmittedTxImage.tsx          |    0
 .../SubmittedTx/SubmittedTxScreen.stories.tsx |    0
 .../SubmittedTx/SubmittedTxScreen.tsx         |   12 +-
 .../InitialCollateralInfoModal.tsx            |    4 +-
 .../ManageCollateralScreen.stories.tsx        |    6 +-
 .../ManageCollateralScreen.tsx                |   47 +-
 .../ManageCollateral/helpers.ts               |    6 +-
 .../illustrations/InfoModalIllustration.tsx   |    0
 .../ManageCollateral/index.ts                 |    0
 .../ManageCollateral/navigation.ts            |    2 +-
 .../ManageCollateral/strings.ts               |    0
 .../RemoveWalletScreen.stories.tsx            |    4 +-
 .../RemoveWallet/RemoveWalletScreen.tsx       |   18 +-
 .../RemoveWallet/index.ts                     |    0
 .../RenameWalletScreen.stories.tsx            |    4 +-
 .../RenameWalletScreen/RenameWalletScreen.tsx |   18 +-
 .../WalletSettingsScreen.stories.tsx          |    4 +-
 .../WalletSettingsScreen.tsx                  |   26 +-
 .../SetupWallet/SetupWalletNavigator.tsx      |    2 +-
 .../Governance/GovernanceNavigator.tsx        |    2 +-
 .../src/features/Swap/common/navigation.ts    |    2 +-
 .../src/features/Swap/common/strings.ts       |   15 +-
 .../useCases/ConfirmTxScreen/ConfirmTx.tsx    |   41 -
 .../ConfirmTxScreen.stories.tsx               |  107 --
 .../ConfirmTxScreen/ConfirmTxWithHW.tsx       |  104 --
 .../ConfirmTxScreen/ConfirmTxWithPassword.tsx |   74 --
 .../ReviewSwap.tsx}                           |  126 +-
 .../TransactionSummary.stories.tsx            |    5 +-
 .../TransactionSummary.tsx                    |  256 ++--
 .../CreateOrder/StartSwapOrderScreen.tsx      |    2 +-
 .../ListOrders/OpenOrders.tsx                 |    2 +-
 .../src/features/Swap/useCases/index.ts       |    1 -
 .../Transactions/TxHistoryNavigator.tsx       |   15 +-
 .../useCases/TxDetails/AssetList.tsx          |    2 +-
 .../useCases/TxDetails/TxDetails.tsx          |    2 +-
 .../useCases/TxHistory/BalanceBanner.tsx      |    2 +-
 .../useCases/TxHistory/LockedDeposit.tsx      |    2 +-
 .../useCases/TxList/TxListItem.tsx            |    4 +-
 .../AggregatedBalance.tsx                     |    2 +-
 .../src/hooks/useAllowScreenShot.tsx          |    2 +-
 .../src/kernel/i18n/locales/en-US.json        |    5 +
 apps/wallet-mobile/src/kernel/navigation.tsx  |    2 +-
 .../legacy/Dashboard/DashboardNavigator.tsx   |    2 +-
 .../src/legacy/Dashboard/UserSummary.tsx      |    2 +-
 .../yoroi-wallets/cardano/cip30/cip30.test.ts |    1 +
 .../src/yoroi-wallets/cardano/utils.ts        |   53 +-
 .../messages/src/WalletNavigator.json         |   48 +-
 .../PairedBalance/PairedBalance.json          |    4 +-
 .../ReviewTx/common/hooks/useStrings.json     |  245 ++--
 .../ApplicationSettingsScreen.json            |   76 +-
 .../Settings/SettingsScreenNavigator.json     |  160 +--
 .../WalletSettings/WalletSettingsScreen.json  |   84 +-
 .../changeAppSettings/About/About.json        |  107 ++
 .../ApplicationSettingsScreen.json            |  287 +++++
 .../ChangeNetwork/strings.json                |  122 ++
 .../EnableLoginWithOsScreen.json              |   77 ++
 .../ChangePassword/ChangePasswordScreen.json  |   92 ++
 .../DisableEasyConfirmationScreen.json        |   32 +
 .../EnableEasyConfirmationScreen.json         |   62 +
 .../ManageCollateral/strings.json             |  197 +++
 .../RemoveWallet/RemoveWalletScreen.json      |  107 ++
 .../RenameWalletScreen.json                   |   32 +
 .../SettingsScreenNavigator.json              |  302 +++++
 .../WalletSettingsScreen.json                 |  317 +++++
 .../SetupWallet/SetupWalletNavigator.json     |   48 +-
 .../src/features/Swap/common/strings.json     | 1063 +++++++++--------
 .../Transactions/TxHistoryNavigator.json      |  171 +--
 .../legacy/Dashboard/DashboardNavigator.json  |    4 +-
 .../src/legacy/Dashboard/UserSummary.json     |   16 +-
 164 files changed, 3515 insertions(+), 1913 deletions(-)
 rename apps/wallet-mobile/src/{features/ReviewTx/common => components/Divider}/Divider.tsx (92%)
 delete mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
 create mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
 create mode 100644 apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Settings/ApplicationSettings/index.ts
 delete mode 100644 apps/wallet-mobile/src/features/Settings/WalletSettings/index.ts
 delete mode 100644 apps/wallet-mobile/src/features/Settings/index.ts
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/About.stories.tsx (60%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/About.tsx (93%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/About/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ApplicationSettings => useCases/changeAppSettings}/ApplicationSettingsScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ApplicationSettings => useCases/changeAppSettings}/ApplicationSettingsScreen.tsx (92%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/ChangeLanguageScreen.stories.tsx (81%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/ChangeLanguageScreen.tsx (87%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeLanguage/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/ChangeNetworkScreen.stories.tsx (81%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/ChangeNetworkScreen.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkPickerItem.tsx (95%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkPickerList.tsx (75%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/NetworkTag.tsx (87%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/PreparingNetworkScreen.tsx (95%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/strings.ts (97%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeNetwork/useLaunchRouteAfterSyncing.tsx (82%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ChangeThemeScreen.stories.tsx (80%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ChangeThemeScreen.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ThemePickerItem.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ChangeTheme/ThemePickerList.tsx (91%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/ChangeCurrencyScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/ChangeCurrencyScreen.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyContext.tsx (91%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyPickerItem.tsx (91%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/Currency/CurrencyPickerList.tsx (92%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/EnableLoginWithOsScreen.tsx (87%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/EnableLoginWithOs/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyMode/PrivacyMode.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/PrivacyPolicyScreen.tsx (85%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/PrivacyPolicy/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ScreenShare/ScreenShare.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/ScreenShare/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/SystemLogScreen/SystemLogScreen.stories.tsx (64%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/SystemLogScreen/SystemLogScreen.tsx (92%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/TermsOfServiceScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/TermsOfServiceScreen.tsx (85%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeAppSettings}/TermsOfService/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/ChangePasswordScreen.stories.tsx (60%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/ChangePasswordScreen.tsx (91%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ChangePassword/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/DisableEasyConfirmationScreen.tsx (87%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/EasyConfirmationScreen.stories.tsx (80%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/EnableEasyConfirmationScreen.tsx (84%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/EasyConfirmation/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/CollateralInfoModal.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx (79%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx (79%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/InitialCollateralInfoModal.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ManageCollateralScreen.stories.tsx (90%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/ManageCollateralScreen.tsx (82%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/helpers.ts (65%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/illustrations/InfoModalIllustration.tsx (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/navigation.ts (85%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/ManageCollateral/strings.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/RemoveWalletScreen.stories.tsx (64%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/RemoveWalletScreen.tsx (89%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RemoveWallet/index.ts (100%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RenameWalletScreen/RenameWalletScreen.stories.tsx (64%)
 rename apps/wallet-mobile/src/features/Settings/{ => useCases/changeWalletSettings}/RenameWalletScreen/RenameWalletScreen.tsx (82%)
 rename apps/wallet-mobile/src/features/Settings/{WalletSettings => useCases/changeWalletSettings}/WalletSettingsScreen.stories.tsx (66%)
 rename apps/wallet-mobile/src/features/Settings/{WalletSettings => useCases/changeWalletSettings}/WalletSettingsScreen.tsx (92%)
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTx.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithPassword.tsx
 rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen/ConfirmTxScreen.tsx => ReviewSwap/ReviewSwap.tsx} (58%)
 rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen => ReviewSwap}/TransactionSummary.stories.tsx (95%)
 rename apps/wallet-mobile/src/features/Swap/useCases/{ConfirmTxScreen => ReviewSwap}/TransactionSummary.tsx (63%)
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/About/About.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.json

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 21011eaba6..41fde2e017 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -185,24 +185,24 @@ const getStories = () => {
     "./src/features/Send/useCases/StartMultiTokenTx/NotifySupportedNameServers/NotifySupportedNameServers.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/NotifySupportedNameServers/NotifySupportedNameServers.stories.tsx"),
     "./src/features/Send/useCases/StartMultiTokenTx/SelectNameServer/SelectNameServer.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/SelectNameServer/SelectNameServer.stories.tsx"),
     "./src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx": require("../src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.stories.tsx"),
-    "./src/features/Settings/About/About.stories.tsx": require("../src/features/Settings/About/About.stories.tsx"),
-    "./src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx": require("../src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx"),
-    "./src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx": require("../src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx"),
-    "./src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx": require("../src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx"),
-    "./src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx": require("../src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx"),
-    "./src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx": require("../src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx"),
-    "./src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx": require("../src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx"),
-    "./src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx": require("../src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx"),
-    "./src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx": require("../src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx"),
-    "./src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx"),
-    "./src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx"),
-    "./src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx": require("../src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx"),
-    "./src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx": require("../src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx"),
-    "./src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx": require("../src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx"),
-    "./src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx": require("../src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx"),
-    "./src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx": require("../src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx"),
-    "./src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx": require("../src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx"),
-    "./src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx": require("../src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx": require("../src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx"),
+    "./src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx": require("../src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx"),
     "./src/features/SetupWallet/common/ButtonCard/ButtonCard.stories.tsx": require("../src/features/SetupWallet/common/ButtonCard/ButtonCard.stories.tsx"),
     "./src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.stories.tsx": require("../src/features/SetupWallet/common/CardAboutPhrase/CardAboutPhrase.stories.tsx"),
     "./src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx": require("../src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx"),
@@ -241,10 +241,9 @@ const getStories = () => {
     "./src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx": require("../src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx"),
     "./src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx": require("../src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx"),
     "./src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx": require("../src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx"),
-    "./src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx"),
     "./src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx"),
     "./src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx"),
-    "./src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx"),
+    "./src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx": require("../src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx"),
     "./src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx"),
     "./src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx"),
     "./src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx": require("../src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx"),
diff --git a/apps/wallet-mobile/src/InitApp.tsx b/apps/wallet-mobile/src/InitApp.tsx
index cbda481e8a..e0c8b7e3e7 100644
--- a/apps/wallet-mobile/src/InitApp.tsx
+++ b/apps/wallet-mobile/src/InitApp.tsx
@@ -5,7 +5,7 @@ import {Platform, UIManager} from 'react-native'
 import uuid from 'uuid'
 
 import {AppNavigator} from './AppNavigator'
-import {useInitScreenShare} from './features/Settings/ScreenShare'
+import {useInitScreenShare} from './features/Settings/useCases/changeAppSettings/ScreenShare'
 import {useWalletManager} from './features/WalletManager/context/WalletManagerProvider'
 import {storageVersionMaker} from './kernel/storage/migrations/storageVersion'
 
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
index c1d3857a7f..2fcf6cc04d 100644
--- a/apps/wallet-mobile/src/WalletNavigator.tsx
+++ b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -26,8 +26,8 @@ import {PortfolioNavigator} from './features/Portfolio/PortfolioNavigator'
 import {CatalystNavigator} from './features/RegisterCatalyst/CatalystNavigator'
 import {ReviewTxNavigator} from './features/ReviewTx/ReviewTxNavigator'
 import {SearchProvider} from './features/Search/SearchContext'
-import {SettingsScreenNavigator} from './features/Settings'
-import {NetworkTag} from './features/Settings/ChangeNetwork/NetworkTag'
+import {SettingsScreenNavigator} from './features/Settings/SettingsScreenNavigator'
+import {NetworkTag} from './features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {GovernanceNavigator} from './features/Staking/Governance/GovernanceNavigator'
 import {SwapFormProvider} from './features/Swap/common/SwapFormProvider'
diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
index 655676b9c4..cfd5918dc8 100644
--- a/apps/wallet-mobile/src/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -7,7 +7,7 @@ import React from 'react'
 import {LogBox, StyleSheet} from 'react-native'
 import * as RNP from 'react-native-paper'
 import {initialWindowMetrics, SafeAreaProvider} from 'react-native-safe-area-context'
-import {enableFreeze, enableScreens} from 'react-native-screens'
+import {enableScreens} from 'react-native-screens'
 import {QueryClientProvider} from 'react-query'
 
 import {LoadingBoundary} from './components/Boundary/Boundary'
@@ -16,7 +16,7 @@ import {AuthProvider} from './features/Auth/AuthProvider'
 import {BrowserProvider} from './features/Discover/common/BrowserProvider'
 import {PortfolioTokenActivityProvider} from './features/Portfolio/common/PortfolioTokenActivityProvider'
 import {ReviewTxProvider} from './features/ReviewTx/common/ReviewTxProvider'
-import {CurrencyProvider} from './features/Settings/Currency/CurrencyContext'
+import {CurrencyProvider} from './features/Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {AutomaticWalletOpenerProvider} from './features/WalletManager/context/AutomaticWalletOpeningProvider'
 import {WalletManagerProvider} from './features/WalletManager/context/WalletManagerProvider'
 import {walletManager} from './features/WalletManager/wallet-manager'
@@ -32,7 +32,6 @@ import {PoolTransitionProvider} from './legacy/Staking/PoolTransition/PoolTransi
 import {useThemeStorageMaker} from './yoroi-wallets/hooks'
 
 enableScreens(true)
-enableFreeze(true)
 
 if (disableLogbox) {
   LogBox.ignoreAllLogs()
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx b/apps/wallet-mobile/src/components/Divider/Divider.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx
rename to apps/wallet-mobile/src/components/Divider/Divider.tsx
index 1733930fda..d87afd1b14 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/Divider.tsx
+++ b/apps/wallet-mobile/src/components/Divider/Divider.tsx
@@ -2,7 +2,7 @@ import {SpacingSize, useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, View} from 'react-native'
 
-import {Space} from '../../../components/Space/Space'
+import {Space} from '../Space/Space'
 
 export const Divider = ({verticalSpace = 'none'}: {verticalSpace?: SpacingSize}) => {
   const {styles} = useStyles()
diff --git a/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx b/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx
index 1146d2ac55..429f85b291 100644
--- a/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx
+++ b/apps/wallet-mobile/src/components/HideableText/HideableText.stories.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {Button} from '../Button/Button'
 import {Spacer} from '../Spacer/Spacer'
 import {Text} from '../Text'
diff --git a/apps/wallet-mobile/src/components/HideableText/HideableText.tsx b/apps/wallet-mobile/src/components/HideableText/HideableText.tsx
index 17ddc8a7be..d87d04021b 100644
--- a/apps/wallet-mobile/src/components/HideableText/HideableText.tsx
+++ b/apps/wallet-mobile/src/components/HideableText/HideableText.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import {TextProps} from 'react-native'
 
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {Text} from '../Text'
 
 type Props = TextProps & {
diff --git a/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
index e5a450f392..6a15669aeb 100644
--- a/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
+++ b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
@@ -7,8 +7,8 @@ import {StyleSheet, Text, TextStyle} from 'react-native'
 
 import {usePortfolio} from '../../features/Portfolio/common/PortfolioProvider'
 import {usePortfolioTokenActivity} from '../../features/Portfolio/common/PortfolioTokenActivityProvider'
-import {useCurrencyPairing} from '../../features/Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../features/Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useWalletManager} from '../../features/WalletManager/context/WalletManagerProvider'
 import {CurrencySymbol} from '../../yoroi-wallets/types/other'
 import {Boundary, ResetError, ResetErrorRef} from '../Boundary/Boundary'
diff --git a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
index aca6bcf848..1b16ebd52f 100644
--- a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
@@ -7,7 +7,7 @@ import {ErrorBoundary} from 'react-error-boundary'
 import {LoadingBoundary} from '../../components/Boundary/Boundary'
 import {SomethingWentWrong} from '../../components/SomethingWentWrong/SomethingWentWrong'
 import {defaultStackNavigationOptions, DiscoverRoutes} from '../../kernel/navigation'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {BrowserNavigator} from './BrowserNavigator'
 import {useStrings} from './common/useStrings'
 import {ReviewTransaction} from './useCases/ReviewTransaction/ReviewTransaction'
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
index 39a2ee4b6c..28aec24bdb 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
@@ -7,7 +7,7 @@ import {SimpleTab} from '../../../../components/SimpleTab/SimpleTab'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {useSearch, useSearchOnNavBar} from '../../../Search/SearchContext'
-import {NetworkTag} from '../../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {ChainDAppsWarning} from '../../common/ChainDAppsWarning'
 import {getGoogleSearchItem} from '../../common/helpers'
 import {useDAppsConnected} from '../../common/useDAppsConnected'
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index 590e375bfd..fdf416276d 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -19,7 +19,7 @@ import {usePrefetchStakingInfo} from '../../legacy/Dashboard/StakePoolInfos'
 import {usePoolTransition} from '../../legacy/Staking/PoolTransition/usePoolTransition'
 import {useCanVote} from '../RegisterCatalyst/common/hooks'
 import {InsufficientFundsModal} from '../RegisterCatalyst/common/InsufficientFundsModal'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useIsGovernanceFeatureEnabled} from '../Staking/Governance/common/helpers'
 import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
 
diff --git a/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx
index 3c8323b85b..b7e3757c96 100644
--- a/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/NftsNavigator.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 
 import {useMetrics} from '../../kernel/metrics/metricsManager'
 import {defaultStackNavigationOptions, NftRoutes} from '../../kernel/navigation'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useStrings} from './common/hooks/useStrings'
 import {MediaDetailsScreen} from './common/MediaDetailsScreen/MediaDetailsScreen'
 import {ListMediaGalleryScreen} from './useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen'
diff --git a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
index 9d934d67c0..78ab679ccc 100644
--- a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import {Boundary} from '../../components/Boundary/Boundary'
 import {defaultStackNavigationOptions, PortfolioRoutes} from '../../kernel/navigation'
 import {SearchProvider} from '../Search/SearchContext'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {TxDetails} from '../Transactions/useCases/TxDetails/TxDetails'
 import {useStrings} from './common/hooks/useStrings'
 import {PortfolioProvider} from './common/PortfolioProvider'
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx
index 53713bf733..987be00e51 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/TokenAmountItem/TokenAmountItem.tsx
@@ -8,7 +8,7 @@ import {Icon} from '../../../../components/Icon'
 import {PairedBalance} from '../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {usePriceImpactRiskTheme} from '../../../Swap/common/helpers'
 import {SwapPriceImpactRisk} from '../../../Swap/common/types'
 import {TokenInfoIcon} from './TokenInfoIcon'
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
index af3b08f03e..23bf03f74c 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
@@ -8,7 +8,7 @@ import {features} from '../../../../kernel/features'
 import {useLanguage} from '../../../../kernel/i18n'
 import {logger} from '../../../../kernel/logger/logger'
 import {fetchPtPriceActivity} from '../../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
-import {useCurrencyPairing} from '../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedNetwork} from '../../../WalletManager/common/hooks/useSelectedNetwork'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {networkConfigs} from '../../../WalletManager/network-manager/network-manager'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
index 3ae304e27e..b274a546c7 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCard.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {StyleSheet, View} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {aggregatePrimaryAmount} from '../../../common/helpers/aggregatePrimaryAmount'
 import {usePortfolioTokenActivity} from '../../../common/PortfolioTokenActivityProvider'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
index 7a65980aaf..0933854186 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
 import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
 import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
index 60db55acf8..c89411c969 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/BalanceCard/Rate.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, Text} from 'react-native'
 
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 
 type Props = {rate: number; name: string}
 export const Rate = ({rate, name}: Props) => {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
index db49a33b5f..6d3401bf3c 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokenItem.tsx
@@ -7,8 +7,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
 import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
 import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
index b14eaef25b..04d66d481a 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
@@ -5,7 +5,7 @@ import {StyleSheet, View} from 'react-native'
 
 import {Text} from '../../../../../components/Text'
 import {Tooltip} from '../../../../../components/Tooltip/Tooltip'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {formatPriceChange} from '../../../common/helpers/priceChange'
 import {TOKEN_CHART_INTERVAL, TokenChartInterval} from '../../../common/hooks/useGetPortfolioTokenChart'
 import {useStrings} from '../../../common/hooks/useStrings'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
index 684c305a1f..b12faf3bb2 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioTokenListScreen.tsx
@@ -6,7 +6,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Tab, TabPanel, Tabs} from '../../../../components/Tabs/Tabs'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {useSearchOnNavBar} from '../../../Search/SearchContext'
-import {NetworkTag} from '../../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useGetDAppsPortfolioBalance} from '../../common/hooks/useGetDAppsPortfolioBalance'
 import {useStrings} from '../../common/hooks/useStrings'
 import {PortfolioListTab, usePortfolio} from '../../common/PortfolioProvider'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
index f953cfeccb..7dafd5b684 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/ListMediaGalleryScreen/ListMediaGalleryScreen.tsx
@@ -9,7 +9,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Space} from '../../../../../../components/Space/Space'
 import {useMetrics} from '../../../../../../kernel/metrics/metricsManager'
 import {useSearch, useSearchOnNavBar} from '../../../../../Search/SearchContext'
-import {NetworkTag} from '../../../../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../../../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useSelectedWallet} from '../../../../../WalletManager/common/hooks/useSelectedWallet'
 import {usePortfolioBalances} from '../../../../common/hooks/usePortfolioBalances'
 import {useStrings} from '../../../../common/hooks/useStrings'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
index 43ae21f7d8..1c9cca4d84 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/TokenBalanceItem.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
 import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
 import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
index 0be7da56c9..909559e7ad 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValueBalance.tsx
@@ -4,8 +4,8 @@ import {Portfolio} from '@yoroi/types'
 import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {SkeletonPrimaryToken} from './SkeletonPrimaryToken'
 
 type Props = {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
index a32669d6c6..28fad6bca3 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TokenValuePairedBalance.tsx
@@ -5,7 +5,7 @@ import * as React from 'react'
 import {StyleSheet, Text} from 'react-native'
 
 import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {SkeletonPairedToken} from './SkeletonPairedToken'
 
 type Props = {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
index 18efd6bf30..619f8d5e10 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/TotalTokensValue/TotalTokensValueContent.tsx
@@ -6,8 +6,8 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {Icon} from '../../../../../components/Icon'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
 import {Tooltip} from '../../../../../components/Tooltip/Tooltip'
-import {useCurrencyPairing} from '../../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {formatPriceChange, priceChange} from '../../../common/helpers/priceChange'
 import {useStrings} from '../../../common/hooks/useStrings'
 import {PnlTag} from '../../../common/PnlTag/PnlTag'
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
index ae20582593..de0fd14e4d 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
@@ -8,7 +8,6 @@ import {useIntl} from 'react-intl'
 import {StyleSheet} from 'react-native'
 
 import {Boundary} from '../../components/Boundary/Boundary'
-import {NetworkTag} from '../../features/Settings/ChangeNetwork/NetworkTag'
 import globalMessages from '../../kernel/i18n/global-messages'
 import {useMetrics} from '../../kernel/metrics/metricsManager'
 import {
@@ -17,6 +16,7 @@ import {
   VotingRegistrationRouteNavigation,
   VotingRegistrationRoutes,
 } from '../../kernel/navigation'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {ConfirmPin} from './useCases/ConfirmPin/ConfirmPin'
 import {ConfirmVotingTx} from './useCases/ConfirmVotingTx/ConfirmVotingTx'
 import {DisplayPin} from './useCases/DisplayPin/DisplayPin'
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
index 92e7bfb3ac..7256cff2d0 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/Accordion.tsx
@@ -1,6 +1,6 @@
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {Animated, LayoutAnimation, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import {Animated, Easing, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {Icon} from '../../../components/Icon'
 
@@ -10,12 +10,12 @@ export const Accordion = ({label, children}: {label: string; children: React.Rea
   const animatedHeight = React.useRef(new Animated.Value(0)).current
 
   const toggleSection = () => {
-    LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
     setIsOpen(!isOpen)
     Animated.timing(animatedHeight, {
       toValue: isOpen ? 0 : 1,
       duration: 300,
       useNativeDriver: false,
+      easing: Easing.ease,
     }).start()
   }
 
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
index 9d2865f4c1..45dea2a1e6 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/CopiableText.tsx
@@ -1,25 +1,40 @@
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {StyleSheet, TouchableOpacity, View} from 'react-native'
+import {StyleSheet, TouchableOpacity, View, ViewStyle} from 'react-native'
 
 import {useCopy} from '../../../components/Clipboard/ClipboardProvider'
 import {Icon} from '../../../components/Icon'
 
-export const CopiableText = ({children, textToCopy}: {children: React.ReactNode; textToCopy: string}) => {
-  const {styles, colors} = useStyles()
-  const {copy} = useCopy()
+export const CopiableText = ({
+  children,
+  style,
+  textToCopy,
+}: {
+  children: React.ReactNode
+  style?: ViewStyle
+  textToCopy: string
+}) => {
+  const {styles} = useStyles()
 
   return (
-    <View style={styles.text}>
+    <View style={[styles.text, style]}>
       {children}
 
-      <TouchableOpacity onPress={() => copy({text: textToCopy})} activeOpacity={0.5}>
-        <Icon.Copy size={24} color={colors.copy} />
-      </TouchableOpacity>
+      <CopyButton textToCopy={textToCopy} />
     </View>
   )
 }
 
+export const CopyButton = ({textToCopy}: {textToCopy: string}) => {
+  const {colors} = useStyles()
+  const {copy} = useCopy()
+  return (
+    <TouchableOpacity onPress={() => copy({text: textToCopy})} activeOpacity={0.5}>
+      <Icon.Copy size={24} color={colors.copy} />
+    </TouchableOpacity>
+  )
+}
+
 const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
index 05dd6ec924..93f5632b61 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
@@ -24,6 +24,9 @@ export const ReviewTxProvider = ({
     cborChanged: (cbor: ReviewTxState['cbor']) => dispatch({type: ReviewTxActionType.CborChanged, cbor}),
     operationsChanged: (operations: ReviewTxState['operations']) =>
       dispatch({type: ReviewTxActionType.OperationsChanged, operations}),
+    customReceiverTitleChanged: (customReceiverTitle: ReviewTxState['customReceiverTitle']) =>
+      dispatch({type: ReviewTxActionType.CustomReceiverTitleChanged, customReceiverTitle}),
+    detailsChanged: (details: ReviewTxState['details']) => dispatch({type: ReviewTxActionType.DetailsChanged, details}),
     onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) =>
       dispatch({type: ReviewTxActionType.OnSuccessChanged, onSuccess}),
     onErrorChanged: (onError: ReviewTxState['onError']) => dispatch({type: ReviewTxActionType.OnErrorChanged, onError}),
@@ -55,6 +58,14 @@ const reviewTxReducer = (state: ReviewTxState, action: ReviewTxAction) => {
         draft.operations = action.operations
         break
 
+      case ReviewTxActionType.CustomReceiverTitleChanged:
+        draft.customReceiverTitle = action.customReceiverTitle
+        break
+
+      case ReviewTxActionType.DetailsChanged:
+        draft.details = action.details
+        break
+
       case ReviewTxActionType.OnSuccessChanged:
         draft.onSuccess = action.onSuccess
         break
@@ -82,6 +93,14 @@ type ReviewTxAction =
       type: ReviewTxActionType.OperationsChanged
       operations: ReviewTxState['operations']
     }
+  | {
+      type: ReviewTxActionType.CustomReceiverTitleChanged
+      customReceiverTitle: ReviewTxState['customReceiverTitle']
+    }
+  | {
+      type: ReviewTxActionType.DetailsChanged
+      details: ReviewTxState['details']
+    }
   | {
       type: ReviewTxActionType.OnSuccessChanged
       onSuccess: ReviewTxState['onSuccess']
@@ -95,6 +114,8 @@ export type ReviewTxState = {
   unsignedTx: YoroiUnsignedTx | null
   cbor: string | null
   operations: Array<React.ReactNode> | null
+  customReceiverTitle: React.ReactNode | null
+  details: {title: string; component: React.ReactNode} | null
   onSuccess: ((signedTx: YoroiSignedTx) => void) | null
   onError: (() => void) | null
 }
@@ -103,6 +124,8 @@ type ReviewTxActions = {
   unsignedTxChanged: (unsignedTx: ReviewTxState['unsignedTx']) => void
   cborChanged: (cbor: ReviewTxState['cbor']) => void
   operationsChanged: (operations: ReviewTxState['operations']) => void
+  customReceiverTitleChanged: (customReceiverTitle: ReviewTxState['customReceiverTitle']) => void
+  detailsChanged: (details: ReviewTxState['details']) => void
   onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) => void
   onErrorChanged: (onError: ReviewTxState['onError']) => void
 }
@@ -111,6 +134,8 @@ const defaultState: ReviewTxState = Object.freeze({
   unsignedTx: null,
   cbor: null,
   operations: null,
+  customReceiverTitle: null,
+  details: null,
   onSuccess: null,
   onError: null,
 })
@@ -124,6 +149,8 @@ const initialReviewTxContext: ReviewTxContext = {
   unsignedTxChanged: missingInit,
   cborChanged: missingInit,
   operationsChanged: missingInit,
+  customReceiverTitleChanged: missingInit,
+  detailsChanged: missingInit,
   onSuccessChanged: missingInit,
   onErrorChanged: missingInit,
 }
@@ -132,6 +159,8 @@ enum ReviewTxActionType {
   UnsignedTxChanged = 'unsignedTxChanged',
   CborChanged = 'cborChanged',
   OperationsChanged = 'operationsChanged',
+  CustomReceiverTitleChanged = 'customReceiverTitleChanged',
+  DetailsChanged = 'detailsChanged',
   OnSuccessChanged = 'onSuccessChanged',
   OnErrorChanged = 'onErrorChanged',
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
deleted file mode 100644
index 6e054df944..0000000000
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useAddressType.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import {useQuery} from 'react-query'
-
-import {getAddressType} from '../../../../yoroi-wallets/cardano/utils'
-
-export const useAddressType = (address: string) => {
-  const query = useQuery(['useAddressType', address], () => getAddressType(address), {
-    suspense: true,
-  })
-
-  if (query.data === undefined) throw new Error('invalid address type')
-  return query.data
-}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
new file mode 100644
index 0000000000..7b67530d7c
--- /dev/null
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
@@ -0,0 +1,13 @@
+import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {TransactionBody} from '../types'
+
+export const formatMetadata = (unsignedTx: YoroiUnsignedTx, txBody: TransactionBody) => {
+  const hash = txBody.auxiliary_data_hash ?? null
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const metadata = unsignedTx.metadata?.['674']?.['msg' as any] ?? null
+
+  return {
+    hash,
+    metadata: {msg: [JSON.parse(metadata)]},
+  }
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
index 7949d9541d..91ef9f2d30 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
@@ -1,10 +1,13 @@
-import {invalid, isNonNullable} from '@yoroi/common'
+// import {CredKind} from '@emurgo/csl-mobile-bridge'
+import {CredKind} from '@emurgo/cross-csl-core'
+import {isNonNullable} from '@yoroi/common'
 import {infoExtractName} from '@yoroi/portfolio'
 import {Portfolio} from '@yoroi/types'
 import _ from 'lodash'
 import {useQuery} from 'react-query'
 
 import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
+import {deriveRewardAddressFromAddress} from '../../../../yoroi-wallets/cardano/utils'
 import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
 import {formatTokenWithText} from '../../../../yoroi-wallets/utils/format'
 import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
@@ -14,12 +17,13 @@ import {
   FormattedFee,
   FormattedInputs,
   FormattedOutputs,
+  FormattedTx,
   TransactionBody,
   TransactionInputs,
   TransactionOutputs,
 } from '../types'
 
-export const useFormattedTx = (data: TransactionBody) => {
+export const useFormattedTx = (data: TransactionBody): FormattedTx => {
   const {wallet} = useSelectedWallet()
 
   const inputs = data?.inputs ?? []
@@ -93,10 +97,14 @@ const formatInputs = async (
     inputs.map(async (input) => {
       const receiveUTxO = getUtxoByTxIdAndIndex(wallet, input.transaction_id, input.index)
       const address = receiveUTxO?.receiver
-      const rewardAddress =
-        address !== undefined ? await deriveRewardAddressFromAddress(address, wallet.networkManager.chainId) : null
       const coin = receiveUTxO?.amount != null ? asQuantity(receiveUTxO.amount) : null
 
+      const addressKind = address != null ? await getAddressKind(address) : null
+      const rewardAddress =
+        address != null && addressKind === CredKind.Key
+          ? await deriveAddress(address, wallet.networkManager.chainId)
+          : null
+
       const primaryAssets =
         coin != null
           ? [
@@ -130,6 +138,7 @@ const formatInputs = async (
       return {
         assets: [...primaryAssets, ...multiAssets].filter(isNonNullable),
         address,
+        addressKind: addressKind ?? null,
         rewardAddress,
         ownAddress: address != null && isOwnedAddress(wallet, address),
         txIndex: input.index,
@@ -147,9 +156,12 @@ const formatOutputs = async (
   return Promise.all(
     outputs.map(async (output) => {
       const address = output.address
-      const rewardAddress = await deriveRewardAddressFromAddress(address, wallet.networkManager.chainId)
       const coin = asQuantity(output.amount.coin)
 
+      const addressKind = await getAddressKind(address)
+      const rewardAddress =
+        addressKind === CredKind.Key ? await deriveAddress(address, wallet.networkManager.chainId) : null
+
       const primaryAssets = [
         {
           tokenInfo: wallet.portfolioPrimaryTokenInfo,
@@ -183,6 +195,7 @@ const formatOutputs = async (
       return {
         assets,
         address,
+        addressKind,
         rewardAddress,
         ownAddress: isOwnedAddress(wallet, address),
       }
@@ -202,20 +215,21 @@ export const formatFee = (wallet: YoroiWallet, data: TransactionBody): Formatted
   }
 }
 
-export const deriveRewardAddressFromAddress = async (address: string, chainId: number): Promise<string> => {
+const deriveAddress = async (address: string, chainId: number) => {
+  try {
+    return await deriveRewardAddressFromAddress(address, chainId)
+  } catch {
+    return null
+  }
+}
+
+const getAddressKind = async (addressBech32: string): Promise<CredKind | null> => {
   const {csl, release} = wrappedCsl()
 
   try {
-    const result = await csl.Address.fromBech32(address)
-      .then((address) => csl.BaseAddress.fromAddress(address))
-      .then((baseAddress) => baseAddress?.stakeCred() ?? invalid('invalid base address'))
-      .then((stakeCredential) => csl.RewardAddress.new(chainId, stakeCredential))
-      .then((rewardAddress) => rewardAddress.toAddress())
-      .then((rewardAddrAsAddress) => rewardAddrAsAddress.toBech32(undefined))
-      .catch((error) => error)
-
-    if (typeof result !== 'string') throw new Error('Its not possible to derive reward address')
-    return result
+    const address = await csl.Address.fromBech32(addressBech32)
+    const addressKind = await (await address.paymentCred())?.kind()
+    return addressKind ?? null
   } finally {
     release()
   }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
index 9914016ec2..b6e245d124 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
@@ -11,6 +11,9 @@ export const useStrings = () => {
     title: intl.formatMessage(messages.title),
     utxosTab: intl.formatMessage(messages.utxosTab),
     overviewTab: intl.formatMessage(messages.overviewTab),
+    metadataTab: intl.formatMessage(messages.metadataTab),
+    metadataHash: intl.formatMessage(messages.metadataHash),
+    metadataJsonLabel: intl.formatMessage(messages.metadataJsonLabel),
     walletLabel: intl.formatMessage(messages.walletLabel),
     feeLabel: intl.formatMessage(messages.feeLabel),
     myWalletLabel: intl.formatMessage(messages.myWalletLabel),
@@ -52,6 +55,18 @@ const messages = defineMessages({
     id: 'txReview.tabLabel.overview',
     defaultMessage: '!!!Overview',
   },
+  metadataTab: {
+    id: 'txReview.tabLabel.metadataTab',
+    defaultMessage: '!!!Metadata',
+  },
+  metadataHash: {
+    id: 'txReview.metadata.metadataHash',
+    defaultMessage: '!!!Metadata hash',
+  },
+  metadataJsonLabel: {
+    id: 'txReview.metadata.metadataJsonLabel',
+    defaultMessage: '!!!Metadata',
+  },
   walletLabel: {
     id: 'txReview.overview.wallet',
     defaultMessage: '!!!Wallet',
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
index 9de33bb075..75588bd47a 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
@@ -2,8 +2,9 @@ import {useQuery} from 'react-query'
 
 import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
 import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {TransactionBody} from '../types'
 
-export const useTxBody = ({cbor, unsignedTx}: {cbor?: string; unsignedTx?: YoroiUnsignedTx}) => {
+export const useTxBody = ({cbor, unsignedTx}: {cbor?: string; unsignedTx?: YoroiUnsignedTx}): TransactionBody => {
   const query = useQuery(
     ['useTxBody', cbor, unsignedTx],
     async () => {
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
index 45744a4cf6..74cb9b2451 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
@@ -3,6 +3,7 @@ import {
   TransactionInputsJSON,
   TransactionOutputsJSON,
 } from '@emurgo/cardano-serialization-lib-nodejs'
+import {CredKind} from '@emurgo/cross-csl-core'
 import {Balance, Portfolio} from '@yoroi/types'
 
 export type TransactionBody = TransactionBodyJSON
@@ -18,6 +19,7 @@ export type FormattedInput = {
     isPrimary: boolean
   }>
   address: string | undefined
+  addressKind: CredKind | null
   rewardAddress: string | null
   ownAddress: boolean
   txIndex: number
@@ -35,6 +37,7 @@ export type FormattedOutput = {
     isPrimary: boolean
   }>
   address: string
+  addressKind: CredKind | null
   rewardAddress: string | null
   ownAddress: boolean
 }
@@ -54,3 +57,8 @@ export type FormattedTx = {
   outputs: FormattedOutputs
   fee: FormattedFee
 }
+
+export type Metadata = {
+  json: string | null
+  hash: string | null
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
new file mode 100644
index 0000000000..c60e4d1c60
--- /dev/null
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
@@ -0,0 +1,90 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+
+import {Space} from '../../../../../components/Space/Space'
+import {CopiableText, CopyButton} from '../../../common/CopiableText'
+import {useStrings} from '../../../common/hooks/useStrings'
+
+type Props = {
+  hash: string | null
+  metadata: {msg: Array<string>} | null
+}
+
+export const MetadataTab = ({metadata, hash}: Props) => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  if (hash == null || metadata == null) return null
+
+  const metadataFormatted = JSON.stringify(metadata, null, 2)
+
+  return (
+    <View style={styles.root}>
+      <Space height="lg" />
+
+      <View style={styles.title}>
+        <Text style={styles.label}>{strings.metadataHash}</Text>
+
+        <Space width="lg" />
+
+        <CopiableText style={styles.hashContainer} textToCopy={hash}>
+          <Text style={styles.text}>{hash}</Text>
+        </CopiableText>
+      </View>
+
+      <Space height="lg" />
+
+      <View style={styles.metadata}>
+        <View style={styles.title}>
+          <Text style={styles.metadataLabel}>{strings.metadataJsonLabel}</Text>
+
+          <CopyButton textToCopy={metadataFormatted} />
+        </View>
+
+        <Space height="lg" />
+
+        <Text>{metadataFormatted}</Text>
+      </View>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {atoms, color} = useTheme()
+  const styles = StyleSheet.create({
+    root: {
+      ...atoms.flex_1,
+      ...atoms.px_lg,
+      backgroundColor: color.bg_color_max,
+    },
+    title: {
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+    },
+    label: {
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_low,
+    },
+    text: {
+      ...atoms.text_right,
+      ...atoms.flex_1,
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_medium,
+    },
+    hashContainer: {
+      ...atoms.flex_1,
+    },
+    metadata: {
+      backgroundColor: color.bg_color_min,
+      ...atoms.rounded_sm,
+      ...atoms.p_lg,
+    },
+    metadataLabel: {
+      ...atoms.body_1_lg_medium,
+      color: color.text_gray_medium,
+    },
+  })
+
+  return {styles} as const
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
index 92278d03ba..cd04aeeb68 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx
@@ -1,11 +1,14 @@
 // 🚧 TODO: grouping by staking address 🚧
 
+import {CredKind} from '@emurgo/cross-csl-core'
 import {Blockies} from '@yoroi/identicon'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
+import {Divider} from '../../../../../components/Divider/Divider'
 import {Icon} from '../../../../../components/Icon'
+import {useModal} from '../../../../../components/Modal/ModalContext'
 import {Space} from '../../../../../components/Space/Space'
 import {formatTokenWithText} from '../../../../../yoroi-wallets/utils/format'
 import {Quantities} from '../../../../../yoroi-wallets/utils/utils'
@@ -13,14 +16,20 @@ import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelec
 import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 import {Accordion} from '../../../common/Accordion'
 import {CopiableText} from '../../../common/CopiableText'
-import {Divider} from '../../../common/Divider'
-import {useAddressType} from '../../../common/hooks/useAddressType'
 import {useStrings} from '../../../common/hooks/useStrings'
-import {ReviewTxState} from '../../../common/ReviewTxProvider'
+import {ReviewTxState, useReviewTx} from '../../../common/ReviewTxProvider'
 import {TokenItem} from '../../../common/TokenItem'
 import {FormattedOutputs, FormattedTx} from '../../../common/types'
 
-export const OverviewTab = ({tx, operations}: {tx: FormattedTx; operations: ReviewTxState['operations']}) => {
+export const OverviewTab = ({
+  tx,
+  operations,
+  details,
+}: {
+  tx: FormattedTx
+  operations: ReviewTxState['operations']
+  details: ReviewTxState['details']
+}) => {
   const {styles} = useStyles()
 
   const notOwnedOutputs = React.useMemo(() => tx.outputs.filter((output) => !output.ownAddress), [tx.outputs])
@@ -37,6 +46,8 @@ export const OverviewTab = ({tx, operations}: {tx: FormattedTx; operations: Revi
       <SenderSection tx={tx} notOwnedOutputs={notOwnedOutputs} ownedOutputs={ownedOutputs} />
 
       <OperationsSection operations={operations} />
+
+      <Details details={details} />
     </View>
   )
 }
@@ -94,7 +105,7 @@ const SenderSection = ({
 }) => {
   const strings = useStrings()
   const {styles} = useStyles()
-  const address = ownedOutputs[0]?.rewardAddress ?? ownedOutputs[0]?.address
+  const address = ownedOutputs[0]?.rewardAddress ?? ownedOutputs[0]?.address ?? '-'
 
   return (
     <Accordion label={strings.myWalletLabel}>
@@ -172,24 +183,30 @@ const SenderSectionLabel = () => {
 }
 
 const ReceiverSection = ({notOwnedOutputs}: {notOwnedOutputs: FormattedOutputs}) => {
-  const address = notOwnedOutputs[0]?.rewardAddress ?? notOwnedOutputs[0]?.address
+  const address = notOwnedOutputs[0]?.rewardAddress ?? notOwnedOutputs[0]?.address ?? '-'
   const {styles} = useStyles()
   const strings = useStrings()
-  const addressType = useAddressType(address)
-  const isScriptAddress = addressType === 'script'
+  const {customReceiverTitle} = useReviewTx()
 
   return (
     <>
       <Space height="sm" />
 
       <View style={styles.receiverAddress}>
-        <Text>{isScriptAddress ? strings.receiveToScriptLabel : strings.receiveToLabel}:</Text>
+        <Text>
+          {notOwnedOutputs[0]?.addressKind === CredKind.Script && customReceiverTitle == null
+            ? strings.receiveToScriptLabel
+            : strings.receiveToLabel}
+          :
+        </Text>
 
-        <CopiableText textToCopy={address}>
-          <Text style={[styles.addressText, styles.receiverSectionAddress]} numberOfLines={1} ellipsizeMode="middle">
-            {address}
-          </Text>
-        </CopiableText>
+        {customReceiverTitle ?? (
+          <CopiableText textToCopy={address}>
+            <Text style={[styles.addressText, styles.receiverSectionAddress]} numberOfLines={1} ellipsizeMode="middle">
+              {address}
+            </Text>
+          </CopiableText>
+        )}
       </View>
     </>
   )
@@ -221,6 +238,29 @@ const OperationsSection = ({operations}: {operations: ReviewTxState['operations'
   )
 }
 
+const Details = ({details}: {details: ReviewTxState['details']}) => {
+  const {openModal} = useModal()
+  const {styles} = useStyles()
+
+  if (details == null) return null
+
+  const handleOnPress = () => {
+    openModal(details.title ?? '', <View style={styles.details}>{details.component}</View>, 550)
+  }
+
+  return (
+    <View>
+      <Space height="lg" />
+
+      <View style={styles.detailsRow}>
+        <TouchableOpacity onPress={handleOnPress} activeOpacity={0.5}>
+          <Text style={styles.detailsButton}>{details?.title}</Text>
+        </TouchableOpacity>
+      </View>
+    </View>
+  )
+}
+
 const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
@@ -290,6 +330,18 @@ const useStyles = () => {
       ...atoms.body_2_md_regular,
       color: color.text_gray_medium,
     },
+    detailsRow: {
+      ...atoms.flex_1,
+      ...atoms.flex_row,
+      ...atoms.justify_end,
+    },
+    details: {
+      ...atoms.px_lg,
+    },
+    detailsButton: {
+      ...atoms.body_2_md_medium,
+      color: color.text_primary_medium,
+    },
   })
 
   const colors = {
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
index 035dc332c2..9b0550327d 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
@@ -1,15 +1,28 @@
 import {createMaterialTopTabNavigator, MaterialTopTabBarProps} from '@react-navigation/material-top-tabs'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {FlatList, ScrollView, StyleSheet, Text, TouchableOpacity, TouchableOpacityProps, View} from 'react-native'
+import {
+  FlatList,
+  StyleProp,
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  TouchableOpacityProps,
+  View,
+  ViewStyle,
+} from 'react-native'
 
 import {Button} from '../../../../components/Button/Button'
 import {SafeArea} from '../../../../components/SafeArea'
+import {ScrollView} from '../../../../components/ScrollView/ScrollView'
+import {isEmptyString} from '../../../../kernel/utils'
+import {formatMetadata} from '../../common/hooks/useFormattedMetadata'
 import {useFormattedTx} from '../../common/hooks/useFormattedTx'
 import {useOnConfirm} from '../../common/hooks/useOnConfirm'
 import {useStrings} from '../../common/hooks/useStrings'
 import {useTxBody} from '../../common/hooks/useTxBody'
 import {useReviewTx} from '../../common/ReviewTxProvider'
+import {MetadataTab} from './Metadata/MetadataTab'
 import {OverviewTab} from './Overview/OverviewTab'
 import {UTxOsTab} from './UTxOs/UTxOsTab'
 
@@ -18,7 +31,7 @@ const MaterialTab = createMaterialTopTabNavigator()
 export const ReviewTxScreen = () => {
   const {styles} = useStyles()
   const strings = useStrings()
-  const {unsignedTx, operations, onSuccess, onError} = useReviewTx()
+  const {unsignedTx, operations, details, onSuccess, onError} = useReviewTx()
 
   if (unsignedTx === null) throw new Error('ReviewTxScreen: missing unsignedTx')
 
@@ -28,21 +41,27 @@ export const ReviewTxScreen = () => {
     onError,
   })
 
-  // TODO: add cbor arguments
+  // TODO: apply cbor
   const txBody = useTxBody({unsignedTx})
   const formatedTx = useFormattedTx(txBody)
+  const formattedMetadata = formatMetadata(unsignedTx, txBody)
 
-  const OverViewTabMemo = React.memo(() => <OverviewTab tx={formatedTx} operations={operations} />)
-  const UTxOsTabMemo = React.memo(() => <UTxOsTab tx={formatedTx} />)
+  const tabsData = [
+    [strings.overviewTab, 'overview'],
+    [strings.utxosTab, 'utxos'],
+  ]
+
+  if (!isEmptyString(formattedMetadata.hash) && formattedMetadata.metadata != null)
+    tabsData.push([strings.metadataTab, 'metadata'])
 
   return (
     <SafeArea style={styles.root}>
-      <MaterialTab.Navigator tabBar={TabBar}>
+      <MaterialTab.Navigator tabBar={(props) => <TabBar {...props} tabsData={tabsData} />}>
         <MaterialTab.Screen name="overview">
           {() => (
             /* TODO: make scrollview general to use button border */
             <ScrollView style={styles.root}>
-              <OverViewTabMemo />
+              <OverviewTab tx={formatedTx} operations={operations} details={details} />
             </ScrollView>
           )}
         </MaterialTab.Screen>
@@ -51,7 +70,16 @@ export const ReviewTxScreen = () => {
           {() => (
             /* TODO: make scrollview general to use button border */
             <ScrollView style={styles.root}>
-              <UTxOsTabMemo />
+              <UTxOsTab tx={formatedTx} />
+            </ScrollView>
+          )}
+        </MaterialTab.Screen>
+
+        <MaterialTab.Screen name="metadata">
+          {() => (
+            /* TODO: make scrollview general to use button border */
+            <ScrollView style={styles.root}>
+              <MetadataTab hash={formattedMetadata.hash} metadata={formattedMetadata.metadata} />
             </ScrollView>
           )}
         </MaterialTab.Screen>
@@ -64,16 +92,12 @@ export const ReviewTxScreen = () => {
   )
 }
 
-const TabBar = ({navigation, state}: MaterialTopTabBarProps) => {
+const TabBar = ({navigation, state, tabsData}: MaterialTopTabBarProps & {tabsData: Array<Array<string>>}) => {
   const {styles} = useStyles()
-  const strings = useStrings()
 
   return (
     <FlatList
-      data={[
-        [strings.overviewTab, 'overview'],
-        [strings.utxosTab, 'utxos'],
-      ]}
+      data={tabsData}
       renderItem={({item: [label, key], index}) => (
         <Tab key={key} active={state.index === index} label={label} onPress={() => navigation.navigate(key)} />
       )}
@@ -105,9 +129,9 @@ export const Tab = ({
   )
 }
 
-const Actions = ({children}: {children: React.ReactNode}) => {
+const Actions = ({children, style}: {children: React.ReactNode; style?: StyleProp<ViewStyle>}) => {
   const {styles} = useStyles()
-  return <View style={styles.actions}>{children}</View>
+  return <View style={[styles.actions, style]}>{children}</View>
 }
 
 const useStyles = () => {
@@ -154,5 +178,8 @@ const useStyles = () => {
     },
   })
 
-  return {styles} as const
+  const colors = {
+    lightGray: color.gray_200,
+  }
+  return {styles, colors} as const
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/UTxOs/UTxOsTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/UTxOs/UTxOsTab.tsx
index 83861af94f..03c5811e9f 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/UTxOs/UTxOsTab.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/UTxOs/UTxOsTab.tsx
@@ -2,10 +2,10 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
+import {Divider} from '../../../../../components/Divider/Divider'
 import {Space} from '../../../../../components/Space/Space'
 import {Accordion} from '../../../common/Accordion'
 import {CopiableText} from '../../../common/CopiableText'
-import {Divider} from '../../../common/Divider'
 import {useStrings} from '../../../common/hooks/useStrings'
 import {TokenItem} from '../../../common/TokenItem'
 import {FormattedInput, FormattedInputs, FormattedOutput, FormattedOutputs, FormattedTx} from '../../../common/types'
diff --git a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/index.ts b/apps/wallet-mobile/src/features/Settings/ApplicationSettings/index.ts
deleted file mode 100644
index 591971f428..0000000000
--- a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ApplicationSettingsScreen'
diff --git a/apps/wallet-mobile/src/features/Settings/SettingsItems.tsx b/apps/wallet-mobile/src/features/Settings/SettingsItems.tsx
index 3c062c34bc..eba1b38cba 100644
--- a/apps/wallet-mobile/src/features/Settings/SettingsItems.tsx
+++ b/apps/wallet-mobile/src/features/Settings/SettingsItems.tsx
@@ -10,7 +10,7 @@ import {Text} from '../../components/Text'
 import {isEmptyString} from '../../kernel/utils'
 import {useCollateralInfo} from '../../yoroi-wallets/cardano/utxoManager/useCollateralInfo'
 import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
-import {usePrivacyMode} from './PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from './useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 
 const Touchable = (props: TouchableOpacityProps) => <TouchableOpacity {...props} activeOpacity={0.5} />
 
diff --git a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
index 734bb47a56..8041fb2e52 100644
--- a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
@@ -18,26 +18,32 @@ import {
 } from '../../kernel/navigation'
 import {ChangePinScreen} from '../Auth/ChangePinScreen'
 import {EnableLoginWithPin} from '../Auth/EnableLoginWithPin'
-import {About} from './About'
-import {ApplicationSettingsScreen} from './ApplicationSettings'
-import {ChangeLanguageScreen} from './ChangeLanguage'
-import {ChangeNetworkScreen, useHandleOpenNetworkNoticeModal} from './ChangeNetwork/ChangeNetworkScreen'
-import {NetworkTag} from './ChangeNetwork/NetworkTag'
-import {PreparingNetworkScreen} from './ChangeNetwork/PreparingNetworkScreen'
-import {ChangePasswordScreen} from './ChangePassword'
-import {ChangeThemeScreen} from './ChangeTheme/ChangeThemeScreen'
-import {ChangeCurrencyScreen} from './Currency/ChangeCurrencyScreen'
-import {DisableEasyConfirmationScreen, EnableEasyConfirmationScreen} from './EasyConfirmation'
-import {EnableLoginWithOsScreen} from './EnableLoginWithOs'
-import {ManageCollateralScreen} from './ManageCollateral'
-import {FailedTxScreen} from './ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen'
-import {SubmittedTxScreen} from './ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen'
-import {PrivacyPolicyScreen} from './PrivacyPolicy'
-import {RemoveWalletScreen} from './RemoveWallet'
-import {RenameWalletScreen} from './RenameWalletScreen/RenameWalletScreen'
-import {SystemLogScreen} from './SystemLogScreen/SystemLogScreen'
-import {TermsOfServiceScreen} from './TermsOfService'
-import {WalletSettingsScreen} from './WalletSettings'
+import {About} from './useCases/changeAppSettings/About'
+import {ApplicationSettingsScreen} from './useCases/changeAppSettings/ApplicationSettingsScreen'
+import {ChangeLanguageScreen} from './useCases/changeAppSettings/ChangeLanguage'
+import {
+  ChangeNetworkScreen,
+  useHandleOpenNetworkNoticeModal,
+} from './useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen'
+import {NetworkTag} from './useCases/changeAppSettings/ChangeNetwork/NetworkTag'
+import {PreparingNetworkScreen} from './useCases/changeAppSettings/ChangeNetwork/PreparingNetworkScreen'
+import {ChangeThemeScreen} from './useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen'
+import {ChangeCurrencyScreen} from './useCases/changeAppSettings/Currency/ChangeCurrencyScreen'
+import {EnableLoginWithOsScreen} from './useCases/changeAppSettings/EnableLoginWithOs'
+import {PrivacyPolicyScreen} from './useCases/changeAppSettings/PrivacyPolicy'
+import {SystemLogScreen} from './useCases/changeAppSettings/SystemLogScreen/SystemLogScreen'
+import {TermsOfServiceScreen} from './useCases/changeAppSettings/TermsOfService'
+import {ChangePasswordScreen} from './useCases/changeWalletSettings/ChangePassword'
+import {
+  DisableEasyConfirmationScreen,
+  EnableEasyConfirmationScreen,
+} from './useCases/changeWalletSettings/EasyConfirmation'
+import {ManageCollateralScreen} from './useCases/changeWalletSettings/ManageCollateral'
+import {FailedTxScreen} from './useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen'
+import {SubmittedTxScreen} from './useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen'
+import {RemoveWalletScreen} from './useCases/changeWalletSettings/RemoveWallet'
+import {RenameWalletScreen} from './useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen'
+import {WalletSettingsScreen} from './useCases/changeWalletSettings/WalletSettingsScreen'
 
 const Stack = createStackNavigator<SettingsStackRoutes>()
 export const SettingsScreenNavigator = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/WalletSettings/index.ts b/apps/wallet-mobile/src/features/Settings/WalletSettings/index.ts
deleted file mode 100644
index 48fb908a1b..0000000000
--- a/apps/wallet-mobile/src/features/Settings/WalletSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './WalletSettingsScreen'
diff --git a/apps/wallet-mobile/src/features/Settings/index.ts b/apps/wallet-mobile/src/features/Settings/index.ts
deleted file mode 100644
index edf6dd1000..0000000000
--- a/apps/wallet-mobile/src/features/Settings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './SettingsScreenNavigator'
diff --git a/apps/wallet-mobile/src/features/Settings/About/About.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx
similarity index 60%
rename from apps/wallet-mobile/src/features/Settings/About/About.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx
index 652e144ca9..bb7a67f2a9 100644
--- a/apps/wallet-mobile/src/features/Settings/About/About.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.stories.tsx
@@ -1,8 +1,8 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {About} from './About'
 
 storiesOf('About', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/About/About.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.tsx
similarity index 93%
rename from apps/wallet-mobile/src/features/Settings/About/About.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.tsx
index 20ba7e5a99..7327863168 100644
--- a/apps/wallet-mobile/src/features/Settings/About/About.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/About.tsx
@@ -4,10 +4,10 @@ import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {Pressable, StyleSheet, TextProps, View, ViewProps} from 'react-native'
 
-import {Text} from '../../../components/Text'
-import {appInfo} from '../../../kernel/appInfo'
-import {commit} from '../../../kernel/env'
-import {SettingsRouteNavigation} from '../../../kernel/navigation'
+import {Text} from '../../../../../components/Text'
+import {appInfo} from '../../../../../kernel/appInfo'
+import {commit} from '../../../../../kernel/env'
+import {SettingsRouteNavigation} from '../../../../../kernel/navigation'
 
 export const About = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/About/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/About/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/About/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx
index 7bed584873..5c40a0ee25 100644
--- a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx
@@ -5,22 +5,22 @@ import {defineMessages, useIntl} from 'react-intl'
 import {Platform, ScrollView, StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Icon} from '../../../components/Icon'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {isNightly, isProduction} from '../../../kernel/env'
-import {useLanguage} from '../../../kernel/i18n'
-import {themeNames} from '../../../kernel/i18n/global-messages'
-import {defaultLanguage} from '../../../kernel/i18n/languages'
-import {useCrashReports} from '../../../yoroi-wallets/hooks'
-import {useAuthSetting, useAuthWithOs, useIsAuthOsSupported} from '../../Auth/common/hooks'
-import {usePrivacyMode} from '../../Settings/PrivacyMode/PrivacyMode'
-import {useSelectedNetwork} from '../../WalletManager/common/hooks/useSelectedNetwork'
-import {networkConfigs} from '../../WalletManager/network-manager/network-manager'
-import {useNavigateTo} from '../common/navigation'
-import {SettingsSwitch} from '../common/SettingsSwitch'
-import {useCurrencyPairing} from '../Currency/CurrencyContext'
-import {useChangeScreenShareSetting, useScreenShareSettingEnabled} from '../ScreenShare'
-import {NavigatedSettingsItem, SettingsItem, SettingsSection} from '../SettingsItems'
+import {Icon} from '../../../../components/Icon'
+import {Spacer} from '../../../../components/Spacer/Spacer'
+import {isNightly, isProduction} from '../../../../kernel/env'
+import {useLanguage} from '../../../../kernel/i18n'
+import {themeNames} from '../../../../kernel/i18n/global-messages'
+import {defaultLanguage} from '../../../../kernel/i18n/languages'
+import {useCrashReports} from '../../../../yoroi-wallets/hooks'
+import {useAuthSetting, useAuthWithOs, useIsAuthOsSupported} from '../../../Auth/common/hooks'
+import {useSelectedNetwork} from '../../../WalletManager/common/hooks/useSelectedNetwork'
+import {networkConfigs} from '../../../WalletManager/network-manager/network-manager'
+import {useNavigateTo} from '../../common/navigation'
+import {SettingsSwitch} from '../../common/SettingsSwitch'
+import {NavigatedSettingsItem, SettingsItem, SettingsSection} from '../../SettingsItems'
+import {useCurrencyPairing} from './Currency/CurrencyContext'
+import {usePrivacyMode} from './PrivacyMode/PrivacyMode'
+import {useChangeScreenShareSetting, useScreenShareSettingEnabled} from './ScreenShare'
 
 export const ApplicationSettingsScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx
similarity index 81%
rename from apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx
index cda007dc2c..3242c37249 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.stories.tsx
@@ -1,7 +1,7 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {SafeAreaInsets} from '../../../../.storybook/decorators'
+import {SafeAreaInsets} from '../../../../../../.storybook/decorators'
 import {ChangeLanguageScreen} from './ChangeLanguageScreen'
 
 storiesOf('ChangeLanguageScreen', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.tsx
similarity index 87%
rename from apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.tsx
index cee65c07af..3410d05100 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeLanguage/ChangeLanguageScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/ChangeLanguageScreen.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {LanguagePicker} from '../../../components/LanguagePicker/LanguagePicker'
+import {LanguagePicker} from '../../../../../components/LanguagePicker/LanguagePicker'
 
 export const ChangeLanguageScreen = () => {
   const styles = useStyles()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeLanguage/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ChangeLanguage/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeLanguage/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx
similarity index 81%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx
index 3e945b8309..3c1ff775e0 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.stories.tsx
@@ -1,7 +1,7 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {SafeAreaInsets} from '../../../../.storybook/decorators'
+import {SafeAreaInsets} from '../../../../../../.storybook/decorators'
 import {ChangeNetworkScreen} from './ChangeNetworkScreen'
 
 storiesOf('ChangeNetworkScreen', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.tsx
index b6e455d8f9..d9cbdd3a9d 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/ChangeNetworkScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/ChangeNetworkScreen.tsx
@@ -5,12 +5,12 @@ import {Platform, StyleSheet, Text, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {UseMutationOptions, useQuery, UseQueryOptions} from 'react-query'
 
-import {Boundary} from '../../../components/Boundary/Boundary'
-import {Button} from '../../../components/Button/Button'
-import {useModal} from '../../../components/Modal/ModalContext'
-import {Space} from '../../../components/Space/Space'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {time} from '../../../kernel/constants'
+import {Boundary} from '../../../../../components/Boundary/Boundary'
+import {Button} from '../../../../../components/Button/Button'
+import {useModal} from '../../../../../components/Modal/ModalContext'
+import {Space} from '../../../../../components/Space/Space'
+import {Spacer} from '../../../../../components/Spacer/Spacer'
+import {time} from '../../../../../kernel/constants'
 import {NetworkPickerList} from './NetworkPickerList'
 import {useStrings} from './strings'
 
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerItem.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerItem.tsx
similarity index 95%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerItem.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerItem.tsx
index 29aa18aee6..a7aaea24ed 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerItem.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerItem.tsx
@@ -3,8 +3,8 @@ import {Chain, Network} from '@yoroi/types'
 import React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
-import {Icon} from '../../../components/Icon'
-import {Text} from '../../../components/Text'
+import {Icon} from '../../../../../components/Icon'
+import {Text} from '../../../../../components/Text'
 
 type Props = {
   name: Readonly<Network.Config['name']>
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerList.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerList.tsx
similarity index 75%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerList.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerList.tsx
index 420e76cfc8..bd2019a48e 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkPickerList.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkPickerList.tsx
@@ -4,13 +4,13 @@ import {freeze} from 'immer'
 import React from 'react'
 import {FlatList, StyleSheet} from 'react-native'
 
-import {useMetrics} from '../../../kernel/metrics/metricsManager'
-import {availableNetworks} from '../../WalletManager/common/constants'
-import {useSelectedNetwork} from '../../WalletManager/common/hooks/useSelectedNetwork'
-import {useAutomaticWalletOpener} from '../../WalletManager/context/AutomaticWalletOpeningProvider'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
-import {networkConfigs} from '../../WalletManager/network-manager/network-manager'
-import {useNavigateTo} from '../common/navigation'
+import {useMetrics} from '../../../../../kernel/metrics/metricsManager'
+import {availableNetworks} from '../../../../WalletManager/common/constants'
+import {useSelectedNetwork} from '../../../../WalletManager/common/hooks/useSelectedNetwork'
+import {useAutomaticWalletOpener} from '../../../../WalletManager/context/AutomaticWalletOpeningProvider'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
+import {networkConfigs} from '../../../../WalletManager/network-manager/network-manager'
+import {useNavigateTo} from '../../../common/navigation'
 import {NetworkPickerItem} from './NetworkPickerItem'
 
 export const NetworkPickerList = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
similarity index 87%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
index ab25f38163..8bca4700af 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/NetworkTag.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
@@ -3,15 +3,15 @@ import {Chain} from '@yoroi/types'
 import * as React from 'react'
 import {StyleSheet, Text, TextStyle, TouchableOpacity, useWindowDimensions, View, ViewStyle} from 'react-native'
 
-import {Button, ButtonType} from '../../../components/Button/Button'
-import {useModal} from '../../../components/Modal/ModalContext'
-import {Space} from '../../../components/Space/Space'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {useMetrics} from '../../../kernel/metrics/metricsManager'
-import {useWalletNavigation} from '../../../kernel/navigation'
-import {availableNetworks} from '../../WalletManager/common/constants'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
-import {networkConfigs} from '../../WalletManager/network-manager/network-manager'
+import {Button, ButtonType} from '../../../../../components/Button/Button'
+import {useModal} from '../../../../../components/Modal/ModalContext'
+import {Space} from '../../../../../components/Space/Space'
+import {Spacer} from '../../../../../components/Spacer/Spacer'
+import {useMetrics} from '../../../../../kernel/metrics/metricsManager'
+import {useWalletNavigation} from '../../../../../kernel/navigation'
+import {availableNetworks} from '../../../../WalletManager/common/constants'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
+import {networkConfigs} from '../../../../WalletManager/network-manager/network-manager'
 import {useStrings} from './strings'
 
 export const NetworkTag = ({
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/PreparingNetworkScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/PreparingNetworkScreen.tsx
similarity index 95%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/PreparingNetworkScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/PreparingNetworkScreen.tsx
index c8ce1576dd..b825b4ca32 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/PreparingNetworkScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/PreparingNetworkScreen.tsx
@@ -6,7 +6,7 @@ import {StyleSheet, Text} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {z} from 'zod'
 
-import {SettingsStackRoutes, useParams} from '../../../kernel/navigation'
+import {SettingsStackRoutes, useParams} from '../../../../../kernel/navigation'
 import {useStrings} from './strings'
 import {useLaunchRouteAfterSyncing} from './useLaunchRouteAfterSyncing'
 
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/strings.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts
similarity index 97%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/strings.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts
index 4f7df6ca6f..29cbabff9f 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/strings.ts
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts
@@ -1,6 +1,6 @@
 import {defineMessages, useIntl} from 'react-intl'
 
-import globalMessages from '../../../kernel/i18n/global-messages'
+import globalMessages from '../../../../../kernel/i18n/global-messages'
 
 export const useStrings = () => {
   const intl = useIntl()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx
similarity index 82%
rename from apps/wallet-mobile/src/features/Settings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx
index 9e1ace44f4..74b3fbb66a 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/useLaunchRouteAfterSyncing.tsx
@@ -1,8 +1,8 @@
 import {Chain} from '@yoroi/types'
 import * as React from 'react'
 
-import {useWalletNavigation} from '../../../kernel/navigation'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+import {useWalletNavigation} from '../../../../../kernel/navigation'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 
 export function useLaunchRouteAfterSyncing({selectedNetwork}: {selectedNetwork: Chain.SupportedNetworks}) {
   const walletNavigation = useWalletNavigation()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx
similarity index 80%
rename from apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx
index 78752e79a1..d5d5979c25 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.stories.tsx
@@ -1,7 +1,7 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {SafeAreaInsets} from '../../../../.storybook/decorators'
+import {SafeAreaInsets} from '../../../../../../.storybook/decorators'
 import {ChangeThemeScreen} from './ChangeThemeScreen'
 
 storiesOf('ChangeThemeScreen', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.tsx
index d482b8fcfa..af0d7a3a9f 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ChangeThemeScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ChangeThemeScreen.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Boundary} from '../../../components/Boundary/Boundary'
+import {Boundary} from '../../../../../components/Boundary/Boundary'
 import {ThemePickerList} from './ThemePickerList'
 
 export const ChangeThemeScreen = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerItem.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerItem.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerItem.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerItem.tsx
index ccd02c9e5e..337e58a73f 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerItem.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerItem.tsx
@@ -3,10 +3,10 @@ import React from 'react'
 import {useIntl} from 'react-intl'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
-import {Icon} from '../../../components/Icon'
-import {Text} from '../../../components/Text'
-import {themeNames} from '../../../kernel/i18n/global-messages'
-import {useThemeStorageMaker} from '../../../yoroi-wallets/hooks'
+import {Icon} from '../../../../../components/Icon'
+import {Text} from '../../../../../components/Text'
+import {themeNames} from '../../../../../kernel/i18n/global-messages'
+import {useThemeStorageMaker} from '../../../../../yoroi-wallets/hooks'
 
 type Props = {
   title: SupportedThemes
diff --git a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerList.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerList.tsx
similarity index 91%
rename from apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerList.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerList.tsx
index 99bf925c17..f510fd7679 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangeTheme/ThemePickerList.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeTheme/ThemePickerList.tsx
@@ -2,7 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {FlatList, StyleSheet} from 'react-native'
 
-import {useThemeStorageMaker} from '../../../yoroi-wallets/hooks'
+import {useThemeStorageMaker} from '../../../../../yoroi-wallets/hooks'
 import {ThemePickerItem} from './ThemePickerItem'
 
 export const ThemePickerList = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/Currency/ChangeCurrencyScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/Currency/ChangeCurrencyScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/Currency/ChangeCurrencyScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.tsx
index f975176689..1c2adc9137 100644
--- a/apps/wallet-mobile/src/features/Settings/Currency/ChangeCurrencyScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/ChangeCurrencyScreen.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Boundary} from '../../../components/Boundary/Boundary'
+import {Boundary} from '../../../../../components/Boundary/Boundary'
 import {CurrencyPickerList} from './CurrencyPickerList'
 
 export const ChangeCurrencyScreen = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyContext.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyContext.tsx
similarity index 91%
rename from apps/wallet-mobile/src/features/Settings/Currency/CurrencyContext.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyContext.tsx
index 2f86e763fc..c6f8a481ec 100644
--- a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyContext.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyContext.tsx
@@ -2,9 +2,9 @@ import {parseSafe, useAsyncStorage} from '@yoroi/common'
 import React from 'react'
 import {useMutation, UseMutationOptions, useQuery, useQueryClient} from 'react-query'
 
-import {configCurrencies, supportedCurrencies} from '../../../kernel/constants'
-import {usePrimaryTokenActivity} from '../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
-import {ConfigCurrencies, CurrencySymbol} from '../../../yoroi-wallets/types/other'
+import {configCurrencies, supportedCurrencies} from '../../../../../kernel/constants'
+import {usePrimaryTokenActivity} from '../../../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
+import {ConfigCurrencies, CurrencySymbol} from '../../../../../yoroi-wallets/types/other'
 
 const CurrencyContext = React.createContext<undefined | CurrencyContext>(undefined)
 export const CurrencyProvider = ({children}: {children: React.ReactNode}) => {
diff --git a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerItem.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerItem.tsx
similarity index 91%
rename from apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerItem.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerItem.tsx
index ce1bcf6366..124187ccf3 100644
--- a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerItem.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerItem.tsx
@@ -3,10 +3,10 @@ import React from 'react'
 import {useIntl} from 'react-intl'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
-import {Icon} from '../../../components/Icon'
-import {Text} from '../../../components/Text'
-import {currencyNames} from '../../../kernel/i18n/global-messages'
-import {CurrencySymbol} from '../../../yoroi-wallets/types/other'
+import {Icon} from '../../../../../components/Icon'
+import {Text} from '../../../../../components/Text'
+import {currencyNames} from '../../../../../kernel/i18n/global-messages'
+import {CurrencySymbol} from '../../../../../yoroi-wallets/types/other'
 
 type Props = {
   nativeName: string
diff --git a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerList.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerList.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerList.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerList.tsx
index eaa76c9ed4..25be483e59 100644
--- a/apps/wallet-mobile/src/features/Settings/Currency/CurrencyPickerList.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/Currency/CurrencyPickerList.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import {FlatList, StyleSheet} from 'react-native'
 
-import {CurrencySymbol} from '../../../yoroi-wallets/types/other'
+import {CurrencySymbol} from '../../../../../yoroi-wallets/types/other'
 import {useCurrencyPairing} from './CurrencyContext'
 import {CurrencyPickerItem} from './CurrencyPickerItem'
 
diff --git a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
similarity index 87%
rename from apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
index 7030a376ef..0f8e7b06c4 100644
--- a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx
@@ -2,10 +2,10 @@ import {useNavigation} from '@react-navigation/native'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 
-import {Button, ButtonType} from '../../../components/Button/Button'
-import globalMessages from '../../../kernel/i18n/global-messages'
-import {useEnableAuthWithOs} from '../../Auth/common/hooks'
-import {OsAuthScreen} from '../../Auth/OsAuthScreen/OsAuthScreen'
+import {Button, ButtonType} from '../../../../../components/Button/Button'
+import globalMessages from '../../../../../kernel/i18n/global-messages'
+import {useEnableAuthWithOs} from '../../../../Auth/common/hooks'
+import {OsAuthScreen} from '../../../../Auth/OsAuthScreen/OsAuthScreen'
 
 export const EnableLoginWithOsScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/EnableLoginWithOs/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/PrivacyMode/PrivacyMode.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.tsx
similarity index 85%
rename from apps/wallet-mobile/src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.tsx
index 2ba3cb65d2..62897c09be 100644
--- a/apps/wallet-mobile/src/features/Settings/PrivacyPolicy/PrivacyPolicyScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/PrivacyPolicyScreen.tsx
@@ -3,8 +3,8 @@ import React from 'react'
 import {ScrollView, StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {useLanguage} from '../../../kernel/i18n'
-import {PrivacyPolicy} from '../../Legal/PrivacyPolicy/PrivacyPolicy'
+import {useLanguage} from '../../../../../kernel/i18n'
+import {PrivacyPolicy} from '../../../../Legal/PrivacyPolicy/PrivacyPolicy'
 
 export const PrivacyPolicyScreen = () => {
   const styles = useStyles()
diff --git a/apps/wallet-mobile/src/features/Settings/PrivacyPolicy/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/PrivacyPolicy/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/PrivacyPolicy/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ScreenShare/ScreenShare.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ScreenShare/ScreenShare.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ScreenShare/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ScreenShare/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx
similarity index 64%
rename from apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx
index de7305e202..359bdb1056 100644
--- a/apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.stories.tsx
@@ -1,8 +1,8 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {SystemLogScreen} from './SystemLogScreen'
 
 storiesOf('Settings SystemLogScreen', module).add('initial', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.tsx
index 35b4c7c63b..4df81dd4c7 100644
--- a/apps/wallet-mobile/src/features/Settings/SystemLogScreen/SystemLogScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/SystemLogScreen/SystemLogScreen.tsx
@@ -3,9 +3,9 @@ import {App} from '@yoroi/types'
 import React from 'react'
 import {ScrollView, StyleSheet, TextProps, View} from 'react-native'
 
-import {Space} from '../../../components/Space/Space'
-import {Text} from '../../../components/Text'
-import {logger} from '../../../kernel/logger/logger'
+import {Space} from '../../../../../components/Space/Space'
+import {Text} from '../../../../../components/Text'
+import {logger} from '../../../../../kernel/logger/logger'
 
 export const SystemLogScreen = () => {
   const styles = useStyles()
diff --git a/apps/wallet-mobile/src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/TermsOfService/TermsOfServiceScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/TermsOfService/TermsOfServiceScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.tsx
similarity index 85%
rename from apps/wallet-mobile/src/features/Settings/TermsOfService/TermsOfServiceScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.tsx
index 9045774937..d065dfaace 100644
--- a/apps/wallet-mobile/src/features/Settings/TermsOfService/TermsOfServiceScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/TermsOfServiceScreen.tsx
@@ -3,8 +3,8 @@ import React from 'react'
 import {ScrollView, StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {useLanguage} from '../../../kernel/i18n'
-import {TermsOfService} from '../../Legal/TermsOfService/TermsOfService'
+import {useLanguage} from '../../../../../kernel/i18n'
+import {TermsOfService} from '../../../../Legal/TermsOfService/TermsOfService'
 
 export const TermsOfServiceScreen = () => {
   const styles = useStyles()
diff --git a/apps/wallet-mobile/src/features/Settings/TermsOfService/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/TermsOfService/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/TermsOfService/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx
similarity index 60%
rename from apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx
index f49233db00..73a2c60535 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.stories.tsx
@@ -1,9 +1,9 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {YoroiWallet} from '../../../../../yoroi-wallets/cardano/types'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {ChangePasswordScreen} from './ChangePasswordScreen'
 
 const wallet: YoroiWallet = {
diff --git a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx
similarity index 91%
rename from apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx
index 003c7dd713..0aa8f62bbd 100644
--- a/apps/wallet-mobile/src/features/Settings/ChangePassword/ChangePasswordScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx
@@ -6,14 +6,14 @@ import {ScrollView, StyleSheet, TextInput as RNTextInput, View, ViewProps} from
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {MutationOptions, useMutation} from 'react-query'
 
-import {Button} from '../../../components/Button/Button'
-import {KeyboardAvoidingView} from '../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {Checkmark, TextInput} from '../../../components/TextInput/TextInput'
-import {errorMessages} from '../../../kernel/i18n/global-messages'
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {REQUIRED_PASSWORD_LENGTH, validatePassword} from '../../../yoroi-wallets/utils/validators'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+import {Button} from '../../../../../components/Button/Button'
+import {KeyboardAvoidingView} from '../../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
+import {Checkmark, TextInput} from '../../../../../components/TextInput/TextInput'
+import {errorMessages} from '../../../../../kernel/i18n/global-messages'
+import {YoroiWallet} from '../../../../../yoroi-wallets/cardano/types'
+import {REQUIRED_PASSWORD_LENGTH, validatePassword} from '../../../../../yoroi-wallets/utils/validators'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 
 export const ChangePasswordScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/ChangePassword/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ChangePassword/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ChangePassword/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
similarity index 87%
rename from apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
index cc9b3c57cf..de5bf4cbef 100644
--- a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.tsx
@@ -5,10 +5,10 @@ import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../components/Button/Button'
-import {Text} from '../../../components/Text'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+import {Button} from '../../../../../components/Button/Button'
+import {Text} from '../../../../../components/Text'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 
 export const DisableEasyConfirmationScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx
similarity index 80%
rename from apps/wallet-mobile/src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx
index a02891616c..087f164379 100644
--- a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EasyConfirmationScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EasyConfirmationScreen.stories.tsx
@@ -2,12 +2,12 @@ import {storiesOf} from '@storybook/react-native'
 import {Chain} from '@yoroi/types'
 import React from 'react'
 
-import {rootStorage} from '../../../kernel/storage/rootStorage'
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {buildPortfolioTokenManagers} from '../../Portfolio/common/helpers/build-token-managers'
-import {WalletManagerProvider} from '../../WalletManager/context/WalletManagerProvider'
-import {buildNetworkManagers} from '../../WalletManager/network-manager/network-manager'
-import {WalletManager} from '../../WalletManager/wallet-manager'
+import {rootStorage} from '../../../../../kernel/storage/rootStorage'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {buildPortfolioTokenManagers} from '../../../../Portfolio/common/helpers/build-token-managers'
+import {WalletManagerProvider} from '../../../../WalletManager/context/WalletManagerProvider'
+import {buildNetworkManagers} from '../../../../WalletManager/network-manager/network-manager'
+import {WalletManager} from '../../../../WalletManager/wallet-manager'
 import {DisableEasyConfirmationScreen} from './DisableEasyConfirmationScreen'
 import {EnableEasyConfirmationScreen} from './EnableEasyConfirmationScreen'
 
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
similarity index 84%
rename from apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
index 99740f3ff2..0df9376a66 100644
--- a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx
@@ -6,16 +6,16 @@ import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../components/Button/Button'
-import {KeyboardAvoidingView} from '../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {LoadingOverlay} from '../../../components/LoadingOverlay/LoadingOverlay'
-import {Text} from '../../../components/Text'
-import {TextInput} from '../../../components/TextInput/TextInput'
-import {showErrorDialog} from '../../../kernel/dialogs'
-import {errorMessages} from '../../../kernel/i18n/global-messages'
-import {isEmptyString} from '../../../kernel/utils'
-import {useEnableEasyConfirmation} from '../../Auth/common/useEnableEasyConfirmation'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
+import {Button} from '../../../../../components/Button/Button'
+import {KeyboardAvoidingView} from '../../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
+import {LoadingOverlay} from '../../../../../components/LoadingOverlay/LoadingOverlay'
+import {Text} from '../../../../../components/Text'
+import {TextInput} from '../../../../../components/TextInput/TextInput'
+import {showErrorDialog} from '../../../../../kernel/dialogs'
+import {errorMessages} from '../../../../../kernel/i18n/global-messages'
+import {isEmptyString} from '../../../../../kernel/utils'
+import {useEnableEasyConfirmation} from '../../../../Auth/common/useEnableEasyConfirmation'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 
 export const EnableEasyConfirmationScreen = () => {
   const intl = useIntl()
diff --git a/apps/wallet-mobile/src/features/Settings/EasyConfirmation/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/EasyConfirmation/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/CollateralInfoModal.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/CollateralInfoModal.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/CollateralInfoModal.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/CollateralInfoModal.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxImage.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
similarity index 79%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
index 669a3d070e..a7b33ed5f0 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/FailedTx/FailedTxScreen.tsx
@@ -3,11 +3,11 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {StyleSheet} from 'react-native'
 
-import {Button} from '../../../../../components/Button/Button'
-import {SafeArea} from '../../../../../components/SafeArea'
-import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {Text} from '../../../../../components/Text'
-import {useStrings} from '../../../../Send/common/strings'
+import {Button} from '../../../../../../../components/Button/Button'
+import {SafeArea} from '../../../../../../../components/SafeArea'
+import {Spacer} from '../../../../../../../components/Spacer/Spacer'
+import {Text} from '../../../../../../../components/Text'
+import {useStrings} from '../../../../../../Send/common/strings'
 import {FailedTxImage} from './FailedTxImage'
 
 export const FailedTxScreen = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxImage.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.stories.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
similarity index 79%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
index 49077bb6d7..79c6de3550 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ConfirmTx/SubmittedTx/SubmittedTxScreen.tsx
@@ -2,12 +2,12 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {StyleSheet} from 'react-native'
 
-import {Button} from '../../../../../components/Button/Button'
-import {SafeArea} from '../../../../../components/SafeArea'
-import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {Text} from '../../../../../components/Text'
-import {useBlockGoBack, useWalletNavigation} from '../../../../../kernel/navigation'
-import {useStrings} from '../../../../Send/common/strings'
+import {Button} from '../../../../../../../components/Button/Button'
+import {SafeArea} from '../../../../../../../components/SafeArea'
+import {Spacer} from '../../../../../../../components/Spacer/Spacer'
+import {Text} from '../../../../../../../components/Text'
+import {useBlockGoBack, useWalletNavigation} from '../../../../../../../kernel/navigation'
+import {useStrings} from '../../../../../../Send/common/strings'
 import {SubmittedTxImage} from './SubmittedTxImage'
 
 export const SubmittedTxScreen = () => {
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/InitialCollateralInfoModal.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/InitialCollateralInfoModal.tsx
index 4c98f2a468..ee27819993 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/InitialCollateralInfoModal.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/InitialCollateralInfoModal.tsx
@@ -2,8 +2,8 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, Text, View} from 'react-native'
 
-import {Button} from '../../../components/Button/Button'
-import {Space} from '../../../components/Space/Space'
+import {Button} from '../../../../../components/Button/Button'
+import {Space} from '../../../../../components/Space/Space'
 import {InfoModalIllustration} from './illustrations/InfoModalIllustration'
 import {useStrings} from './strings'
 
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx
similarity index 90%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx
index cd7a86c129..abf31a11c2 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.stories.tsx
@@ -3,9 +3,9 @@ import {TransferProvider} from '@yoroi/transfer'
 import React from 'react'
 import {StyleSheet, View} from 'react-native'
 
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {YoroiWallet} from '../../../../../yoroi-wallets/cardano/types'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {ManageCollateralScreen} from './ManageCollateralScreen'
 
 const styles = StyleSheet.create({
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
similarity index 82%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
index 4b98258c15..43c60efae2 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/ManageCollateralScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
@@ -16,26 +16,26 @@ import {
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {useMutation} from 'react-query'
 
-import {Button} from '../../../components/Button/Button'
-import {CopyButton} from '../../../components/CopyButton'
-import {ErrorPanel} from '../../../components/ErrorPanel/ErrorPanel'
-import {Icon} from '../../../components/Icon'
-import {Info} from '../../../components/Icon/Info'
-import {useModal} from '../../../components/Modal/ModalContext'
-import {Space} from '../../../components/Space/Space'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {Text} from '../../../components/Text'
-import {SettingsStackRoutes, useUnsafeParams, useWalletNavigation} from '../../../kernel/navigation'
-import {useCollateralInfo} from '../../../yoroi-wallets/cardano/utxoManager/useCollateralInfo'
-import {useSetCollateralId} from '../../../yoroi-wallets/cardano/utxoManager/useSetCollateralId'
-import {collateralConfig, utxosMaker} from '../../../yoroi-wallets/cardano/utxoManager/utxos'
-import {useBalances} from '../../../yoroi-wallets/hooks'
-import {RawUtxo} from '../../../yoroi-wallets/types/other'
-import {YoroiEntry, YoroiSignedTx} from '../../../yoroi-wallets/types/yoroi'
-import {Amounts, asQuantity, Quantities} from '../../../yoroi-wallets/utils/utils'
-import {TokenAmountItem} from '../../Portfolio/common/TokenAmountItem/TokenAmountItem'
-import {useReviewTx} from '../../ReviewTx/common/ReviewTxProvider'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
+import {Button} from '../../../../../components/Button/Button'
+import {CopyButton} from '../../../../../components/CopyButton'
+import {ErrorPanel} from '../../../../../components/ErrorPanel/ErrorPanel'
+import {Icon} from '../../../../../components/Icon'
+import {Info} from '../../../../../components/Icon/Info'
+import {useModal} from '../../../../../components/Modal/ModalContext'
+import {Space} from '../../../../../components/Space/Space'
+import {Spacer} from '../../../../../components/Spacer/Spacer'
+import {Text} from '../../../../../components/Text'
+import {SettingsStackRoutes, useUnsafeParams, useWalletNavigation} from '../../../../../kernel/navigation'
+import {useCollateralInfo} from '../../../../../yoroi-wallets/cardano/utxoManager/useCollateralInfo'
+import {useSetCollateralId} from '../../../../../yoroi-wallets/cardano/utxoManager/useSetCollateralId'
+import {collateralConfig, utxosMaker} from '../../../../../yoroi-wallets/cardano/utxoManager/utxos'
+import {useBalances} from '../../../../../yoroi-wallets/hooks'
+import {RawUtxo} from '../../../../../yoroi-wallets/types/other'
+import {YoroiEntry, YoroiSignedTx} from '../../../../../yoroi-wallets/types/yoroi'
+import {Amounts, asQuantity, Quantities} from '../../../../../yoroi-wallets/utils/utils'
+import {TokenAmountItem} from '../../../../Portfolio/common/TokenAmountItem/TokenAmountItem'
+import {useReviewTx} from '../../../../ReviewTx/common/ReviewTxProvider'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {CollateralInfoModal} from './CollateralInfoModal'
 import {createCollateralEntry} from './helpers'
 import {InitialCollateralInfoModal} from './InitialCollateralInfoModal'
@@ -263,13 +263,19 @@ const useStyles = () => {
       backgroundColor: color.bg_color_max,
       ...atoms.flex_1,
       ...atoms.px_lg,
+      ...atoms.flex_1,
+      ...atoms.px_lg,
     },
     amountItem: {
       ...atoms.flex_row,
       ...atoms.justify_between,
       ...atoms.align_center,
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+      ...atoms.align_center,
     },
     heading: {
+      ...atoms.flex_1,
       ...atoms.flex_1,
       alignSelf: 'center',
     },
@@ -288,4 +294,5 @@ const useStyles = () => {
   }
 
   return {styles, colors} as const
+  return {styles, colors} as const
 }
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/helpers.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/helpers.ts
similarity index 65%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/helpers.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/helpers.ts
index 12f900b725..1fab6ccead 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/helpers.ts
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/helpers.ts
@@ -1,6 +1,6 @@
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {collateralConfig} from '../../../yoroi-wallets/cardano/utxoManager/utxos'
-import {YoroiEntry} from '../../../yoroi-wallets/types/yoroi'
+import {YoroiWallet} from '../../../../../yoroi-wallets/cardano/types'
+import {collateralConfig} from '../../../../../yoroi-wallets/cardano/utxoManager/utxos'
+import {YoroiEntry} from '../../../../../yoroi-wallets/types/yoroi'
 
 const getCollateralAddress = (wallet: YoroiWallet) => {
   return wallet.externalAddresses[0]
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/illustrations/InfoModalIllustration.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/illustrations/InfoModalIllustration.tsx
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/illustrations/InfoModalIllustration.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/illustrations/InfoModalIllustration.tsx
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/navigation.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/navigation.ts
similarity index 85%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/navigation.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/navigation.ts
index 025d6151d2..c8fd73b7a7 100644
--- a/apps/wallet-mobile/src/features/Settings/ManageCollateral/navigation.ts
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/navigation.ts
@@ -1,7 +1,7 @@
 import {useNavigation} from '@react-navigation/native'
 import {useRef} from 'react'
 
-import {SettingsRouteNavigation} from '../../../kernel/navigation'
+import {SettingsRouteNavigation} from '../../../../../kernel/navigation'
 
 export const useNavigateTo = () => {
   const navigation = useNavigation<SettingsRouteNavigation>()
diff --git a/apps/wallet-mobile/src/features/Settings/ManageCollateral/strings.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/ManageCollateral/strings.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx
similarity index 64%
rename from apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx
index 7fafd3a287..b15b3e5cca 100644
--- a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.stories.tsx
@@ -1,8 +1,8 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {RemoveWalletScreen} from './RemoveWalletScreen'
 
 storiesOf('RemoveWalletScreen', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx
similarity index 89%
rename from apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx
index 401298ff96..807c29861c 100644
--- a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx
@@ -4,15 +4,15 @@ import {defineMessages, useIntl} from 'react-intl'
 import {InteractionManager, ScrollView, StyleSheet, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../components/Button/Button'
-import {Checkbox} from '../../../components/Checkbox/Checkbox'
-import {KeyboardAvoidingView} from '../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {Text} from '../../../components/Text'
-import {Checkmark, TextInput, TextInputProps} from '../../../components/TextInput/TextInput'
-import {useWalletNavigation} from '../../../kernel/navigation'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+import {Button} from '../../../../../components/Button/Button'
+import {Checkbox} from '../../../../../components/Checkbox/Checkbox'
+import {KeyboardAvoidingView} from '../../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
+import {Spacer} from '../../../../../components/Spacer/Spacer'
+import {Text} from '../../../../../components/Text'
+import {Checkmark, TextInput, TextInputProps} from '../../../../../components/TextInput/TextInput'
+import {useWalletNavigation} from '../../../../../kernel/navigation'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 
 export const RemoveWalletScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/index.ts b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/index.ts
similarity index 100%
rename from apps/wallet-mobile/src/features/Settings/RemoveWallet/index.ts
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/index.ts
diff --git a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx
similarity index 64%
rename from apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx
index 186f7ff5cc..8fb0211a36 100644
--- a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.stories.tsx
@@ -1,8 +1,8 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {RenameWalletScreen} from './RenameWalletScreen'
 
 storiesOf('RenameWallet', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.tsx
similarity index 82%
rename from apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.tsx
index a0029b57fe..f6e47b2199 100644
--- a/apps/wallet-mobile/src/features/Settings/RenameWalletScreen/RenameWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.tsx
@@ -5,15 +5,15 @@ import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Button} from '../../../components/Button/Button'
-import {KeyboardAvoidingView} from '../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {TextInput} from '../../../components/TextInput/TextInput'
-import globalMessages from '../../../kernel/i18n/global-messages'
-import {isEmptyString} from '../../../kernel/utils'
-import {getWalletNameError} from '../../../yoroi-wallets/utils/validators'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+import {Button} from '../../../../../components/Button/Button'
+import {KeyboardAvoidingView} from '../../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
+import {Spacer} from '../../../../../components/Spacer/Spacer'
+import {TextInput} from '../../../../../components/TextInput/TextInput'
+import globalMessages from '../../../../../kernel/i18n/global-messages'
+import {isEmptyString} from '../../../../../kernel/utils'
+import {getWalletNameError} from '../../../../../yoroi-wallets/utils/validators'
+import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
+import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 
 export const RenameWalletScreen = () => {
   const strings = useStrings()
diff --git a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx
similarity index 66%
rename from apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx
index 16fc925be8..c46755c4b6 100644
--- a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.stories.tsx
@@ -1,8 +1,8 @@
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
+import {mocks} from '../../../../yoroi-wallets/mocks/wallet'
+import {WalletManagerProviderMock} from '../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
 import {WalletSettingsScreen} from './WalletSettingsScreen'
 
 storiesOf('WalletSettingsScreen', module).add('Default', () => (
diff --git a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx
similarity index 92%
rename from apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx
rename to apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx
index 652a3e7429..ac252a3229 100644
--- a/apps/wallet-mobile/src/features/Settings/WalletSettings/WalletSettingsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx
@@ -7,25 +7,25 @@ import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Icon} from '../../../components/Icon'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {DIALOG_BUTTONS, showConfirmationDialog} from '../../../kernel/dialogs'
-import {confirmationMessages} from '../../../kernel/i18n/global-messages'
-import {SettingsRouteNavigation, useWalletNavigation} from '../../../kernel/navigation'
-import {useResync} from '../../../yoroi-wallets/hooks'
-import {useAuth} from '../../Auth/AuthProvider'
-import {useAuthSetting} from '../../Auth/common/hooks'
-import {useAddressMode} from '../../WalletManager/common/hooks/useAddressMode'
-import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
-import {useNavigateTo} from '../common/navigation'
-import {SettingsSwitch} from '../common/SettingsSwitch'
+import {Icon} from '../../../../components/Icon'
+import {Spacer} from '../../../../components/Spacer/Spacer'
+import {DIALOG_BUTTONS, showConfirmationDialog} from '../../../../kernel/dialogs'
+import {confirmationMessages} from '../../../../kernel/i18n/global-messages'
+import {SettingsRouteNavigation, useWalletNavigation} from '../../../../kernel/navigation'
+import {useResync} from '../../../../yoroi-wallets/hooks'
+import {useAuth} from '../../../Auth/AuthProvider'
+import {useAuthSetting} from '../../../Auth/common/hooks'
+import {useAddressMode} from '../../../WalletManager/common/hooks/useAddressMode'
+import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
+import {useNavigateTo} from '../../common/navigation'
+import {SettingsSwitch} from '../../common/SettingsSwitch'
 import {
   NavigatedSettingsItem,
   SettingsBuildItem,
   SettingsCollateralItem,
   SettingsItem,
   SettingsSection,
-} from '../SettingsItems'
+} from '../../SettingsItems'
 
 export const WalletSettingsScreen = () => {
   const intl = useIntl()
diff --git a/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx b/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
index a74e50c70e..8fe12c83e6 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 
 import {defaultStackNavigationOptions, WalletInitRoutes} from '../../kernel/navigation'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {PreparingWalletScreen} from './common/PreparingWalletScreen/PreparingWalletScreen'
 import {ImportReadOnlyWalletScreen} from './legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen'
 import {SaveReadOnlyWalletScreen} from './legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen'
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx b/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
index f607901544..5df15e523e 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 
 import {SafeArea} from '../../../components/SafeArea'
 import {defaultStackNavigationOptions} from '../../../kernel/navigation'
-import {NetworkTag} from '../../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useGovernanceManagerMaker} from './common/helpers'
 import {NavigationStack} from './common/navigation'
 import {useStrings} from './common/strings'
diff --git a/apps/wallet-mobile/src/features/Swap/common/navigation.ts b/apps/wallet-mobile/src/features/Swap/common/navigation.ts
index 93d89633e8..813aa4a5b0 100644
--- a/apps/wallet-mobile/src/features/Swap/common/navigation.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/navigation.ts
@@ -13,7 +13,7 @@ export const useNavigateTo = () => {
     selectBuyToken: () => swapNavigation.navigate('swap-select-buy-token'),
     selectSellToken: () => swapNavigation.navigate('swap-select-sell-token'),
     startSwap: () => swapNavigation.navigate('swap-start-swap', {screen: 'token-swap'}),
-    confirmTx: () => swapNavigation.navigate('swap-confirm-tx'),
+    reviewSwap: () => swapNavigation.navigate('swap-review'),
     submittedTx: (txId: string) => swapNavigation.navigate('swap-submitted-tx', {txId}),
     failedTx: () => swapNavigation.navigate('swap-failed-tx'),
     swapOpenOrders: () =>
diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index 8be4f262bd..2fc173ebbb 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -7,6 +7,7 @@ export const useStrings = () => {
 
   return {
     swapTitle: intl.formatMessage(messages.swapTitle),
+    swapDetailsTitle: intl.formatMessage(messages.swapDetailsTitle),
     tokenSwap: intl.formatMessage(messages.tokenSwap),
     orderSwap: intl.formatMessage(messages.orderSwap),
     dex: intl.formatMessage(messages.dex),
@@ -56,7 +57,7 @@ export const useStrings = () => {
     spendingPassword: intl.formatMessage(messages.spendingPassword),
     sign: intl.formatMessage(messages.sign),
     searchTokens: intl.formatMessage(messages.searchTokens),
-    confirm: intl.formatMessage(messages.confirm),
+    next: intl.formatMessage(messages.next),
     chooseConnectionMethod: intl.formatMessage(messages.chooseConnectionMethod),
     selecteAssetTitle: intl.formatMessage(messages.selectAssetTitle),
     tokens: (qty: number) => intl.formatMessage(globalMessages.tokens, {qty}),
@@ -178,6 +179,10 @@ const messages = defineMessages({
     id: 'swap.swapScreen.swapTitle',
     defaultMessage: '!!!Swap',
   },
+  swapDetailsTitle: {
+    id: 'swap.swapScreen.swapDetailsTitle',
+    defaultMessage: '!!!Swap details',
+  },
   tokenSwap: {
     id: 'swap.swapScreen.tokenSwapTab',
     defaultMessage: '!!!Token swap',
@@ -299,7 +304,7 @@ const messages = defineMessages({
   },
   swapLiqProvFee: {
     id: 'swap.swapScreen.swapLiqProvFee',
-    defaultMessage: '!!!Liq. prov. fee',
+    defaultMessage: '!!!Liquidity provider fee',
   },
   swapLiquidityFeeInfo: {
     id: 'swap.swapScreen.swapLiquidityFeeInfo',
@@ -573,9 +578,9 @@ const messages = defineMessages({
     id: 'components.send.selectasset.title',
     defaultMessage: '!!!Select asset',
   },
-  confirm: {
-    id: 'components.send.confirmscreen.confirmButton',
-    defaultMessage: '!!!Confirm',
+  next: {
+    id: 'global.next',
+    defaultMessage: '!!!Next',
   },
   assignCollateral: {
     id: 'components.send.confirmscreen.assignCollateral',
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTx.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTx.tsx
deleted file mode 100644
index 6db51ff690..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTx.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react'
-import {ErrorBoundary} from 'react-error-boundary'
-
-import {ModalError} from '../../../../components/ModalError/ModalError'
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {ConfirmTxWithHW} from './ConfirmTxWithHW'
-import {ConfirmTxWithPassword} from './ConfirmTxWithPassword'
-
-type Props = {
-  wallet: YoroiWallet
-  unsignedTx: YoroiUnsignedTx
-  onCancel: () => void
-  onSuccess: (signedTx: YoroiSignedTx) => void
-}
-
-export const ConfirmTx = ({wallet, onSuccess, onCancel, unsignedTx}: Props) => {
-  const {meta} = useSelectedWallet()
-  return meta.isHW ? (
-    <ErrorBoundary
-      fallbackRender={({error, resetErrorBoundary}) => (
-        <ModalError error={error} resetErrorBoundary={resetErrorBoundary} onCancel={onCancel} />
-      )}
-    >
-      <ConfirmTxWithHW //
-        wallet={wallet}
-        unsignedTx={unsignedTx}
-        onSuccess={onSuccess}
-        onCancel={onCancel}
-      />
-    </ErrorBoundary>
-  ) : (
-    <ConfirmTxWithPassword //
-      wallet={wallet}
-      unsignedTx={unsignedTx}
-      onSuccess={onSuccess}
-      onCancel={onCancel}
-    />
-  )
-}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx
deleted file mode 100644
index 5236d812dd..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import {storiesOf} from '@storybook/react-native'
-import {mockSwapManager, mockSwapStateDefault, orderMocks, SwapProvider} from '@yoroi/swap'
-import React from 'react'
-
-import {rootStorage} from '../../../../kernel/storage/rootStorage'
-import {mocks as walletMocks} from '../../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
-import {buildPortfolioTokenManagers} from '../../../Portfolio/common/helpers/build-token-managers'
-import {WalletManagerProvider} from '../../../WalletManager/context/WalletManagerProvider'
-import {buildNetworkManagers} from '../../../WalletManager/network-manager/network-manager'
-import {WalletManager} from '../../../WalletManager/wallet-manager'
-import {mocks} from '../../common/mocks'
-import {SwapFormProvider} from '../../common/SwapFormProvider'
-import {ConfirmTxScreen} from './ConfirmTxScreen'
-
-// TODO: should be mocked
-const {tokenManagers} = buildPortfolioTokenManagers()
-const networkManagers = buildNetworkManagers({tokenManagers})
-const walletManager = new WalletManager({
-  rootStorage,
-  networkManagers,
-})
-
-storiesOf('Swap ConfirmTxScreen', module) //
-  .add('swap confirm tx: with password', () => {
-    return <ConfirmTxWithPasswordScreen />
-  })
-  .add('swap confirm tx: with os', () => {
-    return <ConfirmTxWithOSScreen />
-  })
-  .add('swap confirm tx: with hw', () => {
-    return <ConfirmTxWithHWScreen />
-  })
-
-const ConfirmTxWithPasswordScreen = () => {
-  return (
-    <WalletManagerProviderMock wallet={{...walletMocks.wallet}}>
-      <SwapProvider
-        initialState={{
-          ...mockSwapStateDefault,
-          unsignedTx: walletMocks.yoroiUnsignedTx,
-          orderData: {
-            ...mocks.confirmTx.orderData,
-            selectedPoolCalculation: calculation,
-          },
-        }}
-        swapManager={{
-          ...mockSwapManager,
-        }}
-      >
-        <SwapFormProvider>
-          <ConfirmTxScreen />
-        </SwapFormProvider>
-      </SwapProvider>
-    </WalletManagerProviderMock>
-  )
-}
-const ConfirmTxWithOSScreen = () => {
-  return (
-    <WalletManagerProvider walletManager={walletManager}>
-      <WalletManagerProviderMock wallet={{...walletMocks.wallet}}>
-        <SwapProvider
-          initialState={{
-            ...mockSwapStateDefault,
-            unsignedTx: walletMocks.yoroiUnsignedTx,
-            orderData: {
-              ...mocks.confirmTx.orderData,
-              selectedPoolCalculation: calculation,
-            },
-          }}
-          swapManager={{
-            ...mockSwapManager,
-          }}
-        >
-          <SwapFormProvider>
-            <ConfirmTxScreen />
-          </SwapFormProvider>
-        </SwapProvider>
-      </WalletManagerProviderMock>
-    </WalletManagerProvider>
-  )
-}
-const ConfirmTxWithHWScreen = () => {
-  return (
-    <WalletManagerProviderMock wallet={{...walletMocks.wallet}}>
-      <SwapProvider
-        initialState={{
-          ...mockSwapStateDefault,
-          unsignedTx: walletMocks.yoroiUnsignedTx,
-          orderData: {
-            ...mocks.confirmTx.orderData,
-            selectedPoolCalculation: calculation,
-          },
-        }}
-        swapManager={{
-          ...mockSwapManager,
-        }}
-      >
-        <SwapFormProvider>
-          <ConfirmTxScreen />
-        </SwapFormProvider>
-      </SwapProvider>
-    </WalletManagerProviderMock>
-  )
-}
-
-const calculation = orderMocks.mockedOrderCalculations1[0]
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
deleted file mode 100644
index a962da3a2c..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithHW.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import {useTheme} from '@yoroi/theme'
-import {HW} from '@yoroi/types'
-import React, {useState} from 'react'
-import {ScrollView, StyleSheet, View} from 'react-native'
-
-import {Text} from '../../../../components/Text'
-import {LedgerConnect} from '../../../../legacy/HW'
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {useSignWithHwAndSubmitTx} from '../../../../yoroi-wallets/hooks'
-import {withBLE, withUSB} from '../../../../yoroi-wallets/hw/hwWallet'
-import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../../WalletManager/context/WalletManagerProvider'
-import {ActivityIndicator} from '../../common/ConfirmRawTx/ActivityIndicator'
-import {useStrings} from '../../common/strings'
-import {LedgerTransportSwitch} from './LedgerTransportSwitch'
-
-type Props = {
-  wallet: YoroiWallet
-  unsignedTx: YoroiUnsignedTx
-  onCancel?: () => void
-  onSuccess: (signedTx: YoroiSignedTx) => void
-}
-
-type TransportType = 'USB' | 'BLE'
-type Step = 'select-transport' | 'connect-transport' | 'loading'
-
-export const ConfirmTxWithHW = ({onSuccess, wallet, unsignedTx}: Props) => {
-  const styles = useStyles()
-  const {meta} = useSelectedWallet()
-  const {walletManager} = useWalletManager()
-  const [transportType, setTransportType] = React.useState<TransportType>('USB')
-  const [step, setStep] = useState<Step>('select-transport')
-  const strings = useStrings()
-
-  const {signAndSubmitTx} = useSignWithHwAndSubmitTx(
-    {wallet}, //
-    {signTx: {onSuccess}},
-  )
-
-  const onSelectTransport = (transportType: TransportType) => {
-    setTransportType(transportType)
-    setStep('connect-transport')
-  }
-
-  const onConnectBLE = (deviceId: string) => {
-    setStep('loading')
-    const hwDeviceInfo = withBLE(meta, deviceId)
-    walletManager.updateWalletHWDeviceInfo(meta.id, hwDeviceInfo)
-    signAndSubmitTx({unsignedTx, useUSB: false, hwDeviceInfo})
-  }
-
-  const onConnectUSB = (deviceObj: HW.DeviceObj) => {
-    setStep('loading')
-    const hwDeviceInfo = withUSB(meta, deviceObj)
-    walletManager.updateWalletHWDeviceInfo(meta.id, hwDeviceInfo)
-    signAndSubmitTx({unsignedTx, useUSB: true, hwDeviceInfo})
-  }
-
-  if (step === 'select-transport') {
-    return (
-      <LedgerTransportSwitch
-        onSelectBLE={() => onSelectTransport('BLE')}
-        onSelectUSB={() => onSelectTransport('USB')}
-      />
-    )
-  }
-
-  if (step === 'connect-transport') {
-    return (
-      <ScrollView>
-        <LedgerConnect useUSB={transportType === 'USB'} onConnectBLE={onConnectBLE} onConnectUSB={onConnectUSB} />
-      </ScrollView>
-    )
-  }
-
-  return (
-    <View style={styles.container}>
-      <ActivityIndicator />
-
-      <Text style={styles.text}>{strings.continueOnLedger}</Text>
-    </View>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-  const styles = StyleSheet.create({
-    container: {
-      ...atoms.flex_1,
-      ...atoms.align_center,
-      ...atoms.justify_center,
-      ...atoms.gap_2xl,
-      ...atoms.px_lg,
-    },
-    text: {
-      ...atoms.body_1_lg_regular,
-      ...atoms.text_center,
-      color: color.text_gray_medium,
-    },
-  })
-
-  return styles
-}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithPassword.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithPassword.tsx
deleted file mode 100644
index 9f587b995f..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxWithPassword.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import {App} from '@yoroi/types'
-import React from 'react'
-
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {useSignWithPasswordAndSubmitTx} from '../../../../yoroi-wallets/hooks'
-import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {ConfirmWithSpendingPassword} from '../../common/ConfirmWithSpendingPassword'
-import {ErrorData} from '../../common/ConfirmWithSpendingPassword/ConfirmWithSpendingPassword'
-import {useStrings} from '../../common/strings'
-
-type Props = {
-  wallet: YoroiWallet
-  unsignedTx: YoroiUnsignedTx
-  onSuccess: (signedTx: YoroiSignedTx) => void
-  onCancel?: () => void
-}
-
-export const ConfirmTxWithPassword = ({wallet, onSuccess, unsignedTx}: Props) => {
-  const [errorData, setErrorData] = React.useState<ErrorData>({
-    errorMessage: '',
-    errorLogs: '',
-  })
-  const strings = useStrings()
-  const signedTxRef = React.useRef<YoroiSignedTx | undefined>(undefined)
-
-  const {signAndSubmitTx, isLoading} = useSignWithPasswordAndSubmitTx(
-    {wallet}, //
-    {
-      submitTx: {onSuccess: () => signedTxRef.current && onSuccess(signedTxRef.current)},
-      signTx: {
-        onSuccess: (signedTx) => {
-          signedTxRef.current = signedTx
-        },
-      },
-    },
-  )
-
-  const showError = ({errorMessage, errorLogs}: ErrorData) => {
-    setErrorData({
-      errorMessage,
-      errorLogs,
-    })
-  }
-
-  const onConfirm = async (password: string) => {
-    try {
-      const rootKey = await wallet.encryptedStorage.xpriv.read(password)
-      if (rootKey !== undefined) {
-        signAndSubmitTx({unsignedTx, password})
-      }
-    } catch (err) {
-      if (err instanceof App.Errors.WrongPassword) {
-        showError({
-          errorMessage: strings.incorrectPasswordTitle,
-          errorLogs: strings.incorrectPasswordMessage,
-        })
-      } else {
-        showError({
-          errorMessage: strings.generalTxErrorMessage,
-          errorLogs: err,
-        })
-      }
-    }
-  }
-
-  return (
-    <ConfirmWithSpendingPassword
-      onSubmit={onConfirm}
-      isLoading={isLoading}
-      error={errorData.errorMessage.length > 0 ? new Error(errorData.errorMessage) : undefined}
-      onPasswordChange={() => setErrorData({errorMessage: '', errorLogs: ''})}
-    />
-  )
-}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/ReviewSwap.tsx
similarity index 58%
rename from apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
rename to apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/ReviewSwap.tsx
index 7a6d3281a8..2aeda6fe03 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/ReviewSwap.tsx
@@ -1,5 +1,6 @@
-import {useSwap} from '@yoroi/swap'
+import {getPoolUrlByProvider, useSwap} from '@yoroi/swap'
 import {useTheme} from '@yoroi/theme'
+import {capitalize} from 'lodash'
 import React from 'react'
 import {InteractionManager, StyleSheet, useWindowDimensions, View, ViewProps} from 'react-native'
 import {ScrollView} from 'react-native-gesture-handler'
@@ -7,32 +8,29 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Button} from '../../../../components/Button/Button'
 import {KeyboardAvoidingView} from '../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {LoadingOverlay} from '../../../../components/LoadingOverlay/LoadingOverlay'
-import {useModal} from '../../../../components/Modal/ModalContext'
-import {Spacer} from '../../../../components/Spacer/Spacer'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
-import {useSignAndSubmitTx} from '../../../../yoroi-wallets/hooks'
+import {useWalletNavigation} from '../../../../kernel/navigation'
 import {YoroiSignedTx} from '../../../../yoroi-wallets/types/yoroi'
 import {asQuantity, Quantities} from '../../../../yoroi-wallets/utils/utils'
-import {useAuthOsWithEasyConfirmation} from '../../../Auth/common/hooks'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
+import {useReviewTx} from '../../../ReviewTx/common/ReviewTxProvider'
+import {LiquidityPool} from '../../common/LiquidityPool/LiquidityPool'
 import {useNavigateTo} from '../../common/navigation'
+import {PoolIcon} from '../../common/PoolIcon/PoolIcon'
 import {useStrings} from '../../common/strings'
-import {ConfirmTx} from './ConfirmTx'
 import {TransactionSummary} from './TransactionSummary'
 
 const BOTTOM_ACTION_SECTION = 220
 
-export const ConfirmTxScreen = () => {
+export const ReviewSwap = () => {
   const [contentHeight, setContentHeight] = React.useState(0)
   const strings = useStrings()
   const styles = useStyles()
-  const {wallet, meta} = useSelectedWallet()
   const navigate = useNavigateTo()
   const {track} = useMetrics()
-  const {openModal, closeModal} = useModal()
   const {height: deviceHeight} = useWindowDimensions()
-  const signedTxRef = React.useRef<YoroiSignedTx | null>(null)
+  const {navigateToTxReview} = useWalletNavigation()
+  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, customReceiverTitleChanged, detailsChanged} =
+    useReviewTx()
 
   const {unsignedTx, orderData} = useSwap()
   const sellTokenInfo = orderData.amounts.sell?.info
@@ -45,11 +43,6 @@ export const ConfirmTxScreen = () => {
 
   const couldReceiveNoAssets = Quantities.isZero(minReceived)
 
-  const {authWithOs, isLoading: authenticating} = useAuthOsWithEasyConfirmation(
-    {id: wallet.id},
-    {onSuccess: (rootKey) => signAndSubmitTx({unsignedTx, rootKey})},
-  )
-
   const trackSwapOrderSubmitted = () => {
     if (orderData.selectedPoolCalculation === undefined) return
     track.swapOrderSubmitted({
@@ -72,38 +65,38 @@ export const ConfirmTxScreen = () => {
     })
   }
 
-  const {signAndSubmitTx, isLoading: processingTx} = useSignAndSubmitTx(
-    {wallet},
-    {
-      signTx: {
-        useErrorBoundary: true,
-        onSuccess: (signedTx) => {
-          signedTxRef.current = signedTx
-        },
-      },
-      submitTx: {
-        onSuccess: () => {
-          trackSwapOrderSubmitted()
-          navigate.submittedTx(signedTxRef.current?.signedTx.id ?? '')
-        },
-        onError: () => {
-          navigate.failedTx()
-        },
-        useErrorBoundary: true,
-      },
-    },
-  )
+  const onSwapTxError = () => {
+    navigate.failedTx()
+  }
 
-  const onPasswordTxSuccess = (signedTx: YoroiSignedTx) => {
+  const onSwapTxSuccess = (signedTx: YoroiSignedTx) => {
     trackSwapOrderSubmitted()
-    closeModal()
     InteractionManager.runAfterInteractions(() => {
       navigate.submittedTx(signedTx.signedTx.id)
     })
   }
 
-  const txIsLoading = authenticating || processingTx
-  const isButtonDisabled = txIsLoading || couldReceiveNoAssets
+  const onNext = () => {
+    let liquidityPool: React.ReactNode = null
+    if (orderData.selectedPoolCalculation) {
+      const poolIcon = <PoolIcon providerId={orderData.selectedPoolCalculation.pool.provider} size={18} />
+      const poolProviderFormatted = capitalize(orderData.selectedPoolCalculation.pool.provider)
+      const poolUrl = getPoolUrlByProvider(orderData.selectedPoolCalculation.pool.provider)
+
+      liquidityPool = (
+        <LiquidityPool liquidityPoolIcon={poolIcon} liquidityPoolName={poolProviderFormatted} poolUrl={poolUrl} />
+      )
+    }
+
+    if (liquidityPool != null) customReceiverTitleChanged(liquidityPool)
+    detailsChanged({component: <TransactionSummary orderData={orderData} />, title: strings.swapDetailsTitle})
+    unsignedTxChanged(unsignedTx)
+    onSuccessChanged(onSwapTxSuccess)
+    onErrorChanged(onSwapTxError)
+    navigateToTxReview()
+  }
+
+  const isButtonDisabled = couldReceiveNoAssets
 
   return (
     <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.root}>
@@ -116,12 +109,10 @@ export const ConfirmTxScreen = () => {
                 setContentHeight(height + BOTTOM_ACTION_SECTION)
               }}
             >
-              <TransactionSummary />
+              <TransactionSummary orderData={orderData} />
             </View>
           </ScrollView>
         </KeyboardAvoidingView>
-
-        <LoadingOverlay loading={txIsLoading} />
       </View>
 
       <Actions
@@ -129,31 +120,7 @@ export const ConfirmTxScreen = () => {
           ...(deviceHeight < contentHeight && styles.actionBorder),
         }}
       >
-        <Button
-          disabled={isButtonDisabled}
-          testID="swapButton"
-          title={strings.confirm}
-          onPress={() => {
-            if (meta.isEasyConfirmationEnabled) {
-              authWithOs()
-              return
-            }
-            openModal(
-              meta.isHW ? strings.chooseConnectionMethod : strings.signTransaction,
-              <View style={styles.modalContent}>
-                <ConfirmTx
-                  wallet={wallet}
-                  unsignedTx={unsignedTx}
-                  onSuccess={onPasswordTxSuccess}
-                  onCancel={closeModal}
-                />
-
-                <Spacer height={16} />
-              </View>,
-              meta.isHW ? 430 : 350,
-            )
-          }}
-        />
+        <Button disabled={isButtonDisabled} testID="swapButton" title={strings.next} onPress={onNext} />
       </Actions>
     </SafeAreaView>
   )
@@ -168,28 +135,21 @@ const useStyles = () => {
   const {color, atoms} = useTheme()
   const styles = StyleSheet.create({
     root: {
-      flex: 1,
+      ...atoms.flex_1,
+      ...atoms.pt_lg,
       backgroundColor: color.bg_color_max,
-      paddingTop: 16,
     },
     container: {
-      flex: 1,
+      ...atoms.flex_1,
+      ...atoms.justify_between,
       backgroundColor: color.bg_color_max,
-      display: 'flex',
-      flexDirection: 'column',
-      justifyContent: 'space-between',
     },
     actions: {
-      padding: 16,
+      ...atoms.p_lg,
       backgroundColor: color.bg_color_max,
     },
-    modalContent: {
-      flex: 1,
-      alignSelf: 'stretch',
-      ...atoms.px_lg,
-    },
     scroll: {
-      paddingHorizontal: 16,
+      ...atoms.px_lg,
     },
     actionBorder: {
       borderTopWidth: 1,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
similarity index 95%
rename from apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx
rename to apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
index 68d0f74e02..28234c9837 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.stories.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
@@ -34,20 +34,21 @@ storiesOf('TransactionSummary', module) //
   })
 
 const TxSummary = ({calculation}: {calculation: SwapOrderCalculation}) => {
+  const orderData = {...mocks.confirmTx.orderData, selectedPoolCalculation: calculation}
   return (
     <WalletManagerProviderMock wallet={{...walletMocks.wallet}}>
       <SwapProvider
         initialState={{
           ...mockSwapStateDefault,
           unsignedTx: walletMocks.yoroiUnsignedTx,
-          orderData: {...mocks.confirmTx.orderData, selectedPoolCalculation: calculation},
+          orderData,
         }}
         swapManager={{
           ...mockSwapManager,
         }}
       >
         <SwapFormProvider>
-          <TransactionSummary />
+          <TransactionSummary orderData={orderData} />
         </SwapFormProvider>
       </SwapProvider>
     </WalletManagerProviderMock>
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.tsx
similarity index 63%
rename from apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx
rename to apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.tsx
index 337274187b..9fd4a027c6 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.tsx
@@ -1,14 +1,12 @@
-import {getPoolUrlByProvider, useSwap} from '@yoroi/swap'
+import {getPoolUrlByProvider, SwapState} from '@yoroi/swap'
 import {useTheme} from '@yoroi/theme'
 import {capitalize} from 'lodash'
 import React from 'react'
-import {StyleSheet, TouchableOpacity, View} from 'react-native'
-import LinearGradient from 'react-native-linear-gradient'
+import {StyleSheet, View} from 'react-native'
 
+import {Divider} from '../../../../components/Divider/Divider'
 import {Icon} from '../../../../components/Icon'
-import {useModal} from '../../../../components/Modal/ModalContext'
-import {PairedBalance} from '../../../../components/PairedBalance/PairedBalance'
-import {Spacer} from '../../../../components/Spacer/Spacer'
+import {Space} from '../../../../components/Space/Space'
 import {Text} from '../../../../components/Text'
 import {asQuantity, Quantities} from '../../../../yoroi-wallets/utils/utils'
 import {TokenAmountItem} from '../../../Portfolio/common/TokenAmountItem/TokenAmountItem'
@@ -19,18 +17,15 @@ import {LiquidityPool} from '../../common/LiquidityPool/LiquidityPool'
 import {PoolIcon} from '../../common/PoolIcon/PoolIcon'
 import {useStrings} from '../../common/strings'
 import {useSwapForm} from '../../common/SwapFormProvider'
-import {SwapInfoLink} from '../../common/SwapInfoLink/SwapInfoLink'
 
-export const TransactionSummary = () => {
+export const TransactionSummary = ({orderData}: {orderData: SwapState['orderData']}) => {
   const strings = useStrings()
-  const {styles, colors} = useStyles()
+  const {styles} = useStyles()
   const {wallet} = useSelectedWallet()
-  const {orderData} = useSwap()
   const {
     limitPrice: {displayValue: limitDisplayValue},
   } = useSwapForm()
   const {amounts, selectedPoolCalculation: calculation, type} = orderData
-  const {openModal} = useModal()
 
   // should never happen
   if (!calculation || !amounts.buy || !amounts.sell) throw new Error('No selected pool calculation/amounts found')
@@ -52,15 +47,7 @@ export const TransactionSummary = () => {
 
   const tokenToSellName = sellTokenInfo.ticker ?? sellTokenInfo.name
   const tokenToBuyName = buyTokenInfo.ticker ?? buyTokenInfo.name
-  const isSellPrimary = amounts.sell.info.id === wallet.portfolioPrimaryTokenInfo.id
 
-  // Quantities.zero case would only happen on an API error where the price in Ada of Ada were missing
-  const total = isSellPrimary ? calculation.ptTotalValueSpent?.quantity ?? 0n : amounts.sell.quantity
-
-  const formattedSellText = `${Quantities.format(
-    asQuantity(total.toString()),
-    sellTokenInfo.decimals,
-  )} ${tokenToSellName}`
   const formattedFeeText = `${Quantities.format(
     asQuantity((cost.batcherFee.quantity + cost.frontendFeeInfo.fee.quantity).toString()),
     wallet.portfolioPrimaryTokenInfo.decimals,
@@ -88,36 +75,15 @@ export const TransactionSummary = () => {
       label: strings.dex.toUpperCase(),
       value: <LiquidityPool liquidityPoolIcon={poolIcon} liquidityPoolName={poolProviderFormatted} poolUrl={poolUrl} />,
     },
-    {
-      label: strings.swapMinAdaTitle,
-      value: <Text style={styles.text}>{minAdaInfoValue}</Text>,
-    },
-    {
-      label: strings.swapFeesTitle,
-      value: <Text style={styles.text}>{formattedFeeText}</Text>,
-    },
-    {
-      label: strings.swapLiqProvFee,
-      value: <Text style={styles.text}>{liqFeeQuantityFormatted}</Text>,
-    },
-    {
-      label: strings.swapMinReceivedTitle,
-      value: (
-        <View style={styles.flex}>
-          <Text style={[styles.text, styles.alignRight]}>{minReceivedInfoValue}</Text>
-        </View>
-      ),
-    },
     {
       label: `${capitalize(type)} ${strings.price}`,
       value: <Text style={[styles.text, styles.alignRight]}>{priceInfoValue}</Text>,
-      info: type === 'market' ? strings.marketPriceInfo : strings.limitPriceInfo,
     },
     {
       label: strings.priceImpact,
       value:
         priceImpactRisk === 'none' ? (
-          <Text style={[styles.priceImpactRiskText]}>&lt;1%</Text>
+          <Text style={[styles.priceImpactRiskText, styles.priceImpactLowRiskText]}>&lt;1%</Text>
         ) : (
           <View style={styles.priceImpactRiskContainer}>
             <View style={styles.flex}>
@@ -137,90 +103,33 @@ export const TransactionSummary = () => {
             </View>
           </View>
         ),
-      info: strings.priceImpactInfo,
       warning: priceImpactRisk === 'high',
       hidden: orderData.type === 'limit',
     },
+    {
+      label: strings.swapMinAdaTitle,
+      value: <Text style={styles.text}>{minAdaInfoValue}</Text>,
+    },
+    {
+      label: strings.swapFeesTitle,
+      value: <Text style={styles.text}>{formattedFeeText}</Text>,
+    },
+    {
+      label: strings.swapLiqProvFee,
+      value: <Text style={styles.text}>{liqFeeQuantityFormatted}</Text>,
+    },
+    {
+      label: strings.swapMinReceivedTitle,
+      value: (
+        <View style={styles.flex}>
+          <Text style={[styles.text, styles.alignRight]}>{minReceivedInfoValue}</Text>
+        </View>
+      ),
+    },
   ]
 
   return (
     <View>
-      <LinearGradient colors={colors.gradientColor} style={styles.card}>
-        <Text style={styles.cardText}>{strings.total}</Text>
-
-        <View style={styles.total}>
-          <Text style={[styles.cardText, styles.cardTextValue]}>{formattedSellText}</Text>
-
-          {!isSellPrimary && (
-            <>
-              <Spacer height={6} />
-
-              <Text style={[styles.cardText, styles.cardTextValue]}>{formattedFeeText}</Text>
-            </>
-          )}
-
-          {!!calculation.ptTotalValueSpent && (
-            <>
-              <Spacer height={6} />
-
-              <PairedBalance
-                amount={{
-                  info: wallet.portfolioPrimaryTokenInfo,
-                  quantity: BigInt(calculation.ptTotalValueSpent.quantity),
-                }}
-                textStyle={styles.pairedText}
-              />
-            </>
-          )}
-        </View>
-      </LinearGradient>
-
-      <Spacer height={24} />
-
-      {feesInfo.map((orderInfo) => {
-        if (orderInfo?.hidden) {
-          return null
-        }
-        return (
-          <View key={orderInfo.label}>
-            <Spacer height={8} />
-
-            <View style={styles.flexBetween}>
-              <View style={styles.flex}>
-                <Text style={[styles.text, styles.gray]}>{orderInfo.label}</Text>
-
-                <Spacer width={8} />
-
-                {orderInfo.info != undefined && (
-                  <TouchableOpacity
-                    onPress={() => {
-                      openModal(
-                        orderInfo.label,
-                        <View style={styles.modalContent}>
-                          <Text style={styles.modalText}>{orderInfo.info}</Text>
-
-                          <Spacer fill />
-
-                          <SwapInfoLink />
-
-                          <Spacer height={24} />
-                        </View>,
-                      )
-                    }}
-                  >
-                    <Icon.Info size={24} color={colors.icon} />
-                  </TouchableOpacity>
-                )}
-              </View>
-
-              <View style={styles.orderValueContainer}>{orderInfo.value}</View>
-            </View>
-          </View>
-        )
-      })}
-
-      <Spacer height={16} />
-
       {(priceImpactRisk === 'moderate' || priceImpactRisk === 'high') && type === 'market' && (
         <View style={[styles.banner, {backgroundColor: priceImpactRiskTheme.background}]}>
           {priceImpactRisk === 'moderate' && <Icon.Info size={24} color={priceImpactRiskTextColor} />}
@@ -239,17 +148,41 @@ export const TransactionSummary = () => {
         </View>
       )}
 
-      <Spacer height={16} />
+      <Space height="lg" />
 
       <Text style={styles.amountItemLabel}>{strings.swapFrom}</Text>
 
       <TokenAmountItem amount={amounts.sell} orderType={type} />
 
-      <Spacer height={16} />
+      <Space height="lg" />
 
       <Text style={styles.amountItemLabel}>{strings.swapTo}</Text>
 
       <TokenAmountItem amount={amounts.buy} priceImpactRisk={priceImpactRisk} orderType={type} />
+
+      <Divider verticalSpace="lg" />
+
+      <Text style={styles.detailsTitle}>{strings.swapDetailsTitle}</Text>
+
+      {feesInfo.map((orderInfo) => {
+        if (orderInfo?.hidden) {
+          return null
+        }
+
+        return (
+          <View key={orderInfo.label}>
+            <Space height="sm" />
+
+            <View style={styles.flexBetween}>
+              <View style={styles.flex}>
+                <Text style={[styles.text, styles.gray]}>{orderInfo.label}</Text>
+              </View>
+
+              <View style={styles.orderValueContainer}>{orderInfo.value}</View>
+            </View>
+          </View>
+        )
+      })}
     </View>
   )
 }
@@ -258,49 +191,30 @@ const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
     priceImpactRiskContainer: {
-      flex: 1,
-      flexDirection: 'column',
-      justifyContent: 'flex-end',
-      alignItems: 'flex-end',
+      ...atoms.flex_1,
+      ...atoms.justify_end,
+      ...atoms.align_end,
     },
     priceImpactRiskText: {
       ...atoms.body_2_md_regular,
     },
-    alignRight: {
-      textAlign: 'right',
-    },
-    card: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'flex-start',
-      padding: 16,
-      borderRadius: 8,
-    },
-    cardText: {
-      fontSize: 18,
-      color: color.white_static,
+    priceImpactLowRiskText: {
+      color: color.secondary_600,
     },
-    cardTextValue: {
-      ...atoms.heading_4_medium,
-      lineHeight: 22,
-      textAlign: 'right',
-    },
-    pairedText: {
-      fontSize: 14,
-      color: color.white_static,
-      opacity: 0.75,
+    alignRight: {
+      ...atoms.text_right,
     },
     flexBetween: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'flex-start',
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+      ...atoms.align_start,
     },
     flex: {
-      flexDirection: 'row',
-      alignItems: 'center',
+      ...atoms.flex_row,
+      ...atoms.align_center,
     },
     text: {
-      textAlign: 'left',
+      ...atoms.text_left,
       ...atoms.body_1_lg_regular,
       color: color.gray_900,
     },
@@ -310,41 +224,31 @@ const useStyles = () => {
     amountItemLabel: {
       fontSize: 12,
       color: color.gray_900,
-      paddingBottom: 8,
-    },
-    modalContent: {
-      justifyContent: 'space-between',
-      flex: 1,
-      ...atoms.px_lg,
-    },
-    modalText: {
-      ...atoms.body_1_lg_regular,
-      color: color.gray_900,
+      ...atoms.pb_sm,
     },
     orderValueContainer: {
-      flexDirection: 'row',
-      alignItems: 'flex-end',
-      justifyContent: 'flex-end',
-      paddingLeft: 8,
-      flex: 1,
+      ...atoms.flex_row,
+      ...atoms.align_end,
+      ...atoms.justify_end,
+      ...atoms.pl_sm,
+      ...atoms.flex_1,
     },
     banner: {
-      paddingVertical: 12,
-      paddingHorizontal: 16,
-      borderRadius: 8,
-      gap: 8,
+      ...atoms.py_md,
+      ...atoms.px_lg,
+      ...atoms.rounded_sm,
+      ...atoms.gap_sm,
     },
     bannerText: {
-      fontSize: 14,
-      lineHeight: 22,
+      ...atoms.body_2_md_regular,
       color: color.gray_900,
     },
     bold: {
       ...atoms.body_2_md_medium,
     },
-    total: {
-      flexDirection: 'column',
-      alignItems: 'flex-end',
+    detailsTitle: {
+      ...atoms.body_1_lg_medium,
+      color: color.text_gray_medium,
     },
   })
 
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
index 83748dad30..6485c9d1e0 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/StartSwapOrderScreen.tsx
@@ -194,7 +194,7 @@ export const StartSwapOrderScreen = () => {
       ),
     })
 
-    navigateTo.confirmTx()
+    navigateTo.reviewSwap()
   }
 
   const createSwapOrder = (orderData: Swap.CreateOrderData) => {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
index ead8c75e44..6c4f796678 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartOrderSwapScreen/ListOrders/OpenOrders.tsx
@@ -34,7 +34,7 @@ import {useTransactionInfos} from '../../../../../yoroi-wallets/hooks'
 import {usePortfolioTokenInfos} from '../../../../Portfolio/common/hooks/usePortfolioTokenInfos'
 import {TokenInfoIcon} from '../../../../Portfolio/common/TokenAmountItem/TokenInfoIcon'
 import {useSearch} from '../../../../Search/SearchContext'
-import {getCollateralAmountInLovelace} from '../../../../Settings/ManageCollateral/helpers'
+import {getCollateralAmountInLovelace} from '../../../../Settings/useCases/changeWalletSettings/ManageCollateral/helpers'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {ConfirmRawTx} from '../../../common/ConfirmRawTx/ConfirmRawTx'
 import {Counter} from '../../../common/Counter/Counter'
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/index.ts b/apps/wallet-mobile/src/features/Swap/useCases/index.ts
index dd252fe940..285bb7163c 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/index.ts
+++ b/apps/wallet-mobile/src/features/Swap/useCases/index.ts
@@ -1,4 +1,3 @@
-export * from './ConfirmTxScreen/ConfirmTxScreen'
 export * from './ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen'
 export * from './ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen'
 export * from './StartOrderSwapScreen/CreateOrder/EditPool/SelectPoolFromListScreen/SelectPoolFromListScreen'
diff --git a/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
index 5e49b3da57..f776390702 100644
--- a/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
@@ -36,15 +36,15 @@ import {SelectTokenFromListScreen} from '../Send/useCases/ListAmountsToSend/AddT
 import {EditAmountScreen} from '../Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen'
 import {ListAmountsToSendScreen} from '../Send/useCases/ListAmountsToSend/ListAmountsToSendScreen'
 import {StartMultiTokenTxScreen} from '../Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen'
-import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {SwapTabNavigator} from '../Swap/SwapNavigator'
 import {
-  ConfirmTxScreen as ConfirmTxSwapScreen,
   EditSlippageScreen,
   SelectPoolFromListScreen,
   ShowFailedTxScreen as FailedTxSwapScreen,
   ShowSubmittedTxScreen as SubmittedTxSwapScreen,
 } from '../Swap/useCases'
+import {ReviewSwap} from '../Swap/useCases/ReviewSwap/ReviewSwap'
 import {ShowPreprodNoticeScreen} from '../Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen'
 import {ShowSanchoNoticeScreen} from '../Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen'
 import {SelectBuyTokenFromListScreen} from '../Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen'
@@ -242,10 +242,10 @@ export const TxHistoryNavigator = () => {
               />
 
               <Stack.Screen
-                name="swap-confirm-tx"
-                component={ConfirmTxSwapScreen}
+                name="swap-review"
+                component={ReviewSwap}
                 options={{
-                  title: strings.confirmationTransaction,
+                  title: strings.reviewSwapTitle,
                 }}
               />
 
@@ -421,6 +421,10 @@ const messages = defineMessages({
     id: 'swap.swapScreen.swapTo',
     defaultMessage: '!!!Swap to',
   },
+  reviewSwapTitle: {
+    id: 'swap.review.title',
+    defaultMessage: '!!!Swap review',
+  },
   slippageTolerance: {
     id: 'swap.swapScreen.slippageTolerance',
     defaultMessage: '!!!Slippage Tolerance',
@@ -500,6 +504,7 @@ const useStrings = () => {
   return {
     claimShowSuccess: intl.formatMessage(messages.claimShowSuccessTitle),
     confirmationTransaction: intl.formatMessage(messages.confirmationTransaction),
+    reviewSwapTitle: intl.formatMessage(messages.reviewSwapTitle),
     confirmTitle: intl.formatMessage(messages.confirmTitle),
     describeSelectedAddressTitle: intl.formatMessage(messages.describeSelectedAddressTitle),
     editAmountTitle: intl.formatMessage(messages.editAmountTitle),
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AssetList.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AssetList.tsx
index 969633161f..78426426e7 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AssetList.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/AssetList.tsx
@@ -10,7 +10,7 @@ import {isEmptyString} from '../../../../kernel/utils'
 import {CardanoTypes} from '../../../../yoroi-wallets/cardano/types'
 import {formatTokenAmount} from '../../../../yoroi-wallets/utils/format'
 import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useStrings} from '../../common/strings'
 import {useAssetListStyles} from './AssetListTransaction.style'
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
index b0f9dcc120..e6fb7b2aa1 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
@@ -35,7 +35,7 @@ import {useTransactionInfos} from '../../../../yoroi-wallets/hooks'
 import {TransactionInfo} from '../../../../yoroi-wallets/types/other'
 import {formatDateAndTime, formatTokenWithSymbol} from '../../../../yoroi-wallets/utils/format'
 import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useBestBlock} from '../../../WalletManager/common/hooks/useBestBlock'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useWalletManager} from '../../../WalletManager/context/WalletManagerProvider'
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/BalanceBanner.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/BalanceBanner.tsx
index 37df545414..7855e05d08 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/BalanceBanner.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/BalanceBanner.tsx
@@ -9,7 +9,7 @@ import {Icon} from '../../../../components/Icon'
 import {PairedBalance} from '../../../../components/PairedBalance/PairedBalance'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {usePortfolioPrimaryBalance} from '../../../Portfolio/common/hooks/usePortfolioPrimaryBalance'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 
 export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/LockedDeposit.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/LockedDeposit.tsx
index 9b69a7c132..62e970d484 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/LockedDeposit.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/LockedDeposit.tsx
@@ -6,7 +6,7 @@ import {StyleSheet, View} from 'react-native'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Text} from '../../../../components/Text'
 import {usePortfolioPrimaryBreakdown} from '../../../Portfolio/common/hooks/usePortfolioPrimaryBreakdown'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useStrings} from '../../common/strings'
 
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxList/TxListItem.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxList/TxListItem.tsx
index b57e275003..abdb2cce1f 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxList/TxListItem.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxList/TxListItem.tsx
@@ -24,8 +24,8 @@ import {
   formatTokenInteger,
 } from '../../../../yoroi-wallets/utils/format'
 import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
-import {useCurrencyPairing} from '../../../Settings/Currency/CurrencyContext'
-import {usePrivacyMode} from '../../../Settings/PrivacyMode/PrivacyMode'
+import {useCurrencyPairing} from '../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
+import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useStrings} from '../../common/strings'
 import {useTxFilter} from './TxFilterProvider'
diff --git a/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/AggregatedBalance.tsx b/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/AggregatedBalance.tsx
index 6578a1f888..fe36c0911c 100644
--- a/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/AggregatedBalance.tsx
+++ b/apps/wallet-mobile/src/features/WalletManager/useCases/SelectWalletFromListScreen/AggregatedBalance.tsx
@@ -10,7 +10,7 @@ import {usePortfolioTokenActivity} from '../../../Portfolio/common/PortfolioToke
 import {BalanceCardContent} from '../../../Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardContent'
 import {BalanceCardSkeleton} from '../../../Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceCardSkeleton'
 import {BalanceHeaderCard} from '../../../Portfolio/useCases/PortfolioDashboard/BalanceCard/BalanceHeaderCard'
-import {useCurrencyPairing} from '../../../Settings/Currency/CurrencyContext'
+import {useCurrencyPairing} from '../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedNetwork} from '../../common/hooks/useSelectedNetwork'
 
 export const AggregatedBalance = () => {
diff --git a/apps/wallet-mobile/src/hooks/useAllowScreenShot.tsx b/apps/wallet-mobile/src/hooks/useAllowScreenShot.tsx
index e5b2cac85d..2b26590120 100644
--- a/apps/wallet-mobile/src/hooks/useAllowScreenShot.tsx
+++ b/apps/wallet-mobile/src/hooks/useAllowScreenShot.tsx
@@ -6,7 +6,7 @@ import {Platform} from 'react-native'
 import {
   changeScreenShareNativeSettingOnAndroid,
   useScreenShareSettingEnabled,
-} from '../features/Settings/ScreenShare/ScreenShare'
+} from '../features/Settings/useCases/changeAppSettings/ScreenShare/ScreenShare'
 
 export const useAllowScreenshot = () => {
   const {data: screenShareSettingEnabled} = useScreenShareSettingEnabled()
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index ad8c99b4a8..28cf5c2bcc 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -1041,7 +1041,9 @@
   "swap.swapScreen.swapMinReceived": "Minimum amount of assets you can get because of the slippage tolerance.",
   "swap.swapScreen.swapMinReceivedTitle": "Min Received",
   "swap.swapScreen.swapTitle": "Swap",
+  "swap.swapScreen.swapDetailsTitle": "Swap details",
   "swap.swapScreen.swapTo": "Swap to",
+  "swap.review.title": "Swap review",
   "swap.swapScreen.tokenSwapTab": "Asset swap",
   "swap.swapScreen.transactionDisplay": "In a few minutes, your transactions will be displayed both in the list of transaction and Open swap orders",
   "swap.swapScreen.transactionSigned": "Transaction submitted",
@@ -1229,6 +1231,7 @@
   "portfolio.portfolioTokensDetailScreen.detailsOn": "Details on",
   "txReview.tabLabel.utxos": "UTxOs",
   "txReview.tabLabel.overview": "Overview",
+  "txReview.tabLabel.metadataTab": "Metadata",
   "txReview.overview.wallet": "Wallet",
   "txReview.fee": "Fee",
   "txReview.overview.myWalletLabel": "Your Wallet",
@@ -1239,6 +1242,8 @@
   "txReview.utxos.utxosOutputsLabel": "Outputs",
   "txReview.utxos.utxosYourAddressLabel": "Your address",
   "txReview.utxos.utxosForeignAddressLabel": "Foreign address",
+  "txReview.metadata.metadataHash": "Metadata hash",
+  "txReview.metadata.metadataJsonLabel": "Metadata",
   "txReview.title": "Transaction Review",
   "txReview.confirm": "Confirm",
   "txReview.tokenDetails.overViewTab.title": "Overview",
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index a66c01b590..583ef99c02 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -178,7 +178,7 @@ type ClaimRoutes = {
 
 type SwapTokenRoutes = {
   'swap-start-swap': NavigatorScreenParams<SwapTabRoutes>
-  'swap-confirm-tx': undefined
+  'swap-review': undefined
   'swap-select-sell-token': undefined
   'swap-select-buy-token': undefined
   'swap-edit-slippage': undefined
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx b/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
index 96760da7bf..9e579faaa1 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
@@ -5,7 +5,7 @@ import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 
-import {NetworkTag} from '../../features/Settings/ChangeNetwork/NetworkTag'
+import {NetworkTag} from '../../features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {useGovernanceManagerMaker} from '../../features/Staking/Governance/common/helpers'
 import {useSelectedWallet} from '../../features/WalletManager/common/hooks/useSelectedWallet'
 import {DashboardRoutes, defaultStackNavigationOptions} from '../../kernel/navigation'
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
index 87535c2fed..0f121bb7e9 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/UserSummary.tsx
@@ -9,7 +9,7 @@ import {Icon} from '../../components/Icon'
 import {Space} from '../../components/Space/Space'
 import {Text} from '../../components/Text'
 import {TitledCard} from '../../components/TitledCard'
-import {usePrivacyMode} from '../../features/Settings/PrivacyMode/PrivacyMode'
+import {usePrivacyMode} from '../../features/Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useSelectedWallet} from '../../features/WalletManager/common/hooks/useSelectedWallet'
 import globalMessages from '../../kernel/i18n/global-messages'
 import {formatAdaWithText} from '../../yoroi-wallets/utils/format'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
index 06ea9e9790..ce03da0a48 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
@@ -23,6 +23,7 @@ describe('cip30ExtensionMaker', () => {
   })
 
   it('should support getBalance', async () => {
+    console.log('test-1')
     const cip30 = cip30ExtensionMaker(mocks.wallet, mocks.walletMeta)
     const result = await cip30.getBalance()
     expect(result).toBeDefined()
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
index 226323f31c..442a33630b 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-empty */
 import {SendToken} from '@emurgo/yoroi-lib'
+import {invalid} from '@yoroi/common'
 import {Balance, Chain, Portfolio, Wallet} from '@yoroi/types'
 import {BigNumber} from 'bignumber.js'
 import {Buffer} from 'buffer'
@@ -13,7 +14,7 @@ import {toAssetNameHex, toPolicyId} from './api/utils'
 import {withMinAmounts} from './getMinAmounts'
 import {MultiToken} from './MultiToken'
 import {CardanoTypes} from './types'
-import {wrappedCsl as getCSL} from './wrappedCsl'
+import {wrappedCsl as getCSL, wrappedCsl} from './wrappedCsl'
 
 export const deriveRewardAddressHex = async (
   accountPubKeyHex: string,
@@ -31,44 +32,22 @@ export const deriveRewardAddressHex = async (
   return result
 }
 
-export const getAddressType = async (address: string) => {
-  const isKeyAddress = await getIsAddressKeyBech32Format(address)
-  if (isKeyAddress) return 'key'
+export const deriveRewardAddressFromAddress = async (address: string, chainId: number): Promise<string> => {
+  const {csl, release} = wrappedCsl()
 
-  const isScriptAddress = await getIsAddressScriptBech32Format(address)
-  if (isScriptAddress) return 'script'
-
-  const isRewardAddress = await getIsRewardAddressBech32Format(address)
-  if (isRewardAddress) return 'reward'
-
-  throw new Error('invalid address format')
-}
-
-const getIsAddressKeyBech32Format = async (address: string): Promise<boolean> => {
-  try {
-    await CardanoMobile.Ed25519KeyHash.fromBech32(address)
-    return true
-  } catch {
-    return false
-  }
-}
-
-const getIsAddressScriptBech32Format = async (address: string): Promise<boolean> => {
   try {
-    await CardanoMobile.ScriptHash.fromBech32(address)
-    return true
-  } catch {
-    return false
-  }
-}
-
-const getIsRewardAddressBech32Format = async (addressBech32: string): Promise<boolean> => {
-  try {
-    const address = await CardanoMobile.Address.fromBech32(addressBech32)
-    await CardanoMobile.RewardAddress.fromAddress(address)
-    return true
-  } catch {
-    return false
+    const result = await csl.Address.fromBech32(address)
+      .then((address) => csl.BaseAddress.fromAddress(address))
+      .then((baseAddress) => baseAddress?.stakeCred() ?? invalid('invalid base address'))
+      .then((stakeCredential) => csl.RewardAddress.new(chainId, stakeCredential))
+      .then((rewardAddress) => rewardAddress.toAddress())
+      .then((rewardAddrAsAddress) => rewardAddrAsAddress.toBech32(undefined))
+      .catch((error) => error)
+
+    if (typeof result !== 'string') throw new Error('Its not possible to derive reward address')
+    return result
+  } finally {
+    release()
   }
 }
 
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index ce9df7a0e8..c439bb525b 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 306,
       "column": 22,
-      "index": 10668
+      "index": 10719
     },
     "end": {
       "line": 309,
       "column": 3,
-      "index": 10771
+      "index": 10822
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 310,
       "column": 14,
-      "index": 10787
+      "index": 10838
     },
     "end": {
       "line": 313,
       "column": 3,
-      "index": 10886
+      "index": 10937
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 314,
       "column": 17,
-      "index": 10905
+      "index": 10956
     },
     "end": {
       "line": 317,
       "column": 3,
-      "index": 11010
+      "index": 11061
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 318,
       "column": 19,
-      "index": 11031
+      "index": 11082
     },
     "end": {
       "line": 321,
       "column": 3,
-      "index": 11128
+      "index": 11179
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 322,
       "column": 18,
-      "index": 11148
+      "index": 11199
     },
     "end": {
       "line": 325,
       "column": 3,
-      "index": 11243
+      "index": 11294
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 326,
       "column": 16,
-      "index": 11261
+      "index": 11312
     },
     "end": {
       "line": 329,
       "column": 3,
-      "index": 11359
+      "index": 11410
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 330,
       "column": 17,
-      "index": 11378
+      "index": 11429
     },
     "end": {
       "line": 333,
       "column": 3,
-      "index": 11443
+      "index": 11494
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 334,
       "column": 14,
-      "index": 11459
+      "index": 11510
     },
     "end": {
       "line": 337,
       "column": 3,
-      "index": 11553
+      "index": 11604
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 338,
       "column": 14,
-      "index": 11569
+      "index": 11620
     },
     "end": {
       "line": 341,
       "column": 3,
-      "index": 11621
+      "index": 11672
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 342,
       "column": 18,
-      "index": 11641
+      "index": 11692
     },
     "end": {
       "line": 345,
       "column": 3,
-      "index": 11730
+      "index": 11781
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 346,
       "column": 31,
-      "index": 11763
+      "index": 11814
     },
     "end": {
       "line": 349,
       "column": 3,
-      "index": 11872
+      "index": 11923
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 350,
       "column": 19,
-      "index": 11893
+      "index": 11944
     },
     "end": {
       "line": 353,
       "column": 3,
-      "index": 11962
+      "index": 12013
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json b/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
index 33ff0e463c..c44d9ccf9b 100644
--- a/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
+++ b/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 107,
       "column": 22,
-      "index": 3609
+      "index": 3663
     },
     "end": {
       "line": 110,
       "column": 3,
-      "index": 3741
+      "index": 3795
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
index f7ec21070a..fdeb1cc006 100644
--- a/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 39,
+      "line": 42,
       "column": 11,
-      "index": 1785
+      "index": 1976
     },
     "end": {
-      "line": 42,
+      "line": 45,
       "column": 3,
-      "index": 1852
+      "index": 2043
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!UTxOs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 43,
+      "line": 46,
       "column": 9,
-      "index": 1863
+      "index": 2054
     },
     "end": {
-      "line": 46,
+      "line": 49,
       "column": 3,
-      "index": 1926
+      "index": 2117
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!UTxOs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 47,
+      "line": 50,
       "column": 12,
-      "index": 1940
+      "index": 2131
     },
     "end": {
-      "line": 50,
+      "line": 53,
       "column": 3,
-      "index": 2012
+      "index": 2203
     }
   },
   {
@@ -49,14 +49,59 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 51,
+      "line": 54,
       "column": 15,
-      "index": 2029
+      "index": 2220
     },
     "end": {
-      "line": 54,
+      "line": 57,
+      "column": 3,
+      "index": 2298
+    }
+  },
+  {
+    "id": "txReview.tabLabel.metadataTab",
+    "defaultMessage": "!!!Metadata",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 58,
+      "column": 15,
+      "index": 2315
+    },
+    "end": {
+      "line": 61,
+      "column": 3,
+      "index": 2396
+    }
+  },
+  {
+    "id": "txReview.metadata.metadataHash",
+    "defaultMessage": "!!!Metadata hash",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 62,
+      "column": 16,
+      "index": 2414
+    },
+    "end": {
+      "line": 65,
+      "column": 3,
+      "index": 2501
+    }
+  },
+  {
+    "id": "txReview.metadata.metadataJsonLabel",
+    "defaultMessage": "!!!Metadata",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 66,
+      "column": 21,
+      "index": 2524
+    },
+    "end": {
+      "line": 69,
       "column": 3,
-      "index": 2107
+      "index": 2611
     }
   },
   {
@@ -64,14 +109,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 55,
+      "line": 70,
       "column": 15,
-      "index": 2124
+      "index": 2628
     },
     "end": {
-      "line": 58,
+      "line": 73,
       "column": 3,
-      "index": 2198
+      "index": 2702
     }
   },
   {
@@ -79,14 +124,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 59,
+      "line": 74,
       "column": 12,
-      "index": 2212
+      "index": 2716
     },
     "end": {
-      "line": 62,
+      "line": 77,
       "column": 3,
-      "index": 2271
+      "index": 2775
     }
   },
   {
@@ -94,14 +139,14 @@
     "defaultMessage": "!!!Your Wallet",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 63,
+      "line": 78,
       "column": 17,
-      "index": 2290
+      "index": 2794
     },
     "end": {
-      "line": 66,
+      "line": 81,
       "column": 3,
-      "index": 2376
+      "index": 2880
     }
   },
   {
@@ -109,14 +154,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 67,
+      "line": 82,
       "column": 13,
-      "index": 2391
+      "index": 2895
     },
     "end": {
-      "line": 70,
+      "line": 85,
       "column": 3,
-      "index": 2466
+      "index": 2970
     }
   },
   {
@@ -124,14 +169,14 @@
     "defaultMessage": "!!!To",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 71,
+      "line": 86,
       "column": 18,
-      "index": 2486
+      "index": 2990
     },
     "end": {
-      "line": 74,
+      "line": 89,
       "column": 3,
-      "index": 2564
+      "index": 3068
     }
   },
   {
@@ -139,14 +184,14 @@
     "defaultMessage": "!!!To script",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 75,
+      "line": 90,
       "column": 24,
-      "index": 2590
+      "index": 3094
     },
     "end": {
-      "line": 78,
+      "line": 93,
       "column": 3,
-      "index": 2681
+      "index": 3185
     }
   },
   {
@@ -154,14 +199,14 @@
     "defaultMessage": "!!!Inputs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 79,
+      "line": 94,
       "column": 20,
-      "index": 2703
+      "index": 3207
     },
     "end": {
-      "line": 82,
+      "line": 97,
       "column": 3,
-      "index": 2784
+      "index": 3288
     }
   },
   {
@@ -169,14 +214,14 @@
     "defaultMessage": "!!!Outputs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 83,
+      "line": 98,
       "column": 21,
-      "index": 2807
+      "index": 3311
     },
     "end": {
-      "line": 86,
+      "line": 101,
       "column": 3,
-      "index": 2890
+      "index": 3394
     }
   },
   {
@@ -184,14 +229,14 @@
     "defaultMessage": "!!!Your address",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 87,
+      "line": 102,
       "column": 25,
-      "index": 2917
+      "index": 3421
     },
     "end": {
-      "line": 90,
+      "line": 105,
       "column": 3,
-      "index": 3009
+      "index": 3513
     }
   },
   {
@@ -199,14 +244,14 @@
     "defaultMessage": "!!!Foreign address",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 91,
+      "line": 106,
       "column": 28,
-      "index": 3039
+      "index": 3543
     },
     "end": {
-      "line": 94,
+      "line": 109,
       "column": 3,
-      "index": 3137
+      "index": 3641
     }
   },
   {
@@ -214,14 +259,14 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 95,
+      "line": 110,
       "column": 12,
-      "index": 3151
+      "index": 3655
     },
     "end": {
-      "line": 98,
+      "line": 113,
       "column": 3,
-      "index": 3242
+      "index": 3746
     }
   },
   {
@@ -229,14 +274,14 @@
     "defaultMessage": "!!!JSON",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 99,
+      "line": 114,
       "column": 8,
-      "index": 3252
+      "index": 3756
     },
     "end": {
-      "line": 102,
+      "line": 117,
       "column": 3,
-      "index": 3335
+      "index": 3839
     }
   },
   {
@@ -244,14 +289,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 103,
+      "line": 118,
       "column": 12,
-      "index": 3349
+      "index": 3853
     },
     "end": {
-      "line": 106,
+      "line": 121,
       "column": 3,
-      "index": 3439
+      "index": 3943
     }
   },
   {
@@ -259,14 +304,14 @@
     "defaultMessage": "!!!Policy ID",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 107,
+      "line": 122,
       "column": 12,
-      "index": 3453
+      "index": 3957
     },
     "end": {
-      "line": 110,
+      "line": 125,
       "column": 3,
-      "index": 3542
+      "index": 4046
     }
   },
   {
@@ -274,14 +319,14 @@
     "defaultMessage": "!!!Fingerprint",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 111,
+      "line": 126,
       "column": 15,
-      "index": 3559
+      "index": 4063
     },
     "end": {
-      "line": 114,
+      "line": 129,
       "column": 3,
-      "index": 3653
+      "index": 4157
     }
   },
   {
@@ -289,14 +334,14 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 115,
+      "line": 130,
       "column": 8,
-      "index": 3663
+      "index": 4167
     },
     "end": {
-      "line": 118,
+      "line": 133,
       "column": 3,
-      "index": 3755
+      "index": 4259
     }
   },
   {
@@ -304,14 +349,14 @@
     "defaultMessage": "!!!Token Supply",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 119,
+      "line": 134,
       "column": 15,
-      "index": 3772
+      "index": 4276
     },
     "end": {
-      "line": 122,
+      "line": 137,
       "column": 3,
-      "index": 3879
+      "index": 4383
     }
   },
   {
@@ -319,14 +364,14 @@
     "defaultMessage": "!!!Symbol",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 123,
+      "line": 138,
       "column": 10,
-      "index": 3891
+      "index": 4395
     },
     "end": {
-      "line": 126,
+      "line": 141,
       "column": 3,
-      "index": 3987
+      "index": 4491
     }
   },
   {
@@ -334,14 +379,14 @@
     "defaultMessage": "!!!Description",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 127,
+      "line": 142,
       "column": 15,
-      "index": 4004
+      "index": 4508
     },
     "end": {
-      "line": 130,
+      "line": 145,
       "column": 3,
-      "index": 4110
+      "index": 4614
     }
   },
   {
@@ -349,14 +394,14 @@
     "defaultMessage": "!!!Details on",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 131,
+      "line": 146,
       "column": 11,
-      "index": 4123
+      "index": 4627
     },
     "end": {
-      "line": 134,
+      "line": 149,
       "column": 3,
-      "index": 4224
+      "index": 4728
     }
   },
   {
@@ -364,14 +409,14 @@
     "defaultMessage": "!!!Asset Details",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 135,
+      "line": 150,
       "column": 21,
-      "index": 4247
+      "index": 4751
     },
     "end": {
-      "line": 138,
+      "line": 153,
       "column": 3,
-      "index": 4331
+      "index": 4835
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
index 74e1f83c6b..36a1856b3a 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 261,
       "column": 11,
-      "index": 9358
+      "index": 9388
     },
     "end": {
       "line": 264,
       "column": 3,
-      "index": 9468
+      "index": 9498
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 265,
       "column": 21,
-      "index": 9491
+      "index": 9521
     },
     "end": {
       "line": 268,
       "column": 3,
-      "index": 9624
+      "index": 9654
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 269,
       "column": 18,
-      "index": 9644
+      "index": 9674
     },
     "end": {
       "line": 272,
       "column": 3,
-      "index": 9756
+      "index": 9786
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 273,
       "column": 15,
-      "index": 9773
+      "index": 9803
     },
     "end": {
       "line": 276,
       "column": 3,
-      "index": 9879
+      "index": 9909
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 277,
       "column": 22,
-      "index": 9903
+      "index": 9933
     },
     "end": {
       "line": 280,
       "column": 3,
-      "index": 10024
+      "index": 10054
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 281,
       "column": 9,
-      "index": 10035
+      "index": 10065
     },
     "end": {
       "line": 284,
       "column": 3,
-      "index": 10135
+      "index": 10165
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 285,
       "column": 18,
-      "index": 10155
+      "index": 10185
     },
     "end": {
       "line": 288,
       "column": 3,
-      "index": 10282
+      "index": 10312
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 289,
       "column": 13,
-      "index": 10297
+      "index": 10327
     },
     "end": {
       "line": 292,
       "column": 3,
-      "index": 10406
+      "index": 10436
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 293,
       "column": 15,
-      "index": 10423
+      "index": 10453
     },
     "end": {
       "line": 296,
       "column": 3,
-      "index": 10536
+      "index": 10566
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 297,
       "column": 19,
-      "index": 10557
+      "index": 10587
     },
     "end": {
       "line": 300,
       "column": 3,
-      "index": 10718
+      "index": 10748
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 301,
       "column": 20,
-      "index": 10740
+      "index": 10770
     },
     "end": {
       "line": 304,
       "column": 3,
-      "index": 10874
+      "index": 10904
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 305,
       "column": 24,
-      "index": 10900
+      "index": 10930
     },
     "end": {
       "line": 308,
       "column": 3,
-      "index": 11083
+      "index": 11113
     }
   },
   {
@@ -186,12 +186,12 @@
     "start": {
       "line": 309,
       "column": 18,
-      "index": 11103
+      "index": 11133
     },
     "end": {
       "line": 312,
       "column": 3,
-      "index": 11234
+      "index": 11264
     }
   },
   {
@@ -201,12 +201,12 @@
     "start": {
       "line": 313,
       "column": 22,
-      "index": 11258
+      "index": 11288
     },
     "end": {
       "line": 316,
       "column": 3,
-      "index": 11439
+      "index": 11469
     }
   },
   {
@@ -216,12 +216,12 @@
     "start": {
       "line": 317,
       "column": 13,
-      "index": 11454
+      "index": 11484
     },
     "end": {
       "line": 320,
       "column": 3,
-      "index": 11562
+      "index": 11592
     }
   },
   {
@@ -231,12 +231,12 @@
     "start": {
       "line": 321,
       "column": 17,
-      "index": 11581
+      "index": 11611
     },
     "end": {
       "line": 324,
       "column": 3,
-      "index": 11698
+      "index": 11728
     }
   },
   {
@@ -246,12 +246,12 @@
     "start": {
       "line": 325,
       "column": 17,
-      "index": 11717
+      "index": 11747
     },
     "end": {
       "line": 328,
       "column": 3,
-      "index": 11840
+      "index": 11870
     }
   },
   {
@@ -261,12 +261,12 @@
     "start": {
       "line": 329,
       "column": 21,
-      "index": 11863
+      "index": 11893
     },
     "end": {
       "line": 333,
       "column": 3,
-      "index": 12081
+      "index": 12111
     }
   },
   {
@@ -276,12 +276,12 @@
     "start": {
       "line": 334,
       "column": 11,
-      "index": 12094
+      "index": 12124
     },
     "end": {
       "line": 337,
       "column": 3,
-      "index": 12198
+      "index": 12228
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
index 070d220f6c..31687f712a 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 256,
+      "line": 262,
       "column": 18,
-      "index": 7773
+      "index": 8363
     },
     "end": {
-      "line": 259,
+      "line": 265,
       "column": 3,
-      "index": 7871
+      "index": 8461
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Application",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 260,
+      "line": 266,
       "column": 15,
-      "index": 7888
+      "index": 8478
     },
     "end": {
-      "line": 263,
+      "line": 269,
       "column": 3,
-      "index": 7997
+      "index": 8587
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Change PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 264,
+      "line": 270,
       "column": 24,
-      "index": 8023
+      "index": 8613
     },
     "end": {
-      "line": 267,
+      "line": 273,
       "column": 3,
-      "index": 8132
+      "index": 8722
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Change spending password",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 268,
+      "line": 274,
       "column": 23,
-      "index": 8157
+      "index": 8747
     },
     "end": {
-      "line": 271,
+      "line": 277,
       "column": 3,
-      "index": 8271
+      "index": 8861
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 272,
+      "line": 278,
       "column": 21,
-      "index": 8294
+      "index": 8884
     },
     "end": {
-      "line": 275,
+      "line": 281,
       "column": 3,
-      "index": 8395
+      "index": 8985
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Terms of Service Agreement",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 276,
+      "line": 282,
       "column": 23,
-      "index": 8420
+      "index": 9010
     },
     "end": {
-      "line": 279,
+      "line": 285,
       "column": 3,
-      "index": 8536
+      "index": 9126
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change wallet name",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 280,
+      "line": 286,
       "column": 25,
-      "index": 8563
+      "index": 9153
     },
     "end": {
-      "line": 283,
+      "line": 289,
       "column": 3,
-      "index": 8667
+      "index": 9257
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Support",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 284,
+      "line": 290,
       "column": 16,
-      "index": 8685
+      "index": 9275
     },
     "end": {
-      "line": 287,
+      "line": 293,
       "column": 3,
-      "index": 8776
+      "index": 9366
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 288,
+      "line": 294,
       "column": 31,
-      "index": 8809
+      "index": 9399
     },
     "end": {
-      "line": 291,
+      "line": 297,
       "column": 3,
-      "index": 8924
+      "index": 9514
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 292,
+      "line": 298,
       "column": 32,
-      "index": 8958
+      "index": 9548
     },
     "end": {
-      "line": 295,
+      "line": 301,
       "column": 3,
-      "index": 9074
+      "index": 9664
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 296,
+      "line": 302,
       "column": 18,
-      "index": 9094
+      "index": 9684
     },
     "end": {
-      "line": 299,
+      "line": 305,
       "column": 3,
-      "index": 9192
+      "index": 9782
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 300,
+      "line": 306,
       "column": 17,
-      "index": 9211
+      "index": 9801
     },
     "end": {
-      "line": 303,
+      "line": 309,
       "column": 3,
-      "index": 9314
+      "index": 9904
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Language",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 304,
+      "line": 310,
       "column": 17,
-      "index": 9333
+      "index": 9923
     },
     "end": {
-      "line": 307,
+      "line": 313,
       "column": 3,
-      "index": 9431
+      "index": 10021
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Theming",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 308,
+      "line": 314,
       "column": 14,
-      "index": 9447
+      "index": 10037
     },
     "end": {
-      "line": 311,
+      "line": 317,
       "column": 3,
-      "index": 9541
+      "index": 10131
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Network",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 312,
+      "line": 318,
       "column": 16,
-      "index": 9559
+      "index": 10149
     },
     "end": {
-      "line": 315,
+      "line": 321,
       "column": 3,
-      "index": 9655
+      "index": 10245
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!App settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 316,
+      "line": 322,
       "column": 20,
-      "index": 9677
+      "index": 10267
     },
     "end": {
-      "line": 319,
+      "line": 325,
       "column": 3,
-      "index": 9795
+      "index": 10385
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 320,
+      "line": 326,
       "column": 14,
-      "index": 9811
+      "index": 10401
     },
     "end": {
-      "line": 323,
+      "line": 329,
       "column": 3,
-      "index": 9911
+      "index": 10501
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Privacy Policy",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 324,
+      "line": 330,
       "column": 22,
-      "index": 9935
+      "index": 10525
     },
     "end": {
-      "line": 327,
+      "line": 333,
       "column": 3,
-      "index": 10038
+      "index": 10628
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Collateral",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 328,
+      "line": 334,
       "column": 14,
-      "index": 10054
+      "index": 10644
     },
     "end": {
-      "line": 331,
+      "line": 337,
       "column": 3,
-      "index": 10125
+      "index": 10715
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Log",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 332,
+      "line": 338,
       "column": 18,
-      "index": 10145
+      "index": 10735
     },
     "end": {
-      "line": 335,
+      "line": 341,
       "column": 3,
-      "index": 10202
+      "index": 10792
     }
   }
 ]
\ 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 91a15ad429..f245bfae49 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
@@ -6,12 +6,12 @@
     "start": {
       "line": 214,
       "column": 11,
-      "index": 6741
+      "index": 6771
     },
     "end": {
       "line": 217,
       "column": 3,
-      "index": 6839
+      "index": 6869
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 218,
       "column": 11,
-      "index": 6852
+      "index": 6882
     },
     "end": {
       "line": 221,
       "column": 3,
-      "index": 6950
+      "index": 6980
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 222,
       "column": 16,
-      "index": 6968
+      "index": 6998
     },
     "end": {
       "line": 225,
       "column": 3,
-      "index": 7077
+      "index": 7107
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 226,
       "column": 10,
-      "index": 7089
+      "index": 7119
     },
     "end": {
       "line": 229,
       "column": 3,
-      "index": 7185
+      "index": 7215
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 230,
       "column": 14,
-      "index": 7201
+      "index": 7231
     },
     "end": {
       "line": 233,
       "column": 3,
-      "index": 7306
+      "index": 7336
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 234,
       "column": 12,
-      "index": 7320
+      "index": 7350
     },
     "end": {
       "line": 237,
       "column": 3,
-      "index": 7420
+      "index": 7450
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 238,
       "column": 18,
-      "index": 7440
+      "index": 7470
     },
     "end": {
       "line": 241,
       "column": 3,
-      "index": 7562
+      "index": 7592
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 242,
       "column": 20,
-      "index": 7584
+      "index": 7614
     },
     "end": {
       "line": 245,
       "column": 3,
-      "index": 7713
+      "index": 7743
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 246,
       "column": 24,
-      "index": 7739
+      "index": 7769
     },
     "end": {
       "line": 249,
       "column": 3,
-      "index": 7901
+      "index": 7931
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 250,
       "column": 16,
-      "index": 7919
+      "index": 7949
     },
     "end": {
       "line": 253,
       "column": 3,
-      "index": 8028
+      "index": 8058
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 254,
       "column": 14,
-      "index": 8044
+      "index": 8074
     },
     "end": {
       "line": 257,
       "column": 3,
-      "index": 8115
+      "index": 8145
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 258,
       "column": 21,
-      "index": 8138
+      "index": 8168
     },
     "end": {
       "line": 261,
       "column": 3,
-      "index": 8224
+      "index": 8254
     }
   },
   {
@@ -186,12 +186,12 @@
     "start": {
       "line": 262,
       "column": 17,
-      "index": 8243
+      "index": 8273
     },
     "end": {
       "line": 265,
       "column": 3,
-      "index": 8321
+      "index": 8351
     }
   },
   {
@@ -201,12 +201,12 @@
     "start": {
       "line": 266,
       "column": 25,
-      "index": 8348
+      "index": 8378
     },
     "end": {
       "line": 269,
       "column": 3,
-      "index": 8479
+      "index": 8509
     }
   },
   {
@@ -216,12 +216,12 @@
     "start": {
       "line": 271,
       "column": 11,
-      "index": 8540
+      "index": 8570
     },
     "end": {
       "line": 274,
       "column": 3,
-      "index": 8606
+      "index": 8636
     }
   },
   {
@@ -231,12 +231,12 @@
     "start": {
       "line": 275,
       "column": 14,
-      "index": 8622
+      "index": 8652
     },
     "end": {
       "line": 278,
       "column": 3,
-      "index": 8728
+      "index": 8758
     }
   },
   {
@@ -246,12 +246,12 @@
     "start": {
       "line": 279,
       "column": 15,
-      "index": 8745
+      "index": 8775
     },
     "end": {
       "line": 282,
       "column": 3,
-      "index": 8856
+      "index": 8886
     }
   },
   {
@@ -261,12 +261,12 @@
     "start": {
       "line": 283,
       "column": 17,
-      "index": 8875
+      "index": 8905
     },
     "end": {
       "line": 286,
       "column": 3,
-      "index": 8990
+      "index": 9020
     }
   },
   {
@@ -276,12 +276,12 @@
     "start": {
       "line": 287,
       "column": 21,
-      "index": 9013
+      "index": 9043
     },
     "end": {
       "line": 290,
       "column": 3,
-      "index": 9133
+      "index": 9163
     }
   },
   {
@@ -291,12 +291,12 @@
     "start": {
       "line": 291,
       "column": 9,
-      "index": 9144
+      "index": 9174
     },
     "end": {
       "line": 294,
       "column": 3,
-      "index": 9238
+      "index": 9268
     }
   },
   {
@@ -306,12 +306,12 @@
     "start": {
       "line": 295,
       "column": 10,
-      "index": 9250
+      "index": 9280
     },
     "end": {
       "line": 298,
       "column": 3,
-      "index": 9352
+      "index": 9382
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/About/About.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/About/About.json
new file mode 100644
index 0000000000..917c53445c
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/About/About.json
@@ -0,0 +1,107 @@
+[
+  {
+    "id": "global.currentVersion",
+    "defaultMessage": "!!!Current Version",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 101,
+      "column": 18,
+      "index": 2616
+    },
+    "end": {
+      "line": 104,
+      "column": 3,
+      "index": 2696
+    }
+  },
+  {
+    "id": "global.commit",
+    "defaultMessage": "!!!Commit",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 105,
+      "column": 10,
+      "index": 2708
+    },
+    "end": {
+      "line": 108,
+      "column": 3,
+      "index": 2771
+    }
+  },
+  {
+    "id": "global.network",
+    "defaultMessage": "!!!Network",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 109,
+      "column": 11,
+      "index": 2784
+    },
+    "end": {
+      "line": 112,
+      "column": 3,
+      "index": 2849
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.walletType",
+    "defaultMessage": "!!!Wallet type",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 113,
+      "column": 14,
+      "index": 2865
+    },
+    "end": {
+      "line": 116,
+      "column": 3,
+      "index": 2976
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.byronWallet",
+    "defaultMessage": "!!!Byron-era wallet",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 117,
+      "column": 15,
+      "index": 2993
+    },
+    "end": {
+      "line": 120,
+      "column": 3,
+      "index": 3104
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.shelleyWallet",
+    "defaultMessage": "!!!Shelley-era wallet",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 121,
+      "column": 17,
+      "index": 3123
+    },
+    "end": {
+      "line": 124,
+      "column": 3,
+      "index": 3238
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.unknownWalletType",
+    "defaultMessage": "!!!Unknown Wallet Type",
+    "file": "src/features/Settings/useCases/changeAppSettings/About/About.tsx",
+    "start": {
+      "line": 125,
+      "column": 21,
+      "index": 3261
+    },
+    "end": {
+      "line": 128,
+      "column": 3,
+      "index": 3381
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.json
new file mode 100644
index 0000000000..87bf1898bd
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.json
@@ -0,0 +1,287 @@
+[
+  {
+    "id": "components.settings.applicationsettingsscreen.label.general",
+    "defaultMessage": "!!!General",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 261,
+      "column": 11,
+      "index": 9382
+    },
+    "end": {
+      "line": 264,
+      "column": 3,
+      "index": 9492
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.label.securityReporting",
+    "defaultMessage": "!!!Security & Reporting",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 265,
+      "column": 21,
+      "index": 9515
+    },
+    "end": {
+      "line": 268,
+      "column": 3,
+      "index": 9648
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.selectLanguage",
+    "defaultMessage": "!!!Language",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 269,
+      "column": 18,
+      "index": 9668
+    },
+    "end": {
+      "line": 272,
+      "column": 3,
+      "index": 9780
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.selectTheme",
+    "defaultMessage": "!!!Theme",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 273,
+      "column": 15,
+      "index": 9797
+    },
+    "end": {
+      "line": 276,
+      "column": 3,
+      "index": 9903
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.selectFiatCurrency",
+    "defaultMessage": "!!!Fiat Currency",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 277,
+      "column": 22,
+      "index": 9927
+    },
+    "end": {
+      "line": 280,
+      "column": 3,
+      "index": 10048
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.about",
+    "defaultMessage": "!!!About",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 281,
+      "column": 9,
+      "index": 10059
+    },
+    "end": {
+      "line": 284,
+      "column": 3,
+      "index": 10159
+    }
+  },
+  {
+    "id": "components.initialization.acepttermsofservicescreen.title",
+    "defaultMessage": "!!!Terms of Service Agreement",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 285,
+      "column": 18,
+      "index": 10179
+    },
+    "end": {
+      "line": 288,
+      "column": 3,
+      "index": 10306
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.changePin",
+    "defaultMessage": "!!!Change PIN",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 289,
+      "column": 13,
+      "index": 10321
+    },
+    "end": {
+      "line": 292,
+      "column": 3,
+      "index": 10430
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.privacyMode",
+    "defaultMessage": "!!!Hide balance",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 293,
+      "column": 15,
+      "index": 10447
+    },
+    "end": {
+      "line": 296,
+      "column": 3,
+      "index": 10560
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.privacyModeInfo",
+    "defaultMessage": "!!!This function will be applied to all wallets in your app",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 297,
+      "column": 19,
+      "index": 10581
+    },
+    "end": {
+      "line": 300,
+      "column": 3,
+      "index": 10742
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.biometricsSignIn",
+    "defaultMessage": "!!!Sign in with your biometrics",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 301,
+      "column": 20,
+      "index": 10764
+    },
+    "end": {
+      "line": 304,
+      "column": 3,
+      "index": 10898
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.biometricsSignInInfo",
+    "defaultMessage": "!!!Changes to this option will be reflected after restarting the application",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 305,
+      "column": 24,
+      "index": 10924
+    },
+    "end": {
+      "line": 308,
+      "column": 3,
+      "index": 11107
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.crashReporting",
+    "defaultMessage": "!!!Send crash report to Emurgo",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 309,
+      "column": 18,
+      "index": 11127
+    },
+    "end": {
+      "line": 312,
+      "column": 3,
+      "index": 11258
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.crashReportingInfo",
+    "defaultMessage": "!!!Changes to this option will be reflected after restarting the application",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 313,
+      "column": 22,
+      "index": 11282
+    },
+    "end": {
+      "line": 316,
+      "column": 3,
+      "index": 11463
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.analytics",
+    "defaultMessage": "!!!Analytics",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 317,
+      "column": 13,
+      "index": 11478
+    },
+    "end": {
+      "line": 320,
+      "column": 3,
+      "index": 11586
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.privacyPolicy",
+    "defaultMessage": "!!!Privacy Policy",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 321,
+      "column": 17,
+      "index": 11605
+    },
+    "end": {
+      "line": 324,
+      "column": 3,
+      "index": 11722
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.screenSharing",
+    "defaultMessage": "!!!Enable screensharing",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 325,
+      "column": 17,
+      "index": 11741
+    },
+    "end": {
+      "line": 328,
+      "column": 3,
+      "index": 11864
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.screenSharingInfo",
+    "defaultMessage": "!!!Changes to this option will enable you to make screenshots as well share your screen via third party apps",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 329,
+      "column": 21,
+      "index": 11887
+    },
+    "end": {
+      "line": 333,
+      "column": 3,
+      "index": 12105
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network",
+    "defaultMessage": "!!!Network",
+    "file": "src/features/Settings/useCases/changeAppSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 334,
+      "column": 11,
+      "index": 12118
+    },
+    "end": {
+      "line": 337,
+      "column": 3,
+      "index": 12222
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.json
new file mode 100644
index 0000000000..ead5eeef8b
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.json
@@ -0,0 +1,122 @@
+[
+  {
+    "id": "components.settings.applicationsettingsscreen.network.notice.title",
+    "defaultMessage": "!!!What are the test networks?",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 23,
+      "column": 22,
+      "index": 967
+    },
+    "end": {
+      "line": 26,
+      "column": 3,
+      "index": 1104
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.notice.message",
+    "defaultMessage": "!!!The test networks serve as a platform for the community and developers to test products and experiments without risking real funds on the mainnet.",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 27,
+      "column": 24,
+      "index": 1130
+    },
+    "end": {
+      "line": 31,
+      "column": 3,
+      "index": 1394
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.notice.listTitle",
+    "defaultMessage": "!!!Key features of testnet coins:",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 32,
+      "column": 26,
+      "index": 1422
+    },
+    "end": {
+      "line": 35,
+      "column": 3,
+      "index": 1566
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.notice.list",
+    "defaultMessage": "!!!  •  Have no real value.\n  •  Are separate from the mainnet.\n  •  Cannot be sent to mainnet wallets.\n  •  Are easily obtainable from Cardano faucets.",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 36,
+      "column": 21,
+      "index": 1589
+    },
+    "end": {
+      "line": 40,
+      "column": 3,
+      "index": 1856
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.preparingNetworks",
+    "defaultMessage": "!!!Preparing network...",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 41,
+      "column": 20,
+      "index": 1878
+    },
+    "end": {
+      "line": 44,
+      "column": 3,
+      "index": 2013
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.notice.button",
+    "defaultMessage": "!!!I understand",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 45,
+      "column": 23,
+      "index": 2038
+    },
+    "end": {
+      "line": 48,
+      "column": 3,
+      "index": 2161
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.tag.modal.title",
+    "defaultMessage": "!!!Switch to Mainnet",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 49,
+      "column": 24,
+      "index": 2187
+    },
+    "end": {
+      "line": 52,
+      "column": 3,
+      "index": 2317
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.network.tag.modal.text",
+    "defaultMessage": "!!!Are you sure you want to switch back to the main Cardano Network?",
+    "file": "src/features/Settings/useCases/changeAppSettings/ChangeNetwork/strings.ts",
+    "start": {
+      "line": 53,
+      "column": 23,
+      "index": 2342
+    },
+    "end": {
+      "line": 56,
+      "column": 3,
+      "index": 2519
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.json
new file mode 100644
index 0000000000..51a155ad38
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.json
@@ -0,0 +1,77 @@
+[
+  {
+    "id": "components.settings.biometricslinkscreen.notNowButton",
+    "defaultMessage": "!!!Not now",
+    "file": "src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
+    "start": {
+      "line": 55,
+      "column": 16,
+      "index": 1669
+    },
+    "end": {
+      "line": 58,
+      "column": 3,
+      "index": 1773
+    }
+  },
+  {
+    "id": "components.settings.biometricslinkscreen.linkButton",
+    "defaultMessage": "!!!Link",
+    "file": "src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
+    "start": {
+      "line": 59,
+      "column": 14,
+      "index": 1789
+    },
+    "end": {
+      "line": 62,
+      "column": 3,
+      "index": 1888
+    }
+  },
+  {
+    "id": "components.settings.biometricslinkscreen.heading",
+    "defaultMessage": "!!!Use your fingerprint",
+    "file": "src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
+    "start": {
+      "line": 63,
+      "column": 11,
+      "index": 1901
+    },
+    "end": {
+      "line": 66,
+      "column": 3,
+      "index": 2013
+    }
+  },
+  {
+    "id": "components.settings.biometricslinkscreen.subHeading1",
+    "defaultMessage": "!!!for faster, easier access",
+    "file": "src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
+    "start": {
+      "line": 67,
+      "column": 15,
+      "index": 2030
+    },
+    "end": {
+      "line": 70,
+      "column": 3,
+      "index": 2151
+    }
+  },
+  {
+    "id": "components.settings.biometricslinkscreen.subHeading2",
+    "defaultMessage": "!!!to your Yoroi wallet",
+    "file": "src/features/Settings/useCases/changeAppSettings/EnableLoginWithOs/EnableLoginWithOsScreen.tsx",
+    "start": {
+      "line": 71,
+      "column": 15,
+      "index": 2168
+    },
+    "end": {
+      "line": 74,
+      "column": 3,
+      "index": 2284
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.json
new file mode 100644
index 0000000000..b1c92cfe47
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.json
@@ -0,0 +1,92 @@
+[
+  {
+    "id": "components.settings.changepasswordscreen.oldPasswordInputLabel",
+    "defaultMessage": "!!!Current password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 115,
+      "column": 25,
+      "index": 4857
+    },
+    "end": {
+      "line": 118,
+      "column": 3,
+      "index": 4979
+    }
+  },
+  {
+    "id": "components.settings.changepasswordscreen.newPasswordInputLabel",
+    "defaultMessage": "!!!New password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 119,
+      "column": 25,
+      "index": 5006
+    },
+    "end": {
+      "line": 122,
+      "column": 3,
+      "index": 5124
+    }
+  },
+  {
+    "id": "components.walletinit.createwallet.createwalletscreen.passwordLengthRequirement",
+    "defaultMessage": "!!!Minimum {requirePasswordLength} characters",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 123,
+      "column": 31,
+      "index": 5157
+    },
+    "end": {
+      "line": 126,
+      "column": 3,
+      "index": 5322
+    }
+  },
+  {
+    "id": "components.settings.changepasswordscreen.repeatPasswordInputLabel",
+    "defaultMessage": "!!!Repeat new password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 127,
+      "column": 28,
+      "index": 5352
+    },
+    "end": {
+      "line": 130,
+      "column": 3,
+      "index": 5480
+    }
+  },
+  {
+    "id": "components.settings.changepasswordscreen.repeatPasswordInputNotMatchError",
+    "defaultMessage": "!!!Passwords do not match",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 131,
+      "column": 36,
+      "index": 5518
+    },
+    "end": {
+      "line": 134,
+      "column": 3,
+      "index": 5657
+    }
+  },
+  {
+    "id": "components.settings.changepasswordscreen.continueButton",
+    "defaultMessage": "!!!Change password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ChangePassword/ChangePasswordScreen.tsx",
+    "start": {
+      "line": 135,
+      "column": 18,
+      "index": 5677
+    },
+    "end": {
+      "line": 138,
+      "column": 3,
+      "index": 5791
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.json
new file mode 100644
index 0000000000..38b0bb4c23
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.json
@@ -0,0 +1,32 @@
+[
+  {
+    "id": "components.settings.disableeasyconfirmationscreen.disableHeading",
+    "defaultMessage": "!!!By disabling this option you will be able to spend your assets only with your master password.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 48,
+      "column": 18,
+      "index": 1554
+    },
+    "end": {
+      "line": 51,
+      "column": 3,
+      "index": 1756
+    }
+  },
+  {
+    "id": "components.settings.disableeasyconfirmationscreen.disableButton",
+    "defaultMessage": "!!!Disable",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/DisableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 52,
+      "column": 17,
+      "index": 1775
+    },
+    "end": {
+      "line": 55,
+      "column": 3,
+      "index": 1889
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.json
new file mode 100644
index 0000000000..a5cc0bb4c8
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.json
@@ -0,0 +1,62 @@
+[
+  {
+    "id": "components.settings.enableeasyconfirmationscreen.enableHeading",
+    "defaultMessage": "!!!This option will allow you to send transactions from your wallet just by confirming with fingerprint or face recognition with standard system fallback option. This makes your wallet less secure. This is a compromise between UX and security!",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 92,
+      "column": 17,
+      "index": 3287
+    },
+    "end": {
+      "line": 100,
+      "column": 3,
+      "index": 3683
+    }
+  },
+  {
+    "id": "components.settings.enableeasyconfirmationscreen.enableWarning",
+    "defaultMessage": "!!!Please remember your master password, as you may need it in case your biometrics data are removed from the device.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 101,
+      "column": 17,
+      "index": 3702
+    },
+    "end": {
+      "line": 106,
+      "column": 3,
+      "index": 3939
+    }
+  },
+  {
+    "id": "components.settings.enableeasyconfirmationscreen.enableMasterPassword",
+    "defaultMessage": "!!!Master password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 107,
+      "column": 22,
+      "index": 3963
+    },
+    "end": {
+      "line": 110,
+      "column": 3,
+      "index": 4091
+    }
+  },
+  {
+    "id": "components.settings.enableeasyconfirmationscreen.enableButton",
+    "defaultMessage": "!!!Enable",
+    "file": "src/features/Settings/useCases/changeWalletSettings/EasyConfirmation/EnableEasyConfirmationScreen.tsx",
+    "start": {
+      "line": 111,
+      "column": 16,
+      "index": 4109
+    },
+    "end": {
+      "line": 114,
+      "column": 3,
+      "index": 4220
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.json
new file mode 100644
index 0000000000..aa4df473f0
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "components.settings.collateral.lockedAsCollateral",
+    "defaultMessage": "!!!Locked as collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 23,
+      "column": 22,
+      "index": 1270
+    },
+    "end": {
+      "line": 26,
+      "column": 3,
+      "index": 1383
+    }
+  },
+  {
+    "id": "components.settings.collateral.removeCollateral",
+    "defaultMessage": "!!!If you want to return the amount locked as collateral to your balance press the remove icon",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 27,
+      "column": 20,
+      "index": 1405
+    },
+    "end": {
+      "line": 30,
+      "column": 3,
+      "index": 1587
+    }
+  },
+  {
+    "id": "components.settings.collateral.collateralSpent",
+    "defaultMessage": "!!!Your collateral is gone, please generate new collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 31,
+      "column": 19,
+      "index": 1608
+    },
+    "end": {
+      "line": 34,
+      "column": 3,
+      "index": 1753
+    }
+  },
+  {
+    "id": "components.settings.collateral.generateCollateral",
+    "defaultMessage": "!!!Generate collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 35,
+      "column": 22,
+      "index": 1777
+    },
+    "end": {
+      "line": 38,
+      "column": 3,
+      "index": 1889
+    }
+  },
+  {
+    "id": "components.settings.collateral.notEnoughFundsAlertTitle",
+    "defaultMessage": "!!!Not enough funds",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 39,
+      "column": 28,
+      "index": 1919
+    },
+    "end": {
+      "line": 42,
+      "column": 3,
+      "index": 2034
+    }
+  },
+  {
+    "id": "components.settings.collateral.notEnoughFundsAlertMessage",
+    "defaultMessage": "!!!We could not find enough funds in this wallet to create collateral.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 43,
+      "column": 30,
+      "index": 2066
+    },
+    "end": {
+      "line": 46,
+      "column": 3,
+      "index": 2234
+    }
+  },
+  {
+    "id": "components.settings.collateral.notEnoughFundsAlertOK",
+    "defaultMessage": "!!!OK",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 47,
+      "column": 25,
+      "index": 2261
+    },
+    "end": {
+      "line": 50,
+      "column": 3,
+      "index": 2359
+    }
+  },
+  {
+    "id": "components.settings.collateral.collateralInfoModalLabel",
+    "defaultMessage": "!!!Collateral creation",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 51,
+      "column": 28,
+      "index": 2389
+    },
+    "end": {
+      "line": 54,
+      "column": 3,
+      "index": 2507
+    }
+  },
+  {
+    "id": "components.settings.collateral.collateralInfoModalTitle",
+    "defaultMessage": "!!!What is collateral?",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 55,
+      "column": 28,
+      "index": 2537
+    },
+    "end": {
+      "line": 58,
+      "column": 3,
+      "index": 2655
+    }
+  },
+  {
+    "id": "components.settings.collateral.collateralInfoModalText",
+    "defaultMessage": "!!!The collateral mechanism is an important feature that has been designed to ensure successful smart contract execution. It is used to guarantee that Cardano nodes are compensated for their work in case phase-2 validation fails.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 59,
+      "column": 27,
+      "index": 2684
+    },
+    "end": {
+      "line": 63,
+      "column": 3,
+      "index": 3014
+    }
+  },
+  {
+    "id": "components.settings.collateral.initialCollateralInfoModalTitle",
+    "defaultMessage": "!!!Collateral creation",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 64,
+      "column": 35,
+      "index": 3051
+    },
+    "end": {
+      "line": 67,
+      "column": 3,
+      "index": 3176
+    }
+  },
+  {
+    "id": "components.settings.collateral.initialCollateralInfoModalText",
+    "defaultMessage": "!!!The collateral mechanism is designed to ensure smart contracts on Cardano execute successfully. It guarantees that nodes are compensated for their work if a contract fails during validation.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 68,
+      "column": 34,
+      "index": 3212
+    },
+    "end": {
+      "line": 72,
+      "column": 3,
+      "index": 3513
+    }
+  },
+  {
+    "id": "components.settings.collateral.initialCollateralInfoModalButton",
+    "defaultMessage": "!!!Add collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/ManageCollateral/strings.ts",
+    "start": {
+      "line": 73,
+      "column": 36,
+      "index": 3551
+    },
+    "end": {
+      "line": 76,
+      "column": 3,
+      "index": 3672
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.json
new file mode 100644
index 0000000000..0e0fd41374
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.json
@@ -0,0 +1,107 @@
+[
+  {
+    "id": "components.settings.removewalletscreen.descriptionParagraph1",
+    "defaultMessage": "!!!If you wish to permanently delete the wallet make sure you have written down the mnemonic.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 110,
+      "column": 25,
+      "index": 4019
+    },
+    "end": {
+      "line": 113,
+      "column": 3,
+      "index": 4213
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.descriptionParagraph2",
+    "defaultMessage": "!!!To confirm this operation type the wallet name below.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 114,
+      "column": 25,
+      "index": 4240
+    },
+    "end": {
+      "line": 117,
+      "column": 3,
+      "index": 4397
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.walletName",
+    "defaultMessage": "!!!Wallet name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 118,
+      "column": 14,
+      "index": 4413
+    },
+    "end": {
+      "line": 121,
+      "column": 3,
+      "index": 4517
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.walletNameInput",
+    "defaultMessage": "!!!Wallet name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 122,
+      "column": 19,
+      "index": 4538
+    },
+    "end": {
+      "line": 125,
+      "column": 3,
+      "index": 4647
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.walletNameMismatchError",
+    "defaultMessage": "!!!Wallet name does not match",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 126,
+      "column": 27,
+      "index": 4676
+    },
+    "end": {
+      "line": 129,
+      "column": 3,
+      "index": 4808
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.remove",
+    "defaultMessage": "!!!Remove wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 130,
+      "column": 10,
+      "index": 4820
+    },
+    "end": {
+      "line": 133,
+      "column": 3,
+      "index": 4922
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.hasWrittenDownMnemonic",
+    "defaultMessage": "!!!I have written down mnemonic of this wallet and understand that I cannot recover the wallet without it.",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RemoveWallet/RemoveWalletScreen.tsx",
+    "start": {
+      "line": 134,
+      "column": 26,
+      "index": 4950
+    },
+    "end": {
+      "line": 138,
+      "column": 3,
+      "index": 5164
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.json
new file mode 100644
index 0000000000..b5ca86d87b
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.json
@@ -0,0 +1,32 @@
+[
+  {
+    "id": "components.settings.changewalletname.changeButton",
+    "defaultMessage": "!!!Change name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.tsx",
+    "start": {
+      "line": 103,
+      "column": 16,
+      "index": 3350
+    },
+    "end": {
+      "line": 106,
+      "column": 3,
+      "index": 3454
+    }
+  },
+  {
+    "id": "components.settings.changewalletname.walletNameInputLabel",
+    "defaultMessage": "!!!Wallet name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/RenameWalletScreen/RenameWalletScreen.tsx",
+    "start": {
+      "line": 107,
+      "column": 24,
+      "index": 3480
+    },
+    "end": {
+      "line": 110,
+      "column": 3,
+      "index": 3592
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.json
new file mode 100644
index 0000000000..cf42b784be
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.json
@@ -0,0 +1,302 @@
+[
+  {
+    "id": "components.settings.walletsettingscreen.tabTitle",
+    "defaultMessage": "!!!Wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 256,
+      "column": 18,
+      "index": 7895
+    },
+    "end": {
+      "line": 259,
+      "column": 3,
+      "index": 7993
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.tabTitle",
+    "defaultMessage": "!!!Application",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 260,
+      "column": 15,
+      "index": 8010
+    },
+    "end": {
+      "line": 263,
+      "column": 3,
+      "index": 8119
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.changePin",
+    "defaultMessage": "!!!Change PIN",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 264,
+      "column": 24,
+      "index": 8145
+    },
+    "end": {
+      "line": 267,
+      "column": 3,
+      "index": 8254
+    }
+  },
+  {
+    "id": "components.settings.changepasswordscreen.title",
+    "defaultMessage": "!!!Change spending password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 268,
+      "column": 23,
+      "index": 8279
+    },
+    "end": {
+      "line": 271,
+      "column": 3,
+      "index": 8393
+    }
+  },
+  {
+    "id": "components.settings.removewalletscreen.title",
+    "defaultMessage": "!!!Remove wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 272,
+      "column": 21,
+      "index": 8416
+    },
+    "end": {
+      "line": 275,
+      "column": 3,
+      "index": 8517
+    }
+  },
+  {
+    "id": "components.settings.termsofservicescreen.title",
+    "defaultMessage": "!!!Terms of Service Agreement",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 276,
+      "column": 23,
+      "index": 8542
+    },
+    "end": {
+      "line": 279,
+      "column": 3,
+      "index": 8658
+    }
+  },
+  {
+    "id": "components.settings.changewalletname.title",
+    "defaultMessage": "!!!Change wallet name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 280,
+      "column": 25,
+      "index": 8685
+    },
+    "end": {
+      "line": 283,
+      "column": 3,
+      "index": 8789
+    }
+  },
+  {
+    "id": "components.settings.settingsscreen.title",
+    "defaultMessage": "!!!Support",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 284,
+      "column": 16,
+      "index": 8807
+    },
+    "end": {
+      "line": 287,
+      "column": 3,
+      "index": 8898
+    }
+  },
+  {
+    "id": "components.settings.enableeasyconfirmationscreen.title",
+    "defaultMessage": "!!!Easy confirmation",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 288,
+      "column": 31,
+      "index": 8931
+    },
+    "end": {
+      "line": 291,
+      "column": 3,
+      "index": 9046
+    }
+  },
+  {
+    "id": "components.settings.disableeasyconfirmationscreen.title",
+    "defaultMessage": "!!!Easy confirmation",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 292,
+      "column": 32,
+      "index": 9080
+    },
+    "end": {
+      "line": 295,
+      "column": 3,
+      "index": 9196
+    }
+  },
+  {
+    "id": "components.initialization.custompinscreen.title",
+    "defaultMessage": "!!!Set PIN",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 296,
+      "column": 18,
+      "index": 9216
+    },
+    "end": {
+      "line": 299,
+      "column": 3,
+      "index": 9314
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.title",
+    "defaultMessage": "!!!Settings",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 300,
+      "column": 17,
+      "index": 9333
+    },
+    "end": {
+      "line": 303,
+      "column": 3,
+      "index": 9436
+    }
+  },
+  {
+    "id": "components.settings.changelanguagescreen.title",
+    "defaultMessage": "!!!Language",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 304,
+      "column": 17,
+      "index": 9455
+    },
+    "end": {
+      "line": 307,
+      "column": 3,
+      "index": 9553
+    }
+  },
+  {
+    "id": "components.settings.changeThemescreen.title",
+    "defaultMessage": "!!!Theming",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 308,
+      "column": 14,
+      "index": 9569
+    },
+    "end": {
+      "line": 311,
+      "column": 3,
+      "index": 9663
+    }
+  },
+  {
+    "id": "components.settings.changeNetworkScreen.title",
+    "defaultMessage": "!!!Network",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 312,
+      "column": 16,
+      "index": 9681
+    },
+    "end": {
+      "line": 315,
+      "column": 3,
+      "index": 9777
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.appSettingsTitle",
+    "defaultMessage": "!!!App settings",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 316,
+      "column": 20,
+      "index": 9799
+    },
+    "end": {
+      "line": 319,
+      "column": 3,
+      "index": 9917
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.about",
+    "defaultMessage": "!!!About",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 320,
+      "column": 14,
+      "index": 9933
+    },
+    "end": {
+      "line": 323,
+      "column": 3,
+      "index": 10033
+    }
+  },
+  {
+    "id": "components.settings.privacypolicyscreen.title",
+    "defaultMessage": "!!!Privacy Policy",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 324,
+      "column": 22,
+      "index": 10057
+    },
+    "end": {
+      "line": 327,
+      "column": 3,
+      "index": 10160
+    }
+  },
+  {
+    "id": "global.collateral",
+    "defaultMessage": "!!!Collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 328,
+      "column": 14,
+      "index": 10176
+    },
+    "end": {
+      "line": 331,
+      "column": 3,
+      "index": 10247
+    }
+  },
+  {
+    "id": "global.log",
+    "defaultMessage": "!!!Log",
+    "file": "src/features/Settings/useCases/changeWalletSettings/SettingsScreenNavigator.tsx",
+    "start": {
+      "line": 332,
+      "column": 18,
+      "index": 10267
+    },
+    "end": {
+      "line": 335,
+      "column": 3,
+      "index": 10324
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.json
new file mode 100644
index 0000000000..30115fdaed
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.json
@@ -0,0 +1,317 @@
+[
+  {
+    "id": "components.settings.walletsettingscreen.general",
+    "defaultMessage": "!!!General",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 214,
+      "column": 11,
+      "index": 6780
+    },
+    "end": {
+      "line": 217,
+      "column": 3,
+      "index": 6878
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.actions",
+    "defaultMessage": "!!!Actions",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 218,
+      "column": 11,
+      "index": 6891
+    },
+    "end": {
+      "line": 221,
+      "column": 3,
+      "index": 6989
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.switchWallet",
+    "defaultMessage": "!!!Switch wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 222,
+      "column": 16,
+      "index": 7007
+    },
+    "end": {
+      "line": 225,
+      "column": 3,
+      "index": 7116
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.logout",
+    "defaultMessage": "!!!Logout",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 226,
+      "column": 10,
+      "index": 7128
+    },
+    "end": {
+      "line": 229,
+      "column": 3,
+      "index": 7224
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.walletName",
+    "defaultMessage": "!!!Wallet name",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 230,
+      "column": 14,
+      "index": 7240
+    },
+    "end": {
+      "line": 233,
+      "column": 3,
+      "index": 7345
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.security",
+    "defaultMessage": "!!!Security",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 234,
+      "column": 12,
+      "index": 7359
+    },
+    "end": {
+      "line": 237,
+      "column": 3,
+      "index": 7459
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.changePassword",
+    "defaultMessage": "!!!Change spending password",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 238,
+      "column": 18,
+      "index": 7479
+    },
+    "end": {
+      "line": 241,
+      "column": 3,
+      "index": 7601
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.easyConfirmation",
+    "defaultMessage": "!!!Easy transaction confirmation",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 242,
+      "column": 20,
+      "index": 7623
+    },
+    "end": {
+      "line": 245,
+      "column": 3,
+      "index": 7752
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.easyConfirmationInfo",
+    "defaultMessage": "!!!Skip the password and approve transactions with biometrics",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 246,
+      "column": 24,
+      "index": 7778
+    },
+    "end": {
+      "line": 249,
+      "column": 3,
+      "index": 7940
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.removeWallet",
+    "defaultMessage": "!!!Remove wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 250,
+      "column": 16,
+      "index": 7958
+    },
+    "end": {
+      "line": 253,
+      "column": 3,
+      "index": 8067
+    }
+  },
+  {
+    "id": "global.collateral",
+    "defaultMessage": "!!!Collateral",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 254,
+      "column": 14,
+      "index": 8083
+    },
+    "end": {
+      "line": 257,
+      "column": 3,
+      "index": 8154
+    }
+  },
+  {
+    "id": "global.multipleAddresses",
+    "defaultMessage": "!!!Multiple addresses",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 258,
+      "column": 21,
+      "index": 8177
+    },
+    "end": {
+      "line": 261,
+      "column": 3,
+      "index": 8263
+    }
+  },
+  {
+    "id": "global.singleAddress",
+    "defaultMessage": "!!!Single address",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 262,
+      "column": 17,
+      "index": 8282
+    },
+    "end": {
+      "line": 265,
+      "column": 3,
+      "index": 8360
+    }
+  },
+  {
+    "id": "global.multipleAddressesInfo",
+    "defaultMessage": "!!!By enabling this you can operate with more wallet addresses",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 266,
+      "column": 25,
+      "index": 8387
+    },
+    "end": {
+      "line": 269,
+      "column": 3,
+      "index": 8518
+    }
+  },
+  {
+    "id": "global.network",
+    "defaultMessage": "!!!Network:",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 271,
+      "column": 11,
+      "index": 8579
+    },
+    "end": {
+      "line": 274,
+      "column": 3,
+      "index": 8645
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.walletType",
+    "defaultMessage": "!!!Wallet type:",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 275,
+      "column": 14,
+      "index": 8661
+    },
+    "end": {
+      "line": 278,
+      "column": 3,
+      "index": 8767
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.byronWallet",
+    "defaultMessage": "!!!Byron-era wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 279,
+      "column": 15,
+      "index": 8784
+    },
+    "end": {
+      "line": 282,
+      "column": 3,
+      "index": 8895
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.shelleyWallet",
+    "defaultMessage": "!!!Shelley-era wallet",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 283,
+      "column": 17,
+      "index": 8914
+    },
+    "end": {
+      "line": 286,
+      "column": 3,
+      "index": 9029
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.unknownWalletType",
+    "defaultMessage": "!!!Unknown Wallet Type",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 287,
+      "column": 21,
+      "index": 9052
+    },
+    "end": {
+      "line": 290,
+      "column": 3,
+      "index": 9172
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.about",
+    "defaultMessage": "!!!About",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 291,
+      "column": 9,
+      "index": 9183
+    },
+    "end": {
+      "line": 294,
+      "column": 3,
+      "index": 9277
+    }
+  },
+  {
+    "id": "components.settings.walletsettingscreen.resyncWallet",
+    "defaultMessage": "!!!Resync",
+    "file": "src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx",
+    "start": {
+      "line": 295,
+      "column": 10,
+      "index": 9289
+    },
+    "end": {
+      "line": 298,
+      "column": 3,
+      "index": 9391
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
index deb5017b21..7d3438ed72 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 138,
       "column": 21,
-      "index": 4870
+      "index": 4897
     },
     "end": {
       "line": 141,
       "column": 3,
-      "index": 4972
+      "index": 4999
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 142,
       "column": 21,
-      "index": 4995
+      "index": 5022
     },
     "end": {
       "line": 145,
       "column": 3,
-      "index": 5111
+      "index": 5138
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 146,
       "column": 22,
-      "index": 5135
+      "index": 5162
     },
     "end": {
       "line": 149,
       "column": 3,
-      "index": 5254
+      "index": 5281
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 150,
       "column": 23,
-      "index": 5279
+      "index": 5306
     },
     "end": {
       "line": 153,
       "column": 3,
-      "index": 5393
+      "index": 5420
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 154,
       "column": 27,
-      "index": 5422
+      "index": 5449
     },
     "end": {
       "line": 157,
       "column": 3,
-      "index": 5541
+      "index": 5568
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 158,
       "column": 21,
-      "index": 5564
+      "index": 5591
     },
     "end": {
       "line": 161,
       "column": 3,
-      "index": 5682
+      "index": 5709
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 162,
       "column": 22,
-      "index": 5706
+      "index": 5733
     },
     "end": {
       "line": 165,
       "column": 3,
-      "index": 5825
+      "index": 5852
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 166,
       "column": 29,
-      "index": 5856
+      "index": 5883
     },
     "end": {
       "line": 169,
       "column": 3,
-      "index": 5970
+      "index": 5997
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 170,
       "column": 26,
-      "index": 5998
+      "index": 6025
     },
     "end": {
       "line": 173,
       "column": 3,
-      "index": 6125
+      "index": 6152
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 174,
       "column": 21,
-      "index": 6148
+      "index": 6175
     },
     "end": {
       "line": 177,
       "column": 3,
-      "index": 6274
+      "index": 6301
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 178,
       "column": 19,
-      "index": 6295
+      "index": 6322
     },
     "end": {
       "line": 181,
       "column": 3,
-      "index": 6419
+      "index": 6446
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 182,
       "column": 18,
-      "index": 6439
+      "index": 6466
     },
     "end": {
       "line": 185,
       "column": 3,
-      "index": 6562
+      "index": 6589
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index 3313b2a553..6b455f1c70 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 169,
+      "line": 170,
       "column": 12,
-      "index": 11024
+      "index": 11087
     },
     "end": {
-      "line": 172,
+      "line": 173,
       "column": 3,
-      "index": 11187
+      "index": 11250
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Incorrect password.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 173,
+      "line": 174,
       "column": 24,
-      "index": 11213
+      "index": 11276
     },
     "end": {
-      "line": 176,
+      "line": 177,
       "column": 3,
-      "index": 11322
+      "index": 11385
     }
   },
   {
@@ -34,14 +34,29 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 177,
+      "line": 178,
       "column": 13,
-      "index": 11337
+      "index": 11400
+    },
+    "end": {
+      "line": 181,
+      "column": 3,
+      "index": 11473
+    }
+  },
+  {
+    "id": "swap.swapScreen.swapDetailsTitle",
+    "defaultMessage": "!!!Swap details",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 182,
+      "column": 20,
+      "index": 11495
     },
     "end": {
-      "line": 180,
+      "line": 185,
       "column": 3,
-      "index": 11410
+      "index": 11583
     }
   },
   {
@@ -49,14 +64,14 @@
     "defaultMessage": "!!!Token swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 181,
+      "line": 186,
       "column": 13,
-      "index": 11425
+      "index": 11598
     },
     "end": {
-      "line": 184,
+      "line": 189,
       "column": 3,
-      "index": 11507
+      "index": 11680
     }
   },
   {
@@ -64,14 +79,14 @@
     "defaultMessage": "!!!Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 185,
+      "line": 190,
       "column": 13,
-      "index": 11522
+      "index": 11695
     },
     "end": {
-      "line": 188,
+      "line": 193,
       "column": 3,
-      "index": 11601
+      "index": 11774
     }
   },
   {
@@ -79,14 +94,14 @@
     "defaultMessage": "!!!Market Button",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 189,
+      "line": 194,
       "column": 16,
-      "index": 11619
+      "index": 11792
     },
     "end": {
-      "line": 192,
+      "line": 197,
       "column": 3,
-      "index": 11704
+      "index": 11877
     }
   },
   {
@@ -94,14 +109,14 @@
     "defaultMessage": "!!!Limit",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 193,
+      "line": 198,
       "column": 15,
-      "index": 11721
+      "index": 11894
     },
     "end": {
-      "line": 196,
+      "line": 201,
       "column": 3,
-      "index": 11797
+      "index": 11970
     }
   },
   {
@@ -109,14 +124,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 197,
+      "line": 202,
       "column": 12,
-      "index": 11811
+      "index": 11984
     },
     "end": {
-      "line": 200,
+      "line": 205,
       "column": 3,
-      "index": 11888
+      "index": 12061
     }
   },
   {
@@ -124,14 +139,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 201,
+      "line": 206,
       "column": 10,
-      "index": 11900
+      "index": 12073
     },
     "end": {
-      "line": 204,
+      "line": 209,
       "column": 3,
-      "index": 11973
+      "index": 12146
     }
   },
   {
@@ -139,14 +154,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 205,
+      "line": 210,
       "column": 18,
-      "index": 11993
+      "index": 12166
     },
     "end": {
-      "line": 208,
+      "line": 213,
       "column": 3,
-      "index": 12082
+      "index": 12255
     }
   },
   {
@@ -154,14 +169,14 @@
     "defaultMessage": "!!!Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 209,
+      "line": 214,
       "column": 11,
-      "index": 12095
+      "index": 12268
     },
     "end": {
-      "line": 212,
+      "line": 217,
       "column": 3,
-      "index": 12169
+      "index": 12342
     }
   },
   {
@@ -169,14 +184,14 @@
     "defaultMessage": "!!!Select Token",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 213,
+      "line": 218,
       "column": 15,
-      "index": 12186
+      "index": 12359
     },
     "end": {
-      "line": 216,
+      "line": 221,
       "column": 3,
-      "index": 12269
+      "index": 12442
     }
   },
   {
@@ -184,14 +199,14 @@
     "defaultMessage": "!!!Market Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 217,
+      "line": 222,
       "column": 15,
-      "index": 12286
+      "index": 12459
     },
     "end": {
-      "line": 220,
+      "line": 225,
       "column": 3,
-      "index": 12369
+      "index": 12542
     }
   },
   {
@@ -199,14 +214,14 @@
     "defaultMessage": "!!!Market price is the best price available on the market among several DEXes that lets you buy or sell an asset instantly.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 221,
+      "line": 226,
       "column": 19,
-      "index": 12390
+      "index": 12563
     },
     "end": {
-      "line": 225,
+      "line": 230,
       "column": 3,
-      "index": 12591
+      "index": 12764
     }
   },
   {
@@ -214,14 +229,14 @@
     "defaultMessage": "!!!Limit price in a DEX is a specific pre-set price at which you can trade an asset. Unlike market orders, which execute immediately at the current market price, limit orders are set to execute only when the market reaches the trader's specified price.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 226,
+      "line": 231,
       "column": 18,
-      "index": 12611
+      "index": 12784
     },
     "end": {
-      "line": 230,
+      "line": 235,
       "column": 3,
-      "index": 12940
+      "index": 13113
     }
   },
   {
@@ -229,14 +244,14 @@
     "defaultMessage": "!!!Limit Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 231,
+      "line": 236,
       "column": 14,
-      "index": 12956
+      "index": 13129
     },
     "end": {
-      "line": 234,
+      "line": 239,
       "column": 3,
-      "index": 13037
+      "index": 13210
     }
   },
   {
@@ -244,14 +259,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 235,
+      "line": 240,
       "column": 21,
-      "index": 13060
+      "index": 13233
     },
     "end": {
-      "line": 238,
+      "line": 243,
       "column": 3,
-      "index": 13155
+      "index": 13328
     }
   },
   {
@@ -259,14 +274,14 @@
     "defaultMessage": "!!!Slippage must be a number between 0 and 75 and have up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 239,
+      "line": 244,
       "column": 26,
-      "index": 13183
+      "index": 13356
     },
     "end": {
-      "line": 242,
+      "line": 247,
       "column": 3,
-      "index": 13332
+      "index": 13505
     }
   },
   {
@@ -274,14 +289,14 @@
     "defaultMessage": "!!!Slippage Tolerance Info",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 243,
+      "line": 248,
       "column": 25,
-      "index": 13359
+      "index": 13532
     },
     "end": {
-      "line": 246,
+      "line": 251,
       "column": 3,
-      "index": 13463
+      "index": 13636
     }
   },
   {
@@ -289,14 +304,14 @@
     "defaultMessage": "!!!Verified by {pool}",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 247,
+      "line": 252,
       "column": 14,
-      "index": 13479
+      "index": 13652
     },
     "end": {
-      "line": 250,
+      "line": 255,
       "column": 3,
-      "index": 13567
+      "index": 13740
     }
   },
   {
@@ -304,14 +319,14 @@
     "defaultMessage": "!!!This asset is in my portfolio",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 251,
+      "line": 256,
       "column": 12,
-      "index": 13581
+      "index": 13754
     },
     "end": {
-      "line": 254,
+      "line": 259,
       "column": 3,
-      "index": 13678
+      "index": 13851
     }
   },
   {
@@ -319,14 +334,14 @@
     "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 255,
+      "line": 260,
       "column": 16,
-      "index": 13696
+      "index": 13869
     },
     "end": {
-      "line": 258,
+      "line": 263,
       "column": 3,
-      "index": 13834
+      "index": 14007
     }
   },
   {
@@ -334,14 +349,14 @@
     "defaultMessage": "!!!(auto)",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 259,
+      "line": 264,
       "column": 12,
-      "index": 13848
+      "index": 14021
     },
     "end": {
-      "line": 262,
+      "line": 267,
       "column": 3,
-      "index": 13922
+      "index": 14095
     }
   },
   {
@@ -349,14 +364,14 @@
     "defaultMessage": "!!!change dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 263,
+      "line": 268,
       "column": 14,
-      "index": 13938
+      "index": 14111
     },
     "end": {
-      "line": 266,
+      "line": 271,
       "column": 3,
-      "index": 14018
+      "index": 14191
     }
   },
   {
@@ -364,14 +379,14 @@
     "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 267,
+      "line": 272,
       "column": 14,
-      "index": 14034
+      "index": 14207
     },
     "end": {
-      "line": 271,
+      "line": 276,
       "column": 3,
-      "index": 14215
+      "index": 14388
     }
   },
   {
@@ -379,14 +394,14 @@
     "defaultMessage": "!!!Min ADA",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 272,
+      "line": 277,
       "column": 19,
-      "index": 14236
+      "index": 14409
     },
     "end": {
-      "line": 275,
+      "line": 280,
       "column": 3,
-      "index": 14318
+      "index": 14491
     }
   },
   {
@@ -394,14 +409,14 @@
     "defaultMessage": "!!!Swap is not available on testnet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 276,
+      "line": 281,
       "column": 22,
-      "index": 14342
+      "index": 14515
     },
     "end": {
-      "line": 279,
+      "line": 284,
       "column": 3,
-      "index": 14452
+      "index": 14625
     }
   },
   {
@@ -409,14 +424,14 @@
     "defaultMessage": "!!!Switch to mainnet if you want to use the feature and swap real tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 280,
+      "line": 285,
       "column": 21,
-      "index": 14475
+      "index": 14648
     },
     "end": {
-      "line": 283,
+      "line": 288,
       "column": 3,
-      "index": 14621
+      "index": 14794
     }
   },
   {
@@ -424,14 +439,14 @@
     "defaultMessage": "!!!Swap is not available on sanchonet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 284,
+      "line": 289,
       "column": 21,
-      "index": 14644
+      "index": 14817
     },
     "end": {
-      "line": 287,
+      "line": 292,
       "column": 3,
-      "index": 14755
+      "index": 14928
     }
   },
   {
@@ -439,14 +454,14 @@
     "defaultMessage": "!!!Switch to mainnet if you want to use the feature and swap real tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 288,
+      "line": 293,
       "column": 20,
-      "index": 14777
+      "index": 14950
     },
     "end": {
-      "line": 291,
+      "line": 296,
       "column": 3,
-      "index": 14922
+      "index": 15095
     }
   },
   {
@@ -454,14 +469,14 @@
     "defaultMessage": "!!!Fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 292,
+      "line": 297,
       "column": 17,
-      "index": 14941
+      "index": 15114
     },
     "end": {
-      "line": 295,
+      "line": 300,
       "column": 3,
-      "index": 15018
+      "index": 15191
     }
   },
   {
@@ -469,29 +484,29 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 296,
+      "line": 301,
       "column": 20,
-      "index": 15040
+      "index": 15213
     },
     "end": {
-      "line": 299,
+      "line": 304,
       "column": 3,
-      "index": 15138
+      "index": 15311
     }
   },
   {
     "id": "swap.swapScreen.swapLiqProvFee",
-    "defaultMessage": "!!!Liq. prov. fee",
+    "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 300,
+      "line": 305,
       "column": 18,
-      "index": 15158
+      "index": 15331
     },
     "end": {
-      "line": 303,
+      "line": 308,
       "column": 3,
-      "index": 15246
+      "index": 15427
     }
   },
   {
@@ -499,14 +514,14 @@
     "defaultMessage": "!!!Liquidity provider fee is a fixed <b>{fee}%</b> operational fee from the whole transaction volume, that is taken to support DEX “liquidity” allowing traders to buy and sell assets on the decentralized Cardano network.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 304,
+      "line": 309,
       "column": 24,
-      "index": 15272
+      "index": 15453
     },
     "end": {
-      "line": 308,
+      "line": 313,
       "column": 3,
-      "index": 15575
+      "index": 15756
     }
   },
   {
@@ -514,14 +529,14 @@
     "defaultMessage": "!!!Minimum amount of assets you can get because of the slippage tolerance.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 309,
+      "line": 314,
       "column": 19,
-      "index": 15596
+      "index": 15777
     },
     "end": {
-      "line": 312,
+      "line": 317,
       "column": 3,
-      "index": 15742
+      "index": 15923
     }
   },
   {
@@ -529,14 +544,14 @@
     "defaultMessage": "!!!Min Received",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 313,
+      "line": 318,
       "column": 24,
-      "index": 15768
+      "index": 15949
     },
     "end": {
-      "line": 316,
+      "line": 321,
       "column": 3,
-      "index": 15860
+      "index": 16041
     }
   },
   {
@@ -544,14 +559,14 @@
     "defaultMessage": "!!!Enter a value from 0% to 75%. You can also enter up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 317,
+      "line": 322,
       "column": 17,
-      "index": 15879
+      "index": 16060
     },
     "end": {
-      "line": 320,
+      "line": 325,
       "column": 3,
-      "index": 16016
+      "index": 16197
     }
   },
   {
@@ -559,14 +574,14 @@
     "defaultMessage": "!!!{pool} verification",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 321,
+      "line": 326,
       "column": 20,
-      "index": 16038
+      "index": 16219
     },
     "end": {
-      "line": 324,
+      "line": 329,
       "column": 3,
-      "index": 16133
+      "index": 16314
     }
   },
   {
@@ -574,14 +589,14 @@
     "defaultMessage": "!!!Volume, 24h",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 325,
+      "line": 330,
       "column": 10,
-      "index": 16145
+      "index": 16326
     },
     "end": {
-      "line": 328,
+      "line": 333,
       "column": 3,
-      "index": 16222
+      "index": 16403
     }
   },
   {
@@ -589,14 +604,14 @@
     "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 329,
+      "line": 334,
       "column": 24,
-      "index": 16248
+      "index": 16429
     },
     "end": {
-      "line": 333,
+      "line": 338,
       "column": 3,
-      "index": 16530
+      "index": 16711
     }
   },
   {
@@ -604,14 +619,14 @@
     "defaultMessage": "!!! Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 334,
+      "line": 339,
       "column": 9,
-      "index": 16541
+      "index": 16722
     },
     "end": {
-      "line": 337,
+      "line": 342,
       "column": 3,
-      "index": 16603
+      "index": 16784
     }
   },
   {
@@ -619,14 +634,14 @@
     "defaultMessage": "!!!No assets found for this pair",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 338,
+      "line": 343,
       "column": 17,
-      "index": 16622
+      "index": 16803
     },
     "end": {
-      "line": 341,
+      "line": 346,
       "column": 3,
-      "index": 16724
+      "index": 16905
     }
   },
   {
@@ -634,14 +649,14 @@
     "defaultMessage": "!!!No assets found for \"{search}\"",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 342,
+      "line": 347,
       "column": 20,
-      "index": 16746
+      "index": 16927
     },
     "end": {
-      "line": 345,
+      "line": 350,
       "column": 3,
-      "index": 16852
+      "index": 17033
     }
   },
   {
@@ -649,14 +664,14 @@
     "defaultMessage": "!!!Each verified tokens gets",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 346,
+      "line": 351,
       "column": 21,
-      "index": 16875
+      "index": 17056
     },
     "end": {
-      "line": 349,
+      "line": 354,
       "column": 3,
-      "index": 16977
+      "index": 17158
     }
   },
   {
@@ -664,14 +679,14 @@
     "defaultMessage": "!!!verified badge",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 350,
+      "line": 355,
       "column": 17,
-      "index": 16996
+      "index": 17177
     },
     "end": {
-      "line": 353,
+      "line": 358,
       "column": 3,
-      "index": 17083
+      "index": 17264
     }
   },
   {
@@ -679,14 +694,14 @@
     "defaultMessage": "!!!Open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 354,
+      "line": 359,
       "column": 14,
-      "index": 17099
+      "index": 17280
     },
     "end": {
-      "line": 357,
+      "line": 362,
       "column": 3,
-      "index": 17180
+      "index": 17361
     }
   },
   {
@@ -694,14 +709,14 @@
     "defaultMessage": "!!!Completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 358,
+      "line": 363,
       "column": 19,
-      "index": 17201
+      "index": 17382
     },
     "end": {
-      "line": 361,
+      "line": 366,
       "column": 3,
-      "index": 17292
+      "index": 17473
     }
   },
   {
@@ -709,14 +724,14 @@
     "defaultMessage": "!!!TVL",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 362,
+      "line": 367,
       "column": 7,
-      "index": 17301
+      "index": 17482
     },
     "end": {
-      "line": 365,
+      "line": 370,
       "column": 3,
-      "index": 17367
+      "index": 17548
     }
   },
   {
@@ -724,14 +739,14 @@
     "defaultMessage": "!!! Dex Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 366,
+      "line": 371,
       "column": 11,
-      "index": 17380
+      "index": 17561
     },
     "end": {
-      "line": 369,
+      "line": 374,
       "column": 3,
-      "index": 17455
+      "index": 17636
     }
   },
   {
@@ -739,14 +754,14 @@
     "defaultMessage": "!!! Batcher Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 370,
+      "line": 375,
       "column": 14,
-      "index": 17471
+      "index": 17652
     },
     "end": {
-      "line": 373,
+      "line": 378,
       "column": 3,
-      "index": 17553
+      "index": 17734
     }
   },
   {
@@ -754,14 +769,14 @@
     "defaultMessage": "!!!Limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 374,
+      "line": 379,
       "column": 26,
-      "index": 17581
+      "index": 17762
     },
     "end": {
-      "line": 377,
+      "line": 382,
       "column": 3,
-      "index": 17674
+      "index": 17855
     }
   },
   {
@@ -769,14 +784,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 378,
+      "line": 383,
       "column": 32,
-      "index": 17708
+      "index": 17889
     },
     "end": {
-      "line": 383,
+      "line": 388,
       "column": 3,
-      "index": 17928
+      "index": 18109
     }
   },
   {
@@ -784,14 +799,14 @@
     "defaultMessage": "!!!Your limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 384,
+      "line": 389,
       "column": 30,
-      "index": 17960
+      "index": 18141
     },
     "end": {
-      "line": 387,
+      "line": 392,
       "column": 3,
-      "index": 18062
+      "index": 18243
     }
   },
   {
@@ -799,14 +814,14 @@
     "defaultMessage": "!!!Market price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 388,
+      "line": 393,
       "column": 32,
-      "index": 18096
+      "index": 18277
     },
     "end": {
-      "line": 391,
+      "line": 396,
       "column": 3,
-      "index": 18196
+      "index": 18377
     }
   },
   {
@@ -814,14 +829,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 392,
+      "line": 397,
       "column": 25,
-      "index": 18223
+      "index": 18404
     },
     "end": {
-      "line": 395,
+      "line": 400,
       "column": 3,
-      "index": 18308
+      "index": 18489
     }
   },
   {
@@ -829,14 +844,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 396,
+      "line": 401,
       "column": 28,
-      "index": 18338
+      "index": 18519
     },
     "end": {
-      "line": 399,
+      "line": 404,
       "column": 3,
-      "index": 18426
+      "index": 18607
     }
   },
   {
@@ -844,14 +859,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 400,
+      "line": 405,
       "column": 21,
-      "index": 18449
+      "index": 18630
     },
     "end": {
-      "line": 403,
+      "line": 408,
       "column": 3,
-      "index": 18547
+      "index": 18728
     }
   },
   {
@@ -859,14 +874,14 @@
     "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 404,
+      "line": 409,
       "column": 22,
-      "index": 18571
+      "index": 18752
     },
     "end": {
-      "line": 407,
+      "line": 412,
       "column": 3,
-      "index": 18737
+      "index": 18918
     }
   },
   {
@@ -874,14 +889,14 @@
     "defaultMessage": "!!! dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 408,
+      "line": 413,
       "column": 7,
-      "index": 18746
+      "index": 18927
     },
     "end": {
-      "line": 411,
+      "line": 416,
       "column": 3,
-      "index": 18813
+      "index": 18994
     }
   },
   {
@@ -889,14 +904,14 @@
     "defaultMessage": "!!!see on explorer",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 412,
+      "line": 417,
       "column": 17,
-      "index": 18832
+      "index": 19013
     },
     "end": {
-      "line": 415,
+      "line": 420,
       "column": 3,
-      "index": 18920
+      "index": 19101
     }
   },
   {
@@ -904,14 +919,14 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 416,
+      "line": 421,
       "column": 9,
-      "index": 18931
+      "index": 19112
     },
     "end": {
-      "line": 419,
+      "line": 424,
       "column": 3,
-      "index": 19004
+      "index": 19185
     }
   },
   {
@@ -919,14 +934,14 @@
     "defaultMessage": "!!!Clear",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 420,
+      "line": 425,
       "column": 9,
-      "index": 19015
+      "index": 19196
     },
     "end": {
-      "line": 423,
+      "line": 428,
       "column": 3,
-      "index": 19076
+      "index": 19257
     }
   },
   {
@@ -934,14 +949,14 @@
     "defaultMessage": "!!!Sign transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 424,
+      "line": 429,
       "column": 19,
-      "index": 19097
+      "index": 19278
     },
     "end": {
-      "line": 427,
+      "line": 432,
       "column": 3,
-      "index": 19179
+      "index": 19360
     }
   },
   {
@@ -949,14 +964,14 @@
     "defaultMessage": "!!!Spending Password",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 428,
+      "line": 433,
       "column": 20,
-      "index": 19201
+      "index": 19382
     },
     "end": {
-      "line": 431,
+      "line": 436,
       "column": 3,
-      "index": 19285
+      "index": 19466
     }
   },
   {
@@ -964,14 +979,14 @@
     "defaultMessage": "!!!Enter spending password to sign this transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 432,
+      "line": 437,
       "column": 25,
-      "index": 19312
+      "index": 19493
     },
     "end": {
-      "line": 435,
+      "line": 440,
       "column": 3,
-      "index": 19432
+      "index": 19613
     }
   },
   {
@@ -979,14 +994,14 @@
     "defaultMessage": "!!!Sign",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 436,
+      "line": 441,
       "column": 8,
-      "index": 19442
+      "index": 19623
     },
     "end": {
-      "line": 439,
+      "line": 444,
       "column": 3,
-      "index": 19501
+      "index": 19682
     }
   },
   {
@@ -994,14 +1009,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 440,
+      "line": 445,
       "column": 14,
-      "index": 19517
+      "index": 19698
     },
     "end": {
-      "line": 443,
+      "line": 448,
       "column": 3,
-      "index": 19576
+      "index": 19757
     }
   },
   {
@@ -1009,14 +1024,14 @@
     "defaultMessage": "!!!completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 444,
+      "line": 449,
       "column": 23,
-      "index": 19601
+      "index": 19782
     },
     "end": {
-      "line": 447,
+      "line": 452,
       "column": 3,
-      "index": 19686
+      "index": 19867
     }
   },
   {
@@ -1024,14 +1039,14 @@
     "defaultMessage": "!!!open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 448,
+      "line": 453,
       "column": 18,
-      "index": 19706
+      "index": 19887
     },
     "end": {
-      "line": 451,
+      "line": 456,
       "column": 3,
-      "index": 19781
+      "index": 19962
     }
   },
   {
@@ -1039,14 +1054,14 @@
     "defaultMessage": "!!!Confirm order cancellation",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 452,
+      "line": 457,
       "column": 24,
-      "index": 19807
+      "index": 19988
     },
     "end": {
-      "line": 455,
+      "line": 460,
       "column": 3,
-      "index": 19904
+      "index": 20085
     }
   },
   {
@@ -1054,14 +1069,14 @@
     "defaultMessage": "!!!Cancel order",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 456,
+      "line": 461,
       "column": 29,
-      "index": 19935
+      "index": 20116
     },
     "end": {
-      "line": 459,
+      "line": 464,
       "column": 3,
-      "index": 20022
+      "index": 20203
     }
   },
   {
@@ -1069,14 +1084,14 @@
     "defaultMessage": "!!!Are you sure you want to cancel this order?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 460,
+      "line": 465,
       "column": 31,
-      "index": 20055
+      "index": 20236
     },
     "end": {
-      "line": 463,
+      "line": 468,
       "column": 3,
-      "index": 20176
+      "index": 20357
     }
   },
   {
@@ -1084,14 +1099,14 @@
     "defaultMessage": "!!!Learn more about swap orders in Yoroi",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 464,
+      "line": 469,
       "column": 23,
-      "index": 20201
+      "index": 20382
     },
     "end": {
-      "line": 467,
+      "line": 472,
       "column": 3,
-      "index": 20308
+      "index": 20489
     }
   },
   {
@@ -1099,14 +1114,14 @@
     "defaultMessage": "!!!Asset price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 468,
+      "line": 473,
       "column": 29,
-      "index": 20339
+      "index": 20520
     },
     "end": {
-      "line": 471,
+      "line": 476,
       "column": 3,
-      "index": 20426
+      "index": 20607
     }
   },
   {
@@ -1114,14 +1129,14 @@
     "defaultMessage": "!!!Asset amount",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 472,
+      "line": 477,
       "column": 30,
-      "index": 20458
+      "index": 20639
     },
     "end": {
-      "line": 475,
+      "line": 480,
       "column": 3,
-      "index": 20547
+      "index": 20728
     }
   },
   {
@@ -1129,14 +1144,14 @@
     "defaultMessage": "!!!Total returned",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 476,
+      "line": 481,
       "column": 32,
-      "index": 20581
+      "index": 20762
     },
     "end": {
-      "line": 479,
+      "line": 484,
       "column": 3,
-      "index": 20674
+      "index": 20855
     }
   },
   {
@@ -1144,14 +1159,14 @@
     "defaultMessage": "!!!Cancellation Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 480,
+      "line": 485,
       "column": 34,
-      "index": 20710
+      "index": 20891
     },
     "end": {
-      "line": 483,
+      "line": 488,
       "column": 3,
-      "index": 20807
+      "index": 20988
     }
   },
   {
@@ -1159,14 +1174,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 484,
+      "line": 489,
       "column": 26,
-      "index": 20835
+      "index": 21016
     },
     "end": {
-      "line": 487,
+      "line": 492,
       "column": 3,
-      "index": 20915
+      "index": 21096
     }
   },
   {
@@ -1174,14 +1189,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 488,
+      "line": 493,
       "column": 23,
-      "index": 20940
+      "index": 21121
     },
     "end": {
-      "line": 491,
+      "line": 496,
       "column": 3,
-      "index": 21014
+      "index": 21195
     }
   },
   {
@@ -1189,14 +1204,14 @@
     "defaultMessage": "!!!Total",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 492,
+      "line": 497,
       "column": 19,
-      "index": 21035
+      "index": 21216
     },
     "end": {
-      "line": 495,
+      "line": 500,
       "column": 3,
-      "index": 21105
+      "index": 21286
     }
   },
   {
@@ -1204,14 +1219,14 @@
     "defaultMessage": "!!!Liquidity Pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 496,
+      "line": 501,
       "column": 27,
-      "index": 21134
+      "index": 21315
     },
     "end": {
-      "line": 499,
+      "line": 504,
       "column": 3,
-      "index": 21221
+      "index": 21402
     }
   },
   {
@@ -1219,14 +1234,14 @@
     "defaultMessage": "!!!Time Created",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 500,
+      "line": 505,
       "column": 25,
-      "index": 21248
+      "index": 21429
     },
     "end": {
-      "line": 503,
+      "line": 508,
       "column": 3,
-      "index": 21331
+      "index": 21512
     }
   },
   {
@@ -1234,14 +1249,14 @@
     "defaultMessage": "!!!Time Completed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 504,
+      "line": 509,
       "column": 27,
-      "index": 21360
+      "index": 21541
     },
     "end": {
-      "line": 507,
+      "line": 512,
       "column": 3,
-      "index": 21447
+      "index": 21628
     }
   },
   {
@@ -1249,14 +1264,14 @@
     "defaultMessage": "!!!Transaction ID",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 508,
+      "line": 513,
       "column": 18,
-      "index": 21467
+      "index": 21648
     },
     "end": {
-      "line": 511,
+      "line": 516,
       "column": 3,
-      "index": 21545
+      "index": 21726
     }
   },
   {
@@ -1264,14 +1279,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 512,
+      "line": 517,
       "column": 26,
-      "index": 21573
+      "index": 21754
     },
     "end": {
-      "line": 515,
+      "line": 520,
       "column": 3,
-      "index": 21691
+      "index": 21872
     }
   },
   {
@@ -1279,14 +1294,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 516,
+      "line": 521,
       "column": 18,
-      "index": 21711
+      "index": 21892
     },
     "end": {
-      "line": 521,
+      "line": 526,
       "column": 3,
-      "index": 21940
+      "index": 22121
     }
   },
   {
@@ -1294,14 +1309,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 522,
+      "line": 527,
       "column": 13,
-      "index": 21955
+      "index": 22136
     },
     "end": {
-      "line": 525,
+      "line": 530,
       "column": 3,
-      "index": 22069
+      "index": 22250
     }
   },
   {
@@ -1309,14 +1324,14 @@
     "defaultMessage": "!!! USB connection is blocked by iOS devices",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 526,
+      "line": 531,
       "column": 26,
-      "index": 22097
+      "index": 22278
     },
     "end": {
-      "line": 529,
+      "line": 534,
       "column": 3,
-      "index": 22249
+      "index": 22430
     }
   },
   {
@@ -1324,14 +1339,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 530,
+      "line": 535,
       "column": 24,
-      "index": 22275
+      "index": 22456
     },
     "end": {
-      "line": 533,
+      "line": 538,
       "column": 3,
-      "index": 22469
+      "index": 22650
     }
   },
   {
@@ -1339,14 +1354,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 534,
+      "line": 539,
       "column": 19,
-      "index": 22490
+      "index": 22671
     },
     "end": {
-      "line": 537,
+      "line": 542,
       "column": 3,
-      "index": 22616
+      "index": 22797
     }
   },
   {
@@ -1354,14 +1369,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 538,
+      "line": 543,
       "column": 18,
-      "index": 22636
+      "index": 22817
     },
     "end": {
-      "line": 541,
+      "line": 546,
       "column": 3,
-      "index": 22746
+      "index": 22927
     }
   },
   {
@@ -1369,14 +1384,14 @@
     "defaultMessage": "!!!Service unavailable",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 542,
+      "line": 547,
       "column": 22,
-      "index": 22770
+      "index": 22951
     },
     "end": {
-      "line": 545,
+      "line": 550,
       "column": 3,
-      "index": 22864
+      "index": 23045
     }
   },
   {
@@ -1384,14 +1399,14 @@
     "defaultMessage": "!!!The server is temporarily busy due to maintenance downtime or capacity problems",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 546,
+      "line": 551,
       "column": 26,
-      "index": 22892
+      "index": 23073
     },
     "end": {
-      "line": 549,
+      "line": 554,
       "column": 3,
-      "index": 23050
+      "index": 23231
     }
   },
   {
@@ -1399,14 +1414,14 @@
     "defaultMessage": "!!!GO TO transactions",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 550,
+      "line": 555,
       "column": 20,
-      "index": 23072
+      "index": 23253
     },
     "end": {
-      "line": 553,
+      "line": 558,
       "column": 3,
-      "index": 23178
+      "index": 23359
     }
   },
   {
@@ -1414,14 +1429,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 556,
+      "line": 561,
       "column": 11,
-      "index": 23237
+      "index": 23418
     },
     "end": {
-      "line": 559,
+      "line": 564,
       "column": 3,
-      "index": 23332
+      "index": 23513
     }
   },
   {
@@ -1429,14 +1444,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 560,
+      "line": 565,
       "column": 12,
-      "index": 23346
+      "index": 23527
     },
     "end": {
-      "line": 563,
+      "line": 568,
       "column": 3,
-      "index": 23449
+      "index": 23630
     }
   },
   {
@@ -1444,14 +1459,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 564,
+      "line": 569,
       "column": 9,
-      "index": 23460
+      "index": 23641
     },
     "end": {
-      "line": 567,
+      "line": 572,
       "column": 3,
-      "index": 23550
+      "index": 23731
     }
   },
   {
@@ -1459,14 +1474,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 568,
+      "line": 573,
       "column": 16,
-      "index": 23568
+      "index": 23749
     },
     "end": {
-      "line": 571,
+      "line": 576,
       "column": 3,
-      "index": 23664
+      "index": 23845
     }
   },
   {
@@ -1474,29 +1489,29 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 572,
+      "line": 577,
       "column": 20,
-      "index": 23686
+      "index": 23867
     },
     "end": {
-      "line": 575,
+      "line": 580,
       "column": 3,
-      "index": 23775
+      "index": 23956
     }
   },
   {
-    "id": "components.send.confirmscreen.confirmButton",
-    "defaultMessage": "!!!Confirm",
+    "id": "global.next",
+    "defaultMessage": "!!!Next",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 576,
-      "column": 11,
-      "index": 23788
+      "line": 581,
+      "column": 8,
+      "index": 23966
     },
     "end": {
-      "line": 579,
+      "line": 584,
       "column": 3,
-      "index": 23882
+      "index": 24025
     }
   },
   {
@@ -1504,14 +1519,14 @@
     "defaultMessage": "!!!Generate",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 580,
+      "line": 585,
       "column": 20,
-      "index": 23904
+      "index": 24047
     },
     "end": {
-      "line": 583,
+      "line": 588,
       "column": 3,
-      "index": 24002
+      "index": 24145
     }
   },
   {
@@ -1519,14 +1534,14 @@
     "defaultMessage": "!!!Collateral not found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 584,
+      "line": 589,
       "column": 22,
-      "index": 24026
+      "index": 24169
     },
     "end": {
-      "line": 587,
+      "line": 592,
       "column": 3,
-      "index": 24138
+      "index": 24281
     }
   },
   {
@@ -1534,14 +1549,14 @@
     "defaultMessage": "!!!To continue with this action, you need to generate a collateral",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 588,
+      "line": 593,
       "column": 22,
-      "index": 24162
+      "index": 24305
     },
     "end": {
-      "line": 591,
+      "line": 596,
       "column": 3,
-      "index": 24317
+      "index": 24460
     }
   },
   {
@@ -1549,14 +1564,14 @@
     "defaultMessage": "!!!Pending Collateral UTxO",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 592,
+      "line": 597,
       "column": 28,
-      "index": 24347
+      "index": 24490
     },
     "end": {
-      "line": 595,
+      "line": 600,
       "column": 3,
-      "index": 24468
+      "index": 24611
     }
   },
   {
@@ -1564,14 +1579,14 @@
     "defaultMessage": "!!!The collateral UTxO transaction you've submitted is currently in the processing stage, and it may require a few minutes to complete. Please refresh your interface and attempt the action again shortly",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 596,
+      "line": 601,
       "column": 23,
-      "index": 24493
+      "index": 24636
     },
     "end": {
-      "line": 600,
+      "line": 605,
       "column": 3,
-      "index": 24791
+      "index": 24934
     }
   },
   {
@@ -1579,14 +1594,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 601,
+      "line": 606,
       "column": 17,
-      "index": 24810
+      "index": 24953
     },
     "end": {
-      "line": 604,
+      "line": 609,
       "column": 3,
-      "index": 24912
+      "index": 25055
     }
   },
   {
@@ -1594,14 +1609,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 605,
+      "line": 610,
       "column": 16,
-      "index": 24930
+      "index": 25073
     },
     "end": {
-      "line": 608,
+      "line": 613,
       "column": 3,
-      "index": 25085
+      "index": 25228
     }
   },
   {
@@ -1609,14 +1624,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 609,
+      "line": 614,
       "column": 18,
-      "index": 25105
+      "index": 25248
     },
     "end": {
-      "line": 612,
+      "line": 617,
       "column": 3,
-      "index": 25199
+      "index": 25342
     }
   },
   {
@@ -1624,14 +1639,14 @@
     "defaultMessage": "!!!Not enough balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 613,
+      "line": 618,
       "column": 20,
-      "index": 25221
+      "index": 25364
     },
     "end": {
-      "line": 616,
+      "line": 621,
       "column": 3,
-      "index": 25315
+      "index": 25458
     }
   },
   {
@@ -1639,14 +1654,14 @@
     "defaultMessage": "!!!Not enough supply in the pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 617,
+      "line": 622,
       "column": 19,
-      "index": 25336
+      "index": 25479
     },
     "end": {
-      "line": 620,
+      "line": 625,
       "column": 3,
-      "index": 25440
+      "index": 25583
     }
   },
   {
@@ -1654,14 +1669,14 @@
     "defaultMessage": "!!!Not enough balance, please consider the fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 621,
+      "line": 626,
       "column": 23,
-      "index": 25465
+      "index": 25608
     },
     "end": {
-      "line": 624,
+      "line": 629,
       "column": 3,
-      "index": 25588
+      "index": 25731
     }
   },
   {
@@ -1669,14 +1684,14 @@
     "defaultMessage": "!!! This pair is not available in any liquidity pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 625,
+      "line": 630,
       "column": 10,
-      "index": 25600
+      "index": 25743
     },
     "end": {
-      "line": 628,
+      "line": 633,
       "column": 3,
-      "index": 25715
+      "index": 25858
     }
   },
   {
@@ -1684,14 +1699,14 @@
     "defaultMessage": "!!!Continue on Ledger",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 629,
+      "line": 634,
       "column": 20,
-      "index": 25737
+      "index": 25880
     },
     "end": {
-      "line": 632,
+      "line": 637,
       "column": 3,
-      "index": 25837
+      "index": 25980
     }
   },
   {
@@ -1699,14 +1714,14 @@
     "defaultMessage": "!!!Continue",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 633,
+      "line": 638,
       "column": 12,
-      "index": 25851
+      "index": 25994
     },
     "end": {
-      "line": 636,
+      "line": 641,
       "column": 3,
-      "index": 25954
+      "index": 26097
     }
   },
   {
@@ -1714,14 +1729,14 @@
     "defaultMessage": "!!!Slippage Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 637,
+      "line": 642,
       "column": 24,
-      "index": 25980
+      "index": 26123
     },
     "end": {
-      "line": 640,
+      "line": 645,
       "column": 3,
-      "index": 26074
+      "index": 26217
     }
   },
   {
@@ -1729,14 +1744,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 641,
+      "line": 646,
       "column": 23,
-      "index": 26099
+      "index": 26242
     },
     "end": {
-      "line": 645,
+      "line": 650,
       "column": 3,
-      "index": 26302
+      "index": 26445
     }
   },
   {
@@ -1744,14 +1759,14 @@
     "defaultMessage": "!!!Your slippage tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 646,
+      "line": 651,
       "column": 31,
-      "index": 26335
+      "index": 26478
     },
     "end": {
-      "line": 649,
+      "line": 654,
       "column": 3,
-      "index": 26428
+      "index": 26571
     }
   },
   {
@@ -1759,14 +1774,14 @@
     "defaultMessage": "!!!Increase the amount to proceed or change slippage tolerance to 0%",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 650,
+      "line": 655,
       "column": 31,
-      "index": 26461
+      "index": 26604
     },
     "end": {
-      "line": 653,
+      "line": 658,
       "column": 3,
-      "index": 26596
+      "index": 26739
     }
   },
   {
@@ -1774,14 +1789,14 @@
     "defaultMessage": "!!!No orders available yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 654,
+      "line": 659,
       "column": 19,
-      "index": 26617
+      "index": 26760
     },
     "end": {
-      "line": 657,
+      "line": 662,
       "column": 3,
-      "index": 26715
+      "index": 26858
     }
   },
   {
@@ -1789,14 +1804,14 @@
     "defaultMessage": "!!!Start doing SWAP to see your open orders here",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 658,
+      "line": 663,
       "column": 22,
-      "index": 26739
+      "index": 26882
     },
     "end": {
-      "line": 661,
+      "line": 666,
       "column": 3,
-      "index": 26862
+      "index": 27005
     }
   },
   {
@@ -1804,14 +1819,14 @@
     "defaultMessage": "!!!No orders completed yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 662,
+      "line": 667,
       "column": 24,
-      "index": 26888
+      "index": 27031
     },
     "end": {
-      "line": 665,
+      "line": 670,
       "column": 3,
-      "index": 26991
+      "index": 27134
     }
   },
   {
@@ -1819,14 +1834,14 @@
     "defaultMessage": "!!!No orders found for",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 666,
+      "line": 671,
       "column": 30,
-      "index": 27023
+      "index": 27166
     },
     "end": {
-      "line": 669,
+      "line": 674,
       "column": 3,
-      "index": 27128
+      "index": 27271
     }
   },
   {
@@ -1834,14 +1849,14 @@
     "defaultMessage": "!!!No orders found for",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 670,
+      "line": 675,
       "column": 25,
-      "index": 27155
+      "index": 27298
     },
     "end": {
-      "line": 673,
+      "line": 678,
       "column": 3,
-      "index": 27255
+      "index": 27398
     }
   },
   {
@@ -1849,14 +1864,14 @@
     "defaultMessage": "!!!Price Impact",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 674,
+      "line": 679,
       "column": 15,
-      "index": 27272
+      "index": 27415
     },
     "end": {
-      "line": 677,
+      "line": 682,
       "column": 3,
-      "index": 27355
+      "index": 27498
     }
   },
   {
@@ -1864,14 +1879,14 @@
     "defaultMessage": "!!!Price impact over {riskValue}%",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 678,
+      "line": 683,
       "column": 23,
-      "index": 27380
+      "index": 27523
     },
     "end": {
-      "line": 681,
+      "line": 686,
       "column": 3,
-      "index": 27489
+      "index": 27632
     }
   },
   {
@@ -1879,14 +1894,14 @@
     "defaultMessage": "!!!may cause a significant loss of funds. Please bear this in mind and proceed with an extra caution.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 682,
+      "line": 687,
       "column": 30,
-      "index": 27521
+      "index": 27664
     },
     "end": {
-      "line": 686,
+      "line": 691,
       "column": 3,
-      "index": 27711
+      "index": 27854
     }
   },
   {
@@ -1894,14 +1909,14 @@
     "defaultMessage": "!!!may cause a difference in the amount you actually receive. Consider this at your own risk.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 687,
+      "line": 692,
       "column": 34,
-      "index": 27747
+      "index": 27890
     },
     "end": {
-      "line": 690,
+      "line": 695,
       "column": 3,
-      "index": 27927
+      "index": 28070
     }
   },
   {
@@ -1909,14 +1924,14 @@
     "defaultMessage": "!!!Price impact is a difference between the actual market price and your price due to trade size.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 691,
+      "line": 696,
       "column": 19,
-      "index": 27948
+      "index": 28091
     },
     "end": {
-      "line": 694,
+      "line": 699,
       "column": 3,
-      "index": 28117
+      "index": 28260
     }
   },
   {
@@ -1924,14 +1939,14 @@
     "defaultMessage": "!!Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 695,
+      "line": 700,
       "column": 11,
-      "index": 28130
+      "index": 28273
     },
     "end": {
-      "line": 698,
+      "line": 703,
       "column": 3,
-      "index": 28224
+      "index": 28367
     }
   },
   {
@@ -1939,14 +1954,14 @@
     "defaultMessage": "!!!Back to swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 699,
+      "line": 704,
       "column": 20,
-      "index": 28246
+      "index": 28389
     },
     "end": {
-      "line": 702,
+      "line": 707,
       "column": 3,
-      "index": 28341
+      "index": 28484
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
index cb695ac224..b3bc604f57 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 404,
       "column": 16,
-      "index": 14797
+      "index": 14827
     },
     "end": {
       "line": 407,
       "column": 3,
-      "index": 14886
+      "index": 14916
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 408,
       "column": 32,
-      "index": 14920
+      "index": 14950
     },
     "end": {
       "line": 411,
       "column": 3,
-      "index": 15033
+      "index": 15063
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 412,
       "column": 13,
-      "index": 15048
+      "index": 15078
     },
     "end": {
       "line": 415,
       "column": 3,
-      "index": 15121
+      "index": 15151
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 416,
       "column": 17,
-      "index": 15140
+      "index": 15170
     },
     "end": {
       "line": 419,
       "column": 3,
-      "index": 15217
+      "index": 15247
     }
   },
   {
@@ -66,12 +66,27 @@
     "start": {
       "line": 420,
       "column": 15,
-      "index": 15234
+      "index": 15264
     },
     "end": {
       "line": 423,
       "column": 3,
-      "index": 15307
+      "index": 15337
+    }
+  },
+  {
+    "id": "swap.review.title",
+    "defaultMessage": "!!!Swap review",
+    "file": "src/features/Transactions/TxHistoryNavigator.tsx",
+    "start": {
+      "line": 424,
+      "column": 19,
+      "index": 15358
+    },
+    "end": {
+      "line": 427,
+      "column": 3,
+      "index": 15430
     }
   },
   {
@@ -79,14 +94,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 424,
+      "line": 428,
       "column": 21,
-      "index": 15330
+      "index": 15453
     },
     "end": {
-      "line": 427,
+      "line": 431,
       "column": 3,
-      "index": 15425
+      "index": 15548
     }
   },
   {
@@ -94,14 +109,14 @@
     "defaultMessage": "!!!Select pool",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 428,
+      "line": 432,
       "column": 14,
-      "index": 15441
+      "index": 15564
     },
     "end": {
-      "line": 431,
+      "line": 435,
       "column": 3,
-      "index": 15522
+      "index": 15645
     }
   },
   {
@@ -109,14 +124,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 432,
+      "line": 436,
       "column": 13,
-      "index": 15537
+      "index": 15660
     },
     "end": {
-      "line": 435,
+      "line": 439,
       "column": 3,
-      "index": 15617
+      "index": 15740
     }
   },
   {
@@ -124,14 +139,14 @@
     "defaultMessage": "!!!Scan QR code address",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 436,
+      "line": 440,
       "column": 18,
-      "index": 15637
+      "index": 15760
     },
     "end": {
-      "line": 439,
+      "line": 443,
       "column": 3,
-      "index": 15738
+      "index": 15861
     }
   },
   {
@@ -139,14 +154,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 440,
+      "line": 444,
       "column": 20,
-      "index": 15760
+      "index": 15883
     },
     "end": {
-      "line": 443,
+      "line": 447,
       "column": 3,
-      "index": 15849
+      "index": 15972
     }
   },
   {
@@ -154,14 +169,14 @@
     "defaultMessage": "!!!Assets added",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 444,
+      "line": 448,
       "column": 26,
-      "index": 15877
+      "index": 16000
     },
     "end": {
-      "line": 447,
+      "line": 451,
       "column": 3,
-      "index": 15978
+      "index": 16101
     }
   },
   {
@@ -169,14 +184,14 @@
     "defaultMessage": "!!!Edit amount",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 448,
+      "line": 452,
       "column": 19,
-      "index": 15999
+      "index": 16122
     },
     "end": {
-      "line": 451,
+      "line": 455,
       "column": 3,
-      "index": 16092
+      "index": 16215
     }
   },
   {
@@ -184,14 +199,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 452,
+      "line": 456,
       "column": 16,
-      "index": 16110
+      "index": 16233
     },
     "end": {
-      "line": 455,
+      "line": 459,
       "column": 3,
-      "index": 16196
+      "index": 16319
     }
   },
   {
@@ -199,14 +214,14 @@
     "defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 456,
+      "line": 460,
       "column": 19,
-      "index": 16217
+      "index": 16340
     },
     "end": {
-      "line": 462,
+      "line": 466,
       "column": 3,
-      "index": 16455
+      "index": 16578
     }
   },
   {
@@ -214,14 +229,14 @@
     "defaultMessage": "!!!Confirm transaction",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 463,
+      "line": 467,
       "column": 27,
-      "index": 16484
+      "index": 16607
     },
     "end": {
-      "line": 466,
+      "line": 470,
       "column": 3,
-      "index": 16577
+      "index": 16700
     }
   },
   {
@@ -229,14 +244,14 @@
     "defaultMessage": "!!!Please scan a QR code",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 467,
+      "line": 471,
       "column": 13,
-      "index": 16592
+      "index": 16715
     },
     "end": {
-      "line": 470,
+      "line": 474,
       "column": 3,
-      "index": 16667
+      "index": 16790
     }
   },
   {
@@ -244,14 +259,14 @@
     "defaultMessage": "!!!Success",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 471,
+      "line": 475,
       "column": 25,
-      "index": 16694
+      "index": 16817
     },
     "end": {
-      "line": 474,
+      "line": 478,
       "column": 3,
-      "index": 16768
+      "index": 16891
     }
   },
   {
@@ -259,14 +274,14 @@
     "defaultMessage": "!!!Request specific amount",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 475,
+      "line": 479,
       "column": 18,
-      "index": 16788
+      "index": 16911
     },
     "end": {
-      "line": 478,
+      "line": 482,
       "column": 3,
-      "index": 16902
+      "index": 17025
     }
   },
   {
@@ -274,14 +289,14 @@
     "defaultMessage": "!!!Buy/Sell ADA",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 479,
+      "line": 483,
       "column": 28,
-      "index": 16932
+      "index": 17055
     },
     "end": {
-      "line": 482,
+      "line": 486,
       "column": 3,
-      "index": 17028
+      "index": 17151
     }
   },
   {
@@ -289,14 +304,14 @@
     "defaultMessage": "!!!Buy provider",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 483,
+      "line": 487,
       "column": 29,
-      "index": 17059
+      "index": 17182
     },
     "end": {
-      "line": 486,
+      "line": 490,
       "column": 3,
-      "index": 17167
+      "index": 17290
     }
   },
   {
@@ -304,14 +319,14 @@
     "defaultMessage": "!!!Sell provider",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 487,
+      "line": 491,
       "column": 30,
-      "index": 17199
+      "index": 17322
     },
     "end": {
-      "line": 490,
+      "line": 494,
       "column": 3,
-      "index": 17309
+      "index": 17432
     }
   },
   {
@@ -319,14 +334,14 @@
     "defaultMessage": "!!!Tx Details",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 491,
+      "line": 495,
       "column": 18,
-      "index": 17329
+      "index": 17452
     },
     "end": {
-      "line": 494,
+      "line": 498,
       "column": 3,
-      "index": 17423
+      "index": 17546
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
index 9198d0e581..7f80182884 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 64,
       "column": 9,
-      "index": 2065
+      "index": 2092
     },
     "end": {
       "line": 67,
       "column": 3,
-      "index": 2153
+      "index": 2180
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
index 64526f1453..05af0bc668 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/UserSummary.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 163,
       "column": 9,
-      "index": 4877
+      "index": 4904
     },
     "end": {
       "line": 166,
       "column": 3,
-      "index": 4979
+      "index": 5006
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 167,
       "column": 16,
-      "index": 4997
+      "index": 5024
     },
     "end": {
       "line": 170,
       "column": 3,
-      "index": 5107
+      "index": 5134
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 171,
       "column": 18,
-      "index": 5127
+      "index": 5154
     },
     "end": {
       "line": 174,
       "column": 3,
-      "index": 5241
+      "index": 5268
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 175,
       "column": 23,
-      "index": 5266
+      "index": 5293
     },
     "end": {
       "line": 178,
       "column": 3,
-      "index": 5378
+      "index": 5405
     }
   }
 ]
\ No newline at end of file

From 6fbf24a16b182bbb0a5104335af81455765355e4 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 09:41:10 +0200
Subject: [PATCH 06/15] refactor(swap): move swap calculation functions to
 manager (#3689)

---
 .../ReviewSwap/TransactionSummary.stories.tsx |   6 +-
 apps/wallet-mobile/src/kernel/config.ts       |   2 +-
 packages/swap/src/helpers/mocks.ts            |   5 +-
 .../factories/makeOrderCalculations.test.ts   | 117 +++++++++---------
 .../orders/factories/makeOrderCalculations.ts |  24 +---
 .../pools/getBestPoolCalculation.test.ts      |   4 +-
 .../helpers/pools/getBestPoolCalculation.ts   |  10 +-
 packages/swap/src/index.ts                    |   3 -
 packages/swap/src/manager.mocks.ts            |   9 ++
 packages/swap/src/manager.ts                  |   6 +
 .../selectedPoolCalculationSelector.test.ts   |  48 ++++---
 .../selectedPoolCalculationSelector.ts        |  20 +--
 .../src/translators/reactjs/state/state.ts    |  84 ++++++++++---
 packages/types/src/index.ts                   |   8 ++
 .../src/swap/calculations.ts}                 |  21 +++-
 packages/types/src/swap/manager.ts            |  14 +++
 16 files changed, 236 insertions(+), 145 deletions(-)
 rename packages/{swap/src/types.ts => types/src/swap/calculations.ts} (66%)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
index 28234c9837..bb19718039 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx
@@ -1,6 +1,7 @@
 import {storiesOf} from '@storybook/react-native'
 import {tokenInfoMocks} from '@yoroi/portfolio'
-import {mockSwapManager, mockSwapStateDefault, orderMocks, SwapOrderCalculation, SwapProvider} from '@yoroi/swap'
+import {mockSwapManager, mockSwapStateDefault, orderMocks, SwapProvider} from '@yoroi/swap'
+import {Swap} from '@yoroi/types'
 import React from 'react'
 import {StyleSheet, View} from 'react-native'
 
@@ -33,8 +34,9 @@ storiesOf('TransactionSummary', module) //
     )
   })
 
-const TxSummary = ({calculation}: {calculation: SwapOrderCalculation}) => {
+const TxSummary = ({calculation}: {calculation: Swap.OrderCalculation}) => {
   const orderData = {...mocks.confirmTx.orderData, selectedPoolCalculation: calculation}
+
   return (
     <WalletManagerProviderMock wallet={{...walletMocks.wallet}}>
       <SwapProvider
diff --git a/apps/wallet-mobile/src/kernel/config.ts b/apps/wallet-mobile/src/kernel/config.ts
index 461c08071c..8a814b441e 100644
--- a/apps/wallet-mobile/src/kernel/config.ts
+++ b/apps/wallet-mobile/src/kernel/config.ts
@@ -12,4 +12,4 @@ export const governaceAfterBlock = freeze({
 
 export const agreementDate = 1691967600000
 
-export const loggerLevel: App.Logger.Level = isDev ? App.Logger.Level.Debug : App.Logger.Level.Warn
+export const loggerLevel: App.Logger.Level = isDev ? App.Logger.Level.Log : App.Logger.Level.Warn
diff --git a/packages/swap/src/helpers/mocks.ts b/packages/swap/src/helpers/mocks.ts
index 3db7dcc3aa..9c20429af8 100644
--- a/packages/swap/src/helpers/mocks.ts
+++ b/packages/swap/src/helpers/mocks.ts
@@ -1,6 +1,5 @@
 import {Swap} from '@yoroi/types'
 
-import {SwapOrderCalculation} from '../types'
 import {tokenInfoMocks} from '../tokenInfo.mocks'
 
 const mockedPools1: Swap.Pool[] = [
@@ -600,7 +599,7 @@ const mockedPools8: Swap.Pool[] = [
   },
 ]
 
-const mockedOrderCalculations1: SwapOrderCalculation[] = [
+const mockedOrderCalculations1: Swap.OrderCalculation[] = [
   {
     order: {
       side: 'sell',
@@ -1197,7 +1196,7 @@ const mockedOrderCalculations1: SwapOrderCalculation[] = [
   },
 ]
 
-const mockedOrderCalculations2: SwapOrderCalculation[] = [
+const mockedOrderCalculations2: Swap.OrderCalculation[] = [
   {
     order: {
       side: 'buy',
diff --git a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
index 75513cd923..c72fb6bff7 100644
--- a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
+++ b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
@@ -3,7 +3,6 @@ import {AppApi} from '@yoroi/api'
 
 import {makeOrderCalculations} from './makeOrderCalculations'
 import {mocks} from '../../mocks'
-import {SwapOrderCalculation} from '../../../types'
 import {SwapState} from '../../../translators/reactjs/state/state'
 import {tokenInfoMocks} from '../../../tokenInfo.mocks'
 
@@ -40,7 +39,7 @@ describe('makeOrderCalculations', () => {
       frontendFeeTiers,
     })
 
-    expect(calculations[0]).toStrictEqual<SwapOrderCalculation>({
+    expect(calculations[0]).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -150,9 +149,9 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
+    const calculation: Swap.OrderCalculation = calculations[0]!
 
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -231,7 +230,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.3379136660',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 3, buy B)', () => {
     const pool = mocks.mockedPools5[0] as Swap.Pool
@@ -262,9 +261,9 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
+    const calculation: Swap.OrderCalculation = calculations[0]!
 
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'buy',
         slippage: 0,
@@ -343,7 +342,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.3379136754',
       },
       pool: pool,
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 4, buy A, reversed case 3) ', () => {
     const pool = mocks.mockedPools5[1] as Swap.Pool
@@ -374,9 +373,9 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
+    const calculation: Swap.OrderCalculation = calculations[0]!
 
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'buy',
         slippage: 0,
@@ -455,7 +454,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.3379136754',
       },
       pool: pool,
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 5, with slippage)', () => {
     const pool = mocks.mockedPools5[2] as Swap.Pool
@@ -562,7 +561,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '1.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 6, zero supply)', () => {
     const pool = mocks.mockedPools5[3] as Swap.Pool
@@ -667,7 +666,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 7, sell A, not enough supply)', () => {
     const pool = mocks.mockedPools5[4] as Swap.Pool
@@ -773,7 +772,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '-100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 8, buy A, not enough supply)', () => {
     const pool = mocks.mockedPools5[4] as Swap.Pool
@@ -879,7 +878,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '-99.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 9, sell A, A supply is zero)', () => {
     const pool = mocks.mockedPools5[5] as Swap.Pool
@@ -985,7 +984,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 10, sell A, B supply is zero)', () => {
     const pool = mocks.mockedPools5[6] as Swap.Pool
@@ -1091,7 +1090,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 11, buy A, A supply is zero)', () => {
     const pool = mocks.mockedPools5[5] as Swap.Pool
@@ -1194,7 +1193,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 12, buy A, B supply is zero)', () => {
     const pool = mocks.mockedPools5[6] as Swap.Pool
@@ -1300,7 +1299,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 13, sell B, B supply is zero)', () => {
     const pool = mocks.mockedPools5[6] as Swap.Pool
@@ -1406,7 +1405,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 14, sell B, A supply is zero)', () => {
     const pool = mocks.mockedPools5[5] as Swap.Pool
@@ -1512,7 +1511,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 15, buy B, B supply is zero)', () => {
     const pool = mocks.mockedPools5[6] as Swap.Pool
@@ -1615,7 +1614,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 16, buy B, A supply is zero)', () => {
     const pool = mocks.mockedPools5[5] as Swap.Pool
@@ -1721,7 +1720,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 17, buy A, limit price)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -1752,8 +1751,8 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'buy',
         slippage: 0,
@@ -1827,7 +1826,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 18, sell A, limit price)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -1858,8 +1857,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -1933,7 +1932,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 19, buy B, limit price)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -1964,8 +1963,8 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'buy',
         slippage: 0,
@@ -2039,7 +2038,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 20, sell B, limit price)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2070,8 +2069,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2145,7 +2144,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 21, no FEF test)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2176,8 +2175,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2251,7 +2250,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 22, full FEF test)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2285,8 +2284,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2368,7 +2367,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 23, discount 1 FEF test)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2402,8 +2401,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2485,7 +2484,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 24, discount 2 FEF test)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2519,8 +2518,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2602,7 +2601,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '0.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 25, zero sell)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2636,8 +2635,8 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'sell',
         slippage: 0,
@@ -2711,7 +2710,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '-100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 26, zero buy)', () => {
     const pool = mocks.mockedPools5[7] as Swap.Pool
@@ -2745,8 +2744,8 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const calculation: SwapOrderCalculation = calculations[0]!
-    expect(calculation).toStrictEqual<SwapOrderCalculation>({
+    const calculation: Swap.OrderCalculation = calculations[0]!
+    expect(calculation).toStrictEqual<Swap.OrderCalculation>({
       order: {
         side: 'buy',
         slippage: 0,
@@ -2820,7 +2819,7 @@ describe('makeOrderCalculations', () => {
         priceImpact: '-100.0000000000',
       },
       pool: pools[0],
-    } as SwapOrderCalculation)
+    } as Swap.OrderCalculation)
   })
   it('should calculate all fees and amounts correctly (case 27, zero pt sell side)', () => {
     const pool: Swap.Pool = mocks.mockedPools7[1]!
@@ -2853,7 +2852,7 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'buy',
         slippage: 0,
@@ -2961,7 +2960,7 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'sell',
         slippage: 0,
@@ -3069,7 +3068,7 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'sell',
         slippage: 0,
@@ -3177,7 +3176,7 @@ describe('makeOrderCalculations', () => {
       side: 'sell',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'sell',
         slippage: 0,
@@ -3285,7 +3284,7 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'buy',
         slippage: 0,
@@ -3393,7 +3392,7 @@ describe('makeOrderCalculations', () => {
       side: 'buy',
       frontendFeeTiers,
     })
-    const expectedCalculation: SwapOrderCalculation = {
+    const expectedCalculation: Swap.OrderCalculation = {
       order: {
         side: 'buy',
         slippage: 0,
diff --git a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
index a413057d1f..e875dde2f6 100644
--- a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
+++ b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
@@ -1,13 +1,11 @@
-import {App, Portfolio, Swap} from '@yoroi/types'
+import {Portfolio, Swap} from '@yoroi/types'
 import {BigNumber} from 'bignumber.js'
-import {SwapState} from '../../../translators/reactjs/state/state'
 import {getQuantityWithSlippage} from '../amounts/getQuantityWithSlippage'
 import {getLiquidityProviderFee} from '../costs/getLiquidityProviderFee'
 import {getFrontendFee} from '../costs/getFrontendFee'
 import {getMarketPrice} from '../../prices/getMarketPrice'
 import {getBuyAmount} from '../amounts/getBuyAmount'
 import {getSellAmount} from '../amounts/getSellAmount'
-import {SwapOrderCalculation} from '../../../types'
 
 export const makeOrderCalculations = ({
   orderType,
@@ -20,27 +18,13 @@ export const makeOrderCalculations = ({
   frontendFeeTiers,
   tokens,
   priceDecimals = 10,
-}: Readonly<{
-  orderType: Swap.OrderType
-  amounts: {
-    sell?: Portfolio.Token.Amount
-    buy?: Portfolio.Token.Amount
-  }
-  limitPrice?: string
-  pools: ReadonlyArray<Swap.Pool>
-  lpTokenHeld?: Portfolio.Token.Amount
-  slippage: number
-  side?: 'buy' | 'sell'
-  frontendFeeTiers: ReadonlyArray<App.FrontendFeeTier>
-  tokens: SwapState['orderData']['tokens']
-  priceDecimals?: number
-}>): Array<SwapOrderCalculation> => {
+}: Swap.MakeOrderCalculation): Array<Swap.OrderCalculation> => {
   if (!amounts.sell || !amounts.buy || !tokens.ptInfo) return []
 
   const isLimit = orderType === 'limit'
   const maybeLimitPrice = isLimit ? new BigNumber(limitPrice ?? 0) : undefined
 
-  const calculations = pools.map<SwapOrderCalculation>((pool) => {
+  const calculations = pools.map<Swap.OrderCalculation>((pool) => {
     const buy =
       side === 'sell'
         ? getBuyAmount(
@@ -197,7 +181,7 @@ export const makeOrderCalculations = ({
       info: tokens.ptInfo!,
     }
 
-    const result: SwapOrderCalculation = {
+    const result: Swap.OrderCalculation = {
       order: {
         side,
         slippage,
diff --git a/packages/swap/src/helpers/pools/getBestPoolCalculation.test.ts b/packages/swap/src/helpers/pools/getBestPoolCalculation.test.ts
index 4528586e02..7b9312ed39 100644
--- a/packages/swap/src/helpers/pools/getBestPoolCalculation.test.ts
+++ b/packages/swap/src/helpers/pools/getBestPoolCalculation.test.ts
@@ -1,5 +1,5 @@
+import {Swap} from '@yoroi/types'
 import {tokenInfoMocks} from '../../tokenInfo.mocks'
-import {SwapOrderCalculation} from '../../types'
 import {mocks} from '../mocks'
 import {getBestPoolCalculation} from './getBestPoolCalculation'
 
@@ -13,7 +13,7 @@ describe('getBestPoolCalculation', () => {
   })
 
   it('should skip no supply pools', () => {
-    const calculations: ReadonlyArray<SwapOrderCalculation> = [
+    const calculations: Array<Swap.OrderCalculation> = [
       {
         order: {
           side: 'buy',
diff --git a/packages/swap/src/helpers/pools/getBestPoolCalculation.ts b/packages/swap/src/helpers/pools/getBestPoolCalculation.ts
index f069ad3c90..909d14cb99 100644
--- a/packages/swap/src/helpers/pools/getBestPoolCalculation.ts
+++ b/packages/swap/src/helpers/pools/getBestPoolCalculation.ts
@@ -1,14 +1,14 @@
+import {Swap} from '@yoroi/types'
 import BigNumber from 'bignumber.js'
-import {SwapOrderCalculation} from '../../types'
 
 export const getBestPoolCalculation = (
-  calculations: ReadonlyArray<SwapOrderCalculation>,
-): SwapOrderCalculation | undefined => {
+  calculations: Array<Swap.OrderCalculation>,
+): Swap.OrderCalculation | undefined => {
   return calculations.reduce(
     (
-      best: SwapOrderCalculation | undefined,
+      best: Swap.OrderCalculation | undefined,
       current,
-    ): SwapOrderCalculation | undefined => {
+    ): Swap.OrderCalculation | undefined => {
       if (!current.hasSupply) return best
 
       if (best === undefined) return current
diff --git a/packages/swap/src/index.ts b/packages/swap/src/index.ts
index 7d07aaa91b..c66df66340 100644
--- a/packages/swap/src/index.ts
+++ b/packages/swap/src/index.ts
@@ -45,9 +45,6 @@ export {useSwapTokensOnlyVerified} from './translators/reactjs/hooks/useSwapToke
 export {useSwap} from './translators/reactjs/hooks/useSwap'
 export {supportedProviders, milkTokenId} from './translators/constants'
 
-// types
-export * from './types'
-
 // factories
 export {swapApiMaker} from './adapters/api-maker'
 export {swapManagerMaker} from './manager'
diff --git a/packages/swap/src/manager.mocks.ts b/packages/swap/src/manager.mocks.ts
index 60f2f3bcc9..ceda6e3202 100644
--- a/packages/swap/src/manager.mocks.ts
+++ b/packages/swap/src/manager.mocks.ts
@@ -1,6 +1,9 @@
 import {Portfolio, Swap} from '@yoroi/types'
 import {apiMocks} from './adapters/openswap-api/api.mocks'
 import {tokenInfoMocks} from '@yoroi/portfolio'
+import {makeOrderCalculations} from './helpers/orders/factories/makeOrderCalculations'
+import {getBestPoolCalculation} from './helpers/pools/getBestPoolCalculation'
+import {selectedPoolCalculationSelector} from './translators/reactjs/state/selectors/selectedPoolCalculationSelector'
 
 const loading = () => new Promise(() => {})
 const unknownError = () => Promise.reject(new Error('Unknown error'))
@@ -208,6 +211,9 @@ export const mockSwapManager: Swap.Manager = {
   primaryTokenInfo: tokenInfoMocks.primaryETH,
   aggregatorTokenId: undefined,
   frontendFeeTiers: [] as const,
+  makeOrderCalculations,
+  getBestPoolCalculation,
+  selectedPoolCalculationSelector,
 } as const
 
 export const mockSwapManagerDefault: Swap.Manager = {
@@ -241,4 +247,7 @@ export const mockSwapManagerDefault: Swap.Manager = {
   frontendFeeTiers: [] as const,
   aggregatorTokenId: undefined,
   aggregator: 'muesliswap',
+  makeOrderCalculations,
+  getBestPoolCalculation,
+  selectedPoolCalculationSelector,
 } as const
diff --git a/packages/swap/src/manager.ts b/packages/swap/src/manager.ts
index 779df62ec2..0153b69cdc 100644
--- a/packages/swap/src/manager.ts
+++ b/packages/swap/src/manager.ts
@@ -1,4 +1,7 @@
 import {App, Portfolio, Swap} from '@yoroi/types'
+import {makeOrderCalculations} from './helpers/orders/factories/makeOrderCalculations'
+import {getBestPoolCalculation} from './helpers/pools/getBestPoolCalculation'
+import {selectedPoolCalculationSelector} from './translators/reactjs/state/selectors/selectedPoolCalculationSelector'
 
 export const swapManagerMaker = ({
   swapStorage,
@@ -67,5 +70,8 @@ export const swapManagerMaker = ({
     frontendFeeTiers,
     aggregator,
     aggregatorTokenId,
+    makeOrderCalculations,
+    getBestPoolCalculation,
+    selectedPoolCalculationSelector,
   } as const
 }
diff --git a/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.test.ts b/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.test.ts
index b73593c105..8a2b6f3f69 100644
--- a/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.test.ts
+++ b/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.test.ts
@@ -1,21 +1,18 @@
-import {SwapOrderCalculation} from '../../../../types'
-import {SwapState} from '../state' // adjust the import path
-import {mockSwapStateDefault} from '../state.mocks'
+import {Swap} from '@yoroi/types'
 import {selectedPoolCalculationSelector} from './selectedPoolCalculationSelector'
 
 describe('selectedPoolCalculationSelector', () => {
   it('should return the best pool from calculations when type is limit and selectedPoolId matches', () => {
-    const orderData: SwapState['orderData'] = {
-      ...mockSwapStateDefault.orderData,
-      type: 'limit',
+    const orderData = {
+      type: 'limit' as Swap.OrderType,
       selectedPoolId: '1',
       calculations: [
-        {pool: {poolId: '1'}} as SwapOrderCalculation,
-        {pool: {poolId: '2'}} as SwapOrderCalculation,
+        {pool: {poolId: '1'}} as Swap.OrderCalculation,
+        {pool: {poolId: '2'}} as Swap.OrderCalculation,
       ],
       bestPoolCalculation: {
         pool: {poolId: '3'},
-      } as SwapOrderCalculation,
+      } as Swap.OrderCalculation,
     }
 
     const selected = selectedPoolCalculationSelector(orderData)
@@ -23,15 +20,14 @@ describe('selectedPoolCalculationSelector', () => {
   })
 
   it('should return the state bestPoolCalculation when no match is found in calculations', () => {
-    const orderData: SwapState['orderData'] = {
-      ...mockSwapStateDefault.orderData,
-      type: 'limit',
+    const orderData = {
+      type: 'limit' as Swap.OrderType,
       selectedPoolId: '3',
       calculations: [
-        {pool: {poolId: '1'}} as SwapOrderCalculation,
-        {pool: {poolId: '2'}} as SwapOrderCalculation,
+        {pool: {poolId: '1'}} as Swap.OrderCalculation,
+        {pool: {poolId: '2'}} as Swap.OrderCalculation,
       ],
-      bestPoolCalculation: {pool: {poolId: '3'}} as SwapOrderCalculation,
+      bestPoolCalculation: {pool: {poolId: '3'}} as Swap.OrderCalculation,
     }
 
     const selected = selectedPoolCalculationSelector(orderData)
@@ -39,15 +35,14 @@ describe('selectedPoolCalculationSelector', () => {
   })
 
   it('should return state bestPool when type is market', () => {
-    const orderData: SwapState['orderData'] = {
-      ...mockSwapStateDefault.orderData,
-      type: 'market',
+    const orderData = {
+      type: 'market' as Swap.OrderType,
       selectedPoolId: '1',
       calculations: [
-        {pool: {poolId: '1'}} as SwapOrderCalculation,
-        {pool: {poolId: '2'}} as SwapOrderCalculation,
+        {pool: {poolId: '1'}} as Swap.OrderCalculation,
+        {pool: {poolId: '2'}} as Swap.OrderCalculation,
       ],
-      bestPoolCalculation: {pool: {poolId: '3'}} as SwapOrderCalculation,
+      bestPoolCalculation: {pool: {poolId: '3'}} as Swap.OrderCalculation,
     }
 
     const selected = selectedPoolCalculationSelector(orderData)
@@ -55,15 +50,14 @@ describe('selectedPoolCalculationSelector', () => {
   })
 
   it('should return the the current bestPoolCalculation when no selectedPoolId', () => {
-    const orderData: SwapState['orderData'] = {
-      ...mockSwapStateDefault.orderData,
-      type: 'limit',
+    const orderData = {
+      type: 'limit' as Swap.OrderType,
       selectedPoolId: undefined,
       calculations: [
-        {pool: {poolId: '1'}} as SwapOrderCalculation,
-        {pool: {poolId: '2'}} as SwapOrderCalculation,
+        {pool: {poolId: '1'}} as Swap.OrderCalculation,
+        {pool: {poolId: '2'}} as Swap.OrderCalculation,
       ],
-      bestPoolCalculation: {pool: {poolId: '3'}} as SwapOrderCalculation,
+      bestPoolCalculation: {pool: {poolId: '3'}} as Swap.OrderCalculation,
     }
 
     const selected = selectedPoolCalculationSelector(orderData)
diff --git a/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.ts b/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.ts
index ae32960e71..15f7856ac6 100644
--- a/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.ts
+++ b/packages/swap/src/translators/reactjs/state/selectors/selectedPoolCalculationSelector.ts
@@ -1,11 +1,17 @@
-import {SwapOrderCalculation} from '../../../../types'
-import {SwapState} from '../state'
+import {Swap} from '@yoroi/types'
 
-export const selectedPoolCalculationSelector = (
-  orderData: SwapState['orderData'],
-): SwapOrderCalculation | undefined => {
-  const {type, selectedPoolId, calculations, bestPoolCalculation} = orderData
-  let calculation: SwapOrderCalculation | undefined
+export const selectedPoolCalculationSelector = ({
+  type,
+  selectedPoolId,
+  calculations,
+  bestPoolCalculation,
+}: {
+  type: Swap.OrderType
+  selectedPoolId?: string
+  calculations: Array<Swap.OrderCalculation>
+  bestPoolCalculation?: Swap.OrderCalculation
+}): Swap.OrderCalculation | undefined => {
+  let calculation: Swap.OrderCalculation | undefined
 
   // can only select a pool if is a limit order type
   // otherwise will return the current state value for it
diff --git a/packages/swap/src/translators/reactjs/state/state.ts b/packages/swap/src/translators/reactjs/state/state.ts
index 8d16215ca2..8267d3b93e 100644
--- a/packages/swap/src/translators/reactjs/state/state.ts
+++ b/packages/swap/src/translators/reactjs/state/state.ts
@@ -4,7 +4,6 @@ import {freeze, produce} from 'immer'
 import {makeOrderCalculations} from '../../../helpers/orders/factories/makeOrderCalculations'
 import {selectedPoolCalculationSelector} from './selectors/selectedPoolCalculationSelector'
 import {getBestPoolCalculation} from '../../../helpers/pools/getBestPoolCalculation'
-import {SwapOrderCalculation} from '../../../types'
 
 export type SwapState = Readonly<{
   orderData: {
@@ -19,7 +18,7 @@ export type SwapState = Readonly<{
 
     // when limit can manually select a pool
     selectedPoolId?: string
-    selectedPoolCalculation?: SwapOrderCalculation
+    selectedPoolCalculation?: Swap.OrderCalculation
 
     slippage: number
 
@@ -36,8 +35,8 @@ export type SwapState = Readonly<{
     pools: ReadonlyArray<Swap.Pool>
 
     // derivaded data
-    calculations: ReadonlyArray<SwapOrderCalculation>
-    bestPoolCalculation?: SwapOrderCalculation
+    calculations: ReadonlyArray<Swap.OrderCalculation>
+    bestPoolCalculation?: Swap.OrderCalculation
   }
   unsignedTx: any
 }>
@@ -248,7 +247,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.amounts.buy ||
@@ -279,7 +283,12 @@ const orderReducer = (
         draft.orderData.selectedPoolId = action.poolId
 
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.amounts.sell ||
@@ -316,7 +325,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
         break
 
       // when switching and the type is limit can end up with weird amounts
@@ -347,7 +361,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.amounts.buy ||
@@ -396,7 +415,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         draft.orderData.limitPrice =
           state.orderData.type === 'limit'
@@ -428,7 +452,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.amounts.buy ||
@@ -465,7 +494,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.selectedPoolCalculation ||
@@ -501,7 +535,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.selectedPoolCalculation ||
@@ -600,7 +639,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.selectedPoolCalculation ||
@@ -633,7 +677,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         if (
           !draft.orderData.amounts.buy ||
@@ -666,7 +715,12 @@ const orderReducer = (
           draft.orderData.calculations,
         )
         draft.orderData.selectedPoolCalculation =
-          selectedPoolCalculationSelector(draft.orderData)
+          selectedPoolCalculationSelector({
+            type: draft.orderData.type,
+            selectedPoolId: draft.orderData.selectedPoolId,
+            calculations: draft.orderData.calculations,
+            bestPoolCalculation: draft.orderData.bestPoolCalculation,
+          })
 
         draft.orderData.limitPrice = undefined
         draft.orderData.selectedPoolId = undefined
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index e7d72fcf35..9107804cbc 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -259,6 +259,10 @@ import {
   PortfolioTokenHistory,
   PortfolioTokenHistoryPeriod,
 } from './portfolio/history'
+import {
+  SwapMakeOrderCalculation,
+  SwapOrderCalculation,
+} from './swap/calculations'
 
 export namespace App {
   export namespace Errors {
@@ -347,6 +351,10 @@ export namespace Swap {
   export type SupportedProvider = SwapSupportedProvider
 
   export type Storage = SwapStorage
+
+  export type MakeOrderCalculation = SwapMakeOrderCalculation
+
+  export type OrderCalculation = SwapOrderCalculation
 }
 
 export namespace Balance {
diff --git a/packages/swap/src/types.ts b/packages/types/src/swap/calculations.ts
similarity index 66%
rename from packages/swap/src/types.ts
rename to packages/types/src/swap/calculations.ts
index 2f471a3a5a..25513f6708 100644
--- a/packages/swap/src/types.ts
+++ b/packages/types/src/swap/calculations.ts
@@ -1,4 +1,23 @@
-import {App, Portfolio, Swap} from '@yoroi/types'
+import {App, Portfolio, Swap} from '..'
+
+export type SwapMakeOrderCalculation = Readonly<{
+  orderType: Swap.OrderType
+  amounts: {
+    sell?: Portfolio.Token.Amount
+    buy?: Portfolio.Token.Amount
+  }
+  limitPrice?: string
+  pools: ReadonlyArray<Swap.Pool>
+  lpTokenHeld?: Portfolio.Token.Amount
+  slippage: number
+  side?: 'buy' | 'sell'
+  frontendFeeTiers: ReadonlyArray<App.FrontendFeeTier>
+  tokens: {
+    ptInfo?: Portfolio.Token.Info
+    priceDenomination: number
+  }
+  priceDecimals?: number
+}>
 
 export type SwapOrderCalculation = Readonly<{
   order: {
diff --git a/packages/types/src/swap/manager.ts b/packages/types/src/swap/manager.ts
index 85861f1cf3..9d1a41a9b8 100644
--- a/packages/types/src/swap/manager.ts
+++ b/packages/types/src/swap/manager.ts
@@ -3,6 +3,8 @@ import {PortfolioTokenInfo} from '../portfolio/info'
 import {PortfolioTokenId} from '../portfolio/token'
 import {SwapAggregator} from './aggregator'
 import {SwapApi} from './api'
+import {SwapMakeOrderCalculation, SwapOrderCalculation} from './calculations'
+import {SwapOrderType} from './order'
 import {SwapPoolProvider} from './pool'
 import {SwapStorage} from './storage'
 
@@ -37,4 +39,16 @@ export type SwapManager = Readonly<{
   aggregator: SwapAggregator
   aggregatorTokenId?: PortfolioTokenId
   frontendFeeTiers: ReadonlyArray<AppFrontendFeeTier>
+  makeOrderCalculations(
+    args: SwapMakeOrderCalculation,
+  ): Array<SwapOrderCalculation>
+  getBestPoolCalculation(
+    calculations: Array<SwapOrderCalculation>,
+  ): SwapOrderCalculation | undefined
+  selectedPoolCalculationSelector(args: {
+    type: SwapOrderType
+    selectedPoolId?: string
+    calculations: Array<SwapOrderCalculation>
+    bestPoolCalculation?: SwapOrderCalculation
+  }): SwapOrderCalculation | undefined
 }>

From c170ce0a381a83424c2b761c5e1d52b2eea2082d Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:42:31 +0200
Subject: [PATCH 07/15] feature(wallet-mobile): new tx review for yoroi
 governance (#3690)

---
 .../.storybook/storybook.requires.js          |   1 -
 .../features/ReviewTx/common/TokenItem.tsx    |   2 +-
 .../ReviewTx/common/hooks/useOnConfirm.tsx    |   9 +-
 .../Governance/GovernanceNavigator.tsx        |   7 -
 .../Staking/Governance/common/helpers.ts      |  60 ----
 .../Staking/Governance/common/helpers.tsx     | 250 +++++++++++++++
 .../Staking/Governance/common/navigation.ts   |   8 -
 .../Staking/Governance/common/strings.ts      |   6 +-
 .../useCases/ChangeVote/ChangeVoteScreen.tsx  |  21 +-
 .../ConfirmTx/ConfirmTxScreen.stories.tsx     |  56 ----
 .../useCases/ConfirmTx/ConfirmTxScreen.tsx    | 293 ------------------
 .../Governance/useCases/Home/HomeScreen.tsx   |  34 +-
 .../src/kernel/i18n/locales/en-US.json        |   4 +-
 .../yoroi-wallets/cardano/cip30/cip30.test.ts |   1 -
 .../src/yoroi-wallets/cardano/types.ts        |   3 +-
 .../src/yoroi-wallets/mocks/wallet.ts         |   6 +-
 .../Staking/Governance/common/strings.json    | 212 ++++++-------
 17 files changed, 415 insertions(+), 558 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Staking/Governance/common/helpers.ts
 create mode 100644 apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 41fde2e017..ce14bcbce3 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -227,7 +227,6 @@ const getStories = () => {
     "./src/features/Staking/Governance/common/Action/Action.stories.tsx": require("../src/features/Staking/Governance/common/Action/Action.stories.tsx"),
     "./src/features/Staking/Governance/common/LearnMoreLink/LearnMoreLink.stories.tsx": require("../src/features/Staking/Governance/common/LearnMoreLink/LearnMoreLink.stories.tsx"),
     "./src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.stories.tsx": require("../src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.stories.tsx"),
-    "./src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx": require("../src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx"),
     "./src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.stories.tsx": require("../src/features/Staking/Governance/useCases/EnterDrepIdModal/EnterDrepIdModal.stories.tsx"),
     "./src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.stories.tsx": require("../src/features/Staking/Governance/useCases/FailedTx/FailedTxScreen.stories.tsx"),
     "./src/features/Staking/Governance/useCases/Home/HomeScreen.stories.tsx": require("../src/features/Staking/Governance/useCases/Home/HomeScreen.stories.tsx"),
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
index fabea93b81..51ec99bbaa 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
@@ -48,7 +48,7 @@ export const TokenItem = ({
       style={[styles.sentTokenItem, !isPrimaryToken && styles.notPrimarySentTokenItem]}
       disabled={isPrimaryToken}
     >
-      <Text style={[styles.tokenSentItemText, !isPrimaryToken && styles.notPrimarySentTokenItemText]}>{label}</Text>
+      <Text style={[styles.tokenSentItemText, !isPrimaryToken && styles.notPrimarySentTokenItemText]}>-{label}</Text>
     </TouchableOpacity>
   )
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
index 38188b6e93..871badd91b 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
@@ -5,6 +5,7 @@ import {ConfirmTxWithOsModal} from '../../../../components/ConfirmTxWithOsModal/
 import {ConfirmTxWithSpendingPasswordModal} from '../../../../components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {useNavigateTo} from '../../../Staking/Governance/common/navigation'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useStrings} from './useStrings'
 
@@ -13,19 +14,18 @@ export const useOnConfirm = ({
   unsignedTx,
   onSuccess,
   onError,
-  onNotSupportedCIP1694,
 }: {
   onSuccess?: ((txId: YoroiSignedTx) => void) | null
   onError?: (() => void) | null
   cbor?: string
   unsignedTx?: YoroiUnsignedTx
-  onNotSupportedCIP1694?: () => void
 }) => {
   if (unsignedTx === undefined) throw new Error('useOnConfirm: unsignedTx missing')
 
   const {meta} = useSelectedWallet()
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
+  const navigateTo = useNavigateTo()
 
   const onConfirm = () => {
     if (meta.isHW) {
@@ -35,7 +35,10 @@ export const useOnConfirm = ({
           onCancel={closeModal}
           unsignedTx={unsignedTx}
           onSuccess={(signedTx) => onSuccess?.(signedTx)}
-          onNotSupportedCIP1694={onNotSupportedCIP1694}
+          onNotSupportedCIP1694={() => {
+            closeModal()
+            navigateTo.notSupportedVersion()
+          }}
         />,
         400,
       )
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx b/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
index 5df15e523e..865e67fbf0 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/GovernanceNavigator.tsx
@@ -9,7 +9,6 @@ import {useGovernanceManagerMaker} from './common/helpers'
 import {NavigationStack} from './common/navigation'
 import {useStrings} from './common/strings'
 import {ChangeVoteScreen} from './useCases/ChangeVote/ChangeVoteScreen'
-import {ConfirmTxScreen} from './useCases/ConfirmTx/ConfirmTxScreen'
 import {FailedTxScreen} from './useCases/FailedTx/FailedTxScreen'
 import {HomeScreen} from './useCases/Home/HomeScreen'
 import {NoFundsScreen} from './useCases/NoFunds/NoFundsScreen'
@@ -44,12 +43,6 @@ export const GovernanceNavigator = () => {
             options={{title: strings.governanceCentreTitle}}
           />
 
-          <Stack.Screen
-            name="staking-gov-confirm-tx"
-            component={ConfirmTxScreen}
-            options={{title: strings.confirmTxTitle}}
-          />
-
           <Stack.Screen name="staking-gov-tx-success" component={SuccessTxScreen} options={txStatusOptions} />
 
           <Stack.Screen name="staking-gov-tx-failed" component={FailedTxScreen} options={txStatusOptions} />
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.ts b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.ts
deleted file mode 100644
index 304f619fbb..0000000000
--- a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import {useAsyncStorage} from '@yoroi/common'
-import {type StakingKeyState, governanceApiMaker, governanceManagerMaker, useStakingKeyState} from '@yoroi/staking'
-import * as React from 'react'
-
-import {governaceAfterBlock} from '../../../../kernel/config'
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {useStakingKey} from '../../../../yoroi-wallets/hooks'
-import {CardanoMobile} from '../../../../yoroi-wallets/wallets'
-import {useBestBlock} from '../../../WalletManager/common/hooks/useBestBlock'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {GovernanceVote} from '../types'
-
-export const useIsParticipatingInGovernance = (wallet: YoroiWallet) => {
-  const stakingKeyHash = useStakingKey(wallet)
-  const {data: stakingStatus} = useStakingKeyState(stakingKeyHash, {
-    suspense: true,
-    useErrorBoundary: false,
-    retry: false,
-  })
-  return stakingStatus ? mapStakingKeyStateToGovernanceAction(stakingStatus) !== null : false
-}
-
-export const mapStakingKeyStateToGovernanceAction = (state: StakingKeyState): GovernanceVote | null => {
-  if (!state.drepDelegation) return null
-  const vote = state.drepDelegation
-  return vote.action === 'abstain'
-    ? {kind: 'abstain'}
-    : vote.action === 'no-confidence'
-    ? {kind: 'no-confidence'}
-    : {kind: 'delegate', drepID: vote.drepID}
-}
-
-export const useIsGovernanceFeatureEnabled = (wallet: YoroiWallet) => {
-  const bestBlock = useBestBlock({options: {suspense: true}})
-  return bestBlock.height >= governaceAfterBlock[wallet.networkManager.network]
-}
-
-export const useGovernanceManagerMaker = () => {
-  const {
-    wallet: {
-      networkManager: {network},
-      id: walletId,
-    },
-  } = useSelectedWallet()
-
-  const storage = useAsyncStorage()
-  const governanceStorage = storage.join(`wallet/${walletId}/staking-governance/`)
-
-  return React.useMemo(
-    () =>
-      governanceManagerMaker({
-        walletId,
-        network,
-        api: governanceApiMaker({network}),
-        cardano: CardanoMobile,
-        storage: governanceStorage,
-      }),
-    [governanceStorage, network, walletId],
-  )
-}
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
new file mode 100644
index 0000000000..8e02078802
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
@@ -0,0 +1,250 @@
+import {useAsyncStorage} from '@yoroi/common'
+import {
+  type StakingKeyState,
+  governanceApiMaker,
+  governanceManagerMaker,
+  GovernanceProvider,
+  useBech32DRepID,
+  useGovernance,
+  useStakingKeyState,
+  useUpdateLatestGovernanceAction,
+} from '@yoroi/staking'
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+
+import {Space} from '../../../../components/Space/Space'
+import {governaceAfterBlock} from '../../../../kernel/config'
+import {useWalletNavigation} from '../../../../kernel/navigation'
+import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
+import {useStakingKey} from '../../../../yoroi-wallets/hooks'
+import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
+import {formatTokenWithText} from '../../../../yoroi-wallets/utils/format'
+import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
+import {CardanoMobile} from '../../../../yoroi-wallets/wallets'
+import {useReviewTx} from '../../../ReviewTx/common/ReviewTxProvider'
+import {useBestBlock} from '../../../WalletManager/common/hooks/useBestBlock'
+import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
+import {GovernanceVote} from '../types'
+import {useNavigateTo} from './navigation'
+import {useStrings} from './strings'
+
+export const useIsParticipatingInGovernance = (wallet: YoroiWallet) => {
+  const stakingKeyHash = useStakingKey(wallet)
+  const {data: stakingStatus} = useStakingKeyState(stakingKeyHash, {
+    suspense: true,
+    useErrorBoundary: false,
+    retry: false,
+  })
+  return stakingStatus ? mapStakingKeyStateToGovernanceAction(stakingStatus) !== null : false
+}
+
+export const mapStakingKeyStateToGovernanceAction = (state: StakingKeyState): GovernanceVote | null => {
+  if (!state.drepDelegation) return null
+  const vote = state.drepDelegation
+  return vote.action === 'abstain'
+    ? {kind: 'abstain'}
+    : vote.action === 'no-confidence'
+    ? {kind: 'no-confidence'}
+    : {kind: 'delegate', drepID: vote.drepID}
+}
+
+export const useIsGovernanceFeatureEnabled = (wallet: YoroiWallet) => {
+  const bestBlock = useBestBlock({options: {suspense: true}})
+  return bestBlock.height >= governaceAfterBlock[wallet.networkManager.network]
+}
+
+export const useGovernanceManagerMaker = () => {
+  const {
+    wallet: {
+      networkManager: {network},
+      id: walletId,
+    },
+  } = useSelectedWallet()
+
+  const storage = useAsyncStorage()
+  const governanceStorage = storage.join(`wallet/${walletId}/staking-governance/`)
+
+  return React.useMemo(
+    () =>
+      governanceManagerMaker({
+        walletId,
+        network,
+        api: governanceApiMaker({network}),
+        cardano: CardanoMobile,
+        storage: governanceStorage,
+      }),
+    [governanceStorage, network, walletId],
+  )
+}
+
+export const useGovernanceActions = () => {
+  const {manager} = useGovernance()
+  const {wallet} = useSelectedWallet()
+  const navigateTo = useNavigateTo()
+  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, operationsChanged} = useReviewTx()
+  const {updateLatestGovernanceAction} = useUpdateLatestGovernanceAction(wallet.id)
+  const {navigateToTxReview} = useWalletNavigation()
+
+  const handleDelegateAction = ({
+    drepID,
+    unsignedTx,
+    hasStakeCert = false,
+    navigateToStakingOnSuccess = false,
+  }: {
+    drepID: string
+    unsignedTx: YoroiUnsignedTx
+    hasStakeCert?: boolean
+    navigateToStakingOnSuccess?: boolean
+  }) => {
+    let operations = [
+      <GovernanceProvider key="0" manager={manager}>
+        <DelegateOperation drepID={drepID} />
+      </GovernanceProvider>,
+    ]
+
+    if (hasStakeCert) operations = [<RegisterStakingKeyOperation key="-1" />, ...operations]
+
+    operationsChanged(operations)
+    onSuccessChanged((signedTx) => {
+      updateLatestGovernanceAction({kind: 'delegate-to-drep', drepID, txID: signedTx.signedTx.id})
+      navigateTo.txSuccess({navigateToStaking: navigateToStakingOnSuccess ?? false, kind: 'delegate'})
+    })
+    onErrorChanged(() => navigateTo.txFailed())
+    unsignedTxChanged(unsignedTx)
+
+    navigateToTxReview()
+  }
+
+  const handleAbstainAction = ({
+    unsignedTx,
+    hasStakeCert = false,
+    navigateToStakingOnSuccess = false,
+  }: {
+    unsignedTx: YoroiUnsignedTx
+    hasStakeCert?: boolean
+    navigateToStakingOnSuccess?: boolean
+  }) => {
+    let operations = [<AbstainOperation key="0" />]
+    if (hasStakeCert) operations = [<RegisterStakingKeyOperation key="-1" />, ...operations]
+
+    operationsChanged(operations)
+    onSuccessChanged((signedTx) => {
+      updateLatestGovernanceAction({kind: 'vote', vote: 'abstain', txID: signedTx.signedTx.id})
+      navigateTo.txSuccess({navigateToStaking: navigateToStakingOnSuccess ?? false, kind: 'abstain'})
+    })
+    onErrorChanged(() => navigateTo.txFailed())
+    unsignedTxChanged(unsignedTx)
+
+    navigateToTxReview()
+  }
+
+  const handleNoConfidenceAction = ({
+    unsignedTx,
+    hasStakeCert = false,
+    navigateToStakingOnSuccess = false,
+  }: {
+    unsignedTx: YoroiUnsignedTx
+    hasStakeCert?: boolean
+    navigateToStakingOnSuccess?: boolean
+  }) => {
+    let operations = [<NoConfidenceOperation key="0" />]
+    if (hasStakeCert) operations = [<RegisterStakingKeyOperation key="-1" />, ...operations]
+
+    operationsChanged(operations)
+    onSuccessChanged((signedTx) => {
+      updateLatestGovernanceAction({kind: 'vote', vote: 'no-confidence', txID: signedTx.signedTx.id})
+      navigateTo.txSuccess({
+        navigateToStaking: navigateToStakingOnSuccess ?? false,
+        kind: 'no-confidence',
+      })
+    })
+    onErrorChanged(() => navigateTo.txFailed())
+    unsignedTxChanged(unsignedTx)
+
+    navigateToTxReview()
+  }
+
+  return {handleDelegateAction, handleAbstainAction, handleNoConfidenceAction} as const
+}
+
+const RegisterStakingKeyOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+  const {wallet} = useSelectedWallet()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.registerStakingKey}</Text>
+
+      <Space width="lg" />
+
+      <Text style={styles.operationValue}>
+        {formatTokenWithText(asQuantity(wallet.protocolParams.keyDeposit), wallet.portfolioPrimaryTokenInfo)}
+      </Text>
+    </View>
+  )
+}
+
+const AbstainOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.selectAbstain}</Text>
+    </View>
+  )
+}
+
+const NoConfidenceOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.selectNoConfidence}</Text>
+    </View>
+  )
+}
+
+const DelegateOperation = ({drepID}: {drepID: string}) => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  const {data: bech32DrepId} = useBech32DRepID(drepID)
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.delegateVotingToDRep}</Text>
+
+      <Space width="lg" />
+
+      <Text style={styles.operationValue}>{bech32DrepId ?? drepID}</Text>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {color, atoms} = useTheme()
+
+  const styles = StyleSheet.create({
+    operation: {
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+      ...atoms.align_start,
+    },
+    operationLabel: {
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_low,
+    },
+    operationValue: {
+      ...atoms.flex_1,
+      ...atoms.text_right,
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_medium,
+    },
+  })
+
+  return {styles} as const
+}
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/navigation.ts b/apps/wallet-mobile/src/features/Staking/Governance/common/navigation.ts
index 62b7b4e91c..fc20cd6c4a 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/common/navigation.ts
+++ b/apps/wallet-mobile/src/features/Staking/Governance/common/navigation.ts
@@ -2,7 +2,6 @@ import {useNavigation} from '@react-navigation/native'
 import {createStackNavigator, StackNavigationProp} from '@react-navigation/stack'
 import {useRef} from 'react'
 
-import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
 import {GovernanceVote} from '../types'
 
 export type Routes = {
@@ -10,12 +9,6 @@ export type Routes = {
     navigateToStakingOnSuccess?: boolean
   }
   'staking-gov-change-vote': undefined
-  'staking-gov-confirm-tx': {
-    vote: GovernanceVote
-    unsignedTx: YoroiUnsignedTx
-    registerStakingKey?: boolean
-    navigateToStakingOnSuccess?: boolean
-  }
   'staking-gov-tx-success'?: {navigateToStaking?: boolean; kind: GovernanceVote['kind']}
   'staking-gov-tx-failed': undefined
   'staking-gov-not-supported-version': undefined
@@ -29,7 +22,6 @@ export const useNavigateTo = () => {
   return useRef({
     home: () => navigation.navigate('staking-gov-home'),
     changeVote: () => navigation.navigate('staking-gov-change-vote'),
-    confirmTx: (params: Routes['staking-gov-confirm-tx']) => navigation.navigate('staking-gov-confirm-tx', params),
     txSuccess: (params?: Routes['staking-gov-tx-success']) => navigation.navigate('staking-gov-tx-success', params),
     txFailed: () => navigation.navigate('staking-gov-tx-failed'),
     notSupportedVersion: () => navigation.navigate('staking-gov-not-supported-version'),
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/strings.ts b/apps/wallet-mobile/src/features/Staking/Governance/common/strings.ts
index 2280cb83df..b53ad73cd3 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Staking/Governance/common/strings.ts
@@ -18,7 +18,7 @@ export const useStrings = () => {
     drepKey: intl.formatMessage(messages.drepKey),
     delegatingToADRep: intl.formatMessage(messages.delegatingToADRep),
     abstaining: intl.formatMessage(messages.abstaining),
-    delegateVotingToDRep: (drepID: string) => intl.formatMessage(messages.delegateVotingToDRep, {drepID}),
+    delegateVotingToDRep: intl.formatMessage(messages.delegateVotingToDRep),
     selectAbstain: intl.formatMessage(messages.selectAbstain),
     selectNoConfidence: intl.formatMessage(messages.selectNoConfidence),
     operations: intl.formatMessage(messages.operations),
@@ -124,7 +124,7 @@ const messages = defineMessages({
   },
   delegateVotingToDRep: {
     id: 'components.governance.delegateVotingToDRep',
-    defaultMessage: '!!!Delegate voting to \n{drepID}',
+    defaultMessage: '!!!Delegate voting to',
   },
   selectAbstain: {
     id: 'components.governance.selectAbstain',
@@ -255,7 +255,7 @@ const messages = defineMessages({
   },
   registerStakingKey: {
     id: 'components.governance.registerStakingKey',
-    defaultMessage: '!!!Register staking key',
+    defaultMessage: '!!!Register staking key deposit',
   },
   enterDrepIDInfo: {
     id: 'components.governance.enterDrepIDInfo',
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.tsx
index 7180a1c471..093fa90e44 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ChangeVote/ChangeVoteScreen.tsx
@@ -15,9 +15,8 @@ import {Spacer} from '../../../../../components/Spacer/Spacer'
 import {useCreateGovernanceTx, useStakingKey} from '../../../../../yoroi-wallets/hooks'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {Action} from '../../common/Action/Action'
-import {mapStakingKeyStateToGovernanceAction} from '../../common/helpers'
+import {mapStakingKeyStateToGovernanceAction, useGovernanceActions} from '../../common/helpers'
 import {LearnMoreLink} from '../../common/LearnMoreLink/LearnMoreLink'
-import {useNavigateTo} from '../../common/navigation'
 import {useStrings} from '../../common/strings'
 import {GovernanceVote} from '../../types'
 import {EnterDrepIdModal} from '../EnterDrepIdModal/EnterDrepIdModal'
@@ -25,7 +24,6 @@ import {EnterDrepIdModal} from '../EnterDrepIdModal/EnterDrepIdModal'
 export const ChangeVoteScreen = () => {
   const strings = useStrings()
   const {wallet, meta} = useSelectedWallet()
-  const navigateTo = useNavigateTo()
   const stakingKeyHash = useStakingKey(wallet)
   const {data: stakingStatus} = useStakingKeyState(stakingKeyHash, {suspense: true})
   const action = stakingStatus ? mapStakingKeyStateToGovernanceAction(stakingStatus) : null
@@ -33,6 +31,7 @@ export const ChangeVoteScreen = () => {
   const {manager} = useGovernance()
   const [pendingVote, setPendingVote] = React.useState<GovernanceVote['kind'] | null>(null)
   const {styles} = useStyles()
+  const governanceActions = useGovernanceActions()
 
   const {createCertificate: createDelegationCertificate, isLoading: isCreatingDelegationCertificate} =
     useDelegationCertificate({
@@ -73,7 +72,11 @@ export const ChangeVoteScreen = () => {
               certificates: [certificate],
               addressMode: meta.addressMode,
             })
-            navigateTo.confirmTx({unsignedTx, vote})
+
+            governanceActions.handleDelegateAction({
+              unsignedTx,
+              drepID,
+            })
           },
         },
       )
@@ -93,7 +96,10 @@ export const ChangeVoteScreen = () => {
             certificates: [certificate],
             addressMode: meta.addressMode,
           })
-          navigateTo.confirmTx({unsignedTx, vote})
+
+          governanceActions.handleAbstainAction({
+            unsignedTx,
+          })
         },
       },
     )
@@ -112,7 +118,10 @@ export const ChangeVoteScreen = () => {
             certificates: [certificate],
             addressMode: meta.addressMode,
           })
-          navigateTo.confirmTx({unsignedTx, vote})
+
+          governanceActions.handleNoConfidenceAction({
+            unsignedTx,
+          })
         },
       },
     )
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx
deleted file mode 100644
index 6e0a8327f9..0000000000
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.stories.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import {NavigationRouteContext} from '@react-navigation/core'
-import {storiesOf} from '@storybook/react-native'
-import {GovernanceProvider} from '@yoroi/staking'
-import React from 'react'
-
-import {SafeArea} from '../../../../../components/SafeArea'
-import {mocks} from '../../../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
-import {mocks as governanceMocks} from '../../common/mocks'
-import {Routes} from '../../common/navigation'
-import {ConfirmTxScreen} from './ConfirmTxScreen'
-
-storiesOf('Governance/ConfirmTxScreen', module)
-  .addDecorator((story) => <SafeArea>{story()}</SafeArea>)
-  .addDecorator((story) => (
-    <WalletManagerProviderMock wallet={mocks.wallet}>
-      <GovernanceProvider manager={governanceMocks.governanceManager}>{story()}</GovernanceProvider>
-    </WalletManagerProviderMock>
-  ))
-  .add('Abstain', () => (
-    <NavigationRouteContext.Provider value={getContextValue({kind: 'abstain'})}>
-      <ConfirmTxScreen />
-    </NavigationRouteContext.Provider>
-  ))
-  .add('No Confidence', () => (
-    <NavigationRouteContext.Provider value={getContextValue({kind: 'no-confidence'})}>
-      <ConfirmTxScreen />
-    </NavigationRouteContext.Provider>
-  ))
-  .add('Delegate', () => (
-    <NavigationRouteContext.Provider
-      value={getContextValue({kind: 'delegate', drepID: 'drep1e93a2zvs3aw8e4naez0ynpmc48ghx7yaa3n2k8jhwfdt70yscts'})}
-    >
-      <ConfirmTxScreen />
-    </NavigationRouteContext.Provider>
-  ))
-  .add('Delegate And Register Staking Key', () => (
-    <NavigationRouteContext.Provider
-      value={getContextValue(
-        {kind: 'delegate', drepID: 'drep1e93a2zvs3aw8e4naez0ynpmc48ghx7yaa3n2k8jhwfdt70yscts'},
-        true,
-      )}
-    >
-      <ConfirmTxScreen />
-    </NavigationRouteContext.Provider>
-  ))
-
-const getContextValue = (vote: Routes['staking-gov-confirm-tx']['vote'], registerStakingKey = false) => ({
-  key: 'key',
-  name: 'name',
-  params: {
-    vote,
-    unsignedTx: mocks.yoroiUnsignedTx,
-    registerStakingKey,
-  },
-})
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx
deleted file mode 100644
index 3cc7acdff6..0000000000
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/ConfirmTx/ConfirmTxScreen.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import {useFocusEffect} from '@react-navigation/native'
-import {useBech32DRepID, useUpdateLatestGovernanceAction} from '@yoroi/staking'
-import {useTheme} from '@yoroi/theme'
-import React from 'react'
-import {StyleSheet, View} from 'react-native'
-import {TouchableOpacity} from 'react-native-gesture-handler'
-
-import {Button} from '../../../../../components/Button/Button'
-import {ConfirmTxWithHwModal} from '../../../../../components/ConfirmTxWithHwModal/ConfirmTxWithHwModal'
-import {ConfirmTxWithOsModal} from '../../../../../components/ConfirmTxWithOsModal/ConfirmTxWithOsModal'
-import {ConfirmTxWithSpendingPasswordModal} from '../../../../../components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal'
-import {Icon} from '../../../../../components/Icon'
-import {useModal} from '../../../../../components/Modal/ModalContext'
-import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
-import {Space} from '../../../../../components/Space/Space'
-import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {Text} from '../../../../../components/Text'
-import {useMetrics} from '../../../../../kernel/metrics/metricsManager'
-import {useUnsafeParams} from '../../../../../kernel/navigation'
-import {formatTokenWithText} from '../../../../../yoroi-wallets/utils/format'
-import {Amounts} from '../../../../../yoroi-wallets/utils/utils'
-import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
-import {Routes, useNavigateTo} from '../../common/navigation'
-import {useStrings} from '../../common/strings'
-import {GovernanceKindMap} from '../../types'
-
-export const ConfirmTxScreen = () => {
-  const strings = useStrings()
-  const {wallet, meta} = useSelectedWallet()
-  const params = useUnsafeParams<Routes['staking-gov-confirm-tx']>()
-  const navigateTo = useNavigateTo()
-  const {updateLatestGovernanceAction} = useUpdateLatestGovernanceAction(wallet.id)
-  const {openModal, closeModal} = useModal()
-  const [operationsOpen, setOperationsOpen] = React.useState(true)
-  const {track} = useMetrics()
-  const {styles} = useStyles()
-
-  useFocusEffect(
-    React.useCallback(() => {
-      track.governanceConfirmTransactionPageViewed({
-        governance_selection: GovernanceKindMap[params.vote.kind],
-      })
-    }, [params.vote.kind, track]),
-  )
-
-  const {data: bech32DrepId} = useBech32DRepID(params.vote.kind === 'delegate' ? params.vote.drepID : '', {
-    enabled: params.vote.kind === 'delegate',
-  })
-
-  const titles = {
-    abstain: strings.actionAbstainTitle,
-    'no-confidence': strings.actionNoConfidenceTitle,
-    delegate: strings.actionDelegateToADRepTitle,
-  }
-
-  const descriptions = {
-    abstain: strings.actionAbstainDescription,
-    'no-confidence': strings.actionNoConfidenceDescription,
-    delegate: strings.actionDelegateToADRepDescription,
-  }
-
-  const operations = {
-    abstain: strings.selectAbstain,
-    'no-confidence': strings.selectNoConfidence,
-    delegate: strings.delegateVotingToDRep(params.vote.kind === 'delegate' ? bech32DrepId ?? params.vote.drepID : ''),
-  }
-
-  const title = titles[params.vote.kind]
-  const description = descriptions[params.vote.kind]
-  const operation = operations[params.vote.kind]
-
-  const fee = params.unsignedTx.fee
-  const feeAmount = Amounts.getAmount(fee, wallet.portfolioPrimaryTokenInfo.id)
-  const feeText = formatTokenWithText(feeAmount.quantity, wallet.portfolioPrimaryTokenInfo)
-
-  const onSuccess = (txID: string) => {
-    if (params.vote.kind === 'delegate') {
-      updateLatestGovernanceAction({kind: 'delegate-to-drep', drepID: params.vote.drepID, txID})
-    }
-
-    if (params.vote.kind === 'abstain') {
-      updateLatestGovernanceAction({kind: 'vote', vote: 'abstain', txID})
-    }
-
-    if (params.vote.kind === 'no-confidence') {
-      updateLatestGovernanceAction({kind: 'vote', vote: 'no-confidence', txID})
-    }
-
-    navigateTo.txSuccess({navigateToStaking: params.navigateToStakingOnSuccess ?? false, kind: params.vote.kind})
-  }
-
-  const onSubmit = () => {
-    if (meta.isHW) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithHwModal
-          onCancel={closeModal}
-          unsignedTx={params.unsignedTx}
-          onSuccess={(signedTx) => onSuccess(signedTx.signedTx.id)}
-          onNotSupportedCIP1694={() => {
-            closeModal()
-            navigateTo.notSupportedVersion()
-          }}
-        />,
-        400,
-      )
-      return
-    }
-
-    if (!meta.isHW && !meta.isEasyConfirmationEnabled) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithSpendingPasswordModal
-          unsignedTx={params.unsignedTx}
-          onSuccess={(signedTx) => onSuccess(signedTx.signedTx.id)}
-          onError={() => navigateTo.txFailed()}
-        />,
-      )
-      return
-    }
-
-    if (!meta.isHW && meta.isEasyConfirmationEnabled) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithOsModal
-          unsignedTx={params.unsignedTx}
-          onSuccess={(signedTx) => onSuccess(signedTx.signedTx.id)}
-          onError={() => navigateTo.txFailed()}
-        />,
-      )
-      return
-    }
-  }
-
-  return (
-    <View style={styles.root}>
-      <Space height="lg" />
-
-      <Text style={styles.secondaryText}>{title}</Text>
-
-      <Spacer height={4} />
-
-      <Text style={styles.normalText}>{description}</Text>
-
-      <Spacer height={24} />
-
-      <View style={styles.totalsArea}>
-        <View style={styles.row}>
-          <Text style={styles.total}>{strings.total}</Text>
-
-          <Text style={styles.totalValue}>{feeText}</Text>
-        </View>
-
-        <View style={styles.row}>
-          <Text style={styles.total} />
-
-          <PairedBalance
-            amount={{
-              info: wallet.portfolioPrimaryTokenInfo,
-              quantity: BigInt(feeAmount.quantity),
-            }}
-            textStyle={styles.fiatValue}
-            ignorePrivacy
-          />
-        </View>
-      </View>
-
-      <Spacer height={24} />
-
-      <Text style={styles.secondaryText}>{strings.transactionDetails}</Text>
-
-      <Spacer height={24} />
-
-      <TouchableOpacity style={styles.operationsToggle} onPress={() => setOperationsOpen(!operationsOpen)}>
-        <Text style={styles.primaryText}>{strings.operations}</Text>
-
-        <Icon.Chevron direction={operationsOpen ? 'up' : 'down'} color="#6B7384" size={24} />
-      </TouchableOpacity>
-
-      {operationsOpen && (
-        <>
-          {params.registerStakingKey && (
-            <>
-              <Spacer height={32} />
-
-              <Text style={styles.normalText}>{strings.registerStakingKey}</Text>
-            </>
-          )}
-
-          <Spacer height={params.registerStakingKey ? 16 : 32} />
-
-          <Text style={styles.normalText}>{operation}</Text>
-        </>
-      )}
-
-      <Spacer height={32} />
-
-      <View style={styles.feesRow}>
-        <View style={styles.feeLabel}>
-          <Text style={styles.primaryText}>{strings.txFees}</Text>
-        </View>
-
-        <Text style={styles.feeValue}>{feeText}</Text>
-      </View>
-
-      <Spacer fill />
-
-      <Button title={strings.confirm} onPress={onSubmit} />
-
-      <Spacer height={26} />
-    </View>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-  const styles = StyleSheet.create({
-    operationsToggle: {
-      ...atoms.flex_row,
-      ...atoms.justify_between,
-      ...atoms.align_center,
-    },
-    feeLabel: {
-      ...atoms.gap_sm,
-      ...atoms.flex_1,
-      ...atoms.justify_start,
-      ...atoms.align_center,
-      ...atoms.flex_row,
-    },
-    feesRow: {
-      ...atoms.flex_row,
-      ...atoms.justify_between,
-      ...atoms.align_center,
-    },
-    root: {
-      ...atoms.px_lg,
-      ...atoms.flex_1,
-      ...atoms.justify_between,
-      backgroundColor: color.bg_color_max,
-    },
-    primaryText: {
-      color: color.text_gray_medium,
-      ...atoms.font_semibold,
-      ...atoms.body_1_lg_medium,
-    },
-    secondaryText: {
-      ...atoms.body_2_md_regular,
-      color: color.text_gray_low,
-    },
-    row: {
-      ...atoms.flex_row,
-      ...atoms.justify_between,
-      ...atoms.align_center,
-    },
-    totalsArea: {
-      backgroundColor: '#3154cb',
-      ...atoms.py_lg,
-      ...atoms.px_lg,
-      ...atoms.rounded_sm,
-    },
-    total: {
-      fontFamily: 'Rubik-Regular',
-      fontSize: 18,
-      lineHeight: 26,
-      color: color.white_static,
-    },
-    totalValue: {
-      color: color.white_static,
-      ...atoms.font_semibold,
-      fontFamily: 'Rubik-Medium',
-      fontSize: 18,
-      lineHeight: 26,
-    },
-    fiatValue: {
-      fontFamily: 'Rubik-Regular',
-      fontSize: 14,
-      lineHeight: 22,
-      color: color.white_static,
-      opacity: 0.5,
-    },
-    normalText: {
-      color: color.text_gray_medium,
-      ...atoms.font_normal,
-      ...atoms.body_1_lg_regular,
-    },
-    feeValue: {
-      color: color.gray_500,
-      ...atoms.font_normal,
-      ...atoms.body_1_lg_regular,
-    },
-  })
-  return {styles}
-}
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/Home/HomeScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/Home/HomeScreen.tsx
index 9ab880aa80..9f43088d3e 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/Home/HomeScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/Home/HomeScreen.tsx
@@ -28,7 +28,7 @@ import {
 import {TransactionInfo} from '../../../../../yoroi-wallets/types/other'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {Action} from '../../common/Action/Action'
-import {mapStakingKeyStateToGovernanceAction} from '../../common/helpers'
+import {mapStakingKeyStateToGovernanceAction, useGovernanceActions} from '../../common/helpers'
 import {LearnMoreLink} from '../../common/LearnMoreLink/LearnMoreLink'
 import {Routes, useNavigateTo} from '../../common/navigation'
 import {useStrings} from '../../common/strings'
@@ -94,7 +94,7 @@ const ParticipatingInGovernanceVariant = ({
   isTxPending?: boolean
 }) => {
   const strings = useStrings()
-  const styles = useStyles()
+  const {styles} = useStyles()
   const navigateTo = useNavigateTo()
   const {data: bech32DrepId} = useBech32DRepID(action.kind === 'delegate' ? action.drepID : '', {
     enabled: action.kind === 'delegate',
@@ -180,7 +180,7 @@ const formattingOptions = (styles: any) => {
 
 const NeverParticipatedInGovernanceVariant = () => {
   const strings = useStrings()
-  const styles = useStyles()
+  const {styles} = useStyles()
   const navigateTo = useNavigateTo()
   const {
     wallet,
@@ -192,6 +192,7 @@ const NeverParticipatedInGovernanceVariant = () => {
   const params = useUnsafeParams<Routes['staking-gov-home']>()
   const {track} = useMetrics()
   const [pendingVote, setPendingVote] = React.useState<GovernanceVote['kind'] | null>(null)
+  const governanceActions = useGovernanceActions()
 
   useFocusEffect(
     React.useCallback(() => {
@@ -199,8 +200,6 @@ const NeverParticipatedInGovernanceVariant = () => {
     }, [track]),
   )
 
-  const navigateToStakingOnSuccess = params?.navigateToStakingOnSuccess ?? false
-
   const hasStakingKeyRegistered = stakingInfo?.data?.status !== 'not-registered'
   useWalletEvent(wallet, 'utxos', stakingInfo.refetch)
   const needsToRegisterStakingKey = !hasStakingKeyRegistered
@@ -239,6 +238,7 @@ const NeverParticipatedInGovernanceVariant = () => {
     openDRepIdModal(async (drepID) => {
       const vote = {kind: 'delegate', drepID} as const
       const stakingKey = await wallet.getStakingKey()
+
       setPendingVote(vote.kind)
 
       createDelegationCertificate(
@@ -250,7 +250,13 @@ const NeverParticipatedInGovernanceVariant = () => {
               : null
             const certs = stakeCert !== null ? [stakeCert, certificate] : [certificate]
             const unsignedTx = await createGovernanceTxMutation.mutateAsync({certificates: certs, addressMode})
-            navigateTo.confirmTx({unsignedTx, vote, registerStakingKey: stakeCert !== null, navigateToStakingOnSuccess})
+
+            governanceActions.handleDelegateAction({
+              unsignedTx,
+              drepID,
+              navigateToStakingOnSuccess: params?.navigateToStakingOnSuccess,
+              hasStakeCert: stakeCert !== null,
+            })
           },
         },
       )
@@ -271,7 +277,12 @@ const NeverParticipatedInGovernanceVariant = () => {
             : null
           const certs = stakeCert !== null ? [stakeCert, certificate] : [certificate]
           const unsignedTx = await createGovernanceTxMutation.mutateAsync({certificates: certs, addressMode})
-          navigateTo.confirmTx({unsignedTx, vote, registerStakingKey: stakeCert !== null, navigateToStakingOnSuccess})
+
+          governanceActions.handleAbstainAction({
+            unsignedTx,
+            navigateToStakingOnSuccess: params?.navigateToStakingOnSuccess,
+            hasStakeCert: stakeCert !== null,
+          })
         },
       },
     )
@@ -291,7 +302,12 @@ const NeverParticipatedInGovernanceVariant = () => {
             : null
           const certs = stakeCert !== null ? [stakeCert, certificate] : [certificate]
           const unsignedTx = await createGovernanceTxMutation.mutateAsync({certificates: certs, addressMode})
-          navigateTo.confirmTx({unsignedTx, vote, registerStakingKey: stakeCert !== null, navigateToStakingOnSuccess})
+
+          governanceActions.handleNoConfidenceAction({
+            unsignedTx,
+            navigateToStakingOnSuccess: params?.navigateToStakingOnSuccess,
+            hasStakeCert: stakeCert !== null,
+          })
         },
       },
     )
@@ -377,5 +393,5 @@ const useStyles = () => {
     },
   })
 
-  return styles
+  return {styles} as const
 }
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index 28cf5c2bcc..320b3f56d7 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -147,7 +147,7 @@
   "components.governance.changeDRep": "Change DRep",
   "components.governance.confirm": "Confirm",
   "components.governance.confirmTxTitle": "Confirm transaction",
-  "components.governance.delegateVotingToDRep": "Delegate voting to\n{drepID}",
+  "components.governance.delegateVotingToDRep": "Delegate voting to",
   "components.governance.delegatingToADRep": "Delegating to a DRep",
   "components.governance.drepID": "Drep ID (fingerprint)",
   "components.governance.drepKey": "DRep Key",
@@ -165,7 +165,7 @@
   "components.governance.operations": "Operations",
   "components.governance.participationBenefits": "Participating in the Cardano Governance gives you the opportunity to participate in the voting as well as withdraw your staking rewards",
   "components.governance.readyToCollectRewards": "You are now ready to collect your rewards",
-  "components.governance.registerStakingKey": "Register staking key",
+  "components.governance.registerStakingKey": "Register staking key deposit",
   "components.governance.reviewActions": "Review the selections carefully to assign yourself a Governance Status",
   "components.governance.selectAbstain": "Select abstain",
   "components.governance.selectNoConfidence": "Select no confidence",
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
index ce03da0a48..06ea9e9790 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30.test.ts
@@ -23,7 +23,6 @@ describe('cip30ExtensionMaker', () => {
   })
 
   it('should support getBalance', async () => {
-    console.log('test-1')
     const cip30 = cip30ExtensionMaker(mocks.wallet, mocks.walletMeta)
     const result = await cip30.getBalance()
     expect(result).toBeDefined()
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
index d80576eb94..172059076c 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
@@ -10,7 +10,7 @@ import {
   TxMetadata as TxMetadataType,
   UnsignedTx as UnsignedTxType,
 } from '@emurgo/yoroi-lib'
-import {App, HW, Network, Portfolio, Wallet} from '@yoroi/types'
+import {Api, App, HW, Network, Portfolio, Wallet} from '@yoroi/types'
 import {BigNumber} from 'bignumber.js'
 
 import {WalletEncryptedStorage} from '../../kernel/storage/EncryptedStorage'
@@ -58,6 +58,7 @@ export type Pagination = {
 export interface YoroiWallet {
   id: string
   publicKeyHex: string
+  protocolParams: Api.Cardano.ProtocolParams
   readonly portfolioPrimaryTokenInfo: Readonly<Portfolio.Token.Info>
 
   // ---------------------------------------------------------------------------------------
diff --git a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
index 92cb84b8f6..c5a50bacfd 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
@@ -11,7 +11,10 @@ import {Observable} from 'rxjs'
 
 import {buildPortfolioTokenManagers} from '../../features/Portfolio/common/helpers/build-token-managers'
 import {cardanoConfig} from '../../features/WalletManager/common/adapters/cardano/cardano-config'
-import {buildNetworkManagers} from '../../features/WalletManager/network-manager/network-manager'
+import {
+  buildNetworkManagers,
+  protocolParamsPlaceholder,
+} from '../../features/WalletManager/network-manager/network-manager'
 import {toTokenInfo, utf8ToHex} from '../cardano/api/utils'
 import {CardanoTypes, YoroiWallet} from '../cardano/types'
 import {TransactionInfo} from '../types/other'
@@ -69,6 +72,7 @@ const wallet: YoroiWallet = {
   allUtxos: utxos,
   collateralId: '22d391c7a97559cb4784bd975214919618acce75cde573a7150a176700e76181:2',
   accountVisual: 0,
+  protocolParams: protocolParamsPlaceholder,
 
   balance$: new Observable<Portfolio.Event.BalanceManager>(),
   balances: {
diff --git a/apps/wallet-mobile/translations/messages/src/features/Staking/Governance/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Staking/Governance/common/strings.json
index cba4c77db8..d3941eca90 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Staking/Governance/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Staking/Governance/common/strings.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 76,
       "column": 25,
-      "index": 4821
+      "index": 4791
     },
     "end": {
       "line": 79,
       "column": 3,
-      "index": 4928
+      "index": 4898
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 80,
       "column": 18,
-      "index": 4948
+      "index": 4918
     },
     "end": {
       "line": 83,
       "column": 3,
-      "index": 5047
+      "index": 5017
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 84,
       "column": 28,
-      "index": 5077
+      "index": 5047
     },
     "end": {
       "line": 87,
       "column": 3,
-      "index": 5194
+      "index": 5164
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 88,
       "column": 30,
-      "index": 5226
+      "index": 5196
     },
     "end": {
       "line": 91,
       "column": 3,
-      "index": 5336
+      "index": 5306
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 92,
       "column": 36,
-      "index": 5374
+      "index": 5344
     },
     "end": {
       "line": 96,
       "column": 3,
-      "index": 5579
+      "index": 5549
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 97,
       "column": 22,
-      "index": 5603
+      "index": 5573
     },
     "end": {
       "line": 100,
       "column": 3,
-      "index": 5694
+      "index": 5664
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 101,
       "column": 28,
-      "index": 5724
+      "index": 5694
     },
     "end": {
       "line": 104,
       "column": 3,
-      "index": 5889
+      "index": 5859
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 105,
       "column": 27,
-      "index": 5918
+      "index": 5888
     },
     "end": {
       "line": 108,
       "column": 3,
-      "index": 6020
+      "index": 5990
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 109,
       "column": 33,
-      "index": 6055
+      "index": 6025
     },
     "end": {
       "line": 112,
       "column": 3,
-      "index": 6225
+      "index": 6195
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 113,
       "column": 11,
-      "index": 6238
+      "index": 6208
     },
     "end": {
       "line": 116,
       "column": 3,
-      "index": 6319
+      "index": 6289
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 117,
       "column": 21,
-      "index": 6342
+      "index": 6312
     },
     "end": {
       "line": 120,
       "column": 3,
-      "index": 6445
+      "index": 6415
     }
   },
   {
@@ -171,27 +171,27 @@
     "start": {
       "line": 121,
       "column": 14,
-      "index": 6461
+      "index": 6431
     },
     "end": {
       "line": 124,
       "column": 3,
-      "index": 6547
+      "index": 6517
     }
   },
   {
     "id": "components.governance.delegateVotingToDRep",
-    "defaultMessage": "!!!Delegate voting to \n{drepID}",
+    "defaultMessage": "!!!Delegate voting to",
     "file": "src/features/Staking/Governance/common/strings.ts",
     "start": {
       "line": 125,
       "column": 24,
-      "index": 6573
+      "index": 6543
     },
     "end": {
       "line": 128,
       "column": 3,
-      "index": 6688
+      "index": 6647
     }
   },
   {
@@ -201,12 +201,12 @@
     "start": {
       "line": 129,
       "column": 17,
-      "index": 6707
+      "index": 6666
     },
     "end": {
       "line": 132,
       "column": 3,
-      "index": 6800
+      "index": 6759
     }
   },
   {
@@ -216,12 +216,12 @@
     "start": {
       "line": 133,
       "column": 22,
-      "index": 6824
+      "index": 6783
     },
     "end": {
       "line": 136,
       "column": 3,
-      "index": 6928
+      "index": 6887
     }
   },
   {
@@ -231,12 +231,12 @@
     "start": {
       "line": 137,
       "column": 14,
-      "index": 6944
+      "index": 6903
     },
     "end": {
       "line": 140,
       "column": 3,
-      "index": 7030
+      "index": 6989
     }
   },
   {
@@ -246,12 +246,12 @@
     "start": {
       "line": 141,
       "column": 17,
-      "index": 7049
+      "index": 7008
     },
     "end": {
       "line": 144,
       "column": 3,
-      "index": 7167
+      "index": 7126
     }
   },
   {
@@ -261,12 +261,12 @@
     "start": {
       "line": 145,
       "column": 10,
-      "index": 7179
+      "index": 7138
     },
     "end": {
       "line": 148,
       "column": 3,
-      "index": 7272
+      "index": 7231
     }
   },
   {
@@ -276,12 +276,12 @@
     "start": {
       "line": 149,
       "column": 28,
-      "index": 7302
+      "index": 7261
     },
     "end": {
       "line": 152,
       "column": 3,
-      "index": 7433
+      "index": 7392
     }
   },
   {
@@ -291,12 +291,12 @@
     "start": {
       "line": 153,
       "column": 32,
-      "index": 7467
+      "index": 7426
     },
     "end": {
       "line": 156,
       "column": 3,
-      "index": 7595
+      "index": 7554
     }
   },
   {
@@ -306,12 +306,12 @@
     "start": {
       "line": 157,
       "column": 25,
-      "index": 7622
+      "index": 7581
     },
     "end": {
       "line": 161,
       "column": 3,
-      "index": 7850
+      "index": 7809
     }
   },
   {
@@ -321,12 +321,12 @@
     "start": {
       "line": 162,
       "column": 18,
-      "index": 7870
+      "index": 7829
     },
     "end": {
       "line": 165,
       "column": 3,
-      "index": 7966
+      "index": 7925
     }
   },
   {
@@ -336,12 +336,12 @@
     "start": {
       "line": 166,
       "column": 16,
-      "index": 7984
+      "index": 7943
     },
     "end": {
       "line": 169,
       "column": 3,
-      "index": 8078
+      "index": 8037
     }
   },
   {
@@ -351,12 +351,12 @@
     "start": {
       "line": 170,
       "column": 17,
-      "index": 8097
+      "index": 8056
     },
     "end": {
       "line": 173,
       "column": 3,
-      "index": 8246
+      "index": 8205
     }
   },
   {
@@ -366,12 +366,12 @@
     "start": {
       "line": 174,
       "column": 34,
-      "index": 8282
+      "index": 8241
     },
     "end": {
       "line": 177,
       "column": 3,
-      "index": 8438
+      "index": 8397
     }
   },
   {
@@ -381,12 +381,12 @@
     "start": {
       "line": 178,
       "column": 25,
-      "index": 8465
+      "index": 8424
     },
     "end": {
       "line": 182,
       "column": 3,
-      "index": 8679
+      "index": 8638
     }
   },
   {
@@ -396,12 +396,12 @@
     "start": {
       "line": 183,
       "column": 14,
-      "index": 8695
+      "index": 8654
     },
     "end": {
       "line": 186,
       "column": 3,
-      "index": 8782
+      "index": 8741
     }
   },
   {
@@ -411,12 +411,12 @@
     "start": {
       "line": 187,
       "column": 11,
-      "index": 8795
+      "index": 8754
     },
     "end": {
       "line": 190,
       "column": 3,
-      "index": 8875
+      "index": 8834
     }
   },
   {
@@ -426,12 +426,12 @@
     "start": {
       "line": 191,
       "column": 22,
-      "index": 8899
+      "index": 8858
     },
     "end": {
       "line": 194,
       "column": 3,
-      "index": 9002
+      "index": 8961
     }
   },
   {
@@ -441,12 +441,12 @@
     "start": {
       "line": 195,
       "column": 9,
-      "index": 9013
+      "index": 8972
     },
     "end": {
       "line": 198,
       "column": 3,
-      "index": 9089
+      "index": 9048
     }
   },
   {
@@ -456,12 +456,12 @@
     "start": {
       "line": 199,
       "column": 21,
-      "index": 9112
+      "index": 9071
     },
     "end": {
       "line": 202,
       "column": 3,
-      "index": 9213
+      "index": 9172
     }
   },
   {
@@ -471,12 +471,12 @@
     "start": {
       "line": 203,
       "column": 11,
-      "index": 9226
+      "index": 9185
     },
     "end": {
       "line": 206,
       "column": 3,
-      "index": 9363
+      "index": 9322
     }
   },
   {
@@ -486,12 +486,12 @@
     "start": {
       "line": 207,
       "column": 32,
-      "index": 9397
+      "index": 9356
     },
     "end": {
       "line": 210,
       "column": 3,
-      "index": 9563
+      "index": 9522
     }
   },
   {
@@ -501,12 +501,12 @@
     "start": {
       "line": 211,
       "column": 12,
-      "index": 9577
+      "index": 9536
     },
     "end": {
       "line": 214,
       "column": 3,
-      "index": 9660
+      "index": 9619
     }
   },
   {
@@ -516,12 +516,12 @@
     "start": {
       "line": 215,
       "column": 10,
-      "index": 9672
+      "index": 9631
     },
     "end": {
       "line": 218,
       "column": 3,
-      "index": 9751
+      "index": 9710
     }
   },
   {
@@ -531,12 +531,12 @@
     "start": {
       "line": 219,
       "column": 14,
-      "index": 9767
+      "index": 9726
     },
     "end": {
       "line": 222,
       "column": 3,
-      "index": 9860
+      "index": 9819
     }
   },
   {
@@ -546,12 +546,12 @@
     "start": {
       "line": 223,
       "column": 24,
-      "index": 9886
+      "index": 9845
     },
     "end": {
       "line": 226,
       "column": 3,
-      "index": 9988
+      "index": 9947
     }
   },
   {
@@ -561,12 +561,12 @@
     "start": {
       "line": 227,
       "column": 30,
-      "index": 10020
+      "index": 9979
     },
     "end": {
       "line": 231,
       "column": 3,
-      "index": 10311
+      "index": 10270
     }
   },
   {
@@ -576,12 +576,12 @@
     "start": {
       "line": 232,
       "column": 25,
-      "index": 10338
+      "index": 10297
     },
     "end": {
       "line": 235,
       "column": 3,
-      "index": 10450
+      "index": 10409
     }
   },
   {
@@ -591,12 +591,12 @@
     "start": {
       "line": 236,
       "column": 15,
-      "index": 10467
+      "index": 10426
     },
     "end": {
       "line": 239,
       "column": 3,
-      "index": 10560
+      "index": 10519
     }
   },
   {
@@ -606,12 +606,12 @@
     "start": {
       "line": 240,
       "column": 35,
-      "index": 10597
+      "index": 10556
     },
     "end": {
       "line": 243,
       "column": 3,
-      "index": 10729
+      "index": 10688
     }
   },
   {
@@ -621,12 +621,12 @@
     "start": {
       "line": 244,
       "column": 34,
-      "index": 10765
+      "index": 10724
     },
     "end": {
       "line": 247,
       "column": 3,
-      "index": 10939
+      "index": 10898
     }
   },
   {
@@ -636,12 +636,12 @@
     "start": {
       "line": 248,
       "column": 14,
-      "index": 10955
+      "index": 10914
     },
     "end": {
       "line": 251,
       "column": 3,
-      "index": 11043
+      "index": 11002
     }
   },
   {
@@ -651,27 +651,27 @@
     "start": {
       "line": 252,
       "column": 10,
-      "index": 11055
+      "index": 11014
     },
     "end": {
       "line": 255,
       "column": 3,
-      "index": 11142
+      "index": 11101
     }
   },
   {
     "id": "components.governance.registerStakingKey",
-    "defaultMessage": "!!!Register staking key",
+    "defaultMessage": "!!!Register staking key deposit",
     "file": "src/features/Staking/Governance/common/strings.ts",
     "start": {
       "line": 256,
       "column": 22,
-      "index": 11166
+      "index": 11125
     },
     "end": {
       "line": 259,
       "column": 3,
-      "index": 11270
+      "index": 11237
     }
   },
   {
@@ -681,12 +681,12 @@
     "start": {
       "line": 260,
       "column": 19,
-      "index": 11291
+      "index": 11258
     },
     "end": {
       "line": 263,
       "column": 3,
-      "index": 11447
+      "index": 11414
     }
   },
   {
@@ -696,12 +696,12 @@
     "start": {
       "line": 264,
       "column": 15,
-      "index": 11464
+      "index": 11431
     },
     "end": {
       "line": 267,
       "column": 3,
-      "index": 11554
+      "index": 11521
     }
   },
   {
@@ -711,12 +711,12 @@
     "start": {
       "line": 268,
       "column": 25,
-      "index": 11581
+      "index": 11548
     },
     "end": {
       "line": 271,
       "column": 3,
-      "index": 11710
+      "index": 11677
     }
   },
   {
@@ -726,12 +726,12 @@
     "start": {
       "line": 272,
       "column": 28,
-      "index": 11740
+      "index": 11707
     },
     "end": {
       "line": 275,
       "column": 3,
-      "index": 11835
+      "index": 11802
     }
   },
   {
@@ -741,12 +741,12 @@
     "start": {
       "line": 276,
       "column": 34,
-      "index": 11871
+      "index": 11838
     },
     "end": {
       "line": 279,
       "column": 3,
-      "index": 12031
+      "index": 11998
     }
   },
   {
@@ -756,12 +756,12 @@
     "start": {
       "line": 280,
       "column": 29,
-      "index": 12062
+      "index": 12029
     },
     "end": {
       "line": 283,
       "column": 3,
-      "index": 12175
+      "index": 12142
     }
   },
   {
@@ -771,12 +771,12 @@
     "start": {
       "line": 284,
       "column": 22,
-      "index": 12199
+      "index": 12166
     },
     "end": {
       "line": 287,
       "column": 3,
-      "index": 12323
+      "index": 12290
     }
   }
 ]
\ No newline at end of file

From 8e308f73728ac5c7fb926c1e49ba07a121d70a1d Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:58:43 +0200
Subject: [PATCH 08/15] feature(wallet-mobile): prefetch ada prices (#3663)

---
 .../common/hooks/useGetPortfolioTokenChart.ts | 110 ++++++++++--------
 .../common/hooks/useGetTokensWithBalance.ts   |  54 ---------
 .../DashboardTokensList.tsx                   |  28 -----
 .../PortfolioTokenChart.tsx                   |   8 +-
 .../PortfolioTokenChart/TokenChartToolBar.tsx |   4 +-
 .../PortfolioTokenChart/TokenPerformance.tsx  |  14 +--
 .../PortfolioTokenDetailsScreen.tsx           |   3 +-
 apps/wallet-mobile/src/kernel/features.ts     |   1 -
 apps/wallet-mobile/src/kernel/query-client.ts |  21 ++++
 9 files changed, 93 insertions(+), 150 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetTokensWithBalance.ts

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
index 23bf03f74c..a745475dcd 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetPortfolioTokenChart.ts
@@ -4,10 +4,10 @@ import {Chain, Portfolio} from '@yoroi/types'
 import {useQuery, UseQueryOptions} from 'react-query'
 
 import {supportedCurrencies, time} from '../../../../kernel/constants'
-import {features} from '../../../../kernel/features'
 import {useLanguage} from '../../../../kernel/i18n'
 import {logger} from '../../../../kernel/logger/logger'
 import {fetchPtPriceActivity} from '../../../../yoroi-wallets/cardano/usePrimaryTokenActivity'
+import {delay} from '../../../../yoroi-wallets/utils/timeUtils'
 import {useCurrencyPairing} from '../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {useSelectedNetwork} from '../../../WalletManager/common/hooks/useSelectedNetwork'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
@@ -15,7 +15,7 @@ import {networkConfigs} from '../../../WalletManager/network-manager/network-man
 import {priceChange} from '../helpers/priceChange'
 import {usePortfolioTokenDetailParams} from './useNavigateTo'
 
-export const TOKEN_CHART_INTERVAL = {
+export const TokenChartInterval = {
   DAY: '24 H',
   WEEK: '1 W',
   MONTH: '1 M',
@@ -24,7 +24,7 @@ export const TOKEN_CHART_INTERVAL = {
   ALL: 'ALL',
 } as const
 
-export type TokenChartInterval = (typeof TOKEN_CHART_INTERVAL)[keyof typeof TOKEN_CHART_INTERVAL]
+export type TokenChartInterval = (typeof TokenChartInterval)[keyof typeof TokenChartInterval]
 
 type TokenChartData = {
   label: string
@@ -36,13 +36,13 @@ type TokenChartData = {
 const getTimestamps = (timeInterval: TokenChartInterval) => {
   const now = Date.now()
   const [from, resolution] = {
-    [TOKEN_CHART_INTERVAL.DAY]: [now - time.oneDay, 96],
-    [TOKEN_CHART_INTERVAL.WEEK]: [now - time.oneWeek, 168],
-    [TOKEN_CHART_INTERVAL.MONTH]: [now - time.oneMonth, 180],
-    [TOKEN_CHART_INTERVAL.SIX_MONTHS]: [now - time.sixMonths, 180],
-    [TOKEN_CHART_INTERVAL.YEAR]: [now - time.oneYear, 365],
-    [TOKEN_CHART_INTERVAL.ALL]: [new Date('2018').getTime(), 256],
-  }[timeInterval]
+    [TokenChartInterval.DAY]: [now - time.oneDay, 96],
+    [TokenChartInterval.WEEK]: [now - time.oneWeek, 168],
+    [TokenChartInterval.MONTH]: [now - time.oneMonth, 180],
+    [TokenChartInterval.SIX_MONTHS]: [now - time.sixMonths, 180],
+    [TokenChartInterval.YEAR]: [now - time.oneYear, 365],
+    [TokenChartInterval.ALL]: [new Date('2018').getTime(), 256],
+  }[timeInterval ?? TokenChartInterval.DAY]
 
   const step = (now - from) / resolution
   return Array.from({length: resolution}, (_, i) => from + Math.round(step * i))
@@ -50,8 +50,16 @@ const getTimestamps = (timeInterval: TokenChartInterval) => {
 
 const ptTicker = networkConfigs[Chain.Network.Mainnet].primaryTokenInfo.ticker
 
+export const ptPriceQueryFn = async ({queryKey}: {queryKey: ['ptPriceHistory', TokenChartInterval]}) => {
+  const response = await fetchPtPriceActivity(getTimestamps(queryKey[1]))
+  if (isRight(response) && !response.value.data.error && response.value.data.tickers.length !== 0) {
+    return response.value.data.tickers
+  }
+  throw new Error('Failed to fetch token chart data for PT')
+}
+
 export const useGetPortfolioTokenChart = (
-  timeInterval = TOKEN_CHART_INTERVAL.DAY as TokenChartInterval,
+  timeInterval = TokenChartInterval.DAY as TokenChartInterval,
   options: UseQueryOptions<
     TokenChartData[] | null,
     Error,
@@ -70,45 +78,49 @@ export const useGetPortfolioTokenChart = (
   const {currency} = useCurrencyPairing()
   const {languageCode} = useLanguage()
 
-  const ptQuery = useQuery({
+  const ptPriceQuery = useQuery<
+    Awaited<ReturnType<typeof ptPriceQueryFn>>,
+    Error,
+    Awaited<ReturnType<typeof ptPriceQueryFn>>,
+    ['ptPriceHistory', TokenChartInterval]
+  >({
+    enabled: tokenInfo && isPrimaryToken(tokenInfo.info),
     staleTime: time.halfHour,
     cacheTime: time.oneHour,
-    retryDelay: time.oneSecond,
-    optimisticResults: true,
     refetchInterval: time.halfHour,
-    useErrorBoundary: true,
-    refetchOnMount: false,
+    queryKey: ['ptPriceHistory', timeInterval],
+    queryFn: ptPriceQueryFn,
+  })
+
+  const ptQuery = useQuery({
     enabled: tokenInfo && isPrimaryToken(tokenInfo.info),
+    staleTime: time.oneMinute,
     ...options,
-    queryKey: ['useGetPortfolioTokenChart', tokenInfo?.info.id ?? '', timeInterval, currency],
+    queryKey: ['useGetPortfolioTokenChart', 'pt', timeInterval, currency],
     queryFn: async () => {
-      const response = await fetchPtPriceActivity(getTimestamps(timeInterval))
-      if (isRight(response)) {
-        if (response.value.data.error) throw new Error(response.value.data.error)
-
-        const tickers = response.value.data.tickers
-        if (tickers.length === 0) return null
-
-        const validCurrency = currency === ptTicker ? supportedCurrencies.USD : currency ?? supportedCurrencies.USD
-
-        const initialPrice = tickers[0].prices[validCurrency]
-        const records = tickers
-          .map((ticker) => {
-            const value = ticker.prices[validCurrency]
-            if (value === undefined) return undefined
-            const {changePercent, changeValue} = priceChange(initialPrice, value)
-            const label = new Date(ticker.timestamp).toLocaleString(languageCode, {
-              dateStyle: 'short',
-              timeStyle: 'short',
-            })
-            return {label, value, changePercent, changeValue}
+      // force queryFn to be async, otherwise it takes longer and doesn't show isFetching
+      await delay(0)
+
+      const tickers = ptPriceQuery?.data ?? []
+      if (tickers.length === 0) throw new Error('No PT price data')
+
+      const validCurrency = currency === ptTicker ? supportedCurrencies.USD : currency ?? supportedCurrencies.USD
+
+      const initialPrice = tickers[0].prices[validCurrency]
+      const records = tickers
+        .map((ticker) => {
+          const value = ticker.prices[validCurrency]
+          if (value === undefined) return undefined
+          const {changePercent, changeValue} = priceChange(initialPrice, value)
+          const label = new Date(ticker.timestamp).toLocaleString(languageCode, {
+            dateStyle: 'short',
+            timeStyle: 'short',
           })
-          .filter(Boolean) as TokenChartData[]
+          return {label, value, changePercent, changeValue}
+        })
+        .filter(Boolean) as TokenChartData[]
 
-        return records
-      }
-      logger.error('Failed to fetch token chart data for PT')
-      return null
+      return records
     },
   })
 
@@ -119,8 +131,6 @@ export const useGetPortfolioTokenChart = (
     ...options,
     queryKey: ['useGetPortfolioTokenChart', tokenInfo?.info.id ?? '', timeInterval],
     queryFn: async () => {
-      if (!features.portfolioSecondaryCharts) return null
-
       const response = await tokenManager.api.tokenHistory(tokenId, chartIntervalToHistoryPeriod(timeInterval))
       if (isRight(response)) {
         const prices = response.value.data.prices
@@ -153,10 +163,10 @@ export const useGetPortfolioTokenChart = (
 
 const chartIntervalToHistoryPeriod = (i: TokenChartInterval): Portfolio.Token.HistoryPeriod =>
   ({
-    [TOKEN_CHART_INTERVAL.DAY]: Portfolio.Token.HistoryPeriod.OneDay,
-    [TOKEN_CHART_INTERVAL.WEEK]: Portfolio.Token.HistoryPeriod.OneWeek,
-    [TOKEN_CHART_INTERVAL.MONTH]: Portfolio.Token.HistoryPeriod.OneMonth,
-    [TOKEN_CHART_INTERVAL.SIX_MONTHS]: Portfolio.Token.HistoryPeriod.SixMonth,
-    [TOKEN_CHART_INTERVAL.YEAR]: Portfolio.Token.HistoryPeriod.OneYear,
-    [TOKEN_CHART_INTERVAL.ALL]: Portfolio.Token.HistoryPeriod.All,
+    [TokenChartInterval.DAY]: Portfolio.Token.HistoryPeriod.OneDay,
+    [TokenChartInterval.WEEK]: Portfolio.Token.HistoryPeriod.OneWeek,
+    [TokenChartInterval.MONTH]: Portfolio.Token.HistoryPeriod.OneMonth,
+    [TokenChartInterval.SIX_MONTHS]: Portfolio.Token.HistoryPeriod.SixMonth,
+    [TokenChartInterval.YEAR]: Portfolio.Token.HistoryPeriod.OneYear,
+    [TokenChartInterval.ALL]: Portfolio.Token.HistoryPeriod.All,
   }[i] ?? Portfolio.Token.HistoryPeriod.OneDay)
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetTokensWithBalance.ts b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetTokensWithBalance.ts
deleted file mode 100644
index b339b8fe50..0000000000
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useGetTokensWithBalance.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {ImageSourcePropType} from 'react-native'
-import {useQuery, UseQueryOptions} from 'react-query'
-
-import AdaLogo from '../../../../assets/img/ada.png'
-
-interface IPortfolioBalance {
-  logo: ImageSourcePropType | string
-  symbol: string
-  name: string
-  balance: string
-  oldBalance: string
-  usdExchangeRate: number
-}
-
-export const useGetTokensWithBalance = (
-  options: UseQueryOptions<IPortfolioBalance[], Error, IPortfolioBalance[], ['useGetTokensWithBalance']> = {},
-) => {
-  const query = useQuery({
-    useErrorBoundary: true,
-    ...options,
-    queryKey: ['useGetTokensWithBalance'],
-    queryFn: async () => {
-      await new Promise((resolve) => setTimeout(resolve, 3000))
-      return [
-        {
-          logo: AdaLogo,
-          symbol: 'ADA',
-          name: 'Cardano',
-          balance: '2418.02123',
-          oldBalance: '2412.01233',
-          usdExchangeRate: 0.48,
-        },
-        {
-          logo: AdaLogo,
-          symbol: 'AGIX',
-          name: 'Agix',
-          balance: '180.02123',
-          oldBalance: '110.02123',
-          usdExchangeRate: 0.8,
-        },
-        {
-          logo: AdaLogo,
-          symbol: 'HOSKY',
-          name: 'Hosky',
-          balance: '180.5123',
-          oldBalance: '184.5123',
-          usdExchangeRate: 0.8,
-        },
-      ]
-    },
-  })
-
-  return query
-}
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
index 23f9502f5a..ce5754c666 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
@@ -6,26 +6,22 @@ import {FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions, View}
 
 import {Icon} from '../../../../../components/Icon'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
-import {makeList} from '../../../../../kernel/utils'
 import {PreprodFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/PreprodFaucetBanner'
 import {SanchonetFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/SanchonetFaucetBanner'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
-import {useGetTokensWithBalance} from '../../../common/hooks/useGetTokensWithBalance'
 import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
 import {usePortfolioBalances} from '../../../common/hooks/usePortfolioBalances'
 import {useStrings} from '../../../common/hooks/useStrings'
 import {useZeroBalance} from '../../../common/hooks/useZeroBalance'
 import {BuyADABanner} from './BuyADABanner/BuyADABanner'
 import {DashboardTokenItem} from './DashboardTokenItem'
-import {DashboardTokenSkeletonItem} from './DashboardTokenSkeletonItem'
 import {TradeTokensBanner} from './TradeTokensBanner'
 
 export const DashboardTokensList = () => {
   const {styles, cardItemWidth, cardItemWidthForJustAda} = useStyles()
   const navigationTo = useNavigateTo()
   const isZeroADABalance = useZeroBalance()
-  const {isLoading} = useGetTokensWithBalance()
   const {wallet} = useSelectedWallet()
   const balances = usePortfolioBalances({wallet})
   const {
@@ -49,25 +45,6 @@ export const DashboardTokensList = () => {
     navigationTo.tokensList()
   }
 
-  const renderFooterList = () => {
-    if (isLoading)
-      return (
-        <View style={styles.containerLoading}>
-          <View />
-
-          {makeList(3).map((_, index) => (
-            <View style={[styles.tokenItemContainer, {width: cardItemWidth}]} key={index}>
-              <DashboardTokenSkeletonItem />
-            </View>
-          ))}
-
-          <Spacer width={8} />
-        </View>
-      )
-
-    return <Spacer width={16} />
-  }
-
   const renderTokensList = () => {
     if (isZeroADABalance) {
       return (
@@ -96,7 +73,6 @@ export const DashboardTokensList = () => {
         horizontal
         data={tokensList}
         ListHeaderComponent={<Spacer width={16} />}
-        ListFooterComponent={renderFooterList()}
         ItemSeparatorComponent={() => <Spacer width={8} />}
         showsHorizontalScrollIndicator={false}
         keyExtractor={(item) => item.info.id}
@@ -165,10 +141,6 @@ const useStyles = () => {
       ...atoms.body_1_lg_medium,
       color: color.gray_900,
     },
-    containerLoading: {
-      ...atoms.flex_row,
-      ...atoms.gap_sm,
-    },
     justAdaContainer: {
       ...atoms.flex_row,
       ...atoms.gap_lg,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/PortfolioTokenChart.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/PortfolioTokenChart.tsx
index 3bb1067dfb..a46c16d8b1 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/PortfolioTokenChart.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/PortfolioTokenChart.tsx
@@ -2,11 +2,7 @@ import {useTheme} from '@yoroi/theme'
 import React, {useCallback, useState} from 'react'
 import {StyleSheet, View} from 'react-native'
 
-import {
-  type TokenChartInterval,
-  TOKEN_CHART_INTERVAL,
-  useGetPortfolioTokenChart,
-} from '../../../common/hooks/useGetPortfolioTokenChart'
+import {TokenChartInterval, useGetPortfolioTokenChart} from '../../../common/hooks/useGetPortfolioTokenChart'
 import {ChartPlaceholder} from './ChartPlaceholder'
 import {PortfolioTokenChartSkeleton} from './PortfolioTokenChartSkeleton'
 import {TokenChart} from './TokenChart'
@@ -18,7 +14,7 @@ export const PortfolioTokenChart = () => {
 
   const [selectedIndex, setSelectedIndex] = useState(0)
 
-  const [timeInterval, setTimeInterval] = useState<TokenChartInterval>(TOKEN_CHART_INTERVAL.DAY)
+  const [timeInterval, setTimeInterval] = useState<TokenChartInterval>(TokenChartInterval.DAY)
 
   const {data, isFetching} = useGetPortfolioTokenChart(timeInterval)
 
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenChartToolBar.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenChartToolBar.tsx
index 651112ea13..92b4092aa0 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenChartToolBar.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenChartToolBar.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
 import {Text} from '../../../../../components/Text'
-import {type TokenChartInterval, TOKEN_CHART_INTERVAL} from '../../../common/hooks/useGetPortfolioTokenChart'
+import {TokenChartInterval} from '../../../common/hooks/useGetPortfolioTokenChart'
 
 interface Props {
   timeInterval: TokenChartInterval
@@ -21,7 +21,7 @@ export const TokenChartToolbar = ({timeInterval, disabled, onChange}: Props) =>
 
   return (
     <View style={styles.chartToolbar}>
-      {Object.values(TOKEN_CHART_INTERVAL).map((itv) => (
+      {Object.values(TokenChartInterval).map((itv) => (
         <TouchableOpacity
           onPress={() => handleChange(itv)}
           style={[itv === timeInterval ? styles.chartToolbarItemActive : {}, styles.chartToolbarItem]}
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
index 04d66d481a..5711fd678a 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenChart/TokenPerformance.tsx
@@ -7,7 +7,7 @@ import {Text} from '../../../../../components/Text'
 import {Tooltip} from '../../../../../components/Tooltip/Tooltip'
 import {useCurrencyPairing} from '../../../../Settings/useCases/changeAppSettings/Currency/CurrencyContext'
 import {formatPriceChange} from '../../../common/helpers/priceChange'
-import {TOKEN_CHART_INTERVAL, TokenChartInterval} from '../../../common/hooks/useGetPortfolioTokenChart'
+import {TokenChartInterval} from '../../../common/hooks/useGetPortfolioTokenChart'
 import {useStrings} from '../../../common/hooks/useStrings'
 import {PnlTag} from '../../../common/PnlTag/PnlTag'
 
@@ -35,17 +35,17 @@ export const TokenPerformance = ({tokenPerformance, timeInterval}: Props) => {
 
   const intervalLabel = React.useMemo(() => {
     switch (timeInterval) {
-      case TOKEN_CHART_INTERVAL.DAY:
+      case TokenChartInterval.DAY:
         return strings._24_hours
-      case TOKEN_CHART_INTERVAL.WEEK:
+      case TokenChartInterval.WEEK:
         return strings._1_week
-      case TOKEN_CHART_INTERVAL.MONTH:
+      case TokenChartInterval.MONTH:
         return strings._1_month
-      case TOKEN_CHART_INTERVAL.SIX_MONTHS:
+      case TokenChartInterval.SIX_MONTHS:
         return strings._6_months
-      case TOKEN_CHART_INTERVAL.YEAR:
+      case TokenChartInterval.YEAR:
         return strings._1_year
-      case TOKEN_CHART_INTERVAL.ALL:
+      case TokenChartInterval.ALL:
         return strings.all_time
       default:
         return strings._24_hours
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx
index 28bd845fe8..82dc7a6cc3 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx
@@ -21,8 +21,6 @@ import {PortfolioTokenBalance} from './PortfolioTokenBalance/PortfolioTokenBalan
 import {PortfolioTokenChart} from './PortfolioTokenChart/PortfolioTokenChart'
 import {PortfolioTokenInfo} from './PortfolioTokenInfo/PortfolioTokenInfo'
 
-const HEADER_HEIGHT = 304
-
 export const PortfolioTokenDetailsScreen = () => {
   const strings = useStrings()
   const {detailsTab, setDetailsTab} = usePortfolio()
@@ -31,6 +29,7 @@ export const PortfolioTokenDetailsScreen = () => {
   const {id: tokenId} = usePortfolioTokenDetailParams()
   const {wallet} = useSelectedWallet()
   const tokenInfo = wallet.balances.records.get(tokenId)?.info
+  const HEADER_HEIGHT = 304
   const {styles} = useStyles(HEADER_HEIGHT)
 
   if (!tokenInfo) throwLoggedError(new App.Errors.InvalidState('Token info not found, invalid state'))
diff --git a/apps/wallet-mobile/src/kernel/features.ts b/apps/wallet-mobile/src/kernel/features.ts
index 51aa85a456..76e3908c0b 100644
--- a/apps/wallet-mobile/src/kernel/features.ts
+++ b/apps/wallet-mobile/src/kernel/features.ts
@@ -6,7 +6,6 @@ export const features = {
   showProdPoolsInDev: isDev,
   moderatingNftsEnabled: false,
   poolTransition: true,
-  portfolioSecondaryCharts: isDev,
   portfolioPerformance: false,
   portfolioNews: false,
   portfolioExport: false,
diff --git a/apps/wallet-mobile/src/kernel/query-client.ts b/apps/wallet-mobile/src/kernel/query-client.ts
index 3e1d1442ed..9ed88aa570 100644
--- a/apps/wallet-mobile/src/kernel/query-client.ts
+++ b/apps/wallet-mobile/src/kernel/query-client.ts
@@ -1,7 +1,28 @@
 import {freeze} from 'immer'
 import {QueryClient} from 'react-query'
 
+import {ptPriceQueryFn, TokenChartInterval} from '../features/Portfolio/common/hooks/useGetPortfolioTokenChart'
+
 const queryClient = new QueryClient()
+
+const prefetchPtPriceHistory = () => {
+  Object.values(TokenChartInterval).forEach((TokenChartInterval) => {
+    queryClient.prefetchQuery<
+      Awaited<ReturnType<typeof ptPriceQueryFn>>,
+      Error,
+      Awaited<ReturnType<typeof ptPriceQueryFn>>,
+      ['ptPriceHistory', TokenChartInterval]
+    >({
+      queryKey: ['ptPriceHistory', TokenChartInterval],
+      queryFn: ptPriceQueryFn,
+      cacheTime: Infinity,
+      staleTime: Infinity,
+    })
+  })
+}
+
+prefetchPtPriceHistory()
+
 const keyToPersist = 'persist'
 /*
 const queryPersistorStorageKey = 'react-query-persistor'

From bc0ae2b9f25faaa43266e6e379b10cc1911885b8 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:51:04 +0200
Subject: [PATCH 09/15] fix(wallet-mobile): restore debug mode (#3691)

---
 apps/wallet-mobile/src/kernel/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/src/kernel/config.ts b/apps/wallet-mobile/src/kernel/config.ts
index 8a814b441e..461c08071c 100644
--- a/apps/wallet-mobile/src/kernel/config.ts
+++ b/apps/wallet-mobile/src/kernel/config.ts
@@ -12,4 +12,4 @@ export const governaceAfterBlock = freeze({
 
 export const agreementDate = 1691967600000
 
-export const loggerLevel: App.Logger.Level = isDev ? App.Logger.Level.Log : App.Logger.Level.Warn
+export const loggerLevel: App.Logger.Level = isDev ? App.Logger.Level.Debug : App.Logger.Level.Warn

From 944bf3f93f04d13a447d4999f57bc6d52708fec1 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:51:18 +0200
Subject: [PATCH 10/15] fix(wallet-mobile): autofocus and caret color for send
 edit amount (#3692)

---
 .../ListAmountsToSend/EditAmount/EditAmountScreen.tsx      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
index 0951dbc003..5b3a27009a 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -46,7 +46,7 @@ export const EditAmountScreen = () => {
 
   const [quantity, setQuantity] = React.useState(initialQuantity)
   const [inputValue, setInputValue] = React.useState(
-    atomicBreakdown(initialQuantity, amount.info.decimals).bn.toFormat(),
+    initialQuantity === 0n ? '' : atomicBreakdown(initialQuantity, amount.info.decimals).bn.toFormat(),
   )
   const spendable = isPrimary ? available - primaryBreakdown.lockedAsStorageCost : available
 
@@ -54,7 +54,7 @@ export const EditAmountScreen = () => {
 
   React.useEffect(() => {
     setQuantity(initialQuantity)
-    setInputValue(atomicBreakdown(initialQuantity, amount.info.decimals).bn.toFormat())
+    setInputValue(initialQuantity === 0n ? '' : atomicBreakdown(initialQuantity, amount.info.decimals).bn.toFormat())
   }, [amount.info.decimals, initialQuantity])
 
   const isFocused = useIsFocused()
@@ -216,6 +216,7 @@ const AmountInput = ({onChange, value, ticker}: AmountInputProps) => {
       underlineColorAndroid="transparent"
       activeUnderlineColor="transparent"
       selectionColor={colors.selected}
+      cursorColor={colors.cursor}
       noHelper
     />
   )
@@ -272,7 +273,7 @@ const useStyles = () => {
     },
   })
   const colors = {
-    black: color.gray_max,
+    cursor: color.el_gray_max,
     selected: color.input_selected,
   }
   return {styles, colors} as const

From fb4fa0643e66ffc37bb0cf9c546451f9a83ec3c5 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:22:57 +0200
Subject: [PATCH 11/15] feature(wallet-mobile): new tx review for catalyst
 (#3694)

---
 .../.storybook/storybook.requires.js          |   1 -
 .../RegisterCatalyst/CatalystNavigator.tsx    |  23 ---
 .../useCases/ConfirmPin/ConfirmPin.tsx        |  26 ++-
 .../ConfirmVotingTx.stories.tsx               |  70 --------
 .../ConfirmVotingTx/ConfirmVotingTx.tsx       | 157 ------------------
 .../ReviewTx/common/ReviewTxProvider.tsx      |  30 ++++
 .../common/hooks/useFormattedMetadata.tsx     |  13 +-
 .../ReviewTx/common/hooks/useOnConfirm.tsx    |  13 +-
 .../src/features/ReviewTx/common/types.ts     |   4 +-
 .../ReviewTxScreen/Metadata/MetadataTab.tsx   |   8 +-
 .../ReviewTxScreen/ReviewTxScreen.tsx         |   5 +-
 .../Staking/Governance/common/helpers.tsx     |  12 +-
 .../src/catalyst/translators/context.tsx      |   5 -
 .../src/catalyst/translators/state.test.tsx   |  14 --
 .../src/catalyst/translators/state.tsx        |  16 +-
 15 files changed, 90 insertions(+), 307 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index ce14bcbce3..d1d11dfb54 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -166,7 +166,6 @@ const getStories = () => {
     "./src/features/Receive/common/ShareDetailsCard/ShareDetailsCard.stories.tsx": require("../src/features/Receive/common/ShareDetailsCard/ShareDetailsCard.stories.tsx"),
     "./src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.stories.tsx": require("../src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.stories.tsx"),
     "./src/features/Receive/common/SmallAddressCard/SmallAddressCard.stories.tsx": require("../src/features/Receive/common/SmallAddressCard/SmallAddressCard.stories.tsx"),
-    "./src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx": require("../src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx"),
     "./src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.stories.tsx": require("../src/features/RegisterCatalyst/useCases/ShowQrCode/ShowQrCode.stories.tsx"),
     "./src/features/Scan/illustrations/Ilustrations.stories.tsx": require("../src/features/Scan/illustrations/Ilustrations.stories.tsx"),
     "./src/features/Scan/useCases/ScanCodeScreen.stories.tsx": require("../src/features/Scan/useCases/ScanCodeScreen.stories.tsx"),
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
index de0fd14e4d..99c9e521d4 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
@@ -5,7 +5,6 @@ import {catalystApiMaker} from '@yoroi/staking/src'
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {useIntl} from 'react-intl'
-import {StyleSheet} from 'react-native'
 
 import {Boundary} from '../../components/Boundary/Boundary'
 import globalMessages from '../../kernel/i18n/global-messages'
@@ -18,7 +17,6 @@ import {
 } from '../../kernel/navigation'
 import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {ConfirmPin} from './useCases/ConfirmPin/ConfirmPin'
-import {ConfirmVotingTx} from './useCases/ConfirmVotingTx/ConfirmVotingTx'
 import {DisplayPin} from './useCases/DisplayPin/DisplayPin'
 import {DownloadCatalystAppScreen} from './useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen'
 import {QrCode} from './useCases/ShowQrCode/ShowQrCode'
@@ -33,7 +31,6 @@ export const CatalystNavigator = () => {
   const {atoms, color} = useTheme()
   const strings = useStrings()
   const {track} = useMetrics()
-  const {styles} = useStyles()
 
   useFocusEffect(
     React.useCallback(() => {
@@ -68,14 +65,6 @@ export const CatalystNavigator = () => {
           {/* STEP 3 */}
           <Stack.Screen name="confirm-pin" component={ConfirmPin} />
 
-          <Stack.Screen name="confirm-tx">
-            {() => (
-              <Boundary loading={{size: 'full', style: styles.loadingBackground}} error={{size: 'full'}}>
-                <ConfirmVotingTx />
-              </Boundary>
-            )}
-          </Stack.Screen>
-
           {/* STEP 4 */}
           <Stack.Screen component={QrCode} name="qr-code" options={{...navigationOptions, headerLeft: () => null}} />
         </Stack.Group>
@@ -91,7 +80,6 @@ export const useNavigateTo = () => {
   return {
     displayPin: () => navigation.navigate('display-pin'),
     confirmPin: () => navigation.navigate('confirm-pin'),
-    confirmTx: () => navigation.navigate('confirm-tx'),
     qrCode: () => navigation.navigate('qr-code'),
     txHistory: () => resetToTxHistory(),
   }
@@ -104,14 +92,3 @@ const useStrings = () => {
     title: intl.formatMessage(globalMessages.votingTitle),
   }
 }
-
-const useStyles = () => {
-  const {color} = useTheme()
-  const styles = StyleSheet.create({
-    loadingBackground: {
-      backgroundColor: color.bg_color_max,
-    },
-  })
-
-  return {styles}
-}
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
index a6a260c154..90c3fda793 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmPin/ConfirmPin.tsx
@@ -9,8 +9,11 @@ import {Button} from '../../../../components/Button/Button'
 import {BACKSPACE, NumericKeyboard} from '../../../../components/NumericKeyboard'
 import {Space} from '../../../../components/Space/Space'
 import {Spacer} from '../../../../components/Spacer/Spacer'
+import {useWalletNavigation} from '../../../../kernel/navigation'
 import {generatePrivateKeyForCatalyst} from '../../../../yoroi-wallets/cardano/catalyst'
 import {encryptWithPassword} from '../../../../yoroi-wallets/cardano/catalyst/catalystCipher'
+import {useReviewTx} from '../../../ReviewTx/common/ReviewTxProvider'
+import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useNavigateTo} from '../../CatalystNavigator'
 import {Actions, Description, PinBox, Row, Stepper} from '../../common/components'
 import {useStrings} from '../../common/strings'
@@ -19,16 +22,31 @@ export const ConfirmPin = () => {
   const strings = useStrings()
   const {isDark} = useTheme()
   const styles = useStyles()
-  const {pin, votingKeyEncryptedChanged, catalystKeyHexChanged} = useCatalyst()
+  const {pin, votingKeyEncryptedChanged} = useCatalyst()
   const navigateTo = useNavigateTo()
   const [currentActivePin, setCurrentActivePin] = React.useState(1)
+  const {wallet, meta} = useSelectedWallet()
+  const {onCIP36SupportChangeChanged, unsignedTxChanged, onSuccessChanged} = useReviewTx()
+  const {navigateToTxReview} = useWalletNavigation()
 
   const {generateVotingKeys, isLoading} = useGenerateVotingKeys({
-    onSuccess: ({catalystKeyHex, votingKeyEncrypted}) => {
+    onSuccess: async ({catalystKeyHex, votingKeyEncrypted}) => {
       votingKeyEncryptedChanged(votingKeyEncrypted)
-      catalystKeyHexChanged(catalystKeyHex)
 
-      navigateTo.confirmTx()
+      let votingRegTx = await wallet.createVotingRegTx({
+        catalystKeyHex,
+        supportsCIP36: true,
+        addressMode: meta.addressMode,
+      })
+
+      unsignedTxChanged(votingRegTx.votingRegTx)
+      onCIP36SupportChangeChanged(async (supportsCIP36: boolean) => {
+        votingRegTx = await wallet.createVotingRegTx({catalystKeyHex, supportsCIP36, addressMode: meta.addressMode})
+        unsignedTxChanged(votingRegTx.votingRegTx)
+      })
+      onSuccessChanged(navigateTo.qrCode)
+
+      navigateToTxReview()
     },
   })
 
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx
deleted file mode 100644
index 74be329232..0000000000
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.stories.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import {action} from '@storybook/addon-actions'
-import {storiesOf} from '@storybook/react-native'
-import {Catalyst, CatalystProvider} from '@yoroi/staking'
-import {catalystConfig} from '@yoroi/staking/src/catalyst/config'
-import {WalletMeta} from '@yoroi/types/lib/typescript/wallet/meta'
-import React from 'react'
-
-import {QueryProvider} from '../../../../../.storybook/decorators'
-import {Boundary} from '../../../../components/Boundary/Boundary'
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {mocks} from '../../../../yoroi-wallets/mocks/wallet'
-import {walletManagerMock, WalletManagerProviderMock} from '../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
-import {ConfirmVotingTx} from './ConfirmVotingTx'
-
-storiesOf('Catalyst ConfirmVotingTx', module)
-  .add('password', () => (
-    <Providers
-      wallet={{
-        ...mocks.wallet,
-        createVotingRegTx: mocks.createVotingRegTx.success,
-        encryptedStorage: mocks.encryptedStorage,
-      }}
-      meta={{...mocks.walletMeta, isHW: false, isEasyConfirmationEnabled: false}}
-    >
-      <ConfirmVotingTx />
-    </Providers>
-  ))
-  .add('hw', () => (
-    <Providers
-      wallet={{
-        ...mocks.wallet,
-        createVotingRegTx: mocks.createVotingRegTx.success,
-      }}
-      meta={{...mocks.walletMeta, isHW: true, isEasyConfirmationEnabled: false}}
-    >
-      <ConfirmVotingTx />
-    </Providers>
-  ))
-  .add('os', () => (
-    <Providers
-      wallet={{
-        ...mocks.wallet,
-        createVotingRegTx: mocks.createVotingRegTx.success,
-      }}
-      meta={{...mocks.walletMeta, isHW: false, isEasyConfirmationEnabled: true}}
-    >
-      <ConfirmVotingTx />
-    </Providers>
-  ))
-
-const Providers = ({wallet, children, meta}: {wallet: YoroiWallet; children: React.ReactNode; meta: WalletMeta}) => {
-  walletManagerMock.setSelectedWalletId(wallet.id)
-
-  const manager: Catalyst.Manager = {
-    config: catalystConfig,
-    getFundInfo: action('getFundInfo') as Catalyst.Manager['getFundInfo'],
-    fundStatus: action('fundStatus') as Catalyst.Manager['fundStatus'],
-  }
-  return (
-    <QueryProvider>
-      <WalletManagerProviderMock wallet={wallet} meta={meta} walletManager={walletManagerMock}>
-        <Boundary loading={{size: 'full'}}>
-          <CatalystProvider manager={manager} initialState={{pin: '1234'}}>
-            {children}
-          </CatalystProvider>
-        </Boundary>
-      </WalletManagerProviderMock>
-    </QueryProvider>
-  )
-}
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx
deleted file mode 100644
index 2ec8266a04..0000000000
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/useCases/ConfirmVotingTx/ConfirmVotingTx.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import {useCatalyst} from '@yoroi/staking'
-import {useTheme} from '@yoroi/theme'
-import React, {useState} from 'react'
-import {ScrollView, StyleSheet, Text, View} from 'react-native'
-import {SafeAreaView} from 'react-native-safe-area-context'
-
-import {Button} from '../../../../components/Button/Button'
-import {ConfirmTxWithHwModal} from '../../../../components/ConfirmTxWithHwModal/ConfirmTxWithHwModal'
-import {ConfirmTxWithOsModal} from '../../../../components/ConfirmTxWithOsModal/ConfirmTxWithOsModal'
-import {ConfirmTxWithSpendingPasswordModal} from '../../../../components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal'
-import {KeyboardAvoidingView} from '../../../../components/KeyboardAvoidingView/KeyboardAvoidingView'
-import {useModal} from '../../../../components/Modal/ModalContext'
-import {Space} from '../../../../components/Space/Space'
-import {Spacer} from '../../../../components/Spacer/Spacer'
-import {TextInput} from '../../../../components/TextInput/TextInput'
-import {Instructions as HWInstructions} from '../../../../legacy/HW'
-import {useVotingRegTx} from '../../../../yoroi-wallets/hooks'
-import {formatTokenWithSymbol} from '../../../../yoroi-wallets/utils/format'
-import {Amounts} from '../../../../yoroi-wallets/utils/utils'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {useNavigateTo} from '../../CatalystNavigator'
-import {Actions, Description} from '../../common/components'
-import {useStrings} from '../../common/strings'
-
-export const ConfirmVotingTx = () => {
-  const [supportsCIP36, setSupportsCIP36] = useState(true)
-  const styles = useStyles()
-  const strings = useStrings()
-  const {openModal, closeModal} = useModal()
-  const {catalystKeyHex, pin} = useCatalyst()
-  const navigateTo = useNavigateTo()
-
-  const onNext = () => {
-    navigateTo.qrCode()
-  }
-
-  if (pin === null) throw new Error('pin cannot be null')
-  if (catalystKeyHex === null) throw new Error('catalystKeyHex cannot be null')
-
-  const {wallet, meta} = useSelectedWallet()
-  const votingRegTx = useVotingRegTx({wallet, supportsCIP36, catalystKeyHex, addressMode: meta.addressMode})
-
-  const [useUSB, setUseUSB] = useState(false)
-
-  const handleCIP36SupportChange = (supportsCIP36: boolean) => {
-    setSupportsCIP36(supportsCIP36)
-  }
-
-  const onSubmit = () => {
-    if (meta.isHW) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithHwModal
-          onCancel={closeModal}
-          unsignedTx={votingRegTx}
-          setUseUSB={setUseUSB}
-          onCIP36SupportChange={handleCIP36SupportChange}
-          onSuccess={() => onNext()}
-        />,
-      )
-      return
-    }
-
-    if (!meta.isHW && !meta.isEasyConfirmationEnabled) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithSpendingPasswordModal unsignedTx={votingRegTx} onSuccess={() => onNext()} />,
-      )
-      return
-    }
-
-    if (!meta.isHW && meta.isEasyConfirmationEnabled) {
-      openModal(strings.signTransaction, <ConfirmTxWithOsModal unsignedTx={votingRegTx} onSuccess={() => onNext()} />)
-      return
-    }
-  }
-
-  return (
-    <KeyboardAvoidingView style={{flex: 1}}>
-      <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.safeAreaView}>
-        <ScrollView bounces={false}>
-          <Space height="lg" />
-
-          <Text style={styles.confirmVotingTxTitle}>{strings.confirmationTitle}</Text>
-
-          <Space height="lg" />
-
-          {meta.isHW ? (
-            <>
-              <HWInstructions useUSB={useUSB} />
-
-              <Space height="lg" />
-            </>
-          ) : (
-            <>
-              <Description>
-                {meta.isEasyConfirmationEnabled ? strings.authOsInstructions : strings.passwordSignDescription}
-              </Description>
-
-              <Space height="lg" />
-            </>
-          )}
-
-          <View style={styles.inputContainer}>
-            <Text style={styles.label}>{strings.fees}</Text>
-
-            <TextInput
-              value={formatTokenWithSymbol(
-                Amounts.getAmount(votingRegTx.fee, wallet.portfolioPrimaryTokenInfo.id).quantity,
-                wallet.portfolioPrimaryTokenInfo,
-              )}
-              editable={false}
-              autoComplete="off"
-            />
-          </View>
-        </ScrollView>
-
-        <Spacer fill />
-
-        <Actions>
-          <Button title={strings.confirm} onPress={onSubmit} />
-        </Actions>
-      </SafeAreaView>
-    </KeyboardAvoidingView>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-  const styles = StyleSheet.create({
-    safeAreaView: {
-      backgroundColor: color.bg_color_max,
-      ...atoms.flex_1,
-      ...atoms.px_lg,
-      ...atoms.pb_lg,
-    },
-    confirmVotingTxTitle: {
-      ...atoms.body_2_md_regular,
-      color: color.text_gray_medium,
-    },
-    label: {
-      top: -3,
-      left: 11,
-      paddingHorizontal: 3,
-      color: color.text_gray_max,
-      backgroundColor: color.gray_min,
-      ...atoms.z_50,
-      ...atoms.absolute,
-      ...atoms.body_3_sm_regular,
-    },
-    inputContainer: {
-      ...atoms.relative,
-    },
-  })
-
-  return styles
-}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
index 93f5632b61..44274bd96c 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/ReviewTxProvider.tsx
@@ -30,6 +30,10 @@ export const ReviewTxProvider = ({
     onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) =>
       dispatch({type: ReviewTxActionType.OnSuccessChanged, onSuccess}),
     onErrorChanged: (onError: ReviewTxState['onError']) => dispatch({type: ReviewTxActionType.OnErrorChanged, onError}),
+    onNotSupportedCIP1694Changed: (onNotSupportedCIP1694: ReviewTxState['onNotSupportedCIP1694']) =>
+      dispatch({type: ReviewTxActionType.onNotSupportedCIP1694Changed, onNotSupportedCIP1694}),
+    onCIP36SupportChangeChanged: (onCIP36SupportChange: ReviewTxState['onCIP36SupportChange']) =>
+      dispatch({type: ReviewTxActionType.onCIP36SupportChangeChanged, onCIP36SupportChange}),
   }).current
 
   const context = React.useMemo(
@@ -74,6 +78,14 @@ const reviewTxReducer = (state: ReviewTxState, action: ReviewTxAction) => {
         draft.onError = action.onError
         break
 
+      case ReviewTxActionType.onNotSupportedCIP1694Changed:
+        draft.onNotSupportedCIP1694 = action.onNotSupportedCIP1694
+        break
+
+      case ReviewTxActionType.onCIP36SupportChangeChanged:
+        draft.onCIP36SupportChange = action.onCIP36SupportChange
+        break
+
       default:
         throw new Error('[ReviewTxContext] invalid action')
     }
@@ -109,6 +121,14 @@ type ReviewTxAction =
       type: ReviewTxActionType.OnErrorChanged
       onError: ReviewTxState['onError']
     }
+  | {
+      type: ReviewTxActionType.onNotSupportedCIP1694Changed
+      onNotSupportedCIP1694: ReviewTxState['onNotSupportedCIP1694']
+    }
+  | {
+      type: ReviewTxActionType.onCIP36SupportChangeChanged
+      onCIP36SupportChange: ReviewTxState['onCIP36SupportChange']
+    }
 
 export type ReviewTxState = {
   unsignedTx: YoroiUnsignedTx | null
@@ -118,6 +138,8 @@ export type ReviewTxState = {
   details: {title: string; component: React.ReactNode} | null
   onSuccess: ((signedTx: YoroiSignedTx) => void) | null
   onError: (() => void) | null
+  onNotSupportedCIP1694: (() => void) | null
+  onCIP36SupportChange: ((isCIP36Supported: boolean) => void) | null
 }
 
 type ReviewTxActions = {
@@ -128,6 +150,8 @@ type ReviewTxActions = {
   detailsChanged: (details: ReviewTxState['details']) => void
   onSuccessChanged: (onSuccess: ReviewTxState['onSuccess']) => void
   onErrorChanged: (onError: ReviewTxState['onError']) => void
+  onNotSupportedCIP1694Changed: (onNotSupportedCIP1694: ReviewTxState['onNotSupportedCIP1694']) => void
+  onCIP36SupportChangeChanged: (onCIP36SupportChange: ReviewTxState['onCIP36SupportChange']) => void
 }
 
 const defaultState: ReviewTxState = Object.freeze({
@@ -138,6 +162,8 @@ const defaultState: ReviewTxState = Object.freeze({
   details: null,
   onSuccess: null,
   onError: null,
+  onNotSupportedCIP1694: null,
+  onCIP36SupportChange: null,
 })
 
 function missingInit() {
@@ -153,6 +179,8 @@ const initialReviewTxContext: ReviewTxContext = {
   detailsChanged: missingInit,
   onSuccessChanged: missingInit,
   onErrorChanged: missingInit,
+  onNotSupportedCIP1694Changed: missingInit,
+  onCIP36SupportChangeChanged: missingInit,
 }
 
 enum ReviewTxActionType {
@@ -163,6 +191,8 @@ enum ReviewTxActionType {
   DetailsChanged = 'detailsChanged',
   OnSuccessChanged = 'onSuccessChanged',
   OnErrorChanged = 'onErrorChanged',
+  onNotSupportedCIP1694Changed = 'onNotSupportedCIP1694Changed',
+  onCIP36SupportChangeChanged = 'onCIP36SupportChangeChanged',
 }
 
 type ReviewTxContext = ReviewTxState & ReviewTxActions
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
index 7b67530d7c..d84816e045 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
@@ -1,13 +1,18 @@
+import _ from 'lodash'
+
 import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {TransactionBody} from '../types'
+import {FormattedMetadata, TransactionBody} from '../types'
 
-export const formatMetadata = (unsignedTx: YoroiUnsignedTx, txBody: TransactionBody) => {
+export const formatMetadata = (unsignedTx: YoroiUnsignedTx, txBody: TransactionBody): FormattedMetadata => {
   const hash = txBody.auxiliary_data_hash ?? null
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const metadata = unsignedTx.metadata?.['674']?.['msg' as any] ?? null
+  const msg = unsignedTx.metadata?.['674']?.['msg' as any] ?? JSON.stringify({})
+
+  const metadata = hash != null && typeof msg == 'string' ? {msg: [JSON.parse(msg) as unknown]} : null
 
   return {
     hash,
-    metadata: {msg: [JSON.parse(metadata)]},
+    metadata,
   }
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
index 871badd91b..b00d30458b 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
@@ -5,7 +5,6 @@ import {ConfirmTxWithOsModal} from '../../../../components/ConfirmTxWithOsModal/
 import {ConfirmTxWithSpendingPasswordModal} from '../../../../components/ConfirmTxWithSpendingPasswordModal/ConfirmTxWithSpendingPasswordModal'
 import {useModal} from '../../../../components/Modal/ModalContext'
 import {YoroiSignedTx, YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {useNavigateTo} from '../../../Staking/Governance/common/navigation'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {useStrings} from './useStrings'
 
@@ -14,18 +13,21 @@ export const useOnConfirm = ({
   unsignedTx,
   onSuccess,
   onError,
+  onNotSupportedCIP1694,
+  onCIP36SupportChange,
 }: {
   onSuccess?: ((txId: YoroiSignedTx) => void) | null
   onError?: (() => void) | null
   cbor?: string
   unsignedTx?: YoroiUnsignedTx
+  onNotSupportedCIP1694?: (() => void) | null
+  onCIP36SupportChange?: ((isCIP36Supported: boolean) => void) | null
 }) => {
   if (unsignedTx === undefined) throw new Error('useOnConfirm: unsignedTx missing')
 
   const {meta} = useSelectedWallet()
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
-  const navigateTo = useNavigateTo()
 
   const onConfirm = () => {
     if (meta.isHW) {
@@ -36,9 +38,12 @@ export const useOnConfirm = ({
           unsignedTx={unsignedTx}
           onSuccess={(signedTx) => onSuccess?.(signedTx)}
           onNotSupportedCIP1694={() => {
-            closeModal()
-            navigateTo.notSupportedVersion()
+            if (onNotSupportedCIP1694) {
+              closeModal()
+              onNotSupportedCIP1694()
+            }
           }}
+          onCIP36SupportChange={onCIP36SupportChange ?? undefined}
         />,
         400,
       )
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
index 74cb9b2451..04cf6aec6d 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
@@ -58,7 +58,7 @@ export type FormattedTx = {
   fee: FormattedFee
 }
 
-export type Metadata = {
-  json: string | null
+export type FormattedMetadata = {
   hash: string | null
+  metadata: {msg: Array<unknown>} | null
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
index c60e4d1c60..003cbcf55f 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Metadata/MetadataTab.tsx
@@ -5,13 +5,9 @@ import {StyleSheet, Text, View} from 'react-native'
 import {Space} from '../../../../../components/Space/Space'
 import {CopiableText, CopyButton} from '../../../common/CopiableText'
 import {useStrings} from '../../../common/hooks/useStrings'
+import {FormattedMetadata} from '../../../common/types'
 
-type Props = {
-  hash: string | null
-  metadata: {msg: Array<string>} | null
-}
-
-export const MetadataTab = ({metadata, hash}: Props) => {
+export const MetadataTab = ({metadata, hash}: FormattedMetadata) => {
   const {styles} = useStyles()
   const strings = useStrings()
 
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
index 9b0550327d..48f54294af 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
@@ -31,7 +31,8 @@ const MaterialTab = createMaterialTopTabNavigator()
 export const ReviewTxScreen = () => {
   const {styles} = useStyles()
   const strings = useStrings()
-  const {unsignedTx, operations, details, onSuccess, onError} = useReviewTx()
+  const {unsignedTx, operations, details, onSuccess, onError, onNotSupportedCIP1694, onCIP36SupportChange} =
+    useReviewTx()
 
   if (unsignedTx === null) throw new Error('ReviewTxScreen: missing unsignedTx')
 
@@ -39,6 +40,8 @@ export const ReviewTxScreen = () => {
     unsignedTx,
     onSuccess,
     onError,
+    onNotSupportedCIP1694,
+    onCIP36SupportChange,
   })
 
   // TODO: apply cbor
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
index 8e02078802..6a838019e9 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
@@ -82,7 +82,8 @@ export const useGovernanceActions = () => {
   const {manager} = useGovernance()
   const {wallet} = useSelectedWallet()
   const navigateTo = useNavigateTo()
-  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, operationsChanged} = useReviewTx()
+  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, operationsChanged, onNotSupportedCIP1694Changed} =
+    useReviewTx()
   const {updateLatestGovernanceAction} = useUpdateLatestGovernanceAction(wallet.id)
   const {navigateToTxReview} = useWalletNavigation()
 
@@ -112,6 +113,9 @@ export const useGovernanceActions = () => {
     })
     onErrorChanged(() => navigateTo.txFailed())
     unsignedTxChanged(unsignedTx)
+    onNotSupportedCIP1694Changed(() => {
+      navigateTo.notSupportedVersion()
+    })
 
     navigateToTxReview()
   }
@@ -135,6 +139,9 @@ export const useGovernanceActions = () => {
     })
     onErrorChanged(() => navigateTo.txFailed())
     unsignedTxChanged(unsignedTx)
+    onNotSupportedCIP1694Changed(() => {
+      navigateTo.notSupportedVersion()
+    })
 
     navigateToTxReview()
   }
@@ -161,6 +168,9 @@ export const useGovernanceActions = () => {
     })
     onErrorChanged(() => navigateTo.txFailed())
     unsignedTxChanged(unsignedTx)
+    onNotSupportedCIP1694Changed(() => {
+      navigateTo.notSupportedVersion()
+    })
 
     navigateToTxReview()
   }
diff --git a/packages/staking/src/catalyst/translators/context.tsx b/packages/staking/src/catalyst/translators/context.tsx
index a1e4a910f3..65598d49fa 100644
--- a/packages/staking/src/catalyst/translators/context.tsx
+++ b/packages/staking/src/catalyst/translators/context.tsx
@@ -53,11 +53,6 @@ export function CatalystProvider({
         type: CatalystActionType.VotingKeyEncryptedChanged,
         votingKeyEncrypted,
       }),
-    catalystKeyHexChanged: (catalystKeyHex: CatalystState['catalystKeyHex']) =>
-      dispatch({
-        type: CatalystActionType.CatalystKeyHexChanged,
-        catalystKeyHex,
-      }),
     reset: () =>
       dispatch({
         type: CatalystActionType.Reset,
diff --git a/packages/staking/src/catalyst/translators/state.test.tsx b/packages/staking/src/catalyst/translators/state.test.tsx
index 00096625de..6040327d02 100644
--- a/packages/staking/src/catalyst/translators/state.test.tsx
+++ b/packages/staking/src/catalyst/translators/state.test.tsx
@@ -39,20 +39,8 @@ describe('State Actions', () => {
     expect(state.votingKeyEncrypted).toBe(votingKeyEncrypted)
   })
 
-  it('CatalystKeyHexChanged', () => {
-    const catalystKeyHex = 'super-complex-hex'
-    const action: CatalystAction = {
-      type: CatalystActionType.CatalystKeyHexChanged,
-      catalystKeyHex,
-    }
-
-    const state = catalystReducer(catalystDefaultState, action)
-    expect(state.catalystKeyHex).toBe(catalystKeyHex)
-  })
-
   it('Reset', () => {
     const votingKeyEncrypted = 'super-complex-voting-key'
-    const catalystKeyHex = 'super-complex-catalyst-key'
     const action: CatalystAction = {
       type: CatalystActionType.Reset,
     }
@@ -62,12 +50,10 @@ describe('State Actions', () => {
         ...catalystDefaultState,
         pin: '1234',
         votingKeyEncrypted,
-        catalystKeyHex,
       },
       action,
     )
     expect(state.pin).toBe(null)
     expect(state.votingKeyEncrypted).toBe(null)
-    expect(state.catalystKeyHex).toBe(null)
   })
 })
diff --git a/packages/staking/src/catalyst/translators/state.tsx b/packages/staking/src/catalyst/translators/state.tsx
index 08e2f60517..b5d942f9b9 100644
--- a/packages/staking/src/catalyst/translators/state.tsx
+++ b/packages/staking/src/catalyst/translators/state.tsx
@@ -14,14 +14,10 @@ export const catalystReducer = (
         draft.votingKeyEncrypted = action.votingKeyEncrypted
         break
 
-      case CatalystActionType.CatalystKeyHexChanged:
-        draft.catalystKeyHex = action.catalystKeyHex
-        break
-
       case CatalystActionType.Reset:
         draft.pin = catalystDefaultState.pin
         draft.votingKeyEncrypted = catalystDefaultState.votingKeyEncrypted
-        draft.catalystKeyHex = catalystDefaultState.catalystKeyHex
+
         break
 
       default:
@@ -34,7 +30,6 @@ export const catalystDefaultState: Readonly<CatalystState> = freeze(
   {
     pin: null,
     votingKeyEncrypted: null,
-    catalystKeyHex: null,
   },
   true,
 )
@@ -42,7 +37,6 @@ export const catalystDefaultState: Readonly<CatalystState> = freeze(
 export type CatalystState = {
   pin: string | null
   votingKeyEncrypted: string | null
-  catalystKeyHex: string | null
 }
 
 export type CatalystAction =
@@ -51,10 +45,6 @@ export type CatalystAction =
       type: CatalystActionType.VotingKeyEncryptedChanged
       votingKeyEncrypted: CatalystState['votingKeyEncrypted']
     }
-  | {
-      type: CatalystActionType.CatalystKeyHexChanged
-      catalystKeyHex: CatalystState['catalystKeyHex']
-    }
   | {
       type: CatalystActionType.Reset
     }
@@ -62,7 +52,6 @@ export type CatalystAction =
 export enum CatalystActionType {
   PinChanged = 'pinChanged',
   VotingKeyEncryptedChanged = 'votingKeyEncryptedChanged',
-  CatalystKeyHexChanged = 'catalystKeyHexChanged',
   Reset = 'reset',
 }
 
@@ -71,9 +60,6 @@ export type CatalystActions = {
   votingKeyEncryptedChanged: (
     votingKeyEncrypted: CatalystState['votingKeyEncrypted'],
   ) => void
-  catalystKeyHexChanged: (
-    catalystKeyHex: CatalystState['catalystKeyHex'],
-  ) => void
   reset: () => void
 }
 

From 1c18498fc09f0765973addad9a657c33ca646f70 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:27:21 +0200
Subject: [PATCH 12/15] chore: drop sanchonet (#3693)

---
 .../.storybook/storybook.requires.js          |    2 -
 .../common/ProviderItem/ProviderItem.tsx      |    3 +-
 .../SanchonetFaucetBanner.stories.tsx         |    7 -
 .../ShowBuyBanner/SanchonetFaucetBanner.tsx   |  102 --
 .../common/ShowBuyBanner/ShowBuyBanner.tsx    |    4 -
 .../features/Exchange/common/useStrings.tsx   |   30 -
 .../CreateExchangeButton.tsx                  |   18 +-
 .../CreateExchangeOrderScreen.tsx             |    6 +-
 .../EditAmount/EditAmount.tsx                 |    3 +-
 .../ShowDisclaimer/ShowDisclaimer.tsx         |    5 +-
 .../ShowPreprodNotice/ShowPreprodNotice.tsx   |    3 +-
 .../common/helpers/build-token-managers.ts    |    5 -
 .../Portfolio/common/hooks/useNavigateTo.tsx  |    4 -
 .../DashboardTokensList.tsx                   |    8 +-
 .../PortfolioTokenDetails/Actions.tsx         |    1 -
 .../PortfolioWalletTokenList.tsx              |    4 +-
 .../ChangeNetwork/NetworkTag.tsx              |   20 +-
 .../SetupWallet/common/useStrings.tsx         |   10 -
 .../useCases/NoFunds/NoFundsScreen.tsx        |    7 +-
 .../src/features/Swap/common/strings.ts       |   10 -
 .../ShowSanchoNoticeScreen.stories.tsx        |    8 -
 .../ShowSanchoNoticeScreen.tsx                |   48 -
 .../Transactions/TxHistoryNavigator.tsx       |   10 -
 .../useCases/TxDetails/TxDetails.tsx          |   19 +-
 .../useCases/TxHistory/ActionsBanner.tsx      |    6 -
 .../WalletManager/common/constants.ts         |    6 +-
 .../helpers/get-wallet-factory.test.ts        |    9 -
 .../helpers/get-wallet-factory.ts             |    6 -
 .../to-chain-supported-network.test.ts        |    4 -
 .../helpers/to-chain-supported-network.ts     |    2 -
 .../network-manager/network-manager.ts        |   11 -
 apps/wallet-mobile/src/kernel/config.ts       |    1 -
 .../src/kernel/i18n/locales/en-US.json        |   10 -
 apps/wallet-mobile/src/kernel/navigation.tsx  |    1 -
 .../features/Exchange/common/useStrings.json  |  394 +++---
 .../SetupWallet/common/useStrings.json        |  662 +++++-----
 .../src/features/Swap/common/strings.json     | 1062 ++++++++---------
 .../Transactions/TxHistoryNavigator.json      |  184 +--
 .../screens/chooseNetworkType.screen.ts       |    1 -
 packages/api/src/cardano/api/config.ts        |    3 -
 .../dapp-connector/src/adapters/api.test.ts   |   12 -
 packages/dapp-connector/src/adapters/api.ts   |    1 -
 packages/explorers/README.md                  |   15 +-
 .../explorers/src/explorer-manager.test.ts    |   51 -
 packages/explorers/src/explorer-manager.ts    |   20 -
 .../src/adapters/dullahan-api/api-maker.ts    |   16 -
 packages/staking/src/governance/config.ts     |    6 -
 packages/types/src/chain/network.ts           |    2 -
 48 files changed, 1104 insertions(+), 1718 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.tsx

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index d1d11dfb54..6ec961a8f2 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -134,7 +134,6 @@ const getStories = () => {
     "./src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.stories.tsx": require("../src/features/Exchange/common/ShowBuyBanner/BuyBannerBig.stories.tsx"),
     "./src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.stories.tsx": require("../src/features/Exchange/common/ShowBuyBanner/BuyBannerSmall.stories.tsx"),
     "./src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.stories.tsx": require("../src/features/Exchange/common/ShowBuyBanner/PreprodFaucetBanner.stories.tsx"),
-    "./src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx": require("../src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx"),
     "./src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.stories.tsx": require("../src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.stories.tsx"),
     "./src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.stories.tsx": require("../src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.stories.tsx"),
     "./src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.stories.tsx": require("../src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.stories.tsx"),
@@ -243,7 +242,6 @@ const getStories = () => {
     "./src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx"),
     "./src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx": require("../src/features/Swap/useCases/ReviewSwap/TransactionSummary.stories.tsx"),
     "./src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen.stories.tsx"),
-    "./src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx": require("../src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx"),
     "./src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx": require("../src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/AmountActions.stories.tsx"),
     "./src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/ResetQuantities.stories.tsx": require("../src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/ResetQuantities.stories.tsx"),
     "./src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/SwitchTokens.stories.tsx": require("../src/features/Swap/useCases/StartOrderSwapScreen/CreateOrder/Actions/AmountActions/SwitchTokens.stories.tsx"),
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ProviderItem/ProviderItem.tsx b/apps/wallet-mobile/src/features/Exchange/common/ProviderItem/ProviderItem.tsx
index 601ff50b3f..526c9afef1 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ProviderItem/ProviderItem.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ProviderItem/ProviderItem.tsx
@@ -24,11 +24,10 @@ export const ProviderItem = ({onPress, fee, rightAdornment, leftAdornment, disab
   const {orderType} = useExchange()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
   const isMainnet = network === Chain.Network.Mainnet
   const isBuy = orderType === 'buy'
 
-  if ((isPreprod || isSancho) && isBuy) return null
+  if (isPreprod && isBuy) return null
 
   return (
     <>
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx
deleted file mode 100644
index 33790e96d1..0000000000
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.stories.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import {storiesOf} from '@storybook/react-native'
-import React from 'react'
-
-import {SanchonetFaucetBanner} from './SanchonetFaucetBanner'
-
-storiesOf('Exchange SanchonetFaucetBanner', module) //
-  .add('initial', () => <SanchonetFaucetBanner />)
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
deleted file mode 100644
index 1180aae206..0000000000
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/SanchonetFaucetBanner.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import {useTheme} from '@yoroi/theme'
-import * as React from 'react'
-import {Linking, StyleSheet, Text, View} from 'react-native'
-import LinearGradient from 'react-native-linear-gradient'
-
-import {Button} from '../../../../components/Button/Button'
-import {Space} from '../../../../components/Space/Space'
-import {Spacer} from '../../../../components/Spacer/Spacer'
-import {useStrings} from '../useStrings'
-import {PreprodFaucetBannerLogo} from './PreprodFaucetBannerLogo'
-
-export const SanchonetFaucetBanner = () => {
-  const strings = useStrings()
-  const {styles, colors} = useStyles()
-
-  const handleOnPress = () => {
-    Linking.openURL('https://sancho.network/faucet/')
-  }
-
-  return (
-    <LinearGradient style={styles.gradient} start={{x: 1, y: 1}} end={{x: 0, y: 0}} colors={colors.gradientColor}>
-      <View style={styles.viewTitle}>
-        <Text style={styles.title}>{strings.sanchoFaucetBannerTitle}</Text>
-
-        <Space height="xs" />
-      </View>
-
-      <View style={styles.content}>
-        <View style={styles.contentInner}>
-          <Spacer height={8} />
-
-          <Text style={styles.text}>{strings.sanchoFaucetBannerText}</Text>
-
-          <Space height="lg" />
-
-          <Button
-            testID="rampOnOffButton"
-            title={strings.sanchoFaucetBannerButtonText}
-            onPress={handleOnPress}
-            style={styles.spaceButton}
-          />
-        </View>
-
-        <View style={styles.logo}>
-          <PreprodFaucetBannerLogo />
-        </View>
-      </View>
-    </LinearGradient>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-  const styles = StyleSheet.create({
-    gradient: {
-      ...atoms.flex_1,
-      opacity: 1,
-      borderRadius: 8,
-      ...atoms.flex_col,
-    },
-    viewTitle: {
-      ...atoms.flex_row,
-      ...atoms.justify_between,
-      ...atoms.flex_1,
-      ...atoms.px_lg,
-      ...atoms.pt_md,
-    },
-    title: {
-      ...atoms.body_1_lg_medium,
-      color: color.gray_max,
-      ...atoms.flex_wrap,
-      ...atoms.flex_shrink,
-    },
-    content: {
-      position: 'relative',
-      ...atoms.flex_1,
-      ...atoms.px_lg,
-      ...atoms.pb_lg,
-    },
-    contentInner: {
-      ...atoms.flex_1,
-    },
-    logo: {
-      position: 'absolute',
-      bottom: 0,
-      right: 0,
-    },
-    text: {
-      ...atoms.body_2_md_regular,
-      color: color.gray_max,
-      maxWidth: 270,
-    },
-    spaceButton: {
-      maxWidth: 180,
-    },
-  })
-  const colors = {
-    gradientColor: color.bg_gradient_1,
-    gray: color.gray_max,
-  }
-  return {styles, colors} as const
-}
diff --git a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
index 8df63e337a..aea314433e 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/ShowBuyBanner/ShowBuyBanner.tsx
@@ -12,7 +12,6 @@ import {useShowBuyBannerSmall} from '../useShowBuyBannerSmall'
 import {BuyBannerBig} from './BuyBannerBig'
 import {BuyBannerSmall} from './BuyBannerSmall'
 import {PreprodFaucetBanner} from './PreprodFaucetBanner'
-import {SanchonetFaucetBanner} from './SanchonetFaucetBanner'
 
 export const ShowBuyBanner = () => {
   const {wallet} = useSelectedWallet()
@@ -33,9 +32,6 @@ export const ShowBuyBanner = () => {
     case hasZeroPt && hasZeroTx && network === Chain.Network.Preprod:
       banner = <PreprodFaucetBanner />
       break
-    case hasZeroPt && hasZeroTx && network === Chain.Network.Sancho:
-      banner = <SanchonetFaucetBanner />
-      break
     case hasZeroPt && hasZeroTx:
       banner = <BuyBannerBig />
       break
diff --git a/apps/wallet-mobile/src/features/Exchange/common/useStrings.tsx b/apps/wallet-mobile/src/features/Exchange/common/useStrings.tsx
index 22b3b65c94..61d7ec1403 100644
--- a/apps/wallet-mobile/src/features/Exchange/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/common/useStrings.tsx
@@ -39,15 +39,9 @@ export const useStrings = () => {
     preprodFaucetBannerTitle: intl.formatMessage(messages.preprodFaucetBannerTitle),
     preprodFaucetBannerText: intl.formatMessage(messages.preprodFaucetBannerText),
     preprodFaucetBannerButtonText: intl.formatMessage(messages.preprodFaucetBannerButtonText),
-    sanchoFaucetBannerTitle: intl.formatMessage(messages.sanchoFaucetBannerTitle),
-    sanchoFaucetBannerText: intl.formatMessage(messages.sanchoFaucetBannerText),
-    sanchoFaucetBannerButtonText: intl.formatMessage(messages.sanchoFaucetBannerButtonText),
     createOrderPreprodFaucetButtonText: intl.formatMessage(messages.createOrderPreprodFaucetButtonText),
     createOrderPreprodNoticeTitle: intl.formatMessage(messages.createOrderPreprodNoticeTitle),
     createOrderPreprodNoticeText: intl.formatMessage(messages.createOrderPreprodNoticeText),
-    createOrderSanchonetFaucetButtonText: intl.formatMessage(messages.createOrderSanchonetFaucetButtonText),
-    createOrderSanchonetNoticeTitle: intl.formatMessage(messages.createOrderSanchonetNoticeTitle),
-    createOrderSanchonetNoticeText: intl.formatMessage(messages.createOrderSanchonetNoticeText),
     playground: intl.formatMessage(messages.playground),
     close: intl.formatMessage(globalMessages.close),
     error: intl.formatMessage(globalMessages.error),
@@ -188,18 +182,6 @@ const messages = Object.freeze(
       id: 'rampOnOff.createRampOnOff.preprodfaucetbanner.button.text',
       defaultMessage: '!!!Go to tada faucet',
     },
-    sanchoFaucetBannerTitle: {
-      id: 'rampOnOff.createRampOnOff.sanchofaucetbanner.title',
-      defaultMessage: '!!!Learn Cardano with test ADA ⭐️',
-    },
-    sanchoFaucetBannerText: {
-      id: 'rampOnOff.createRampOnOff.sanchofaucetbanner.text',
-      defaultMessage: `!!!Get started with Cardano's test currency, TADA. It's your key to testing a new world of possibilities.`,
-    },
-    sanchoFaucetBannerButtonText: {
-      id: 'rampOnOff.createRampOnOff.sanchofaucetbanner.button.text',
-      defaultMessage: '!!!Go to tada faucet',
-    },
     createOrderPreprodFaucetButtonText: {
       id: 'rampOnOff.createRampOnOff.createorder.preprodfaucet.button.text',
       defaultMessage: '!!!Add test ada',
@@ -212,18 +194,6 @@ const messages = Object.freeze(
       id: 'rampOnOff.createRampOnOff.createorder.preprodnotice.text',
       defaultMessage: '!!!Switch network or top up your testnet network wallet with the free Cardano faucet',
     },
-    createOrderSanchonetFaucetButtonText: {
-      id: 'rampOnOff.createRampOnOff.createorder.sanchofaucet.button.text',
-      defaultMessage: '!!!Add test ada',
-    },
-    createOrderSanchonetNoticeTitle: {
-      id: 'rampOnOff.createRampOnOff.createorder.sanchonotice.title',
-      defaultMessage: '!!!ADA purchases can only be made on the mainnet',
-    },
-    createOrderSanchonetNoticeText: {
-      id: 'rampOnOff.createRampOnOff.createorder.sanchonotice.text',
-      defaultMessage: '!!!Switch network or top up your testnet network wallet with the free Cardano faucet',
-    },
     playground: {
       id: 'rampOnOff.createRampOnOff.createorder.playground',
       defaultMessage: '!!!Playground',
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
index 04a3f36e10..7615ad3081 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeButton/CreateExchangeButton.tsx
@@ -25,16 +25,9 @@ export const CreateExchangeButton = ({
   } = useWalletManager()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
   const isBuy = orderType === 'buy'
 
-  const title = isBuy
-    ? isPreprod
-      ? strings.createOrderPreprodFaucetButtonText
-      : isSancho
-      ? strings.createOrderSanchonetFaucetButtonText
-      : strings.proceed
-    : strings.proceed
+  const title = isBuy ? (isPreprod ? strings.createOrderPreprodFaucetButtonText : strings.proceed) : strings.proceed
 
   const handleOnPress = () => {
     if (isPreprod && isBuy) {
@@ -42,11 +35,6 @@ export const CreateExchangeButton = ({
       return
     }
 
-    if (isSancho && isBuy) {
-      handleOnPressOnSanchonet()
-      return
-    }
-
     onPress()
   }
 
@@ -61,10 +49,6 @@ const handleOnPressOnPreprod = () => {
   Linking.openURL('https://docs.cardano.org/cardano-testnets/tools/faucet/')
 }
 
-const handleOnPressOnSanchonet = () => {
-  Linking.openURL('https://sancho.network/faucet/')
-}
-
 const useStyles = () => {
   const {atoms} = useTheme()
   const styles = StyleSheet.create({
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
index ec5a722d28..3a25c8bf98 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/CreateExchangeOrderScreen.tsx
@@ -135,12 +135,10 @@ export const CreateExchangeOrderScreen = () => {
 
   // on Preprod it launches the faucet when buying
   // selling is enabled for both and launch the sandbox
-  const isSancho = network === Chain.Network.Sancho
   const isPreprod = network === Chain.Network.Preprod
-  const isBlocked = isSancho && orderType === 'buy'
-  const exchangeDisabled = isLoading || (wallet.isMainnet && !canExchange) || isBlocked
+  const exchangeDisabled = isLoading || (wallet.isMainnet && !canExchange)
 
-  const feeText = (isPreprod || isSancho) && orderType === 'sell' ? strings.playground : `${fee}% ${strings.fee}`
+  const feeText = isPreprod && orderType === 'sell' ? strings.playground : `${fee}% ${strings.fee}`
 
   return (
     <KeyboardAvoidingView style={styles.root}>
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.tsx
index a643e72e1a..5e16337a0a 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/EditAmount/EditAmount.tsx
@@ -20,7 +20,6 @@ export const EditAmount = ({disabled}: {disabled?: boolean}) => {
   } = useWalletManager()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
 
   const {wallet} = useSelectedWallet()
   const balance = usePortfolioPrimaryBalance({wallet})
@@ -72,7 +71,7 @@ export const EditAmount = ({disabled}: {disabled?: boolean}) => {
     ],
   )
 
-  if (isPreprod || isSancho) return null
+  if (isPreprod) return null
 
   return (
     <>
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowDisclaimer/ShowDisclaimer.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowDisclaimer/ShowDisclaimer.tsx
index 86f3e7a9d0..e402acbf62 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowDisclaimer/ShowDisclaimer.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowDisclaimer/ShowDisclaimer.tsx
@@ -19,12 +19,11 @@ export const ShowDisclaimer = () => {
   const {orderType} = useExchange()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
 
-  if ((isPreprod || isSancho) && orderType === 'buy') return null
+  if (isPreprod && orderType === 'buy') return null
 
   const contentDisclaimer =
-    (isPreprod || isSancho) && orderType === 'sell' ? strings.contentDisclaimerPreprod : strings.contentDisclaimer
+    isPreprod && orderType === 'sell' ? strings.contentDisclaimerPreprod : strings.contentDisclaimer
 
   return (
     <>
diff --git a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowPreprodNotice/ShowPreprodNotice.tsx b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowPreprodNotice/ShowPreprodNotice.tsx
index c72faf6984..c092ffcc92 100644
--- a/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowPreprodNotice/ShowPreprodNotice.tsx
+++ b/apps/wallet-mobile/src/features/Exchange/useCases/CreateExchangeOrderScreen/ShowPreprodNotice/ShowPreprodNotice.tsx
@@ -18,9 +18,8 @@ export const ShowPreprodNotice = () => {
   const {orderType} = useExchange()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
 
-  if ((isPreprod || isSancho) && orderType === 'buy')
+  if (isPreprod && orderType === 'buy')
     return (
       <View style={styles.container}>
         <Space height="_2xl" />
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/helpers/build-token-managers.ts b/apps/wallet-mobile/src/features/Portfolio/common/helpers/build-token-managers.ts
index 8f81e1a40f..7763c57068 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/helpers/build-token-managers.ts
+++ b/apps/wallet-mobile/src/features/Portfolio/common/helpers/build-token-managers.ts
@@ -28,19 +28,16 @@ const buildPortfolioTokenManager = ({network}: {network: Chain.SupportedNetworks
 export const buildPortfolioTokenManagers = () => {
   const mainnetPortfolioTokenManager = buildPortfolioTokenManager({network: Chain.Network.Mainnet})
   const preprodPortfolioTokenManager = buildPortfolioTokenManager({network: Chain.Network.Preprod})
-  const sanchoPortfolioTokenManager = buildPortfolioTokenManager({network: Chain.Network.Sancho})
   const previewPortfolioTokenManager = buildPortfolioTokenManager({network: Chain.Network.Preview})
 
   const tokenManagers: Readonly<{
     [Chain.Network.Mainnet]: Portfolio.Manager.Token
     [Chain.Network.Preprod]: Portfolio.Manager.Token
-    [Chain.Network.Sancho]: Portfolio.Manager.Token
     [Chain.Network.Preview]: Portfolio.Manager.Token
   }> = freeze(
     {
       [Chain.Network.Mainnet]: mainnetPortfolioTokenManager.tokenManager,
       [Chain.Network.Preprod]: preprodPortfolioTokenManager.tokenManager,
-      [Chain.Network.Sancho]: sanchoPortfolioTokenManager.tokenManager,
       [Chain.Network.Preview]: previewPortfolioTokenManager.tokenManager,
     },
     true,
@@ -49,13 +46,11 @@ export const buildPortfolioTokenManagers = () => {
   const tokenStorages: Readonly<{
     [Chain.Network.Mainnet]: App.Storage<false, Portfolio.Token.Id>
     [Chain.Network.Preprod]: App.Storage<false, Portfolio.Token.Id>
-    [Chain.Network.Sancho]: App.Storage<false, Portfolio.Token.Id>
     [Chain.Network.Preview]: App.Storage<false, Portfolio.Token.Id>
   }> = freeze(
     {
       [Chain.Network.Mainnet]: mainnetPortfolioTokenManager.storage,
       [Chain.Network.Preprod]: preprodPortfolioTokenManager.storage,
-      [Chain.Network.Sancho]: sanchoPortfolioTokenManager.storage,
       [Chain.Network.Preview]: previewPortfolioTokenManager.storage,
     },
     true,
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index 083f4277d4..e991186c32 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -35,10 +35,6 @@ export const useNavigateTo = () => {
       navigation.navigate('history', {
         screen: 'swap-preprod-notice',
       }),
-    swapSanchoNotice: () =>
-      navigation.navigate('history', {
-        screen: 'swap-sancho-notice',
-      }),
     buyAda: () => navigation.navigate('history', {screen: 'exchange-create-order'}),
   } as const).current
 }
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
index ce5754c666..0a2925bbcb 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx
@@ -7,7 +7,6 @@ import {FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions, View}
 import {Icon} from '../../../../../components/Icon'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
 import {PreprodFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/PreprodFaucetBanner'
-import {SanchonetFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/SanchonetFaucetBanner'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
 import {useNavigateTo} from '../../../common/hooks/useNavigateTo'
@@ -29,7 +28,6 @@ export const DashboardTokensList = () => {
   } = useWalletManager()
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
 
   const tokensList = React.useMemo(() => balances.fts ?? [], [balances.fts])
   const isJustADA = React.useMemo(() => {
@@ -47,11 +45,7 @@ export const DashboardTokensList = () => {
 
   const renderTokensList = () => {
     if (isZeroADABalance) {
-      return (
-        <View style={styles.container}>
-          {isPreprod ? <PreprodFaucetBanner /> : isSancho ? <SanchonetFaucetBanner /> : <BuyADABanner />}
-        </View>
-      )
+      return <View style={styles.container}>{isPreprod ? <PreprodFaucetBanner /> : <BuyADABanner />}</View>
     }
 
     if (isJustADA) {
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
index 7e8455ea56..2d76676a6a 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -32,7 +32,6 @@ export const Actions = ({tokenInfo}: Props) => {
 
   const handleOnSwap = () => {
     if (network === Chain.Network.Preprod) return navigateTo.swapPreprodNotice()
-    if (network === Chain.Network.Sancho) return navigateTo.swapSanchoNotice()
 
     swapForm.resetSwapForm()
 
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/PortfolioWalletTokenList.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/PortfolioWalletTokenList.tsx
index bf63f5206c..a9e115c066 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/PortfolioWalletTokenList.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokensList/PortfolioWalletTokenList/PortfolioWalletTokenList.tsx
@@ -9,7 +9,6 @@ import {Spacer} from '../../../../../components/Spacer/Spacer'
 import {useMetrics} from '../../../../../kernel/metrics/metricsManager'
 import {makeList} from '../../../../../kernel/utils'
 import {PreprodFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/PreprodFaucetBanner'
-import {SanchonetFaucetBanner} from '../../../../Exchange/common/ShowBuyBanner/SanchonetFaucetBanner'
 import {useSearch} from '../../../../Search/SearchContext'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {useWalletManager} from '../../../../WalletManager/context/WalletManagerProvider'
@@ -90,7 +89,6 @@ export const PortfolioWalletTokenList = () => {
   }, [isSearching, search, track])
 
   const isPreprod = network === Chain.Network.Preprod
-  const isSancho = network === Chain.Network.Sancho
 
   const renderFooterList = () => {
     if (isSearching) return null
@@ -110,7 +108,7 @@ export const PortfolioWalletTokenList = () => {
         <View>
           <Spacer height={16} />
 
-          {isPreprod ? <PreprodFaucetBanner /> : isSancho ? <SanchonetFaucetBanner /> : <BuyADABanner />}
+          {isPreprod ? <PreprodFaucetBanner /> : <BuyADABanner />}
         </View>
       )
     }
diff --git a/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
index 8bca4700af..ff87565efd 100644
--- a/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
+++ b/apps/wallet-mobile/src/features/Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag.tsx
@@ -37,8 +37,7 @@ export const NetworkTag = ({
   const strings = useStrings()
   const {track} = useMetrics()
 
-  const Tag =
-    selectedNetwork === Chain.Network.Sancho ? SanchoTag : selectedNetwork === Chain.Network.Preprod ? PreprodTag : null
+  const Tag = selectedNetwork === Chain.Network.Preprod ? PreprodTag : null
 
   const onPress = () => {
     if (directChangeActive && selectedNetwork !== Chain.Network.Mainnet) {
@@ -104,17 +103,6 @@ const PreprodTag = ({onPress, disabled}: {onPress: () => void; disabled: boolean
   )
 }
 
-const SanchoTag = ({onPress, disabled}: {onPress: () => void; disabled: boolean}) => {
-  const {styles} = useStyles()
-  const {name} = networkConfigs[Chain.Network.Sancho]
-
-  return (
-    <TouchableOpacity onPress={onPress} activeOpacity={0.5} style={styles.sanchonetLabel} disabled={disabled}>
-      <Text>{name}</Text>
-    </TouchableOpacity>
-  )
-}
-
 const MainnetWarningDialog = ({onCancel, onOk}: {onCancel: () => void; onOk: () => void}) => {
   const {styles} = useStyles()
   const strings = useStrings()
@@ -162,12 +150,6 @@ const useStyles = () => {
       ...atoms.px_sm,
       ...atoms.py_xs,
     },
-    sanchonetLabel: {
-      backgroundColor: color.el_secondary,
-      ...atoms.rounded_full,
-      ...atoms.px_sm,
-      ...atoms.py_xs,
-    },
     warningModal: {
       ...atoms.px_lg,
       ...atoms.flex_1,
diff --git a/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx b/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
index 843a1b9240..c8351960e8 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/common/useStrings.tsx
@@ -23,10 +23,8 @@ export const useStrings = () => {
     connectWalletButtonCard: intl.formatMessage(messages.connectWalletButtonCard),
     cardanoMainnet: intl.formatMessage(messages.cardanoMainnet),
     cardanoTestnet: intl.formatMessage(messages.cardanoTestnet),
-    cardanoSanchonet: intl.formatMessage(messages.cardanoSanchonet),
     cardanoMainnetDescription: intl.formatMessage(messages.cardanoMainnetDescription),
     cardanoTestnetDescription: intl.formatMessage(messages.cardanoTestnetDescription),
-    cardanoSanchonetDescription: intl.formatMessage(messages.cardanoSanchonetDescription),
 
     continueButton: intl.formatMessage(messages.continueButton),
     next: intl.formatMessage(messages.next),
@@ -180,10 +178,6 @@ const messages = Object.freeze(
       id: 'components.walletinit.walletinitmenu.cardanoTestnetbutton.title',
       defaultMessage: '!!!Cardano Preprod Testnet',
     },
-    cardanoSanchonet: {
-      id: 'components.walletinit.walletinitmenu.cardanoSanchonetbutton.title',
-      defaultMessage: '!!!Cardano SanchoNet',
-    },
     cardanoMainnetDescription: {
       id: 'components.walletinit.walletinitmenu.cardanoMainnetbutton.description',
       defaultMessage: '!!!Works with real ADA',
@@ -192,10 +186,6 @@ const messages = Object.freeze(
       id: 'components.walletinit.walletinitmenu.cardanoTestnetbutton.description',
       defaultMessage: '!!!Works with test ADA (tADA)',
     },
-    cardanoSanchonetDescription: {
-      id: 'components.walletinit.walletinitmenu.cardanoSanchonetbutton.description',
-      defaultMessage: '!!!Testnet for rolling out governance',
-    },
     aboutRecoveryPhraseTitle: {
       id: 'components.walletinit.aboutRecoveryPhrase.aboutRecoveryPhrase.title',
       defaultMessage: '!!!Read this information carefully before saving your recovery phrase:',
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
index 58d2f54c9f..f92a8463b7 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/useCases/NoFunds/NoFundsScreen.tsx
@@ -24,13 +24,8 @@ export const NoFundsScreen = () => {
   } = useWalletManager()
 
   const handleOnTryAgain = () => {
-    if (network === Chain.Network.Sancho) {
-      Linking.openURL('https://sancho.network/faucet/')
-      return
-    }
-
     if (network === Chain.Network.Preprod) {
-      Linking.openURL('https://sancho.network/faucet/')
+      Linking.openURL('https://docs.cardano.org/cardano-testnets/tools/faucet/')
       return
     }
 
diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index 2fc173ebbb..62806fa02f 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -161,8 +161,6 @@ export const useStrings = () => {
     backToSwapOrders: intl.formatMessage(messages.backToSwapOrders),
     preprodNoticeTitle: intl.formatMessage(messages.preprodNoticeTitle),
     preprodNoticeText: intl.formatMessage(messages.preprodNoticeText),
-    sanchoNoticeTitle: intl.formatMessage(messages.sanchoNoticeTitle),
-    sanchoNoticeText: intl.formatMessage(messages.sanchoNoticeText),
   }
 }
 
@@ -286,14 +284,6 @@ const messages = defineMessages({
     id: 'swap.swapScreen.preprodNoticeText',
     defaultMessage: `!!!Switch to mainnet if you want to use the feature and swap real tokens`,
   },
-  sanchoNoticeTitle: {
-    id: 'swap.swapScreen.sanchoNoticeTitle',
-    defaultMessage: `!!!Swap is not available on sanchonet`,
-  },
-  sanchoNoticeText: {
-    id: 'swap.swapScreen.sanchoNoticeText',
-    defaultMessage: `!!!Switch to mainnet if you want to use the feature and swap real tokens`,
-  },
   swapFeesTitle: {
     id: 'swap.swapScreen.swapFeesTitle',
     defaultMessage: `!!!Fees`,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx
deleted file mode 100644
index 6839ea5ff6..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.stories.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import {storiesOf} from '@storybook/react-native'
-import React from 'react'
-
-import {ShowSanchoNoticeScreen} from './ShowSanchoNoticeScreen'
-
-storiesOf('Swap Preprod Notice Screen', module).add('initial', () => {
-  return <ShowSanchoNoticeScreen />
-})
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.tsx
deleted file mode 100644
index 5b5e2bf1d6..0000000000
--- a/apps/wallet-mobile/src/features/Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import {useTheme} from '@yoroi/theme'
-import * as React from 'react'
-import {StyleSheet, Text} from 'react-native'
-
-import {SafeArea} from '../../../../components/SafeArea'
-import {PreprodNoticeScreenLogo} from '../../common/Illustrations/PreprodNoticeScreenLogo'
-import {useStrings} from '../../common/strings'
-
-export const ShowSanchoNoticeScreen = () => {
-  const {styles} = useStyles()
-  const strings = useStrings()
-
-  return (
-    <SafeArea style={styles.container}>
-      <PreprodNoticeScreenLogo />
-
-      <Text style={styles.title}>{strings.sanchoNoticeTitle}</Text>
-
-      <Text style={styles.text}>{strings.sanchoNoticeText}</Text>
-    </SafeArea>
-  )
-}
-
-const useStyles = () => {
-  const {atoms, color} = useTheme()
-  const styles = StyleSheet.create({
-    container: {
-      backgroundColor: color.bg_color_max,
-      ...atoms.p_lg,
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-    },
-    title: {
-      color: color.gray_900,
-      ...atoms.heading_3_medium,
-      ...atoms.px_sm,
-      textAlign: 'center',
-    },
-    text: {
-      color: color.text_gray_medium,
-      ...atoms.body_1_lg_regular,
-      textAlign: 'center',
-      maxWidth: 300,
-    },
-  })
-  return {styles}
-}
diff --git a/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
index f776390702..90f6f1226c 100644
--- a/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/TxHistoryNavigator.tsx
@@ -46,7 +46,6 @@ import {
 } from '../Swap/useCases'
 import {ReviewSwap} from '../Swap/useCases/ReviewSwap/ReviewSwap'
 import {ShowPreprodNoticeScreen} from '../Swap/useCases/ShowPreprodNoticeScreen/ShowPreprodNoticeScreen'
-import {ShowSanchoNoticeScreen} from '../Swap/useCases/ShowSanchoNoticeScreen/ShowSanchoNoticeScreen'
 import {SelectBuyTokenFromListScreen} from '../Swap/useCases/StartOrderSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen'
 import {SelectSellTokenFromListScreen} from '../Swap/useCases/StartOrderSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen'
 import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
@@ -232,15 +231,6 @@ export const TxHistoryNavigator = () => {
                 }}
               />
 
-              <Stack.Screen
-                name="swap-sancho-notice"
-                component={ShowSanchoNoticeScreen}
-                options={{
-                  ...sendOptions(navigationOptions, color),
-                  title: strings.swapTitle,
-                }}
-              />
-
               <Stack.Screen
                 name="swap-review"
                 component={ReviewSwap}
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
index e6fb7b2aa1..e66e8a9b29 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxDetails/TxDetails.tsx
@@ -2,7 +2,6 @@
 import {useRoute} from '@react-navigation/native'
 import {isNonNullable} from '@yoroi/common'
 import {useTheme} from '@yoroi/theme'
-import {Chain} from '@yoroi/types'
 import {BigNumber} from 'bignumber.js'
 import {fromPairs} from 'lodash'
 import React, {useState} from 'react'
@@ -38,7 +37,6 @@ import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
 import {usePrivacyMode} from '../../../Settings/useCases/changeAppSettings/PrivacyMode/PrivacyMode'
 import {useBestBlock} from '../../../WalletManager/common/hooks/useBestBlock'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {useWalletManager} from '../../../WalletManager/context/WalletManagerProvider'
 import {messages, useStrings} from '../../common/strings'
 import AddressModal from './AddressModal/AddressModal'
 import {AssetList} from './AssetList'
@@ -52,9 +50,6 @@ export const TxDetails = () => {
   const intl = useIntl()
   const {id} = useRoute().params as Params
   const {wallet} = useSelectedWallet()
-  const {
-    selected: {network},
-  } = useWalletManager()
   const explorers = wallet.networkManager.explorers
   const internalAddressIndex = fromPairs(wallet.internalAddresses.map((addr, i) => [addr, i]))
   const externalAddressIndex = fromPairs(wallet.externalAddresses.map((addr, i) => [addr, i]))
@@ -182,14 +177,12 @@ export const TxDetails = () => {
           <CopyButton title={transaction.id} value={transaction.id} />
         </ScrollView>
 
-        {network !== Chain.Network.Sancho && (
-          <Actions style={styles.borderTop}>
-            <Button
-              onPress={() => Linking.openURL(explorers.cardanoscan.tx(transaction.id))}
-              title={strings.openInExplorer}
-            />
-          </Actions>
-        )}
+        <Actions style={styles.borderTop}>
+          <Button
+            onPress={() => Linking.openURL(explorers.cardanoscan.tx(transaction.id))}
+            title={strings.openInExplorer}
+          />
+        </Actions>
       </FadeIn>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
index b4a4913773..8cdc08ccc8 100644
--- a/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/features/Transactions/useCases/TxHistory/ActionsBanner.tsx
@@ -58,11 +58,6 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
       return
     }
 
-    if (network === Chain.Network.Sancho) {
-      navigateTo.swapSanchoNotice()
-      return
-    }
-
     resetSwapForm()
 
     track.swapInitiated({
@@ -199,7 +194,6 @@ const useNavigateTo = () => {
     receiveMultipleAddresses: () => navigation.navigate('receive-multiple'),
     swap: () => navigation.navigate('swap-start-swap', {screen: 'token-swap'}),
     swapPreprodNotice: () => navigation.navigate('swap-preprod-notice'),
-    swapSanchoNotice: () => navigation.navigate('swap-sancho-notice'),
     exchange: () => navigation.navigate('exchange-create-order'),
   }
 }
diff --git a/apps/wallet-mobile/src/features/WalletManager/common/constants.ts b/apps/wallet-mobile/src/features/WalletManager/common/constants.ts
index 7b7d195a0a..49aea7fc8e 100644
--- a/apps/wallet-mobile/src/features/WalletManager/common/constants.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/common/constants.ts
@@ -14,11 +14,7 @@ export const implementations: ReadonlyArray<Wallet.Implementation> = freeze([
 const {tokenManagers} = buildPortfolioTokenManagers()
 export const networkManagers = buildNetworkManagers({tokenManagers})
 
-const supportedNetworksDev: Array<Chain.SupportedNetworks> = freeze([
-  Chain.Network.Mainnet,
-  Chain.Network.Preprod,
-  Chain.Network.Sancho,
-])
+const supportedNetworksDev: Array<Chain.SupportedNetworks> = freeze([Chain.Network.Mainnet, Chain.Network.Preprod])
 
 const supportedNetworksProd: Array<Chain.SupportedNetworks> = freeze([Chain.Network.Mainnet, Chain.Network.Preprod])
 
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.test.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.test.ts
index aa5a85e195..24865bd994 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.test.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.test.ts
@@ -25,15 +25,6 @@ describe('getWalletFactory', () => {
     expect(result).toBeDefined()
   })
 
-  it('should return the correct wallet factory for Sancho', () => {
-    const network = Chain.Network.Sancho
-    const implementation: Wallet.Implementation = 'cardano-cip1852'
-
-    const result = getWalletFactory({network, implementation})
-
-    expect(result).toBeDefined()
-  })
-
   it('should return the correct wallet factory for Mainnet with implementation "haskell-byron"', () => {
     const network = Chain.Network.Mainnet
     const implementation: Wallet.Implementation = 'cardano-bip44'
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.ts
index bee0c71573..04eb83d955 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/get-wallet-factory.ts
@@ -8,11 +8,9 @@ import {WalletFactory} from '../../common/types'
 
 const ShelleyWalletMainnet = makeCardanoWallet(networkManagers[Chain.Network.Mainnet], 'cardano-cip1852')
 const ShelleyWalletTestnet = makeCardanoWallet(networkManagers[Chain.Network.Preprod], 'cardano-cip1852')
-const ShelleySanchonetWallet = makeCardanoWallet(networkManagers[Chain.Network.Sancho], 'cardano-cip1852')
 const ShelleyPreviewWallet = makeCardanoWallet(networkManagers[Chain.Network.Preview], 'cardano-cip1852')
 const ByronWallet = makeCardanoWallet(networkManagers[Chain.Network.Mainnet], 'cardano-bip44')
 const ByronWalletTestnet = makeCardanoWallet(networkManagers[Chain.Network.Preprod], 'cardano-bip44')
-const ByronSanchonetWallet = makeCardanoWallet(networkManagers[Chain.Network.Sancho], 'cardano-bip44')
 const ByronPreviewWallet = makeCardanoWallet(networkManagers[Chain.Network.Preview], 'cardano-bip44')
 
 /**
@@ -40,10 +38,6 @@ export function getWalletFactory({
       'cardano-cip1852': ShelleyWalletTestnet,
       'cardano-bip44': ByronWalletTestnet,
     },
-    [Chain.Network.Sancho]: /* cardano sanchonet */ {
-      'cardano-cip1852': ShelleySanchonetWallet,
-      'cardano-bip44': ByronSanchonetWallet,
-    },
     [Chain.Network.Preview]: /* cardano preview */ {
       'cardano-cip1852': ShelleyPreviewWallet,
       'cardano-bip44': ByronPreviewWallet,
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.test.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.test.ts
index 4e6a1fdea9..53b5bc8b28 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.test.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.test.ts
@@ -11,10 +11,6 @@ describe('toChainSupportedNetwork', () => {
     expect(toChainSupportedNetwork(1)).toBe(Chain.Network.Mainnet)
   })
 
-  it('should return Chain.Network.Sancho for networkId 450', () => {
-    expect(toChainSupportedNetwork(450)).toBe(Chain.Network.Sancho)
-  })
-
   it('should return Chain.Network.Preprod for unknown networkId', () => {
     expect(toChainSupportedNetwork(999 as never)).toBe(Chain.Network.Preprod)
   })
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.ts
index efb9584061..721831bcef 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/helpers/to-chain-supported-network.ts
@@ -5,8 +5,6 @@ export function toChainSupportedNetwork(legacyNetworkId: number): Chain.Supporte
     case 0:
     case 1:
       return Chain.Network.Mainnet
-    case 450:
-      return Chain.Network.Sancho
     default:
       return Chain.Network.Preprod
   }
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
index d5098f604d..da70dc1039 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
@@ -101,17 +101,6 @@ export const networkConfigs: Readonly<Record<Chain.SupportedNetworks, Readonly<N
 
     legacyApiBaseUrl: 'https://preprod-backend.yoroiwallet.com/api',
   },
-  [Chain.Network.Sancho]: {
-    network: Chain.Network.Sancho,
-    primaryTokenInfo: primaryTokenInfoAnyTestnet,
-    chainId: 0,
-    protocolMagic: 4,
-    eras: [shelleyEraConfig],
-    name: 'Sancho',
-    isMainnet: false,
-
-    legacyApiBaseUrl: 'https://sanchonet-backend.yoroiwallet.com/api',
-  },
   // NOTE: not supported yet on mobile
   [Chain.Network.Preview]: {
     network: Chain.Network.Preview,
diff --git a/apps/wallet-mobile/src/kernel/config.ts b/apps/wallet-mobile/src/kernel/config.ts
index 461c08071c..e645950efb 100644
--- a/apps/wallet-mobile/src/kernel/config.ts
+++ b/apps/wallet-mobile/src/kernel/config.ts
@@ -4,7 +4,6 @@ import {freeze} from 'immer'
 import {isDev} from './env'
 
 export const governaceAfterBlock = freeze({
-  [Chain.Network.Sancho]: 0,
   [Chain.Network.Mainnet]: 10782931,
   [Chain.Network.Preprod]: 2639667,
   [Chain.Network.Preview]: Infinity,
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index 320b3f56d7..eb9f6b47dd 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -554,10 +554,8 @@
   "components.walletinit.walletinitmenu.connectwalletbutton.title": "Connect hardware wallet device",
   "components.walletinit.walletinitmenu.cardanoMainnetbutton.title": "Cardano Mainnet",
   "components.walletinit.walletinitmenu.cardanoTestnetbutton.title": "Cardano Preprod Testnet",
-  "components.walletinit.walletinitmenu.cardanoSanchonetbutton.title": "Cardano SanchoNet",
   "components.walletinit.walletinitmenu.cardanoMainnetbutton.description": "Works with real ADA",
   "components.walletinit.walletinitmenu.cardanoTestnetbutton.description": "Works with test ADA (tADA)",
-  "components.walletinit.walletinitmenu.cardanoSanchonetbutton.description": "Testnet for rolling out governance",
   "components.walletinit.aboutRecoveryPhrase.aboutRecoveryPhrase.title": "<b>Read this information carefully</b> before saving your recovery phrase:",
   "components.walletinit.aboutRecoveryPhrase.aboutRecoveryStepper.title": "About recovery phrase",
   "components.walletinit.aboutRecoveryPhrase.aboutRecoveryPhraseCard.firstItem": "<b>Recovery phrase</b> is a unique combination of words",
@@ -1028,8 +1026,6 @@
   "swap.swapScreen.slippageToleranceInfo": "Slippage tolerance is set as a percentage of the total swap value. Your transactions will not be executed if the price moves by more than this amount",
   "swap.swapScreen.preprodNoticeTitle": "Swap is not available on testnet",
   "swap.swapScreen.preprodNoticeText": "Switch to mainnet if you want to use the feature and swap real tokens",
-  "swap.swapScreen.sanchoNoticeTitle": "Swap is not available on sanchonet",
-  "swap.swapScreen.sanchoNoticeText": "Switch to mainnet if you want to use the feature and swap real tokens",
   "swap.swapScreen.swapFees": "Swap fees include the following:\n • DEX Fee\n • Frontend Fee",
   "swap.swapScreen.swapFeesTitle": "Fees",
   "swap.swapScreen.swapFrom": "Swap from",
@@ -1075,15 +1071,9 @@
   "rampOnOff.createRampOnOff.preprodfaucetbanner.title": "Learn Cardano with test ADA ⭐️",
   "rampOnOff.createRampOnOff.preprodfaucetbanner.text": "Get started with Cardano's test currency, TADA. It's your key to testing a new world of possibilities.",
   "rampOnOff.createRampOnOff.preprodfaucetbanner.button.text": "Go to tada faucet",
-  "rampOnOff.createRampOnOff.sanchofaucetbanner.title": "Learn Cardano with test ADA ⭐️",
-  "rampOnOff.createRampOnOff.sanchofaucetbanner.text": "Get started with Cardano's test currency, TADA. It's your key to testing a new world of possibilities.",
-  "rampOnOff.createRampOnOff.sanchofaucetbanner.button.text": "Go to tada faucet",
   "rampOnOff.createRampOnOff.createorder.preprodfaucet.button.text": "Add test ada",
   "rampOnOff.createRampOnOff.createorder.preprodnotice.title": "ADA purchases can only be made on the mainnet",
   "rampOnOff.createRampOnOff.createorder.preprodnotice.text": "Switch network or top up your testnet network wallet with the free Cardano faucet",
-  "rampOnOff.createRampOnOff.createorder.sanchofaucet.button.text": "Add test ada",
-  "rampOnOff.createRampOnOff.createorder.sanchonotice.title": "ADA purchases can only be made on the mainnet",
-  "rampOnOff.createRampOnOff.createorder.sanchonotice.text": "Switch network or top up your testnet network wallet with the free Cardano faucet",
   "rampOnOff.createRampOnOff.createorder.playground": "Playground",
   "rampOnOff.createRampOnOff.loadingLink": "We are redirecting you outside Yoroi. Please wait",
   "rampOnOff.createRampOnOff.linkError": "This service is currently unavailable. Please try again later",
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index 583ef99c02..b11c7c0f6f 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -186,7 +186,6 @@ type SwapTokenRoutes = {
   'swap-submitted-tx': {txId: string}
   'swap-failed-tx': undefined
   'swap-preprod-notice': undefined
-  'swap-sancho-notice': undefined
 }
 export type SwapTokenRouteseNavigation = StackNavigationProp<SwapTokenRoutes>
 
diff --git a/apps/wallet-mobile/translations/messages/src/features/Exchange/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/Exchange/common/useStrings.json
index 240f6597de..e62a249683 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Exchange/common/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Exchange/common/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 61,
+      "line": 55,
       "column": 20,
-      "index": 3525
+      "index": 2963
     },
     "end": {
-      "line": 64,
+      "line": 58,
       "column": 5,
-      "index": 3620
+      "index": 3058
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!PROCEED",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 65,
+      "line": 59,
       "column": 13,
-      "index": 3635
+      "index": 3073
     },
     "end": {
-      "line": 68,
+      "line": 62,
       "column": 5,
-      "index": 3706
+      "index": 3144
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Disclaimer",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 69,
+      "line": 63,
       "column": 16,
-      "index": 3724
+      "index": 3162
     },
     "end": {
-      "line": 72,
+      "line": 66,
       "column": 5,
-      "index": 3820
+      "index": 3258
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!You can test the off-ramp capabilities with test ADA using a 3rd party provider. No real transactions will take place, but you can interact with the interface. By clicking 'Proceed,' you acknowledge that you will be redirected to our partner's website, where you may need to accept their terms and conditions.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 73,
+      "line": 67,
       "column": 30,
-      "index": 3852
+      "index": 3290
     },
     "end": {
-      "line": 76,
+      "line": 70,
       "column": 5,
-      "index": 4262
+      "index": 3700
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Yoroi uses third party web3 on-and-off ramp solution to provide direct Fiat-ADA exchange. By clicking \"Proceed\", you also acknowledge that you will be redirected to our partner's website, where you may be asked to accept their terms and conditions. The third party web3 on-and-off ramp solution may have a certain limitation that will vary depending on your location and your financial institution.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 77,
+      "line": 71,
       "column": 23,
-      "index": 4287
+      "index": 3725
     },
     "end": {
-      "line": 81,
+      "line": 75,
       "column": 5,
-      "index": 4787
+      "index": 4225
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Buy ADA",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 82,
+      "line": 76,
       "column": 15,
-      "index": 4804
+      "index": 4242
     },
     "end": {
-      "line": 85,
+      "line": 79,
       "column": 5,
-      "index": 4896
+      "index": 4334
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Sell ADA",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 86,
+      "line": 80,
       "column": 16,
-      "index": 4914
+      "index": 4352
     },
     "end": {
-      "line": 89,
+      "line": 83,
       "column": 5,
-      "index": 5008
+      "index": 4446
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!ADA amount",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 90,
+      "line": 84,
       "column": 17,
-      "index": 5027
+      "index": 4465
     },
     "end": {
-      "line": 93,
+      "line": 87,
       "column": 5,
-      "index": 5124
+      "index": 4562
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Provider Fee",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 94,
+      "line": 88,
       "column": 17,
-      "index": 5143
+      "index": 4581
     },
     "end": {
-      "line": 97,
+      "line": 91,
       "column": 5,
-      "index": 5242
+      "index": 4680
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Provider",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 98,
+      "line": 92,
       "column": 14,
-      "index": 5258
+      "index": 4696
     },
     "end": {
-      "line": 101,
+      "line": 95,
       "column": 5,
-      "index": 5350
+      "index": 4788
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Banxa",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 102,
+      "line": 96,
       "column": 11,
-      "index": 5363
+      "index": 4801
     },
     "end": {
-      "line": 105,
+      "line": 99,
       "column": 5,
-      "index": 5449
+      "index": 4887
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Exchange ADA",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 106,
+      "line": 100,
       "column": 11,
-      "index": 5462
+      "index": 4900
     },
     "end": {
-      "line": 109,
+      "line": 103,
       "column": 5,
-      "index": 5539
+      "index": 4977
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Not Enough Balannce",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 110,
+      "line": 104,
       "column": 22,
-      "index": 5563
+      "index": 5001
     },
     "end": {
-      "line": 113,
+      "line": 107,
       "column": 5,
-      "index": 5664
+      "index": 5102
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Minimum required is 100 ADA",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 114,
+      "line": 108,
       "column": 20,
-      "index": 5686
+      "index": 5124
     },
     "end": {
-      "line": 117,
+      "line": 111,
       "column": 5,
-      "index": 5803
+      "index": 5241
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!You can currently sell only to USD using ACH.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 118,
+      "line": 112,
       "column": 25,
-      "index": 5830
+      "index": 5268
     },
     "end": {
-      "line": 121,
+      "line": 115,
       "column": 5,
-      "index": 5970
+      "index": 5408
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Congrats🎉 Your ADA will come in a few minutes",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 122,
+      "line": 116,
       "column": 14,
-      "index": 5986
+      "index": 5424
     },
     "end": {
-      "line": 125,
+      "line": 119,
       "column": 5,
-      "index": 6116
+      "index": 5554
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!ADA amount you get",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 126,
+      "line": 120,
       "column": 24,
-      "index": 6142
+      "index": 5580
     },
     "end": {
-      "line": 129,
+      "line": 123,
       "column": 5,
-      "index": 6254
+      "index": 5692
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Fiat amount you sell",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 130,
+      "line": 124,
       "column": 22,
-      "index": 6278
+      "index": 5716
     },
     "end": {
-      "line": 133,
+      "line": 127,
       "column": 5,
-      "index": 6390
+      "index": 5828
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!GO TO TRANSACTIONS",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 134,
+      "line": 128,
       "column": 22,
-      "index": 6414
+      "index": 5852
     },
     "end": {
-      "line": 137,
+      "line": 131,
       "column": 5,
-      "index": 6524
+      "index": 5962
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Buy ADA/Sell transaction",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 138,
+      "line": 132,
       "column": 19,
-      "index": 6545
+      "index": 5983
     },
     "end": {
-      "line": 141,
+      "line": 135,
       "column": 5,
-      "index": 6658
+      "index": 6096
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Normally the Buy ADA/Sell transaction takes 3-5 of minutes for the order to be fulfilled. However, there are instances where the order cannot be fulfilled instantly because the compliance team can be doing a manual verification of the KYC docs or any other issues.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 142,
+      "line": 136,
       "column": 38,
-      "index": 6698
+      "index": 6136
     },
     "end": {
-      "line": 146,
+      "line": 140,
       "column": 5,
-      "index": 7078
+      "index": 6516
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Contact",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 147,
+      "line": 141,
       "column": 13,
-      "index": 7093
+      "index": 6531
     },
     "end": {
-      "line": 150,
+      "line": 144,
       "column": 5,
-      "index": 7183
+      "index": 6621
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!and",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 151,
+      "line": 145,
       "column": 9,
-      "index": 7194
+      "index": 6632
     },
     "end": {
-      "line": 154,
+      "line": 148,
       "column": 5,
-      "index": 7276
+      "index": 6714
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!Yoroi Customer Support",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 155,
+      "line": 149,
       "column": 21,
-      "index": 7299
+      "index": 6737
     },
     "end": {
-      "line": 158,
+      "line": 152,
       "column": 5,
-      "index": 7412
+      "index": 6850
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!if you witnessed any significant transaction delays or errors.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 159,
+      "line": 153,
       "column": 17,
-      "index": 7431
+      "index": 6869
     },
     "end": {
-      "line": 162,
+      "line": 156,
       "column": 5,
-      "index": 7580
+      "index": 7018
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Welcome to Yoroi 👋️\nGet your first ADA fast & easy",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 163,
+      "line": 157,
       "column": 20,
-      "index": 7602
+      "index": 7040
     },
     "end": {
-      "line": 166,
+      "line": 160,
       "column": 5,
-      "index": 7744
+      "index": 7182
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Top up your wallet safely using our trusted partners",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 167,
+      "line": 161,
       "column": 24,
-      "index": 7770
+      "index": 7208
     },
     "end": {
-      "line": 170,
+      "line": 164,
       "column": 5,
-      "index": 7916
+      "index": 7354
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Need more ADA for staking or swap?",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 171,
+      "line": 165,
       "column": 20,
-      "index": 7938
+      "index": 7376
     },
     "end": {
-      "line": 174,
+      "line": 168,
       "column": 5,
-      "index": 8062
+      "index": 7500
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!fee",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 175,
+      "line": 169,
       "column": 9,
-      "index": 8073
+      "index": 7511
     },
     "end": {
-      "line": 178,
+      "line": 172,
       "column": 5,
-      "index": 8155
+      "index": 7593
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!Learn Cardano with test ADA ⭐️",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 179,
+      "line": 173,
       "column": 30,
-      "index": 8187
+      "index": 7625
     },
     "end": {
-      "line": 182,
+      "line": 176,
       "column": 5,
-      "index": 8318
+      "index": 7756
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Get started with Cardano's test currency, TADA. It's your key to testing a new world of possibilities.",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 183,
+      "line": 177,
       "column": 29,
-      "index": 8349
+      "index": 7787
     },
     "end": {
-      "line": 186,
+      "line": 180,
       "column": 5,
-      "index": 8551
+      "index": 7989
     }
   },
   {
@@ -469,59 +469,14 @@
     "defaultMessage": "!!!Go to tada faucet",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 187,
+      "line": 181,
       "column": 35,
-      "index": 8588
-    },
-    "end": {
-      "line": 190,
-      "column": 5,
-      "index": 8712
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.sanchofaucetbanner.title",
-    "defaultMessage": "!!!Learn Cardano with test ADA ⭐️",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 191,
-      "column": 29,
-      "index": 8743
-    },
-    "end": {
-      "line": 194,
-      "column": 5,
-      "index": 8873
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.sanchofaucetbanner.text",
-    "defaultMessage": "!!!Get started with Cardano's test currency, TADA. It's your key to testing a new world of possibilities.",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 195,
-      "column": 28,
-      "index": 8903
-    },
-    "end": {
-      "line": 198,
-      "column": 5,
-      "index": 9104
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.sanchofaucetbanner.button.text",
-    "defaultMessage": "!!!Go to tada faucet",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 199,
-      "column": 34,
-      "index": 9140
+      "index": 8026
     },
     "end": {
-      "line": 202,
+      "line": 184,
       "column": 5,
-      "index": 9263
+      "index": 8150
     }
   },
   {
@@ -529,14 +484,14 @@
     "defaultMessage": "!!!Add test ada",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 203,
+      "line": 185,
       "column": 40,
-      "index": 9305
+      "index": 8192
     },
     "end": {
-      "line": 206,
+      "line": 188,
       "column": 5,
-      "index": 9430
+      "index": 8317
     }
   },
   {
@@ -544,14 +499,14 @@
     "defaultMessage": "!!!ADA purchases can only be made on the mainnet",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 207,
+      "line": 189,
       "column": 35,
-      "index": 9467
+      "index": 8354
     },
     "end": {
-      "line": 210,
+      "line": 192,
       "column": 5,
-      "index": 9619
+      "index": 8506
     }
   },
   {
@@ -559,59 +514,14 @@
     "defaultMessage": "!!!Switch network or top up your testnet network wallet with the free Cardano faucet",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 211,
+      "line": 193,
       "column": 34,
-      "index": 9655
-    },
-    "end": {
-      "line": 214,
-      "column": 5,
-      "index": 9842
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.createorder.sanchofaucet.button.text",
-    "defaultMessage": "!!!Add test ada",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 215,
-      "column": 42,
-      "index": 9886
-    },
-    "end": {
-      "line": 218,
-      "column": 5,
-      "index": 10010
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.createorder.sanchonotice.title",
-    "defaultMessage": "!!!ADA purchases can only be made on the mainnet",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 219,
-      "column": 37,
-      "index": 10049
-    },
-    "end": {
-      "line": 222,
-      "column": 5,
-      "index": 10200
-    }
-  },
-  {
-    "id": "rampOnOff.createRampOnOff.createorder.sanchonotice.text",
-    "defaultMessage": "!!!Switch network or top up your testnet network wallet with the free Cardano faucet",
-    "file": "src/features/Exchange/common/useStrings.tsx",
-    "start": {
-      "line": 223,
-      "column": 36,
-      "index": 10238
+      "index": 8542
     },
     "end": {
-      "line": 226,
+      "line": 196,
       "column": 5,
-      "index": 10424
+      "index": 8729
     }
   },
   {
@@ -619,14 +529,14 @@
     "defaultMessage": "!!!Playground",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 227,
+      "line": 197,
       "column": 16,
-      "index": 10442
+      "index": 8747
     },
     "end": {
-      "line": 230,
+      "line": 200,
       "column": 5,
-      "index": 10550
+      "index": 8855
     }
   },
   {
@@ -634,14 +544,14 @@
     "defaultMessage": "!!!We are redirecting you outside Yoroi. Please wait",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 231,
+      "line": 201,
       "column": 17,
-      "index": 10569
+      "index": 8874
     },
     "end": {
-      "line": 234,
+      "line": 204,
       "column": 5,
-      "index": 10705
+      "index": 9010
     }
   },
   {
@@ -649,14 +559,14 @@
     "defaultMessage": "!!!This service is currently unavailable. Please try again later",
     "file": "src/features/Exchange/common/useStrings.tsx",
     "start": {
-      "line": 235,
+      "line": 205,
       "column": 15,
-      "index": 10722
+      "index": 9027
     },
     "end": {
-      "line": 238,
+      "line": 208,
       "column": 5,
-      "index": 10868
+      "index": 9173
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
index fce734e942..47dcb02dfa 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/common/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not found",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 123,
+      "line": 121,
       "column": 14,
-      "index": 8982
+      "index": 8822
     },
     "end": {
-      "line": 126,
+      "line": 124,
       "column": 5,
-      "index": 9103
+      "index": 8943
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Clear all",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 127,
+      "line": 125,
       "column": 14,
-      "index": 9119
+      "index": 8959
     },
     "end": {
-      "line": 130,
+      "line": 128,
       "column": 5,
-      "index": 9240
+      "index": 9080
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Minimum characters",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 131,
+      "line": 129,
       "column": 33,
-      "index": 9275
+      "index": 9115
     },
     "end": {
-      "line": 134,
+      "line": 132,
       "column": 5,
-      "index": 9422
+      "index": 9262
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Repeat password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 135,
+      "line": 133,
       "column": 30,
-      "index": 9454
+      "index": 9294
     },
     "end": {
-      "line": 138,
+      "line": 136,
       "column": 5,
-      "index": 9576
+      "index": 9416
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Passwords do not match",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 139,
+      "line": 137,
       "column": 30,
-      "index": 9608
+      "index": 9448
     },
     "end": {
-      "line": 142,
+      "line": 140,
       "column": 5,
-      "index": 9737
+      "index": 9577
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Yoroi",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 143,
+      "line": 141,
       "column": 15,
-      "index": 9754
+      "index": 9594
     },
     "end": {
-      "line": 146,
+      "line": 144,
       "column": 5,
-      "index": 9856
+      "index": 9696
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Light wallet for Cardano assets",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 147,
+      "line": 145,
       "column": 18,
-      "index": 9876
+      "index": 9716
     },
     "end": {
-      "line": 150,
+      "line": 148,
       "column": 5,
-      "index": 10007
+      "index": 9847
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Learn more on Yoroi Zendesk",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 151,
+      "line": 149,
       "column": 15,
-      "index": 10024
+      "index": 9864
     },
     "end": {
-      "line": 154,
+      "line": 152,
       "column": 5,
-      "index": 10149
+      "index": 9989
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Continue",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 155,
+      "line": 153,
       "column": 20,
-      "index": 10171
+      "index": 10011
     },
     "end": {
-      "line": 158,
+      "line": 156,
       "column": 5,
-      "index": 10285
+      "index": 10125
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 159,
+      "line": 157,
       "column": 10,
-      "index": 10297
+      "index": 10137
     },
     "end": {
-      "line": 162,
+      "line": 160,
       "column": 5,
-      "index": 10403
+      "index": 10243
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Create new wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 163,
+      "line": 161,
       "column": 28,
-      "index": 10433
+      "index": 10273
     },
     "end": {
-      "line": 166,
+      "line": 164,
       "column": 5,
-      "index": 10561
+      "index": 10401
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Restore Yoroi existing wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 167,
+      "line": 165,
       "column": 29,
-      "index": 10592
+      "index": 10432
     },
     "end": {
-      "line": 170,
+      "line": 168,
       "column": 5,
-      "index": 10733
+      "index": 10573
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Connect hardware wallet device",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 171,
+      "line": 169,
       "column": 29,
-      "index": 10764
+      "index": 10604
     },
     "end": {
-      "line": 174,
+      "line": 172,
       "column": 5,
-      "index": 10906
+      "index": 10746
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Cardano Mainnet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 175,
+      "line": 173,
       "column": 20,
-      "index": 10928
+      "index": 10768
     },
     "end": {
-      "line": 178,
+      "line": 176,
       "column": 5,
-      "index": 11056
+      "index": 10896
     }
   },
   {
@@ -214,29 +214,14 @@
     "defaultMessage": "!!!Cardano Preprod Testnet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 179,
+      "line": 177,
       "column": 20,
-      "index": 11078
+      "index": 10918
     },
     "end": {
-      "line": 182,
+      "line": 180,
       "column": 5,
-      "index": 11214
-    }
-  },
-  {
-    "id": "components.walletinit.walletinitmenu.cardanoSanchonetbutton.title",
-    "defaultMessage": "!!!Cardano SanchoNet",
-    "file": "src/features/SetupWallet/common/useStrings.tsx",
-    "start": {
-      "line": 183,
-      "column": 22,
-      "index": 11238
-    },
-    "end": {
-      "line": 186,
-      "column": 5,
-      "index": 11370
+      "index": 11054
     }
   },
   {
@@ -244,14 +229,14 @@
     "defaultMessage": "!!!Works with real ADA",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 187,
+      "line": 181,
       "column": 31,
-      "index": 11403
+      "index": 11087
     },
     "end": {
-      "line": 190,
+      "line": 184,
       "column": 5,
-      "index": 11541
+      "index": 11225
     }
   },
   {
@@ -259,29 +244,14 @@
     "defaultMessage": "!!!Works with test ADA (tADA)",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 191,
+      "line": 185,
       "column": 31,
-      "index": 11574
-    },
-    "end": {
-      "line": 194,
-      "column": 5,
-      "index": 11719
-    }
-  },
-  {
-    "id": "components.walletinit.walletinitmenu.cardanoSanchonetbutton.description",
-    "defaultMessage": "!!!Testnet for rolling out governance",
-    "file": "src/features/SetupWallet/common/useStrings.tsx",
-    "start": {
-      "line": 195,
-      "column": 33,
-      "index": 11754
+      "index": 11258
     },
     "end": {
-      "line": 198,
+      "line": 188,
       "column": 5,
-      "index": 11909
+      "index": 11403
     }
   },
   {
@@ -289,14 +259,14 @@
     "defaultMessage": "!!!Read this information carefully before saving your recovery phrase:",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 199,
+      "line": 189,
       "column": 30,
-      "index": 11941
+      "index": 11435
     },
     "end": {
-      "line": 202,
+      "line": 192,
       "column": 5,
-      "index": 12125
+      "index": 11619
     }
   },
   {
@@ -304,14 +274,14 @@
     "defaultMessage": "!!!About recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 203,
+      "line": 193,
       "column": 29,
-      "index": 12156
+      "index": 11650
     },
     "end": {
-      "line": 206,
+      "line": 196,
       "column": 5,
-      "index": 12295
+      "index": 11789
     }
   },
   {
@@ -319,14 +289,14 @@
     "defaultMessage": "!!!Recovery phrase is the only way to access your wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 207,
+      "line": 197,
       "column": 38,
-      "index": 12335
+      "index": 11829
     },
     "end": {
-      "line": 210,
+      "line": 200,
       "column": 5,
-      "index": 12513
+      "index": 12007
     }
   },
   {
@@ -334,14 +304,14 @@
     "defaultMessage": "!!!If you lose your Recovery phrase, it will not be possible to recover your wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 211,
+      "line": 201,
       "column": 39,
-      "index": 12554
+      "index": 12048
     },
     "end": {
-      "line": 214,
+      "line": 204,
       "column": 5,
-      "index": 12760
+      "index": 12254
     }
   },
   {
@@ -349,14 +319,14 @@
     "defaultMessage": "!!!You are the only person who knows and stores your Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 215,
+      "line": 205,
       "column": 38,
-      "index": 12800
+      "index": 12294
     },
     "end": {
-      "line": 218,
+      "line": 208,
       "column": 5,
-      "index": 12990
+      "index": 12484
     }
   },
   {
@@ -364,14 +334,14 @@
     "defaultMessage": "!!!You are the only person who knows and stores your Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 219,
+      "line": 209,
       "column": 39,
-      "index": 13031
+      "index": 12525
     },
     "end": {
-      "line": 222,
+      "line": 212,
       "column": 5,
-      "index": 13222
+      "index": 12716
     }
   },
   {
@@ -379,14 +349,14 @@
     "defaultMessage": "!!!Yoroi NEVER asks for your Recovery phrase. Watch out for scammers and impersonators",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 223,
+      "line": 213,
       "column": 38,
-      "index": 13262
+      "index": 12756
     },
     "end": {
-      "line": 226,
+      "line": 216,
       "column": 5,
-      "index": 13470
+      "index": 12964
     }
   },
   {
@@ -394,14 +364,14 @@
     "defaultMessage": "!!!Click “Show recovery phrase” below to reveal and save it.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 227,
+      "line": 217,
       "column": 25,
-      "index": 13497
+      "index": 12991
     },
     "end": {
-      "line": 230,
+      "line": 220,
       "column": 5,
-      "index": 13647
+      "index": 13141
     }
   },
   {
@@ -409,14 +379,14 @@
     "defaultMessage": "!!!Recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 231,
+      "line": 221,
       "column": 24,
-      "index": 13673
+      "index": 13167
     },
     "end": {
-      "line": 234,
+      "line": 224,
       "column": 5,
-      "index": 13796
+      "index": 13290
     }
   },
   {
@@ -424,14 +394,14 @@
     "defaultMessage": "!!!Hide recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 235,
+      "line": 225,
       "column": 30,
-      "index": 13828
+      "index": 13322
     },
     "end": {
-      "line": 238,
+      "line": 228,
       "column": 5,
-      "index": 13959
+      "index": 13453
     }
   },
   {
@@ -439,14 +409,14 @@
     "defaultMessage": "!!!Show recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 239,
+      "line": 229,
       "column": 30,
-      "index": 13991
+      "index": 13485
     },
     "end": {
-      "line": 242,
+      "line": 232,
       "column": 5,
-      "index": 14122
+      "index": 13616
     }
   },
   {
@@ -454,14 +424,14 @@
     "defaultMessage": "!!!Tips",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 243,
+      "line": 233,
       "column": 30,
-      "index": 14154
+      "index": 13648
     },
     "end": {
-      "line": 246,
+      "line": 236,
       "column": 5,
-      "index": 14270
+      "index": 13764
     }
   },
   {
@@ -469,14 +439,14 @@
     "defaultMessage": "!!!How to save your recovery phrase?",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 247,
+      "line": 237,
       "column": 29,
-      "index": 14301
+      "index": 13795
     },
     "end": {
-      "line": 250,
+      "line": 240,
       "column": 5,
-      "index": 14445
+      "index": 13939
     }
   },
   {
@@ -484,14 +454,14 @@
     "defaultMessage": "!!!Make sure no one is looking at your screen.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 251,
+      "line": 241,
       "column": 33,
-      "index": 14480
+      "index": 13974
     },
     "end": {
-      "line": 254,
+      "line": 244,
       "column": 5,
-      "index": 14638
+      "index": 14132
     }
   },
   {
@@ -499,14 +469,14 @@
     "defaultMessage": "!!!DO NOT take a screenshot.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 255,
+      "line": 245,
       "column": 34,
-      "index": 14674
+      "index": 14168
     },
     "end": {
-      "line": 258,
+      "line": 248,
       "column": 5,
-      "index": 14815
+      "index": 14309
     }
   },
   {
@@ -514,14 +484,14 @@
     "defaultMessage": "!!!Write the recovery phrase on a piece of paper and store in a secure location like a safety deposit box.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 259,
+      "line": 249,
       "column": 33,
-      "index": 14850
+      "index": 14344
     },
     "end": {
-      "line": 263,
+      "line": 253,
       "column": 5,
-      "index": 15076
+      "index": 14570
     }
   },
   {
@@ -529,14 +499,14 @@
     "defaultMessage": "!!!It is recommended to have 2 or 3 copies of the recovery phrase in different secure locations.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 264,
+      "line": 254,
       "column": 34,
-      "index": 15112
+      "index": 14606
     },
     "end": {
-      "line": 268,
+      "line": 258,
       "column": 5,
-      "index": 15329
+      "index": 14823
     }
   },
   {
@@ -544,14 +514,14 @@
     "defaultMessage": "!!!DO NOT share the recovery phrase as this will allow anyone to access your assets and wallet.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 269,
+      "line": 259,
       "column": 33,
-      "index": 15364
+      "index": 14858
     },
     "end": {
-      "line": 272,
+      "line": 262,
       "column": 5,
-      "index": 15571
+      "index": 15065
     }
   },
   {
@@ -559,14 +529,14 @@
     "defaultMessage": "!!!Select each word in the correct order to confirm your recovery phrase.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 273,
+      "line": 263,
       "column": 31,
-      "index": 15604
+      "index": 15098
     },
     "end": {
-      "line": 276,
+      "line": 266,
       "column": 5,
-      "index": 15772
+      "index": 15266
     }
   },
   {
@@ -574,14 +544,14 @@
     "defaultMessage": "!!!Verify recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 277,
+      "line": 267,
       "column": 30,
-      "index": 15804
+      "index": 15298
     },
     "end": {
-      "line": 280,
+      "line": 270,
       "column": 5,
-      "index": 15946
+      "index": 15440
     }
   },
   {
@@ -589,14 +559,14 @@
     "defaultMessage": "!!!Incorrect order. Try again",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 281,
+      "line": 271,
       "column": 38,
-      "index": 15986
+      "index": 15480
     },
     "end": {
-      "line": 284,
+      "line": 274,
       "column": 5,
-      "index": 16117
+      "index": 15611
     }
   },
   {
@@ -604,14 +574,14 @@
     "defaultMessage": "!!!The recovery phrase is verified",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 285,
+      "line": 275,
       "column": 40,
-      "index": 16159
+      "index": 15653
     },
     "end": {
-      "line": 288,
+      "line": 278,
       "column": 5,
-      "index": 16297
+      "index": 15791
     }
   },
   {
@@ -619,14 +589,14 @@
     "defaultMessage": "!!!Tips",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 289,
+      "line": 279,
       "column": 29,
-      "index": 16328
+      "index": 15822
     },
     "end": {
-      "line": 292,
+      "line": 282,
       "column": 5,
-      "index": 16447
+      "index": 15941
     }
   },
   {
@@ -634,14 +604,14 @@
     "defaultMessage": "!!!What is wallet name",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 293,
+      "line": 283,
       "column": 30,
-      "index": 16479
+      "index": 15973
     },
     "end": {
-      "line": 296,
+      "line": 286,
       "column": 5,
-      "index": 16614
+      "index": 16108
     }
   },
   {
@@ -649,14 +619,14 @@
     "defaultMessage": "!!!It is a wallet identifier that helps you to easier find the exact wallet in your app",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 297,
+      "line": 287,
       "column": 34,
-      "index": 16650
+      "index": 16144
     },
     "end": {
-      "line": 300,
+      "line": 290,
       "column": 5,
-      "index": 16849
+      "index": 16343
     }
   },
   {
@@ -664,14 +634,14 @@
     "defaultMessage": "!!!You can have different wallet names for the same wallet account connected to different devices",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 301,
+      "line": 291,
       "column": 35,
-      "index": 16886
+      "index": 16380
     },
     "end": {
-      "line": 305,
+      "line": 295,
       "column": 5,
-      "index": 17104
+      "index": 16598
     }
   },
   {
@@ -679,14 +649,14 @@
     "defaultMessage": "!!!What is password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 306,
+      "line": 296,
       "column": 34,
-      "index": 17140
+      "index": 16634
     },
     "end": {
-      "line": 309,
+      "line": 299,
       "column": 5,
-      "index": 17276
+      "index": 16770
     }
   },
   {
@@ -694,14 +664,14 @@
     "defaultMessage": "!!!Password is an additional security layer used to confirm transactions from this device",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 310,
+      "line": 300,
       "column": 38,
-      "index": 17316
+      "index": 16810
     },
     "end": {
-      "line": 313,
+      "line": 303,
       "column": 5,
-      "index": 17521
+      "index": 17015
     }
   },
   {
@@ -709,14 +679,14 @@
     "defaultMessage": "!!!Both wallet name and password are stored locally, so you are only person who can change or restore it.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 314,
+      "line": 304,
       "column": 39,
-      "index": 17562
+      "index": 17056
     },
     "end": {
-      "line": 318,
+      "line": 308,
       "column": 5,
-      "index": 17792
+      "index": 17286
     }
   },
   {
@@ -724,14 +694,14 @@
     "defaultMessage": "!!!What is wallet checksum and plate number?",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 319,
+      "line": 309,
       "column": 34,
-      "index": 17828
+      "index": 17322
     },
     "end": {
-      "line": 322,
+      "line": 312,
       "column": 5,
-      "index": 17989
+      "index": 17483
     }
   },
   {
@@ -739,14 +709,14 @@
     "defaultMessage": "!!!is a generic Blockie image that is generated to visually distinguish your wallet from others.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 323,
+      "line": 313,
       "column": 38,
-      "index": 18029
+      "index": 17523
     },
     "end": {
-      "line": 327,
+      "line": 317,
       "column": 5,
-      "index": 18249
+      "index": 17743
     }
   },
   {
@@ -754,14 +724,14 @@
     "defaultMessage": "!!!Wallet checksum",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 328,
+      "line": 318,
       "column": 20,
-      "index": 18271
+      "index": 17765
     },
     "end": {
-      "line": 331,
+      "line": 321,
       "column": 5,
-      "index": 18414
+      "index": 17908
     }
   },
   {
@@ -769,14 +739,14 @@
     "defaultMessage": "!!!Plate number {checksum} is a auto-generated sign of four letters and four digits.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 332,
+      "line": 322,
       "column": 39,
-      "index": 18455
+      "index": 17949
     },
     "end": {
-      "line": 335,
+      "line": 325,
       "column": 5,
-      "index": 18656
+      "index": 18150
     }
   },
   {
@@ -784,14 +754,14 @@
     "defaultMessage": "!!!Checksum and plate number are unique to your wallet and represent your public key.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 336,
+      "line": 326,
       "column": 38,
-      "index": 18696
+      "index": 18190
     },
     "end": {
-      "line": 339,
+      "line": 329,
       "column": 5,
-      "index": 18897
+      "index": 18391
     }
   },
   {
@@ -799,14 +769,14 @@
     "defaultMessage": "!!!Wallet details",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 340,
+      "line": 330,
       "column": 23,
-      "index": 18922
+      "index": 18416
     },
     "end": {
-      "line": 343,
+      "line": 333,
       "column": 5,
-      "index": 19039
+      "index": 18533
     }
   },
   {
@@ -814,14 +784,14 @@
     "defaultMessage": "!!!Add your wallet name and password.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 344,
+      "line": 334,
       "column": 24,
-      "index": 19065
+      "index": 18559
     },
     "end": {
-      "line": 347,
+      "line": 337,
       "column": 5,
-      "index": 19204
+      "index": 18698
     }
   },
   {
@@ -829,14 +799,14 @@
     "defaultMessage": "!!!Combine letters, numbers and symbols to make it stronger",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 348,
+      "line": 338,
       "column": 33,
-      "index": 19239
+      "index": 18733
     },
     "end": {
-      "line": 351,
+      "line": 341,
       "column": 5,
-      "index": 19408
+      "index": 18902
     }
   },
   {
@@ -844,14 +814,14 @@
     "defaultMessage": "!!!Enter wallet name",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 352,
+      "line": 342,
       "column": 28,
-      "index": 19438
+      "index": 18932
     },
     "end": {
-      "line": 355,
+      "line": 345,
       "column": 5,
-      "index": 19563
+      "index": 19057
     }
   },
   {
@@ -859,14 +829,14 @@
     "defaultMessage": "!!!Enter password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 356,
+      "line": 346,
       "column": 32,
-      "index": 19597
+      "index": 19091
     },
     "end": {
-      "line": 359,
+      "line": 349,
       "column": 5,
-      "index": 19723
+      "index": 19217
     }
   },
   {
@@ -874,14 +844,14 @@
     "defaultMessage": "!!!Confirm password",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 360,
+      "line": 350,
       "column": 39,
-      "index": 19764
+      "index": 19258
     },
     "end": {
-      "line": 363,
+      "line": 353,
       "column": 5,
-      "index": 19899
+      "index": 19393
     }
   },
   {
@@ -889,14 +859,14 @@
     "defaultMessage": "!!!Please enter valid mnemonic.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 364,
+      "line": 354,
       "column": 21,
-      "index": 19922
+      "index": 19416
     },
     "end": {
-      "line": 367,
+      "line": 357,
       "column": 5,
-      "index": 20071
+      "index": 19565
     }
   },
   {
@@ -904,14 +874,14 @@
     "defaultMessage": "!!!The recovery phrase is verified",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 368,
+      "line": 358,
       "column": 19,
-      "index": 20092
+      "index": 19586
     },
     "end": {
-      "line": 371,
+      "line": 361,
       "column": 5,
-      "index": 20242
+      "index": 19736
     }
   },
   {
@@ -919,14 +889,14 @@
     "defaultMessage": "!!!Enter recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 372,
+      "line": 362,
       "column": 29,
-      "index": 20273
+      "index": 19767
     },
     "end": {
-      "line": 375,
+      "line": 365,
       "column": 5,
-      "index": 20423
+      "index": 19917
     }
   },
   {
@@ -934,14 +904,14 @@
     "defaultMessage": "!!!15 word recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 376,
+      "line": 366,
       "column": 32,
-      "index": 20457
+      "index": 19951
     },
     "end": {
-      "line": 379,
+      "line": 369,
       "column": 5,
-      "index": 20592
+      "index": 20086
     }
   },
   {
@@ -949,14 +919,14 @@
     "defaultMessage": "!!!24 word recovery phrase",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 380,
+      "line": 370,
       "column": 32,
-      "index": 20626
+      "index": 20120
     },
     "end": {
-      "line": 383,
+      "line": 373,
       "column": 5,
-      "index": 20761
+      "index": 20255
     }
   },
   {
@@ -964,14 +934,14 @@
     "defaultMessage": "!!!Add the recovery phrase you received upon your wallet creation process.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 384,
+      "line": 374,
       "column": 30,
-      "index": 20793
+      "index": 20287
     },
     "end": {
-      "line": 387,
+      "line": 377,
       "column": 5,
-      "index": 20994
+      "index": 20488
     }
   },
   {
@@ -979,14 +949,14 @@
     "defaultMessage": "!!!This wallet is already added",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 388,
+      "line": 378,
       "column": 39,
-      "index": 21035
+      "index": 20529
     },
     "end": {
-      "line": 391,
+      "line": 381,
       "column": 5,
-      "index": 21202
+      "index": 20696
     }
   },
   {
@@ -994,14 +964,14 @@
     "defaultMessage": "!!!This wallet already exist on your device, You can open it or go back and restore another wallet.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 392,
+      "line": 382,
       "column": 38,
-      "index": 21242
+      "index": 20736
     },
     "end": {
-      "line": 396,
+      "line": 386,
       "column": 5,
-      "index": 21484
+      "index": 20978
     }
   },
   {
@@ -1009,14 +979,14 @@
     "defaultMessage": "!!!Open wallet",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 397,
+      "line": 387,
       "column": 40,
-      "index": 21526
+      "index": 21020
     },
     "end": {
-      "line": 400,
+      "line": 390,
       "column": 5,
-      "index": 21677
+      "index": 21171
     }
   },
   {
@@ -1024,14 +994,14 @@
     "defaultMessage": "!!!Preparing your wallet...",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 401,
+      "line": 391,
       "column": 21,
-      "index": 21700
+      "index": 21194
     },
     "end": {
-      "line": 404,
+      "line": 394,
       "column": 5,
-      "index": 21845
+      "index": 21339
     }
   },
   {
@@ -1039,14 +1009,14 @@
     "defaultMessage": "!!!Word not found",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 405,
+      "line": 395,
       "column": 18,
-      "index": 21865
+      "index": 21359
     },
     "end": {
-      "line": 408,
+      "line": 398,
       "column": 5,
-      "index": 21997
+      "index": 21491
     }
   },
   {
@@ -1054,14 +1024,14 @@
     "defaultMessage": "!!!Choose connection method",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 409,
+      "line": 399,
       "column": 18,
-      "index": 22017
+      "index": 21511
     },
     "end": {
-      "line": 412,
+      "line": 402,
       "column": 5,
-      "index": 22141
+      "index": 21635
     }
   },
   {
@@ -1069,14 +1039,14 @@
     "defaultMessage": "!!!Select the option to connect Ledger Nano X or Ledger Nano S to Yoroi app",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 413,
+      "line": 403,
       "column": 17,
-      "index": 22160
+      "index": 21654
     },
     "end": {
-      "line": 416,
+      "line": 406,
       "column": 5,
-      "index": 22331
+      "index": 21825
     }
   },
   {
@@ -1084,14 +1054,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 417,
+      "line": 407,
       "column": 22,
-      "index": 22355
+      "index": 21849
     },
     "end": {
-      "line": 420,
+      "line": 410,
       "column": 5,
-      "index": 22475
+      "index": 21969
     }
   },
   {
@@ -1099,14 +1069,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 421,
+      "line": 411,
       "column": 21,
-      "index": 22498
+      "index": 21992
     },
     "end": {
-      "line": 424,
+      "line": 414,
       "column": 5,
-      "index": 22630
+      "index": 22124
     }
   },
   {
@@ -1114,14 +1084,14 @@
     "defaultMessage": "!!!USB connection is NOT available on Apple iOS devices. You can always try this connection type on Android platform",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 425,
+      "line": 415,
       "column": 23,
-      "index": 22655
+      "index": 22149
     },
     "end": {
-      "line": 429,
+      "line": 419,
       "column": 5,
-      "index": 22881
+      "index": 22375
     }
   },
   {
@@ -1129,14 +1099,14 @@
     "defaultMessage": "!!!<b>Add</b> your <b>wallet name</b>",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 430,
+      "line": 420,
       "column": 26,
-      "index": 22909
+      "index": 22403
     },
     "end": {
-      "line": 433,
+      "line": 423,
       "column": 5,
-      "index": 23049
+      "index": 22543
     }
   },
   {
@@ -1144,14 +1114,14 @@
     "defaultMessage": "!!!Action needed: Please, export public key from your Ledger device.",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 434,
+      "line": 424,
       "column": 17,
-      "index": 23068
+      "index": 22562
     },
     "end": {
-      "line": 437,
+      "line": 427,
       "column": 5,
-      "index": 23246
+      "index": 22740
     }
   },
   {
@@ -1159,14 +1129,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 438,
+      "line": 428,
       "column": 20,
-      "index": 23268
+      "index": 22762
     },
     "end": {
-      "line": 441,
+      "line": 431,
       "column": 5,
-      "index": 23384
+      "index": 22878
     }
   },
   {
@@ -1174,14 +1144,14 @@
     "defaultMessage": "!!!Before continuing, please make sure that:",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 442,
+      "line": 432,
       "column": 22,
-      "index": 23408
+      "index": 22902
     },
     "end": {
-      "line": 445,
+      "line": 435,
       "column": 5,
-      "index": 23560
+      "index": 23054
     }
   },
   {
@@ -1189,14 +1159,14 @@
     "defaultMessage": "!!!Intro",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 446,
+      "line": 436,
       "column": 18,
-      "index": 23580
+      "index": 23074
     },
     "end": {
-      "line": 449,
+      "line": 439,
       "column": 5,
-      "index": 23699
+      "index": 23193
     }
   },
   {
@@ -1204,14 +1174,14 @@
     "defaultMessage": "!!!Learn more about using Yoroi with Ledger",
     "file": "src/features/SetupWallet/common/useStrings.tsx",
     "start": {
-      "line": 450,
+      "line": 440,
       "column": 23,
-      "index": 23724
+      "index": 23218
     },
     "end": {
-      "line": 453,
+      "line": 443,
       "column": 5,
-      "index": 23867
+      "index": 23361
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index 6b455f1c70..e8bfe8c513 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 170,
+      "line": 168,
       "column": 12,
-      "index": 11087
+      "index": 10947
     },
     "end": {
-      "line": 173,
+      "line": 171,
       "column": 3,
-      "index": 11250
+      "index": 11110
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Incorrect password.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 174,
+      "line": 172,
       "column": 24,
-      "index": 11276
+      "index": 11136
     },
     "end": {
-      "line": 177,
+      "line": 175,
       "column": 3,
-      "index": 11385
+      "index": 11245
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 178,
+      "line": 176,
       "column": 13,
-      "index": 11400
+      "index": 11260
     },
     "end": {
-      "line": 181,
+      "line": 179,
       "column": 3,
-      "index": 11473
+      "index": 11333
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Swap details",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 182,
+      "line": 180,
       "column": 20,
-      "index": 11495
+      "index": 11355
     },
     "end": {
-      "line": 185,
+      "line": 183,
       "column": 3,
-      "index": 11583
+      "index": 11443
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Token swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 186,
+      "line": 184,
       "column": 13,
-      "index": 11598
+      "index": 11458
     },
     "end": {
-      "line": 189,
+      "line": 187,
       "column": 3,
-      "index": 11680
+      "index": 11540
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 190,
+      "line": 188,
       "column": 13,
-      "index": 11695
+      "index": 11555
     },
     "end": {
-      "line": 193,
+      "line": 191,
       "column": 3,
-      "index": 11774
+      "index": 11634
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Market Button",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 194,
+      "line": 192,
       "column": 16,
-      "index": 11792
+      "index": 11652
     },
     "end": {
-      "line": 197,
+      "line": 195,
       "column": 3,
-      "index": 11877
+      "index": 11737
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Limit",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 198,
+      "line": 196,
       "column": 15,
-      "index": 11894
+      "index": 11754
     },
     "end": {
-      "line": 201,
+      "line": 199,
       "column": 3,
-      "index": 11970
+      "index": 11830
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 202,
+      "line": 200,
       "column": 12,
-      "index": 11984
+      "index": 11844
     },
     "end": {
-      "line": 205,
+      "line": 203,
       "column": 3,
-      "index": 12061
+      "index": 11921
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 206,
+      "line": 204,
       "column": 10,
-      "index": 12073
+      "index": 11933
     },
     "end": {
-      "line": 209,
+      "line": 207,
       "column": 3,
-      "index": 12146
+      "index": 12006
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 210,
+      "line": 208,
       "column": 18,
-      "index": 12166
+      "index": 12026
     },
     "end": {
-      "line": 213,
+      "line": 211,
       "column": 3,
-      "index": 12255
+      "index": 12115
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 214,
+      "line": 212,
       "column": 11,
-      "index": 12268
+      "index": 12128
     },
     "end": {
-      "line": 217,
+      "line": 215,
       "column": 3,
-      "index": 12342
+      "index": 12202
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Select Token",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 218,
+      "line": 216,
       "column": 15,
-      "index": 12359
+      "index": 12219
     },
     "end": {
-      "line": 221,
+      "line": 219,
       "column": 3,
-      "index": 12442
+      "index": 12302
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Market Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 222,
+      "line": 220,
       "column": 15,
-      "index": 12459
+      "index": 12319
     },
     "end": {
-      "line": 225,
+      "line": 223,
       "column": 3,
-      "index": 12542
+      "index": 12402
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Market price is the best price available on the market among several DEXes that lets you buy or sell an asset instantly.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 226,
+      "line": 224,
       "column": 19,
-      "index": 12563
+      "index": 12423
     },
     "end": {
-      "line": 230,
+      "line": 228,
       "column": 3,
-      "index": 12764
+      "index": 12624
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Limit price in a DEX is a specific pre-set price at which you can trade an asset. Unlike market orders, which execute immediately at the current market price, limit orders are set to execute only when the market reaches the trader's specified price.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 231,
+      "line": 229,
       "column": 18,
-      "index": 12784
+      "index": 12644
     },
     "end": {
-      "line": 235,
+      "line": 233,
       "column": 3,
-      "index": 13113
+      "index": 12973
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Limit Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 236,
+      "line": 234,
       "column": 14,
-      "index": 13129
+      "index": 12989
     },
     "end": {
-      "line": 239,
+      "line": 237,
       "column": 3,
-      "index": 13210
+      "index": 13070
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 240,
+      "line": 238,
       "column": 21,
-      "index": 13233
+      "index": 13093
     },
     "end": {
-      "line": 243,
+      "line": 241,
       "column": 3,
-      "index": 13328
+      "index": 13188
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Slippage must be a number between 0 and 75 and have up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 244,
+      "line": 242,
       "column": 26,
-      "index": 13356
+      "index": 13216
     },
     "end": {
-      "line": 247,
+      "line": 245,
       "column": 3,
-      "index": 13505
+      "index": 13365
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Slippage Tolerance Info",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 248,
+      "line": 246,
       "column": 25,
-      "index": 13532
+      "index": 13392
     },
     "end": {
-      "line": 251,
+      "line": 249,
       "column": 3,
-      "index": 13636
+      "index": 13496
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Verified by {pool}",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 252,
+      "line": 250,
       "column": 14,
-      "index": 13652
+      "index": 13512
     },
     "end": {
-      "line": 255,
+      "line": 253,
       "column": 3,
-      "index": 13740
+      "index": 13600
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!This asset is in my portfolio",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 256,
+      "line": 254,
       "column": 12,
-      "index": 13754
+      "index": 13614
     },
     "end": {
-      "line": 259,
+      "line": 257,
       "column": 3,
-      "index": 13851
+      "index": 13711
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 260,
+      "line": 258,
       "column": 16,
-      "index": 13869
+      "index": 13729
     },
     "end": {
-      "line": 263,
+      "line": 261,
       "column": 3,
-      "index": 14007
+      "index": 13867
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!(auto)",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 264,
+      "line": 262,
       "column": 12,
-      "index": 14021
+      "index": 13881
     },
     "end": {
-      "line": 267,
+      "line": 265,
       "column": 3,
-      "index": 14095
+      "index": 13955
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!change dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 268,
+      "line": 266,
       "column": 14,
-      "index": 14111
+      "index": 13971
     },
     "end": {
-      "line": 271,
+      "line": 269,
       "column": 3,
-      "index": 14191
+      "index": 14051
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 272,
+      "line": 270,
       "column": 14,
-      "index": 14207
+      "index": 14067
     },
     "end": {
-      "line": 276,
+      "line": 274,
       "column": 3,
-      "index": 14388
+      "index": 14248
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Min ADA",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 277,
+      "line": 275,
       "column": 19,
-      "index": 14409
+      "index": 14269
     },
     "end": {
-      "line": 280,
+      "line": 278,
       "column": 3,
-      "index": 14491
+      "index": 14351
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Swap is not available on testnet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 281,
+      "line": 279,
       "column": 22,
-      "index": 14515
+      "index": 14375
     },
     "end": {
-      "line": 284,
+      "line": 282,
       "column": 3,
-      "index": 14625
+      "index": 14485
     }
   },
   {
@@ -424,44 +424,14 @@
     "defaultMessage": "!!!Switch to mainnet if you want to use the feature and swap real tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 285,
+      "line": 283,
       "column": 21,
-      "index": 14648
+      "index": 14508
     },
     "end": {
-      "line": 288,
+      "line": 286,
       "column": 3,
-      "index": 14794
-    }
-  },
-  {
-    "id": "swap.swapScreen.sanchoNoticeTitle",
-    "defaultMessage": "!!!Swap is not available on sanchonet",
-    "file": "src/features/Swap/common/strings.ts",
-    "start": {
-      "line": 289,
-      "column": 21,
-      "index": 14817
-    },
-    "end": {
-      "line": 292,
-      "column": 3,
-      "index": 14928
-    }
-  },
-  {
-    "id": "swap.swapScreen.sanchoNoticeText",
-    "defaultMessage": "!!!Switch to mainnet if you want to use the feature and swap real tokens",
-    "file": "src/features/Swap/common/strings.ts",
-    "start": {
-      "line": 293,
-      "column": 20,
-      "index": 14950
-    },
-    "end": {
-      "line": 296,
-      "column": 3,
-      "index": 15095
+      "index": 14654
     }
   },
   {
@@ -469,14 +439,14 @@
     "defaultMessage": "!!!Fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 297,
+      "line": 287,
       "column": 17,
-      "index": 15114
+      "index": 14673
     },
     "end": {
-      "line": 300,
+      "line": 290,
       "column": 3,
-      "index": 15191
+      "index": 14750
     }
   },
   {
@@ -484,14 +454,14 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 301,
+      "line": 291,
       "column": 20,
-      "index": 15213
+      "index": 14772
     },
     "end": {
-      "line": 304,
+      "line": 294,
       "column": 3,
-      "index": 15311
+      "index": 14870
     }
   },
   {
@@ -499,14 +469,14 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 305,
+      "line": 295,
       "column": 18,
-      "index": 15331
+      "index": 14890
     },
     "end": {
-      "line": 308,
+      "line": 298,
       "column": 3,
-      "index": 15427
+      "index": 14986
     }
   },
   {
@@ -514,14 +484,14 @@
     "defaultMessage": "!!!Liquidity provider fee is a fixed <b>{fee}%</b> operational fee from the whole transaction volume, that is taken to support DEX “liquidity” allowing traders to buy and sell assets on the decentralized Cardano network.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 309,
+      "line": 299,
       "column": 24,
-      "index": 15453
+      "index": 15012
     },
     "end": {
-      "line": 313,
+      "line": 303,
       "column": 3,
-      "index": 15756
+      "index": 15315
     }
   },
   {
@@ -529,14 +499,14 @@
     "defaultMessage": "!!!Minimum amount of assets you can get because of the slippage tolerance.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 314,
+      "line": 304,
       "column": 19,
-      "index": 15777
+      "index": 15336
     },
     "end": {
-      "line": 317,
+      "line": 307,
       "column": 3,
-      "index": 15923
+      "index": 15482
     }
   },
   {
@@ -544,14 +514,14 @@
     "defaultMessage": "!!!Min Received",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 318,
+      "line": 308,
       "column": 24,
-      "index": 15949
+      "index": 15508
     },
     "end": {
-      "line": 321,
+      "line": 311,
       "column": 3,
-      "index": 16041
+      "index": 15600
     }
   },
   {
@@ -559,14 +529,14 @@
     "defaultMessage": "!!!Enter a value from 0% to 75%. You can also enter up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 322,
+      "line": 312,
       "column": 17,
-      "index": 16060
+      "index": 15619
     },
     "end": {
-      "line": 325,
+      "line": 315,
       "column": 3,
-      "index": 16197
+      "index": 15756
     }
   },
   {
@@ -574,14 +544,14 @@
     "defaultMessage": "!!!{pool} verification",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 326,
+      "line": 316,
       "column": 20,
-      "index": 16219
+      "index": 15778
     },
     "end": {
-      "line": 329,
+      "line": 319,
       "column": 3,
-      "index": 16314
+      "index": 15873
     }
   },
   {
@@ -589,14 +559,14 @@
     "defaultMessage": "!!!Volume, 24h",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 330,
+      "line": 320,
       "column": 10,
-      "index": 16326
+      "index": 15885
     },
     "end": {
-      "line": 333,
+      "line": 323,
       "column": 3,
-      "index": 16403
+      "index": 15962
     }
   },
   {
@@ -604,14 +574,14 @@
     "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 334,
+      "line": 324,
       "column": 24,
-      "index": 16429
+      "index": 15988
     },
     "end": {
-      "line": 338,
+      "line": 328,
       "column": 3,
-      "index": 16711
+      "index": 16270
     }
   },
   {
@@ -619,14 +589,14 @@
     "defaultMessage": "!!! Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 339,
+      "line": 329,
       "column": 9,
-      "index": 16722
+      "index": 16281
     },
     "end": {
-      "line": 342,
+      "line": 332,
       "column": 3,
-      "index": 16784
+      "index": 16343
     }
   },
   {
@@ -634,14 +604,14 @@
     "defaultMessage": "!!!No assets found for this pair",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 343,
+      "line": 333,
       "column": 17,
-      "index": 16803
+      "index": 16362
     },
     "end": {
-      "line": 346,
+      "line": 336,
       "column": 3,
-      "index": 16905
+      "index": 16464
     }
   },
   {
@@ -649,14 +619,14 @@
     "defaultMessage": "!!!No assets found for \"{search}\"",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 347,
+      "line": 337,
       "column": 20,
-      "index": 16927
+      "index": 16486
     },
     "end": {
-      "line": 350,
+      "line": 340,
       "column": 3,
-      "index": 17033
+      "index": 16592
     }
   },
   {
@@ -664,14 +634,14 @@
     "defaultMessage": "!!!Each verified tokens gets",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 351,
+      "line": 341,
       "column": 21,
-      "index": 17056
+      "index": 16615
     },
     "end": {
-      "line": 354,
+      "line": 344,
       "column": 3,
-      "index": 17158
+      "index": 16717
     }
   },
   {
@@ -679,14 +649,14 @@
     "defaultMessage": "!!!verified badge",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 355,
+      "line": 345,
       "column": 17,
-      "index": 17177
+      "index": 16736
     },
     "end": {
-      "line": 358,
+      "line": 348,
       "column": 3,
-      "index": 17264
+      "index": 16823
     }
   },
   {
@@ -694,14 +664,14 @@
     "defaultMessage": "!!!Open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 359,
+      "line": 349,
       "column": 14,
-      "index": 17280
+      "index": 16839
     },
     "end": {
-      "line": 362,
+      "line": 352,
       "column": 3,
-      "index": 17361
+      "index": 16920
     }
   },
   {
@@ -709,14 +679,14 @@
     "defaultMessage": "!!!Completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 363,
+      "line": 353,
       "column": 19,
-      "index": 17382
+      "index": 16941
     },
     "end": {
-      "line": 366,
+      "line": 356,
       "column": 3,
-      "index": 17473
+      "index": 17032
     }
   },
   {
@@ -724,14 +694,14 @@
     "defaultMessage": "!!!TVL",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 367,
+      "line": 357,
       "column": 7,
-      "index": 17482
+      "index": 17041
     },
     "end": {
-      "line": 370,
+      "line": 360,
       "column": 3,
-      "index": 17548
+      "index": 17107
     }
   },
   {
@@ -739,14 +709,14 @@
     "defaultMessage": "!!! Dex Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 371,
+      "line": 361,
       "column": 11,
-      "index": 17561
+      "index": 17120
     },
     "end": {
-      "line": 374,
+      "line": 364,
       "column": 3,
-      "index": 17636
+      "index": 17195
     }
   },
   {
@@ -754,14 +724,14 @@
     "defaultMessage": "!!! Batcher Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 375,
+      "line": 365,
       "column": 14,
-      "index": 17652
+      "index": 17211
     },
     "end": {
-      "line": 378,
+      "line": 368,
       "column": 3,
-      "index": 17734
+      "index": 17293
     }
   },
   {
@@ -769,14 +739,14 @@
     "defaultMessage": "!!!Limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 379,
+      "line": 369,
       "column": 26,
-      "index": 17762
+      "index": 17321
     },
     "end": {
-      "line": 382,
+      "line": 372,
       "column": 3,
-      "index": 17855
+      "index": 17414
     }
   },
   {
@@ -784,14 +754,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 383,
+      "line": 373,
       "column": 32,
-      "index": 17889
+      "index": 17448
     },
     "end": {
-      "line": 388,
+      "line": 378,
       "column": 3,
-      "index": 18109
+      "index": 17668
     }
   },
   {
@@ -799,14 +769,14 @@
     "defaultMessage": "!!!Your limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 389,
+      "line": 379,
       "column": 30,
-      "index": 18141
+      "index": 17700
     },
     "end": {
-      "line": 392,
+      "line": 382,
       "column": 3,
-      "index": 18243
+      "index": 17802
     }
   },
   {
@@ -814,14 +784,14 @@
     "defaultMessage": "!!!Market price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 393,
+      "line": 383,
       "column": 32,
-      "index": 18277
+      "index": 17836
     },
     "end": {
-      "line": 396,
+      "line": 386,
       "column": 3,
-      "index": 18377
+      "index": 17936
     }
   },
   {
@@ -829,14 +799,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 397,
+      "line": 387,
       "column": 25,
-      "index": 18404
+      "index": 17963
     },
     "end": {
-      "line": 400,
+      "line": 390,
       "column": 3,
-      "index": 18489
+      "index": 18048
     }
   },
   {
@@ -844,14 +814,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 401,
+      "line": 391,
       "column": 28,
-      "index": 18519
+      "index": 18078
     },
     "end": {
-      "line": 404,
+      "line": 394,
       "column": 3,
-      "index": 18607
+      "index": 18166
     }
   },
   {
@@ -859,14 +829,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 405,
+      "line": 395,
       "column": 21,
-      "index": 18630
+      "index": 18189
     },
     "end": {
-      "line": 408,
+      "line": 398,
       "column": 3,
-      "index": 18728
+      "index": 18287
     }
   },
   {
@@ -874,14 +844,14 @@
     "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 409,
+      "line": 399,
       "column": 22,
-      "index": 18752
+      "index": 18311
     },
     "end": {
-      "line": 412,
+      "line": 402,
       "column": 3,
-      "index": 18918
+      "index": 18477
     }
   },
   {
@@ -889,14 +859,14 @@
     "defaultMessage": "!!! dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 413,
+      "line": 403,
       "column": 7,
-      "index": 18927
+      "index": 18486
     },
     "end": {
-      "line": 416,
+      "line": 406,
       "column": 3,
-      "index": 18994
+      "index": 18553
     }
   },
   {
@@ -904,14 +874,14 @@
     "defaultMessage": "!!!see on explorer",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 417,
+      "line": 407,
       "column": 17,
-      "index": 19013
+      "index": 18572
     },
     "end": {
-      "line": 420,
+      "line": 410,
       "column": 3,
-      "index": 19101
+      "index": 18660
     }
   },
   {
@@ -919,14 +889,14 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 421,
+      "line": 411,
       "column": 9,
-      "index": 19112
+      "index": 18671
     },
     "end": {
-      "line": 424,
+      "line": 414,
       "column": 3,
-      "index": 19185
+      "index": 18744
     }
   },
   {
@@ -934,14 +904,14 @@
     "defaultMessage": "!!!Clear",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 425,
+      "line": 415,
       "column": 9,
-      "index": 19196
+      "index": 18755
     },
     "end": {
-      "line": 428,
+      "line": 418,
       "column": 3,
-      "index": 19257
+      "index": 18816
     }
   },
   {
@@ -949,14 +919,14 @@
     "defaultMessage": "!!!Sign transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 429,
+      "line": 419,
       "column": 19,
-      "index": 19278
+      "index": 18837
     },
     "end": {
-      "line": 432,
+      "line": 422,
       "column": 3,
-      "index": 19360
+      "index": 18919
     }
   },
   {
@@ -964,14 +934,14 @@
     "defaultMessage": "!!!Spending Password",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 433,
+      "line": 423,
       "column": 20,
-      "index": 19382
+      "index": 18941
     },
     "end": {
-      "line": 436,
+      "line": 426,
       "column": 3,
-      "index": 19466
+      "index": 19025
     }
   },
   {
@@ -979,14 +949,14 @@
     "defaultMessage": "!!!Enter spending password to sign this transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 437,
+      "line": 427,
       "column": 25,
-      "index": 19493
+      "index": 19052
     },
     "end": {
-      "line": 440,
+      "line": 430,
       "column": 3,
-      "index": 19613
+      "index": 19172
     }
   },
   {
@@ -994,14 +964,14 @@
     "defaultMessage": "!!!Sign",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 441,
+      "line": 431,
       "column": 8,
-      "index": 19623
+      "index": 19182
     },
     "end": {
-      "line": 444,
+      "line": 434,
       "column": 3,
-      "index": 19682
+      "index": 19241
     }
   },
   {
@@ -1009,14 +979,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 445,
+      "line": 435,
       "column": 14,
-      "index": 19698
+      "index": 19257
     },
     "end": {
-      "line": 448,
+      "line": 438,
       "column": 3,
-      "index": 19757
+      "index": 19316
     }
   },
   {
@@ -1024,14 +994,14 @@
     "defaultMessage": "!!!completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 449,
+      "line": 439,
       "column": 23,
-      "index": 19782
+      "index": 19341
     },
     "end": {
-      "line": 452,
+      "line": 442,
       "column": 3,
-      "index": 19867
+      "index": 19426
     }
   },
   {
@@ -1039,14 +1009,14 @@
     "defaultMessage": "!!!open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 453,
+      "line": 443,
       "column": 18,
-      "index": 19887
+      "index": 19446
     },
     "end": {
-      "line": 456,
+      "line": 446,
       "column": 3,
-      "index": 19962
+      "index": 19521
     }
   },
   {
@@ -1054,14 +1024,14 @@
     "defaultMessage": "!!!Confirm order cancellation",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 457,
+      "line": 447,
       "column": 24,
-      "index": 19988
+      "index": 19547
     },
     "end": {
-      "line": 460,
+      "line": 450,
       "column": 3,
-      "index": 20085
+      "index": 19644
     }
   },
   {
@@ -1069,14 +1039,14 @@
     "defaultMessage": "!!!Cancel order",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 461,
+      "line": 451,
       "column": 29,
-      "index": 20116
+      "index": 19675
     },
     "end": {
-      "line": 464,
+      "line": 454,
       "column": 3,
-      "index": 20203
+      "index": 19762
     }
   },
   {
@@ -1084,14 +1054,14 @@
     "defaultMessage": "!!!Are you sure you want to cancel this order?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 465,
+      "line": 455,
       "column": 31,
-      "index": 20236
+      "index": 19795
     },
     "end": {
-      "line": 468,
+      "line": 458,
       "column": 3,
-      "index": 20357
+      "index": 19916
     }
   },
   {
@@ -1099,14 +1069,14 @@
     "defaultMessage": "!!!Learn more about swap orders in Yoroi",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 469,
+      "line": 459,
       "column": 23,
-      "index": 20382
+      "index": 19941
     },
     "end": {
-      "line": 472,
+      "line": 462,
       "column": 3,
-      "index": 20489
+      "index": 20048
     }
   },
   {
@@ -1114,14 +1084,14 @@
     "defaultMessage": "!!!Asset price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 473,
+      "line": 463,
       "column": 29,
-      "index": 20520
+      "index": 20079
     },
     "end": {
-      "line": 476,
+      "line": 466,
       "column": 3,
-      "index": 20607
+      "index": 20166
     }
   },
   {
@@ -1129,14 +1099,14 @@
     "defaultMessage": "!!!Asset amount",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 477,
+      "line": 467,
       "column": 30,
-      "index": 20639
+      "index": 20198
     },
     "end": {
-      "line": 480,
+      "line": 470,
       "column": 3,
-      "index": 20728
+      "index": 20287
     }
   },
   {
@@ -1144,14 +1114,14 @@
     "defaultMessage": "!!!Total returned",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 481,
+      "line": 471,
       "column": 32,
-      "index": 20762
+      "index": 20321
     },
     "end": {
-      "line": 484,
+      "line": 474,
       "column": 3,
-      "index": 20855
+      "index": 20414
     }
   },
   {
@@ -1159,14 +1129,14 @@
     "defaultMessage": "!!!Cancellation Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 485,
+      "line": 475,
       "column": 34,
-      "index": 20891
+      "index": 20450
     },
     "end": {
-      "line": 488,
+      "line": 478,
       "column": 3,
-      "index": 20988
+      "index": 20547
     }
   },
   {
@@ -1174,14 +1144,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 489,
+      "line": 479,
       "column": 26,
-      "index": 21016
+      "index": 20575
     },
     "end": {
-      "line": 492,
+      "line": 482,
       "column": 3,
-      "index": 21096
+      "index": 20655
     }
   },
   {
@@ -1189,14 +1159,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 493,
+      "line": 483,
       "column": 23,
-      "index": 21121
+      "index": 20680
     },
     "end": {
-      "line": 496,
+      "line": 486,
       "column": 3,
-      "index": 21195
+      "index": 20754
     }
   },
   {
@@ -1204,14 +1174,14 @@
     "defaultMessage": "!!!Total",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 497,
+      "line": 487,
       "column": 19,
-      "index": 21216
+      "index": 20775
     },
     "end": {
-      "line": 500,
+      "line": 490,
       "column": 3,
-      "index": 21286
+      "index": 20845
     }
   },
   {
@@ -1219,14 +1189,14 @@
     "defaultMessage": "!!!Liquidity Pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 501,
+      "line": 491,
       "column": 27,
-      "index": 21315
+      "index": 20874
     },
     "end": {
-      "line": 504,
+      "line": 494,
       "column": 3,
-      "index": 21402
+      "index": 20961
     }
   },
   {
@@ -1234,14 +1204,14 @@
     "defaultMessage": "!!!Time Created",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 505,
+      "line": 495,
       "column": 25,
-      "index": 21429
+      "index": 20988
     },
     "end": {
-      "line": 508,
+      "line": 498,
       "column": 3,
-      "index": 21512
+      "index": 21071
     }
   },
   {
@@ -1249,14 +1219,14 @@
     "defaultMessage": "!!!Time Completed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 509,
+      "line": 499,
       "column": 27,
-      "index": 21541
+      "index": 21100
     },
     "end": {
-      "line": 512,
+      "line": 502,
       "column": 3,
-      "index": 21628
+      "index": 21187
     }
   },
   {
@@ -1264,14 +1234,14 @@
     "defaultMessage": "!!!Transaction ID",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 513,
+      "line": 503,
       "column": 18,
-      "index": 21648
+      "index": 21207
     },
     "end": {
-      "line": 516,
+      "line": 506,
       "column": 3,
-      "index": 21726
+      "index": 21285
     }
   },
   {
@@ -1279,14 +1249,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 517,
+      "line": 507,
       "column": 26,
-      "index": 21754
+      "index": 21313
     },
     "end": {
-      "line": 520,
+      "line": 510,
       "column": 3,
-      "index": 21872
+      "index": 21431
     }
   },
   {
@@ -1294,14 +1264,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 521,
+      "line": 511,
       "column": 18,
-      "index": 21892
+      "index": 21451
     },
     "end": {
-      "line": 526,
+      "line": 516,
       "column": 3,
-      "index": 22121
+      "index": 21680
     }
   },
   {
@@ -1309,14 +1279,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 527,
+      "line": 517,
       "column": 13,
-      "index": 22136
+      "index": 21695
     },
     "end": {
-      "line": 530,
+      "line": 520,
       "column": 3,
-      "index": 22250
+      "index": 21809
     }
   },
   {
@@ -1324,14 +1294,14 @@
     "defaultMessage": "!!! USB connection is blocked by iOS devices",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 531,
+      "line": 521,
       "column": 26,
-      "index": 22278
+      "index": 21837
     },
     "end": {
-      "line": 534,
+      "line": 524,
       "column": 3,
-      "index": 22430
+      "index": 21989
     }
   },
   {
@@ -1339,14 +1309,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 535,
+      "line": 525,
       "column": 24,
-      "index": 22456
+      "index": 22015
     },
     "end": {
-      "line": 538,
+      "line": 528,
       "column": 3,
-      "index": 22650
+      "index": 22209
     }
   },
   {
@@ -1354,14 +1324,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 539,
+      "line": 529,
       "column": 19,
-      "index": 22671
+      "index": 22230
     },
     "end": {
-      "line": 542,
+      "line": 532,
       "column": 3,
-      "index": 22797
+      "index": 22356
     }
   },
   {
@@ -1369,14 +1339,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 543,
+      "line": 533,
       "column": 18,
-      "index": 22817
+      "index": 22376
     },
     "end": {
-      "line": 546,
+      "line": 536,
       "column": 3,
-      "index": 22927
+      "index": 22486
     }
   },
   {
@@ -1384,14 +1354,14 @@
     "defaultMessage": "!!!Service unavailable",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 547,
+      "line": 537,
       "column": 22,
-      "index": 22951
+      "index": 22510
     },
     "end": {
-      "line": 550,
+      "line": 540,
       "column": 3,
-      "index": 23045
+      "index": 22604
     }
   },
   {
@@ -1399,14 +1369,14 @@
     "defaultMessage": "!!!The server is temporarily busy due to maintenance downtime or capacity problems",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 551,
+      "line": 541,
       "column": 26,
-      "index": 23073
+      "index": 22632
     },
     "end": {
-      "line": 554,
+      "line": 544,
       "column": 3,
-      "index": 23231
+      "index": 22790
     }
   },
   {
@@ -1414,14 +1384,14 @@
     "defaultMessage": "!!!GO TO transactions",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 555,
+      "line": 545,
       "column": 20,
-      "index": 23253
+      "index": 22812
     },
     "end": {
-      "line": 558,
+      "line": 548,
       "column": 3,
-      "index": 23359
+      "index": 22918
     }
   },
   {
@@ -1429,14 +1399,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 561,
+      "line": 551,
       "column": 11,
-      "index": 23418
+      "index": 22977
     },
     "end": {
-      "line": 564,
+      "line": 554,
       "column": 3,
-      "index": 23513
+      "index": 23072
     }
   },
   {
@@ -1444,14 +1414,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 565,
+      "line": 555,
       "column": 12,
-      "index": 23527
+      "index": 23086
     },
     "end": {
-      "line": 568,
+      "line": 558,
       "column": 3,
-      "index": 23630
+      "index": 23189
     }
   },
   {
@@ -1459,14 +1429,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 569,
+      "line": 559,
       "column": 9,
-      "index": 23641
+      "index": 23200
     },
     "end": {
-      "line": 572,
+      "line": 562,
       "column": 3,
-      "index": 23731
+      "index": 23290
     }
   },
   {
@@ -1474,14 +1444,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 573,
+      "line": 563,
       "column": 16,
-      "index": 23749
+      "index": 23308
     },
     "end": {
-      "line": 576,
+      "line": 566,
       "column": 3,
-      "index": 23845
+      "index": 23404
     }
   },
   {
@@ -1489,14 +1459,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 577,
+      "line": 567,
       "column": 20,
-      "index": 23867
+      "index": 23426
     },
     "end": {
-      "line": 580,
+      "line": 570,
       "column": 3,
-      "index": 23956
+      "index": 23515
     }
   },
   {
@@ -1504,14 +1474,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 581,
+      "line": 571,
       "column": 8,
-      "index": 23966
+      "index": 23525
     },
     "end": {
-      "line": 584,
+      "line": 574,
       "column": 3,
-      "index": 24025
+      "index": 23584
     }
   },
   {
@@ -1519,14 +1489,14 @@
     "defaultMessage": "!!!Generate",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 585,
+      "line": 575,
       "column": 20,
-      "index": 24047
+      "index": 23606
     },
     "end": {
-      "line": 588,
+      "line": 578,
       "column": 3,
-      "index": 24145
+      "index": 23704
     }
   },
   {
@@ -1534,14 +1504,14 @@
     "defaultMessage": "!!!Collateral not found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 589,
+      "line": 579,
       "column": 22,
-      "index": 24169
+      "index": 23728
     },
     "end": {
-      "line": 592,
+      "line": 582,
       "column": 3,
-      "index": 24281
+      "index": 23840
     }
   },
   {
@@ -1549,14 +1519,14 @@
     "defaultMessage": "!!!To continue with this action, you need to generate a collateral",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 593,
+      "line": 583,
       "column": 22,
-      "index": 24305
+      "index": 23864
     },
     "end": {
-      "line": 596,
+      "line": 586,
       "column": 3,
-      "index": 24460
+      "index": 24019
     }
   },
   {
@@ -1564,14 +1534,14 @@
     "defaultMessage": "!!!Pending Collateral UTxO",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 597,
+      "line": 587,
       "column": 28,
-      "index": 24490
+      "index": 24049
     },
     "end": {
-      "line": 600,
+      "line": 590,
       "column": 3,
-      "index": 24611
+      "index": 24170
     }
   },
   {
@@ -1579,14 +1549,14 @@
     "defaultMessage": "!!!The collateral UTxO transaction you've submitted is currently in the processing stage, and it may require a few minutes to complete. Please refresh your interface and attempt the action again shortly",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 601,
+      "line": 591,
       "column": 23,
-      "index": 24636
+      "index": 24195
     },
     "end": {
-      "line": 605,
+      "line": 595,
       "column": 3,
-      "index": 24934
+      "index": 24493
     }
   },
   {
@@ -1594,14 +1564,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 606,
+      "line": 596,
       "column": 17,
-      "index": 24953
+      "index": 24512
     },
     "end": {
-      "line": 609,
+      "line": 599,
       "column": 3,
-      "index": 25055
+      "index": 24614
     }
   },
   {
@@ -1609,14 +1579,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 610,
+      "line": 600,
       "column": 16,
-      "index": 25073
+      "index": 24632
     },
     "end": {
-      "line": 613,
+      "line": 603,
       "column": 3,
-      "index": 25228
+      "index": 24787
     }
   },
   {
@@ -1624,14 +1594,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 614,
+      "line": 604,
       "column": 18,
-      "index": 25248
+      "index": 24807
     },
     "end": {
-      "line": 617,
+      "line": 607,
       "column": 3,
-      "index": 25342
+      "index": 24901
     }
   },
   {
@@ -1639,14 +1609,14 @@
     "defaultMessage": "!!!Not enough balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 618,
+      "line": 608,
       "column": 20,
-      "index": 25364
+      "index": 24923
     },
     "end": {
-      "line": 621,
+      "line": 611,
       "column": 3,
-      "index": 25458
+      "index": 25017
     }
   },
   {
@@ -1654,14 +1624,14 @@
     "defaultMessage": "!!!Not enough supply in the pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 622,
+      "line": 612,
       "column": 19,
-      "index": 25479
+      "index": 25038
     },
     "end": {
-      "line": 625,
+      "line": 615,
       "column": 3,
-      "index": 25583
+      "index": 25142
     }
   },
   {
@@ -1669,14 +1639,14 @@
     "defaultMessage": "!!!Not enough balance, please consider the fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 626,
+      "line": 616,
       "column": 23,
-      "index": 25608
+      "index": 25167
     },
     "end": {
-      "line": 629,
+      "line": 619,
       "column": 3,
-      "index": 25731
+      "index": 25290
     }
   },
   {
@@ -1684,14 +1654,14 @@
     "defaultMessage": "!!! This pair is not available in any liquidity pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 630,
+      "line": 620,
       "column": 10,
-      "index": 25743
+      "index": 25302
     },
     "end": {
-      "line": 633,
+      "line": 623,
       "column": 3,
-      "index": 25858
+      "index": 25417
     }
   },
   {
@@ -1699,14 +1669,14 @@
     "defaultMessage": "!!!Continue on Ledger",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 634,
+      "line": 624,
       "column": 20,
-      "index": 25880
+      "index": 25439
     },
     "end": {
-      "line": 637,
+      "line": 627,
       "column": 3,
-      "index": 25980
+      "index": 25539
     }
   },
   {
@@ -1714,14 +1684,14 @@
     "defaultMessage": "!!!Continue",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 638,
+      "line": 628,
       "column": 12,
-      "index": 25994
+      "index": 25553
     },
     "end": {
-      "line": 641,
+      "line": 631,
       "column": 3,
-      "index": 26097
+      "index": 25656
     }
   },
   {
@@ -1729,14 +1699,14 @@
     "defaultMessage": "!!!Slippage Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 642,
+      "line": 632,
       "column": 24,
-      "index": 26123
+      "index": 25682
     },
     "end": {
-      "line": 645,
+      "line": 635,
       "column": 3,
-      "index": 26217
+      "index": 25776
     }
   },
   {
@@ -1744,14 +1714,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 646,
+      "line": 636,
       "column": 23,
-      "index": 26242
+      "index": 25801
     },
     "end": {
-      "line": 650,
+      "line": 640,
       "column": 3,
-      "index": 26445
+      "index": 26004
     }
   },
   {
@@ -1759,14 +1729,14 @@
     "defaultMessage": "!!!Your slippage tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 651,
+      "line": 641,
       "column": 31,
-      "index": 26478
+      "index": 26037
     },
     "end": {
-      "line": 654,
+      "line": 644,
       "column": 3,
-      "index": 26571
+      "index": 26130
     }
   },
   {
@@ -1774,14 +1744,14 @@
     "defaultMessage": "!!!Increase the amount to proceed or change slippage tolerance to 0%",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 655,
+      "line": 645,
       "column": 31,
-      "index": 26604
+      "index": 26163
     },
     "end": {
-      "line": 658,
+      "line": 648,
       "column": 3,
-      "index": 26739
+      "index": 26298
     }
   },
   {
@@ -1789,14 +1759,14 @@
     "defaultMessage": "!!!No orders available yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 659,
+      "line": 649,
       "column": 19,
-      "index": 26760
+      "index": 26319
     },
     "end": {
-      "line": 662,
+      "line": 652,
       "column": 3,
-      "index": 26858
+      "index": 26417
     }
   },
   {
@@ -1804,14 +1774,14 @@
     "defaultMessage": "!!!Start doing SWAP to see your open orders here",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 663,
+      "line": 653,
       "column": 22,
-      "index": 26882
+      "index": 26441
     },
     "end": {
-      "line": 666,
+      "line": 656,
       "column": 3,
-      "index": 27005
+      "index": 26564
     }
   },
   {
@@ -1819,14 +1789,14 @@
     "defaultMessage": "!!!No orders completed yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 667,
+      "line": 657,
       "column": 24,
-      "index": 27031
+      "index": 26590
     },
     "end": {
-      "line": 670,
+      "line": 660,
       "column": 3,
-      "index": 27134
+      "index": 26693
     }
   },
   {
@@ -1834,14 +1804,14 @@
     "defaultMessage": "!!!No orders found for",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 671,
+      "line": 661,
       "column": 30,
-      "index": 27166
+      "index": 26725
     },
     "end": {
-      "line": 674,
+      "line": 664,
       "column": 3,
-      "index": 27271
+      "index": 26830
     }
   },
   {
@@ -1849,14 +1819,14 @@
     "defaultMessage": "!!!No orders found for",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 675,
+      "line": 665,
       "column": 25,
-      "index": 27298
+      "index": 26857
     },
     "end": {
-      "line": 678,
+      "line": 668,
       "column": 3,
-      "index": 27398
+      "index": 26957
     }
   },
   {
@@ -1864,14 +1834,14 @@
     "defaultMessage": "!!!Price Impact",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 679,
+      "line": 669,
       "column": 15,
-      "index": 27415
+      "index": 26974
     },
     "end": {
-      "line": 682,
+      "line": 672,
       "column": 3,
-      "index": 27498
+      "index": 27057
     }
   },
   {
@@ -1879,14 +1849,14 @@
     "defaultMessage": "!!!Price impact over {riskValue}%",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 683,
+      "line": 673,
       "column": 23,
-      "index": 27523
+      "index": 27082
     },
     "end": {
-      "line": 686,
+      "line": 676,
       "column": 3,
-      "index": 27632
+      "index": 27191
     }
   },
   {
@@ -1894,14 +1864,14 @@
     "defaultMessage": "!!!may cause a significant loss of funds. Please bear this in mind and proceed with an extra caution.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 687,
+      "line": 677,
       "column": 30,
-      "index": 27664
+      "index": 27223
     },
     "end": {
-      "line": 691,
+      "line": 681,
       "column": 3,
-      "index": 27854
+      "index": 27413
     }
   },
   {
@@ -1909,14 +1879,14 @@
     "defaultMessage": "!!!may cause a difference in the amount you actually receive. Consider this at your own risk.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 692,
+      "line": 682,
       "column": 34,
-      "index": 27890
+      "index": 27449
     },
     "end": {
-      "line": 695,
+      "line": 685,
       "column": 3,
-      "index": 28070
+      "index": 27629
     }
   },
   {
@@ -1924,14 +1894,14 @@
     "defaultMessage": "!!!Price impact is a difference between the actual market price and your price due to trade size.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 696,
+      "line": 686,
       "column": 19,
-      "index": 28091
+      "index": 27650
     },
     "end": {
-      "line": 699,
+      "line": 689,
       "column": 3,
-      "index": 28260
+      "index": 27819
     }
   },
   {
@@ -1939,14 +1909,14 @@
     "defaultMessage": "!!Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 700,
+      "line": 690,
       "column": 11,
-      "index": 28273
+      "index": 27832
     },
     "end": {
-      "line": 703,
+      "line": 693,
       "column": 3,
-      "index": 28367
+      "index": 27926
     }
   },
   {
@@ -1954,14 +1924,14 @@
     "defaultMessage": "!!!Back to swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 704,
+      "line": 694,
       "column": 20,
-      "index": 28389
+      "index": 27948
     },
     "end": {
-      "line": 707,
+      "line": 697,
       "column": 3,
-      "index": 28484
+      "index": 28043
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
index b3bc604f57..28c77b73ba 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Transactions/TxHistoryNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 404,
+      "line": 394,
       "column": 16,
-      "index": 14827
+      "index": 14436
     },
     "end": {
-      "line": 407,
+      "line": 397,
       "column": 3,
-      "index": 14916
+      "index": 14525
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Address details",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 408,
+      "line": 398,
       "column": 32,
-      "index": 14950
+      "index": 14559
     },
     "end": {
-      "line": 411,
+      "line": 401,
       "column": 3,
-      "index": 15063
+      "index": 14672
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 412,
+      "line": 402,
       "column": 13,
-      "index": 15078
+      "index": 14687
     },
     "end": {
-      "line": 415,
+      "line": 405,
       "column": 3,
-      "index": 15151
+      "index": 14760
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 416,
+      "line": 406,
       "column": 17,
-      "index": 15170
+      "index": 14779
     },
     "end": {
-      "line": 419,
+      "line": 409,
       "column": 3,
-      "index": 15247
+      "index": 14856
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 420,
+      "line": 410,
       "column": 15,
-      "index": 15264
+      "index": 14873
     },
     "end": {
-      "line": 423,
+      "line": 413,
       "column": 3,
-      "index": 15337
+      "index": 14946
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Swap review",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 424,
+      "line": 414,
       "column": 19,
-      "index": 15358
+      "index": 14967
     },
     "end": {
-      "line": 427,
+      "line": 417,
       "column": 3,
-      "index": 15430
+      "index": 15039
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 428,
+      "line": 418,
       "column": 21,
-      "index": 15453
+      "index": 15062
     },
     "end": {
-      "line": 431,
+      "line": 421,
       "column": 3,
-      "index": 15548
+      "index": 15157
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Select pool",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 432,
+      "line": 422,
       "column": 14,
-      "index": 15564
+      "index": 15173
     },
     "end": {
-      "line": 435,
+      "line": 425,
       "column": 3,
-      "index": 15645
+      "index": 15254
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 436,
+      "line": 426,
       "column": 13,
-      "index": 15660
+      "index": 15269
     },
     "end": {
-      "line": 439,
+      "line": 429,
       "column": 3,
-      "index": 15740
+      "index": 15349
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Scan QR code address",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 440,
+      "line": 430,
       "column": 18,
-      "index": 15760
+      "index": 15369
     },
     "end": {
-      "line": 443,
+      "line": 433,
       "column": 3,
-      "index": 15861
+      "index": 15470
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 444,
+      "line": 434,
       "column": 20,
-      "index": 15883
+      "index": 15492
     },
     "end": {
-      "line": 447,
+      "line": 437,
       "column": 3,
-      "index": 15972
+      "index": 15581
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Assets added",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 448,
+      "line": 438,
       "column": 26,
-      "index": 16000
+      "index": 15609
     },
     "end": {
-      "line": 451,
+      "line": 441,
       "column": 3,
-      "index": 16101
+      "index": 15710
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Edit amount",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 452,
+      "line": 442,
       "column": 19,
-      "index": 16122
+      "index": 15731
     },
     "end": {
-      "line": 455,
+      "line": 445,
       "column": 3,
-      "index": 16215
+      "index": 15824
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 456,
+      "line": 446,
       "column": 16,
-      "index": 16233
+      "index": 15842
     },
     "end": {
-      "line": 459,
+      "line": 449,
       "column": 3,
-      "index": 16319
+      "index": 15928
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 460,
+      "line": 450,
       "column": 19,
-      "index": 16340
+      "index": 15949
     },
     "end": {
-      "line": 466,
+      "line": 456,
       "column": 3,
-      "index": 16578
+      "index": 16187
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Confirm transaction",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 467,
+      "line": 457,
       "column": 27,
-      "index": 16607
+      "index": 16216
     },
     "end": {
-      "line": 470,
+      "line": 460,
       "column": 3,
-      "index": 16700
+      "index": 16309
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Please scan a QR code",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 471,
+      "line": 461,
       "column": 13,
-      "index": 16715
+      "index": 16324
     },
     "end": {
-      "line": 474,
+      "line": 464,
       "column": 3,
-      "index": 16790
+      "index": 16399
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Success",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 475,
+      "line": 465,
       "column": 25,
-      "index": 16817
+      "index": 16426
     },
     "end": {
-      "line": 478,
+      "line": 468,
       "column": 3,
-      "index": 16891
+      "index": 16500
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Request specific amount",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 479,
+      "line": 469,
       "column": 18,
-      "index": 16911
+      "index": 16520
     },
     "end": {
-      "line": 482,
+      "line": 472,
       "column": 3,
-      "index": 17025
+      "index": 16634
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Buy/Sell ADA",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 483,
+      "line": 473,
       "column": 28,
-      "index": 17055
+      "index": 16664
     },
     "end": {
-      "line": 486,
+      "line": 476,
       "column": 3,
-      "index": 17151
+      "index": 16760
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Buy provider",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 487,
+      "line": 477,
       "column": 29,
-      "index": 17182
+      "index": 16791
     },
     "end": {
-      "line": 490,
+      "line": 480,
       "column": 3,
-      "index": 17290
+      "index": 16899
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Sell provider",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 491,
+      "line": 481,
       "column": 30,
-      "index": 17322
+      "index": 16931
     },
     "end": {
-      "line": 494,
+      "line": 484,
       "column": 3,
-      "index": 17432
+      "index": 17041
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Tx Details",
     "file": "src/features/Transactions/TxHistoryNavigator.tsx",
     "start": {
-      "line": 495,
+      "line": 485,
       "column": 18,
-      "index": 17452
+      "index": 17061
     },
     "end": {
-      "line": 498,
+      "line": 488,
       "column": 3,
-      "index": 17546
+      "index": 17155
     }
   }
 ]
\ No newline at end of file
diff --git a/e2e/wallet-mobile/screens/chooseNetworkType.screen.ts b/e2e/wallet-mobile/screens/chooseNetworkType.screen.ts
index 84b7b14788..263152d832 100644
--- a/e2e/wallet-mobile/screens/chooseNetworkType.screen.ts
+++ b/e2e/wallet-mobile/screens/chooseNetworkType.screen.ts
@@ -2,6 +2,5 @@ import {by, element} from 'detox'
 
 export const networkMainnetButton = () => element(by.id('setup-network-select-mainnet-button'))
 export const networkTestnetButton = () => element(by.id('setup-network-select-testnet-button'))
-export const networkSanchonetButton = () => element(by.id('setup-network-select-sanchonet-button'))
 export const pageTitleCreateFlow = () => element(by.text('Create wallet'))
 export const pageTitleRestoreFlow = () => element(by.text('Restore wallet'))
diff --git a/packages/api/src/cardano/api/config.ts b/packages/api/src/cardano/api/config.ts
index 8417fd4924..8217c102f4 100644
--- a/packages/api/src/cardano/api/config.ts
+++ b/packages/api/src/cardano/api/config.ts
@@ -10,9 +10,6 @@ export const API_ENDPOINTS: Readonly<
   [Chain.Network.Preprod]: {
     root: 'https://yoroi-backend-zero-preprod.emurgornd.com',
   },
-  [Chain.Network.Sancho]: {
-    root: 'https://yoroi-backend-zero-sanchonet.emurgornd.com',
-  },
   [Chain.Network.Preview]: {
     root: 'https://yoroi-backend-zero-preview.emurgornd.com',
   },
diff --git a/packages/dapp-connector/src/adapters/api.test.ts b/packages/dapp-connector/src/adapters/api.test.ts
index 79cfad55af..618eb8b102 100644
--- a/packages/dapp-connector/src/adapters/api.test.ts
+++ b/packages/dapp-connector/src/adapters/api.test.ts
@@ -76,18 +76,6 @@ describe('dappConnectorApiMaker', () => {
       })
     })
 
-    it('should support sancho', async () => {
-      const fakeResult = {tag: 'right' as const, value: {data: await managerMock.getDAppList()}} as const
-      const fakeFetchData = () => Promise.resolve(fakeResult)
-      const result = await dappConnectorApiMaker({request: fakeFetchData as any}).getDApps({
-        network: Chain.Network.Sancho,
-      })
-      expect(result).toEqual({
-        ...fakeResult.value.data,
-        dapps: fakeResult.value.data.dapps.map((d) => ({...d, logo: 'https://daehx1qv45z7c.cloudfront.net/icon.png'})),
-      })
-    })
-
     it('should throw on unsupported chain id', async () => {
       const fakeResult = {tag: 'right' as const, value: {data: await managerMock.getDAppList()}} as const
       const fakeFetchData = () => Promise.resolve(fakeResult)
diff --git a/packages/dapp-connector/src/adapters/api.ts b/packages/dapp-connector/src/adapters/api.ts
index d5822535c9..6e760f6f5b 100644
--- a/packages/dapp-connector/src/adapters/api.ts
+++ b/packages/dapp-connector/src/adapters/api.ts
@@ -7,7 +7,6 @@ import {Chain} from '@yoroi/types'
 const dappListHosts: Readonly<Record<Chain.SupportedNetworks, string>> = freeze({
   [Chain.Network.Mainnet]: 'https://daehx1qv45z7c.cloudfront.net/data.json',
   [Chain.Network.Preprod]: 'https://daehx1qv45z7c.cloudfront.net/preprod.json',
-  [Chain.Network.Sancho]: 'https://daehx1qv45z7c.cloudfront.net/sancho.json',
   [Chain.Network.Preview]: 'https://daehx1qv45z7c.cloudfront.net/preview.json',
 })
 
diff --git a/packages/explorers/README.md b/packages/explorers/README.md
index dd4410302d..97c9d1fe1a 100644
--- a/packages/explorers/README.md
+++ b/packages/explorers/README.md
@@ -32,11 +32,14 @@ import {explorerManager} from '@yoroi/explorers'
 const mainnetExplorer = explorerManager[Chain.Network.Mainnet]
 
 // Generate URLs using CardanoScan explorer
-const tokenUrl = mainnetExplorer[Explorers.Explorer.CardanoScan].token('fingerprint')
-const addressUrl = mainnetExplorer[Explorers.Explorer.CardanoScan].address('address')
+const tokenUrl =
+  mainnetExplorer[Explorers.Explorer.CardanoScan].token('fingerprint')
+const addressUrl =
+  mainnetExplorer[Explorers.Explorer.CardanoScan].address('address')
 const txUrl = mainnetExplorer[Explorers.Explorer.CardanoScan].tx('txHash')
 const poolUrl = mainnetExplorer[Explorers.Explorer.CardanoScan].pool('poolId')
-const stakeUrl = mainnetExplorer[Explorers.Explorer.CardanoScan].stake('stakeAddress')
+const stakeUrl =
+  mainnetExplorer[Explorers.Explorer.CardanoScan].stake('stakeAddress')
 
 console.log(tokenUrl) // Output: https://cardanoscan.io/token/fingerprint
 console.log(addressUrl) // Output: https://cardanoscan.io/address/address
@@ -55,12 +58,12 @@ Networks:
 
 1. Mainnet: The live network for Cardano.
 2. Preprod: The pre-production network for testing.
-3. Sancho: The temporary Conway test network for governance.
-4. Preview: A preview network for new features.
+3. Preview: A preview network for new features.
 
 Explorers:
 
 1. CardanoScan: A popular Cardano blockchain explorer.
+
    1. [Twitter ![X](https://img.icons8.com/ios-filled/12/000000/x.png)](https://twitter.com/cardanoscan.io)
    2. [Discord ![Discord](https://img.icons8.com/ios-filled/12/000000/discord-logo.png)](https://discord.gg/WQFPHNXcz8)
    3. [Explorer](https://cardanoscan.io)
@@ -103,7 +106,7 @@ If you are a developer working on a new Cardano explorer and want to add support
         pool: (poolId: string) => `https://yourexplorer.io/pool/${poolId}`,
         stake: (stakeAddress: string) => `https://yourexplorer.io/stake/${stakeAddress}`,
      },
-   }, 
+   },
    ```
 
 3. Test Your Implementation
diff --git a/packages/explorers/src/explorer-manager.test.ts b/packages/explorers/src/explorer-manager.test.ts
index e8f000f5d6..aba88ad7df 100644
--- a/packages/explorers/src/explorer-manager.test.ts
+++ b/packages/explorers/src/explorer-manager.test.ts
@@ -37,22 +37,6 @@ describe('explorerManager', () => {
           stake: expect.any(Function),
         },
       },
-      [Chain.Network.Sancho]: {
-        [Explorers.Explorer.CardanoScan]: {
-          token: expect.any(Function),
-          address: expect.any(Function),
-          tx: expect.any(Function),
-          pool: expect.any(Function),
-          stake: expect.any(Function),
-        },
-        [Explorers.Explorer.CExplorer]: {
-          token: expect.any(Function),
-          address: expect.any(Function),
-          tx: expect.any(Function),
-          pool: expect.any(Function),
-          stake: expect.any(Function),
-        },
-      },
       [Chain.Network.Preview]: {
         [Explorers.Explorer.CardanoScan]: {
           token: expect.any(Function),
@@ -142,41 +126,6 @@ describe('explorerManager', () => {
     ).toBe('https://preprod.cexplorer.io/stake/stakeAddress')
   })
 
-  it('should generate the correct URLs for Sancho', () => {
-    const sanchoExplorer = explorerManager[Chain.Network.Sancho]
-    expect(
-      sanchoExplorer[Explorers.Explorer.CardanoScan].token('fingerprint'),
-    ).toBe('https://sancho.cardanoscan.io/token/fingerprint')
-    expect(
-      sanchoExplorer[Explorers.Explorer.CardanoScan].address('address'),
-    ).toBe('https://sancho.cardanoscan.io/address/address')
-    expect(sanchoExplorer[Explorers.Explorer.CardanoScan].tx('txHash')).toBe(
-      'https://sancho.cardanoscan.io/transaction/txHash',
-    )
-    expect(sanchoExplorer[Explorers.Explorer.CardanoScan].pool('poolId')).toBe(
-      'https://sancho.cardanoscan.io/pool/poolId',
-    )
-    expect(
-      sanchoExplorer[Explorers.Explorer.CardanoScan].stake('stakeAddress'),
-    ).toBe('https://sancho.cardanoscan.io/stakeKey/stakeAddress')
-
-    expect(
-      sanchoExplorer[Explorers.Explorer.CExplorer].token('fingerprint'),
-    ).toBe('https://sancho.cexplorer.io/asset/fingerprint')
-    expect(
-      sanchoExplorer[Explorers.Explorer.CExplorer].address('address'),
-    ).toBe('https://sancho.cexplorer.io/address/address')
-    expect(sanchoExplorer[Explorers.Explorer.CExplorer].tx('txHash')).toBe(
-      'https://sancho.cexplorer.io/tx/txHash',
-    )
-    expect(sanchoExplorer[Explorers.Explorer.CExplorer].pool('poolId')).toBe(
-      'https://sancho.cexplorer.io/pool/poolId',
-    )
-    expect(
-      sanchoExplorer[Explorers.Explorer.CExplorer].stake('stakeAddress'),
-    ).toBe('https://sancho.cexplorer.io/stake/stakeAddress')
-  })
-
   it('should generate the correct URLs for Preview', () => {
     const previewExplorer = explorerManager[Chain.Network.Preview]
     expect(
diff --git a/packages/explorers/src/explorer-manager.ts b/packages/explorers/src/explorer-manager.ts
index eb57658abb..a3f227fb56 100644
--- a/packages/explorers/src/explorer-manager.ts
+++ b/packages/explorers/src/explorer-manager.ts
@@ -44,26 +44,6 @@ export const explorerManager: Readonly<
         `https://preprod.cexplorer.io/stake/${stakeAddress}`,
     },
   },
-  [Chain.Network.Sancho]: {
-    [Explorers.Explorer.CardanoScan]: {
-      token: (fingerprint) =>
-        `https://sancho.cardanoscan.io/token/${fingerprint}`,
-      address: (address) => `https://sancho.cardanoscan.io/address/${address}`,
-      tx: (txHash) => `https://sancho.cardanoscan.io/transaction/${txHash}`,
-      pool: (poolId) => `https://sancho.cardanoscan.io/pool/${poolId}`,
-      stake: (stakeAddress) =>
-        `https://sancho.cardanoscan.io/stakeKey/${stakeAddress}`,
-    },
-    [Explorers.Explorer.CExplorer]: {
-      token: (fingerprint) =>
-        `https://sancho.cexplorer.io/asset/${fingerprint}`,
-      address: (address) => `https://sancho.cexplorer.io/address/${address}`,
-      tx: (txHash) => `https://sancho.cexplorer.io/tx/${txHash}`,
-      pool: (poolId) => `https://sancho.cexplorer.io/pool/${poolId}`,
-      stake: (stakeAddress) =>
-        `https://sancho.cexplorer.io/stake/${stakeAddress}`,
-    },
-  },
   [Chain.Network.Preview]: {
     [Explorers.Explorer.CardanoScan]: {
       token: (fingerprint) =>
diff --git a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
index a101999e22..a477e51c99 100644
--- a/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
+++ b/packages/portfolio/src/adapters/dullahan-api/api-maker.ts
@@ -391,22 +391,6 @@ export const apiConfig: ApiConfig = freeze(
       tokenImageInvalidate:
         'https://preprod.processed-media.yoroiwallet.com/invalidate',
     },
-    [Chain.Network.Sancho]: {
-      tokenDiscovery:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/discovery',
-      tokenInfo:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/info',
-      tokenInfos:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/info/multi',
-      tokenTraits:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/nft/traits',
-      tokenActivity:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/activity/multi',
-      tokenHistory:
-        'https://yoroi-backend-zero-sanchonet.emurgornd.com/tokens/history/price',
-      tokenImageInvalidate:
-        'https://preprod.processed-media.yoroiwallet.com/invalidate',
-    },
     [Chain.Network.Preview]: {
       tokenDiscovery:
         'https://yoroi-backend-zero-preview.emurgornd.com/tokens/discovery',
diff --git a/packages/staking/src/governance/config.ts b/packages/staking/src/governance/config.ts
index aa6f799bfb..cc154086eb 100644
--- a/packages/staking/src/governance/config.ts
+++ b/packages/staking/src/governance/config.ts
@@ -20,12 +20,6 @@ export const GOVERNANCE_ENDPOINTS: Readonly<
     getDRepById:
       'https://yoroi-backend-zero-preprod.emurgornd.com/dreps/{{DREP_ID}}/state',
   },
-  [Chain.Network.Sancho]: {
-    getStakeKeyState:
-      'https://yoroi-backend-zero-sanchonet.emurgornd.com/stakekeys/{{STAKE_KEY_HASH}}/state',
-    getDRepById:
-      'https://yoroi-backend-zero-sanchonet.emurgornd.com/dreps/{{DREP_ID}}/state',
-  },
   [Chain.Network.Preview]: {
     getStakeKeyState:
       'https://yoroi-backend-zero-preview.emurgornd.com/stakekeys/{{STAKE_KEY_HASH}}/state',
diff --git a/packages/types/src/chain/network.ts b/packages/types/src/chain/network.ts
index 26d2b0fd75..a57c0ff5b1 100644
--- a/packages/types/src/chain/network.ts
+++ b/packages/types/src/chain/network.ts
@@ -3,11 +3,9 @@ export enum ChainNetwork {
   Testnet = 'testnet',
   Preview = 'preview',
   Preprod = 'preprod',
-  Sancho = 'sancho',
 }
 
 export type ChainSupportedNetworks =
   | ChainNetwork.Mainnet
   | ChainNetwork.Preprod
-  | ChainNetwork.Sancho
   | ChainNetwork.Preview

From 1b18d9268e5a264e7fce3c76193111dbadb18088 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Sat, 19 Oct 2024 03:25:15 +0200
Subject: [PATCH 13/15] fix(wallet-mobile): navigation weirdness in Send
 (#3695)

---
 .../src/features/Send/common/navigation.ts    | 16 ++---
 .../AddToken/SelectTokenFromListScreen.tsx    |  5 --
 .../EditAmount/EditAmountScreen.tsx           |  8 +--
 .../ListAmountsToSendScreen.tsx               |  6 +-
 apps/wallet-mobile/src/kernel/navigation.tsx  | 68 +------------------
 .../ListAmountsToSendScreen.json              |  8 +--
 6 files changed, 16 insertions(+), 95 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Send/common/navigation.ts b/apps/wallet-mobile/src/features/Send/common/navigation.ts
index 45a7caedaa..8d6338b453 100644
--- a/apps/wallet-mobile/src/features/Send/common/navigation.ts
+++ b/apps/wallet-mobile/src/features/Send/common/navigation.ts
@@ -1,19 +1,17 @@
 import {useNavigation} from '@react-navigation/native'
 import {useRef} from 'react'
 
-import {
-  AppRouteNavigation,
-  TxHistoryRouteNavigation,
-  TxHistoryRoutes,
-  useOverridePreviousRoute,
-} from '../../../kernel/navigation'
+import {AppRouteNavigation, TxHistoryRouteNavigation} from '../../../kernel/navigation'
 
 export const useNavigateTo = () => {
   const navigation = useNavigation<TxHistoryRouteNavigation & AppRouteNavigation>()
 
   return useRef({
     selectedTokens: () => navigation.navigate('send-list-amounts-to-send'),
-    addToken: () => navigation.navigate('send-select-token-from-list'),
+    addToken: ({shouldPopPrevious}: {shouldPopPrevious: boolean} = {shouldPopPrevious: false}) => {
+      if (shouldPopPrevious) navigation.pop()
+      navigation.navigate('send-select-token-from-list')
+    },
     startTx: () => navigation.navigate('send-start-tx'),
     editAmount: () => navigation.navigate('send-edit-amount'),
     reader: () => navigation.navigate('scan-start', {insideFeature: 'send'}),
@@ -48,7 +46,3 @@ export const useNavigateTo = () => {
       }),
   }).current
 }
-
-export const useOverridePreviousSendTxRoute = (routeName: keyof TxHistoryRoutes) => {
-  useOverridePreviousRoute(routeName)
-}
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/AddToken/SelectTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/AddToken/SelectTokenFromListScreen.tsx
index 58454aa648..3390091e26 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/AddToken/SelectTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/AddToken/SelectTokenFromListScreen.tsx
@@ -17,7 +17,6 @@ import {TokenAmountItem} from '../../../../Portfolio/common/TokenAmountItem/Toke
 import {useSearch, useSearchOnNavBar} from '../../../../Search/SearchContext'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
 import {limitOfSecondaryAmountsPerTx} from '../../../common/constants'
-import {useOverridePreviousSendTxRoute} from '../../../common/navigation'
 import {NoAssetFoundImage} from '../../../common/NoAssetFoundImage'
 import {useStrings} from '../../../common/strings'
 import {MaxAmountsPerTx} from './Show/MaxAmountsPerTx'
@@ -74,10 +73,6 @@ export const SelectTokenFromListScreen = () => {
   const secondaryAmountsCounter = currentAmountsSize - (hasPrimary ? 1 : 0)
   const canAddAmount = secondaryAmountsCounter < limitOfSecondaryAmountsPerTx
 
-  // to redirect the user automatically there is no amount added
-  const hasTokensSelected = currentAmountsSize > 0
-  useOverridePreviousSendTxRoute(hasTokensSelected ? 'send-list-amounts-to-send' : 'send-start-tx')
-
   const handleOnPressNFTs = React.useCallback(() => startTransition(() => setFungibilityFilter('nfts')), [])
   const handleOnPressFTs = React.useCallback(() => startTransition(() => setFungibilityFilter('fts')), [])
   const handleOnPressAll = React.useCallback(() => startTransition(() => setFungibilityFilter('all')), [])
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
index 5b3a27009a..77ad0b3276 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -20,7 +20,7 @@ import {usePortfolioBalances} from '../../../../Portfolio/common/hooks/usePortfo
 import {usePortfolioPrimaryBreakdown} from '../../../../Portfolio/common/hooks/usePortfolioPrimaryBreakdown'
 import {TokenAmountItem} from '../../../../Portfolio/common/TokenAmountItem/TokenAmountItem'
 import {useSelectedWallet} from '../../../../WalletManager/common/hooks/useSelectedWallet'
-import {useNavigateTo, useOverridePreviousSendTxRoute} from '../../../common/navigation'
+import {useNavigateTo} from '../../../common/navigation'
 import {useStrings} from '../../../common/strings'
 import {NoBalance} from './ShowError/NoBalance'
 import {UnableToSpend} from './ShowError/UnableToSpend'
@@ -50,8 +50,6 @@ export const EditAmountScreen = () => {
   )
   const spendable = isPrimary ? available - primaryBreakdown.lockedAsStorageCost : available
 
-  useOverridePreviousSendTxRoute(initialQuantity === 0n ? 'send-select-token-from-list' : 'send-list-amounts-to-send')
-
   React.useEffect(() => {
     setQuantity(initialQuantity)
     setInputValue(initialQuantity === 0n ? '' : atomicBreakdown(initialQuantity, amount.info.decimals).bn.toFormat())
@@ -60,13 +58,13 @@ export const EditAmountScreen = () => {
   const isFocused = useIsFocused()
   React.useEffect(() => {
     return () => {
-      if (quantity === 0n && !isFocused) {
+      if (amount.quantity === 0n && !isFocused) {
         InteractionManager.runAfterInteractions(() => {
           amountRemoved(selectedTokenId)
         })
       }
     }
-  }, [amountRemoved, isFocused, quantity, selectedTokenId])
+  }, [amount.quantity, amountRemoved, isFocused, selectedTokenId])
 
   const hasBalance = available >= quantity
   // primary can have locked amount
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
index 179d075369..ea0a47aaeb 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx
@@ -25,7 +25,7 @@ import {TokenAmountItem} from '../../../Portfolio/common/TokenAmountItem/TokenAm
 import {useReviewTx} from '../../../ReviewTx/common/ReviewTxProvider'
 import {useSearch} from '../../../Search/SearchContext'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {useNavigateTo, useOverridePreviousSendTxRoute} from '../../common/navigation'
+import {useNavigateTo} from '../../common/navigation'
 import {toYoroiEntry} from '../../common/toYoroiEntry'
 import {AddTokenButton} from './AddToken/AddToken'
 import {RemoveAmountButton} from './RemoveAmount'
@@ -41,8 +41,6 @@ export const ListAmountsToSendScreen = () => {
   const {wallet} = useSelectedWallet()
   const {unsignedTxChanged, onSuccessChanged, onErrorChanged} = useReviewTx()
 
-  useOverridePreviousSendTxRoute('send-start-tx')
-
   useLayoutEffect(() => {
     navigation.setOptions({headerLeft: () => <ListAmountsNavigateBackButton />})
   }, [navigation])
@@ -76,7 +74,7 @@ export const ListAmountsToSendScreen = () => {
     // use case: redirect to add token screen if there is no token left
     if (selectedTokensCounter === 1) {
       clearSearch()
-      navigateTo.addToken()
+      navigateTo.addToken({shouldPopPrevious: true})
     }
     amountRemoved(tokenId)
   }
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index b11c7c0f6f..6d960cb8e0 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -1,16 +1,15 @@
 import {MaterialTopTabNavigationOptions} from '@react-navigation/material-top-tabs'
-import {NavigationProp, NavigationState, NavigatorScreenParams, useNavigation, useRoute} from '@react-navigation/native'
+import {NavigationState, NavigatorScreenParams, useNavigation, useRoute} from '@react-navigation/native'
 import {StackNavigationOptions, StackNavigationProp, TransitionPresets} from '@react-navigation/stack'
 import {isKeyOf} from '@yoroi/common'
 import {Atoms, ThemedPalette, useTheme} from '@yoroi/theme'
 import {Chain, Portfolio, Scan} from '@yoroi/types'
 import React from 'react'
-import {Dimensions, InteractionManager, Platform, TouchableOpacity, TouchableOpacityProps, View} from 'react-native'
+import {Dimensions, Platform, TouchableOpacity, TouchableOpacityProps, View} from 'react-native'
 
 import {Icon} from '../components/Icon'
 import {Routes as StakingGovernanceRoutes} from '../features/Staking/Governance/common/navigation'
 import {YoroiUnsignedTx} from '../yoroi-wallets/types/yoroi'
-import {compareArrays} from '../yoroi-wallets/utils/utils'
 
 // prettier-ignore
 export const useUnsafeParams = <Params, >() => {
@@ -650,66 +649,3 @@ const getFocusedRouteName = (state: Partial<NavigationState> | NavigationState['
 
   return [name]
 }
-
-function useKeepRoutesInHistory(routesToKeep: string[]) {
-  const navigation = useNavigation()
-  const [initialRouteId] = React.useState(() => getNavigationRouteId(navigation))
-
-  React.useEffect(() => {
-    const currentRouteId = getNavigationRouteId(navigation)
-
-    if (currentRouteId !== initialRouteId) {
-      return
-    }
-    const {routes} = navigation.getState()
-    const currentRouteNames = routes.map((r) => r.name)
-
-    if (compareArrays(currentRouteNames, routesToKeep)) {
-      return
-    }
-
-    const newRoutes = routes.filter((r) => routesToKeep.includes(r.name))
-
-    const task = InteractionManager.runAfterInteractions(() => {
-      const newState = {
-        index: newRoutes.length - 1,
-        routes: newRoutes.map((r) => ({...r, state: undefined})),
-        routeNames: newRoutes.map((r) => r.name),
-      }
-      navigation.reset(newState)
-    })
-
-    return () => task.cancel()
-  }, [navigation, initialRouteId, routesToKeep])
-}
-
-export function useOverridePreviousRoute<RouteName extends string>(previousRouteName: RouteName) {
-  const navigation = useNavigation()
-  const [initialRouteName] = React.useState(() => getNavigationRouteName(navigation))
-  const allRouteNames: string[] = navigation.getState().routes.map((route) => route.name)
-  const previousRouteIndex = allRouteNames.indexOf(previousRouteName)
-  const currentRouteIndex = allRouteNames.indexOf(initialRouteName)
-
-  let newRoutes = allRouteNames
-  if (previousRouteIndex < currentRouteIndex) {
-    newRoutes = allRouteNames.filter((routeName, index) => index <= previousRouteIndex || index >= currentRouteIndex)
-  }
-
-  if (previousRouteIndex > currentRouteIndex) {
-    newRoutes = allRouteNames.filter((routeName, index) => index < currentRouteIndex)
-    newRoutes.push(previousRouteName, initialRouteName)
-  }
-
-  useKeepRoutesInHistory(newRoutes)
-}
-
-function getNavigationRouteId(navigation: NavigationProp<ReactNavigation.RootParamList>) {
-  const state = navigation.getState()
-  return state.routes[state.index].key
-}
-
-function getNavigationRouteName(navigation: NavigationProp<ReactNavigation.RootParamList>) {
-  return selectRouteName(navigation.getState())
-}
-
-const selectRouteName = (state: NavigationState) => state.routes[state.index].name
diff --git a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
index 0df5b7981c..ce25e2fc6f 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Add token",
     "file": "src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.tsx",
     "start": {
-      "line": 221,
+      "line": 219,
       "column": 12,
-      "index": 7359
+      "index": 7280
     },
     "end": {
-      "line": 224,
+      "line": 222,
       "column": 3,
-      "index": 7436
+      "index": 7357
     }
   }
 ]
\ No newline at end of file

From eb9c3bf20905637efd9a1fe4567c1e96146dbb78 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:25:06 +0200
Subject: [PATCH 14/15] feature(wallet-mobile): new tx review for stake
 delegation (#3696)

---
 .../features/ReviewTx/common/TokenItem.tsx    |   2 +-
 .../ReviewTx/common/hooks/useFormattedTx.tsx  |   7 +-
 .../ReviewTx/common/hooks/useStrings.tsx      |  25 ++
 .../features/ReviewTx/common/operations.tsx   | 140 ++++++++
 .../src/features/ReviewTx/common/types.ts     |   4 +
 .../Staking/Governance/common/helpers.tsx     |  96 +-----
 .../src/kernel/i18n/locales/en-US.json        |   7 +-
 apps/wallet-mobile/src/kernel/navigation.tsx  |   9 -
 .../legacy/Dashboard/DashboardNavigator.tsx   |   3 -
 .../DelegationConfirmation.stories.tsx        |  69 ----
 .../DelegationConfirmation.tsx                | 203 ------------
 .../Staking/DelegationConfirmation/index.ts   |   1 -
 .../PoolTransition/usePoolTransition.tsx      |  37 ++-
 .../Staking/StakingCenter/StakingCenter.tsx   |  25 +-
 .../yoroi-wallets/cardano/delegationUtils.ts  |  10 +
 .../ReviewTx/common/hooks/useStrings.json     | 299 +++++++++++-------
 .../legacy/Dashboard/DashboardNavigator.json  |   8 +-
 .../PoolTransition/usePoolTransition.json     | 104 +++---
 .../Staking/StakingCenter/StakingCenter.json  |  16 +-
 19 files changed, 495 insertions(+), 570 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/operations.tsx
 delete mode 100644 apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
 delete mode 100644 apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/index.ts

diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
index 51ec99bbaa..fabea93b81 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/TokenItem.tsx
@@ -48,7 +48,7 @@ export const TokenItem = ({
       style={[styles.sentTokenItem, !isPrimaryToken && styles.notPrimarySentTokenItem]}
       disabled={isPrimaryToken}
     >
-      <Text style={[styles.tokenSentItemText, !isPrimaryToken && styles.notPrimarySentTokenItemText]}>-{label}</Text>
+      <Text style={[styles.tokenSentItemText, !isPrimaryToken && styles.notPrimarySentTokenItemText]}>{label}</Text>
     </TouchableOpacity>
   )
 }
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
index 91ef9f2d30..e01bdae3ea 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedTx.tsx
@@ -51,7 +51,12 @@ export const useFormattedTx = (data: TransactionBody): FormattedTx => {
   const formattedOutputs = useFormattedOutputs(wallet, outputs, portfolioTokenInfos)
   const formattedFee = formatFee(wallet, data)
 
-  return {inputs: formattedInputs, outputs: formattedOutputs, fee: formattedFee}
+  return {
+    inputs: formattedInputs,
+    outputs: formattedOutputs,
+    fee: formattedFee,
+    certificates: data.certs ?? null,
+  }
 }
 
 export const useFormattedInputs = (
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
index b6e245d124..3858509fab 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useStrings.tsx
@@ -35,6 +35,11 @@ export const useStrings = () => {
     description: intl.formatMessage(messages.description),
     details: intl.formatMessage(messages.details),
     tokenDetailsTitle: intl.formatMessage(messages.tokenDetailsTitle),
+    registerStakingKey: intl.formatMessage(messages.registerStakingKey),
+    selectAbstain: intl.formatMessage(messages.selectAbstain),
+    selectNoConfidence: intl.formatMessage(messages.selectNoConfidence),
+    delegateVotingToDRep: intl.formatMessage(messages.delegateVotingToDRep),
+    delegateStake: intl.formatMessage(messages.delegateStake),
   }
 }
 
@@ -151,4 +156,24 @@ const messages = defineMessages({
     id: 'txReview.tokenDetails.title',
     defaultMessage: '!!!Asset Details',
   },
+  registerStakingKey: {
+    id: 'txReview.operations.registerStakingKey',
+    defaultMessage: '!!!Register staking key deposit',
+  },
+  selectAbstain: {
+    id: 'txReview.operations.selectAbstain',
+    defaultMessage: '!!!Select abstain',
+  },
+  selectNoConfidence: {
+    id: 'txReview.operations.selectNoConfidence',
+    defaultMessage: '!!!Select no confidence',
+  },
+  delegateVotingToDRep: {
+    id: 'txReview.operations.delegateVotingToDRep',
+    defaultMessage: '!!!Delegate voting to',
+  },
+  delegateStake: {
+    id: 'txReview.operations.delegateStake',
+    defaultMessage: '!!!Stake entire wallet balance to',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/operations.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/operations.tsx
new file mode 100644
index 0000000000..37e67650b2
--- /dev/null
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/operations.tsx
@@ -0,0 +1,140 @@
+import {PoolInfoApi} from '@emurgo/yoroi-lib'
+import {useBech32DRepID} from '@yoroi/staking'
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {Linking, StyleSheet, Text, View} from 'react-native'
+import {TouchableOpacity} from 'react-native-gesture-handler'
+import {useQuery} from 'react-query'
+
+import {Space} from '../../../components/Space/Space'
+import {getPoolBech32Id} from '../../../yoroi-wallets/cardano/delegationUtils'
+import {formatTokenWithText} from '../../../yoroi-wallets/utils/format'
+import {asQuantity} from '../../../yoroi-wallets/utils/utils'
+import {useSelectedNetwork} from '../../WalletManager/common/hooks/useSelectedNetwork'
+import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
+import {useStrings} from './hooks/useStrings'
+
+export const RegisterStakingKeyOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+  const {wallet} = useSelectedWallet()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.registerStakingKey}</Text>
+
+      <Space width="lg" />
+
+      <Text style={styles.operationValue}>
+        {formatTokenWithText(asQuantity(wallet.protocolParams.keyDeposit), wallet.portfolioPrimaryTokenInfo)}
+      </Text>
+    </View>
+  )
+}
+export const DelegateStakeOperation = ({poolId}: {poolId: string}) => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+  const poolInfo = usePoolInfo({poolId})
+  const {networkManager} = useSelectedNetwork()
+
+  const poolInfoText = poolInfo != null ? `[${poolInfo.ticker}] ${poolInfo.name}` : poolId
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.delegateStake}</Text>
+
+      <Space width="lg" />
+
+      <TouchableOpacity
+        activeOpacity={0.5}
+        onPress={() => Linking.openURL(networkManager.explorers.cardanoscan.pool(poolId))}
+      >
+        <Text style={styles.operationLink}>{poolInfoText}</Text>
+      </TouchableOpacity>
+    </View>
+  )
+}
+
+export const usePoolInfo = ({poolId}: {poolId: string}) => {
+  const {networkManager} = useSelectedNetwork()
+  const poolInfoApi = React.useMemo(
+    () => new PoolInfoApi(networkManager.legacyApiBaseUrl),
+    [networkManager.legacyApiBaseUrl],
+  )
+  const poolInfo = useQuery({
+    queryKey: ['usePoolInfoStakeOperation', poolId],
+    queryFn: async () => {
+      const poolBech32Id = await getPoolBech32Id(poolId)
+      return poolInfoApi.getSingleExplorerPoolInfo(poolBech32Id)
+    },
+  })
+
+  return poolInfo?.data ?? null
+}
+
+export const AbstainOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.selectAbstain}</Text>
+    </View>
+  )
+}
+
+export const NoConfidenceOperation = () => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.selectNoConfidence}</Text>
+    </View>
+  )
+}
+
+export const DelegateVotingToDrepOperation = ({drepID}: {drepID: string}) => {
+  const {styles} = useStyles()
+  const strings = useStrings()
+
+  const {data: bech32DrepId} = useBech32DRepID(drepID)
+
+  return (
+    <View style={styles.operation}>
+      <Text style={styles.operationLabel}>{strings.delegateVotingToDRep}</Text>
+
+      <Space width="lg" />
+
+      <Text style={styles.operationValue}>{bech32DrepId ?? drepID}</Text>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {color, atoms} = useTheme()
+
+  const styles = StyleSheet.create({
+    operation: {
+      ...atoms.flex_row,
+      ...atoms.justify_between,
+      ...atoms.align_start,
+    },
+    operationLabel: {
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_low,
+    },
+    operationValue: {
+      ...atoms.flex_1,
+      ...atoms.text_right,
+      ...atoms.body_2_md_regular,
+      color: color.text_gray_medium,
+    },
+    operationLink: {
+      ...atoms.body_2_md_regular,
+      color: color.text_primary_medium,
+    },
+  })
+
+  return {styles} as const
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
index 04cf6aec6d..f06f1d2530 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/types.ts
@@ -1,4 +1,5 @@
 import {
+  CertificatesJSON,
   TransactionBodyJSON,
   TransactionInputsJSON,
   TransactionOutputsJSON,
@@ -56,9 +57,12 @@ export type FormattedTx = {
   inputs: FormattedInputs
   outputs: FormattedOutputs
   fee: FormattedFee
+  certificates: Certificates
 }
 
 export type FormattedMetadata = {
   hash: string | null
   metadata: {msg: Array<unknown>} | null
 }
+
+export type Certificates = CertificatesJSON | null
diff --git a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
index 6a838019e9..b8ec96328e 100644
--- a/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
+++ b/apps/wallet-mobile/src/features/Staking/Governance/common/helpers.tsx
@@ -4,30 +4,29 @@ import {
   governanceApiMaker,
   governanceManagerMaker,
   GovernanceProvider,
-  useBech32DRepID,
   useGovernance,
   useStakingKeyState,
   useUpdateLatestGovernanceAction,
 } from '@yoroi/staking'
-import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
-import {StyleSheet, Text, View} from 'react-native'
 
-import {Space} from '../../../../components/Space/Space'
 import {governaceAfterBlock} from '../../../../kernel/config'
 import {useWalletNavigation} from '../../../../kernel/navigation'
 import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
 import {useStakingKey} from '../../../../yoroi-wallets/hooks'
 import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
-import {formatTokenWithText} from '../../../../yoroi-wallets/utils/format'
-import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
 import {CardanoMobile} from '../../../../yoroi-wallets/wallets'
+import {
+  AbstainOperation,
+  DelegateVotingToDrepOperation,
+  NoConfidenceOperation,
+  RegisterStakingKeyOperation,
+} from '../../../ReviewTx/common/operations'
 import {useReviewTx} from '../../../ReviewTx/common/ReviewTxProvider'
 import {useBestBlock} from '../../../WalletManager/common/hooks/useBestBlock'
 import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
 import {GovernanceVote} from '../types'
 import {useNavigateTo} from './navigation'
-import {useStrings} from './strings'
 
 export const useIsParticipatingInGovernance = (wallet: YoroiWallet) => {
   const stakingKeyHash = useStakingKey(wallet)
@@ -100,7 +99,7 @@ export const useGovernanceActions = () => {
   }) => {
     let operations = [
       <GovernanceProvider key="0" manager={manager}>
-        <DelegateOperation drepID={drepID} />
+        <DelegateVotingToDrepOperation drepID={drepID} />
       </GovernanceProvider>,
     ]
 
@@ -177,84 +176,3 @@ export const useGovernanceActions = () => {
 
   return {handleDelegateAction, handleAbstainAction, handleNoConfidenceAction} as const
 }
-
-const RegisterStakingKeyOperation = () => {
-  const {styles} = useStyles()
-  const strings = useStrings()
-  const {wallet} = useSelectedWallet()
-
-  return (
-    <View style={styles.operation}>
-      <Text style={styles.operationLabel}>{strings.registerStakingKey}</Text>
-
-      <Space width="lg" />
-
-      <Text style={styles.operationValue}>
-        {formatTokenWithText(asQuantity(wallet.protocolParams.keyDeposit), wallet.portfolioPrimaryTokenInfo)}
-      </Text>
-    </View>
-  )
-}
-
-const AbstainOperation = () => {
-  const {styles} = useStyles()
-  const strings = useStrings()
-
-  return (
-    <View style={styles.operation}>
-      <Text style={styles.operationLabel}>{strings.selectAbstain}</Text>
-    </View>
-  )
-}
-
-const NoConfidenceOperation = () => {
-  const {styles} = useStyles()
-  const strings = useStrings()
-
-  return (
-    <View style={styles.operation}>
-      <Text style={styles.operationLabel}>{strings.selectNoConfidence}</Text>
-    </View>
-  )
-}
-
-const DelegateOperation = ({drepID}: {drepID: string}) => {
-  const {styles} = useStyles()
-  const strings = useStrings()
-
-  const {data: bech32DrepId} = useBech32DRepID(drepID)
-
-  return (
-    <View style={styles.operation}>
-      <Text style={styles.operationLabel}>{strings.delegateVotingToDRep}</Text>
-
-      <Space width="lg" />
-
-      <Text style={styles.operationValue}>{bech32DrepId ?? drepID}</Text>
-    </View>
-  )
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-
-  const styles = StyleSheet.create({
-    operation: {
-      ...atoms.flex_row,
-      ...atoms.justify_between,
-      ...atoms.align_start,
-    },
-    operationLabel: {
-      ...atoms.body_2_md_regular,
-      color: color.text_gray_low,
-    },
-    operationValue: {
-      ...atoms.flex_1,
-      ...atoms.text_right,
-      ...atoms.body_2_md_regular,
-      color: color.text_gray_medium,
-    },
-  })
-
-  return {styles} as const
-}
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index eb9f6b47dd..caeffe72a9 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -1246,5 +1246,10 @@
   "txReview.tokenDetails.overViewTab.symbol.label": "Symbol",
   "txReview.tokenDetails.overViewTab.description.label": "Description",
   "txReview.tokenDetails.overViewTab.details.label": "Details on",
-  "txReview.tokenDetails.title": "Asset Details"
+  "txReview.tokenDetails.title": "Asset Details",
+  "txReview.operations.registerStakingKey": "Register staking key deposit",
+  "txReview.operations.selectAbstain": "Select abstain",
+  "txReview.operations.selectNoConfidence": "Select no confidence",
+  "txReview.operations.delegateVotingToDRep": "Delegate voting to",
+  "txReview.operations.delegateStake": "Stake entire wallet balance to"
 }
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index 6d960cb8e0..50691d8b91 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -9,7 +9,6 @@ import {Dimensions, Platform, TouchableOpacity, TouchableOpacityProps, View} fro
 
 import {Icon} from '../components/Icon'
 import {Routes as StakingGovernanceRoutes} from '../features/Staking/Governance/common/navigation'
-import {YoroiUnsignedTx} from '../yoroi-wallets/types/yoroi'
 
 // prettier-ignore
 export const useUnsafeParams = <Params, >() => {
@@ -190,10 +189,6 @@ export type SwapTokenRouteseNavigation = StackNavigationProp<SwapTokenRoutes>
 
 export type StakingCenterRoutes = {
   'staking-center-main': undefined
-  'delegation-confirmation': {
-    poolId: string
-    yoroiUnsignedTx: YoroiUnsignedTx
-  }
   'delegation-failed-tx': undefined
 }
 
@@ -273,10 +268,6 @@ export type BrowserRoutes = {
 export type DashboardRoutes = {
   'staking-dashboard-main': undefined
   'staking-center': NavigatorScreenParams<StakingCenterRoutes>
-  'delegation-confirmation': {
-    poolId: string
-    yoroiUnsignedTx: YoroiUnsignedTx
-  }
   'delegation-failed-tx': undefined
 }
 
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx b/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
index 9e579faaa1..f536b3ffd7 100644
--- a/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
+++ b/apps/wallet-mobile/src/legacy/Dashboard/DashboardNavigator.tsx
@@ -9,7 +9,6 @@ import {NetworkTag} from '../../features/Settings/useCases/changeAppSettings/Cha
 import {useGovernanceManagerMaker} from '../../features/Staking/Governance/common/helpers'
 import {useSelectedWallet} from '../../features/WalletManager/common/hooks/useSelectedWallet'
 import {DashboardRoutes, defaultStackNavigationOptions} from '../../kernel/navigation'
-import {DelegationConfirmation} from '../Staking/DelegationConfirmation'
 import {FailedTxScreen} from '../Staking/FailedTx/FailedTxScreen'
 import {StakingCenter} from '../Staking/StakingCenter'
 import {Dashboard} from './Dashboard'
@@ -44,8 +43,6 @@ export const DashboardNavigator = () => {
           component={StakingCenter}
         />
 
-        <Stack.Screen name="delegation-confirmation" component={DelegationConfirmation} />
-
         <Stack.Screen name="delegation-failed-tx" component={FailedTxScreen} />
       </Stack.Navigator>
     </GovernanceProvider>
diff --git a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx b/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx
deleted file mode 100644
index 52bd0458c5..0000000000
--- a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import {storiesOf} from '@storybook/react-native'
-import React from 'react'
-import {QueryClient, QueryClientProvider} from 'react-query'
-
-import {RouteProvider} from '../../../../.storybook/decorators'
-import {StakingCenterRoutes} from '../../../kernel/navigation'
-import {mocks} from '../../../yoroi-wallets/mocks/wallet'
-import {WalletManagerProviderMock} from '../../../yoroi-wallets/mocks/WalletManagerProviderMock'
-import {DelegationConfirmation} from './DelegationConfirmation'
-
-storiesOf('DelegationConfirmation', module)
-  .add('Default', () => (
-    <QueryClientProvider client={new QueryClient()}>
-      <WalletManagerProviderMock
-        wallet={{
-          ...mocks.wallet,
-
-          fetchPoolInfo: mocks.fetchPoolInfo.success.poolFound,
-        }}
-      >
-        <RouteProvider params={params}>
-          <DelegationConfirmation />
-        </RouteProvider>
-      </WalletManagerProviderMock>
-    </QueryClientProvider>
-  ))
-  .add('loading', () => (
-    <QueryClientProvider client={new QueryClient()}>
-      <WalletManagerProviderMock
-        wallet={{
-          ...mocks.wallet,
-
-          fetchPoolInfo: mocks.fetchPoolInfo.loading,
-        }}
-      >
-        <RouteProvider params={params}>
-          <DelegationConfirmation />
-        </RouteProvider>
-      </WalletManagerProviderMock>
-    </QueryClientProvider>
-  ))
-  .add('error', () => (
-    <QueryClientProvider client={new QueryClient()}>
-      <WalletManagerProviderMock
-        wallet={{
-          ...mocks.wallet,
-
-          fetchPoolInfo: mocks.fetchPoolInfo.error,
-        }}
-      >
-        <RouteProvider params={params}>
-          <DelegationConfirmation />
-        </RouteProvider>
-      </WalletManagerProviderMock>
-    </QueryClientProvider>
-  ))
-
-const params: StakingCenterRoutes['delegation-confirmation'] = {
-  poolId: '6777ed5eac05ab8bf55d073424132e200935c8d3be62fb00f5252cd27a9fe6e5',
-  yoroiUnsignedTx: {
-    ...mocks.yoroiUnsignedTx,
-    staking: {
-      registrations: [],
-      deregistrations: [],
-      delegations: [{address: 'rewardAddress', amounts: {'.': '123456789'}}],
-      withdrawals: [],
-    },
-  },
-}
diff --git a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx b/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
deleted file mode 100644
index a55acad821..0000000000
--- a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import {useTheme} from '@yoroi/theme'
-import React, {useEffect, useState} from 'react'
-import {defineMessages, useIntl} from 'react-intl'
-import {Platform, ScrollView, StyleSheet, View} from 'react-native'
-import {useQueryClient} from 'react-query'
-
-import {ConfirmTx} from '../../../components/ConfirmTx/ConfirmTx'
-import {KeyboardSpacer} from '../../../components/KeyboardSpacer'
-import {Space} from '../../../components/Space/Space'
-import {Text} from '../../../components/Text'
-import {ValidatedTextInput} from '../../../components/ValidatedTextInput'
-import {useSelectedWallet} from '../../../features/WalletManager/common/hooks/useSelectedWallet'
-import {debugWalletInfo, features} from '../../../kernel/features'
-import globalMessages, {txLabels} from '../../../kernel/i18n/global-messages'
-import {StakingCenterRoutes, useParams, useWalletNavigation} from '../../../kernel/navigation'
-import {formatTokenAmount} from '../../../yoroi-wallets/utils/format'
-import {Amounts, Entries} from '../../../yoroi-wallets/utils/utils'
-import {useStakePoolInfoAndHistory} from '../../Dashboard/StakePoolInfo'
-import {Instructions as HWInstructions} from '../../HW'
-
-type Params = StakingCenterRoutes['delegation-confirmation']
-
-const isParams = (params?: Params | object | undefined): params is Params => {
-  return (
-    !!params &&
-    'yoroiUnsignedTx' in params &&
-    typeof params.yoroiUnsignedTx === 'object' &&
-    'poolId' in params &&
-    typeof params.poolId === 'string'
-  )
-}
-
-export const DelegationConfirmation = () => {
-  const {resetToTxHistory} = useWalletNavigation()
-  const {wallet, meta} = useSelectedWallet()
-  const strings = useStrings()
-  const styles = useStyles()
-  const queryClient = useQueryClient()
-
-  const {poolId, yoroiUnsignedTx} = useParams<Params>(isParams)
-
-  if (!yoroiUnsignedTx.staking?.delegations) throw new Error('invalid transaction')
-  const stakingAmount = Amounts.getAmount(
-    Entries.toAmounts(yoroiUnsignedTx.staking.delegations),
-    wallet.portfolioPrimaryTokenInfo.id,
-  )
-  const [password, setPassword] = useState('')
-  const [useUSB, setUseUSB] = useState(false)
-
-  useEffect(() => {
-    if (features.prefillWalletInfo && __DEV__) setPassword(debugWalletInfo.PASSWORD)
-  }, [])
-
-  const onSuccess = () => {
-    queryClient.resetQueries([wallet.id, 'stakingInfo'])
-    resetToTxHistory()
-  }
-
-  const fee = formatTokenAmount(
-    yoroiUnsignedTx.fee[wallet.portfolioPrimaryTokenInfo.id],
-    wallet.portfolioPrimaryTokenInfo,
-  )
-
-  return (
-    <View style={styles.container}>
-      <ScrollView>
-        <View style={styles.itemBlock}>
-          <Text style={styles.heading}>{strings.stakePoolName}</Text>
-
-          <StakePoolName stakePoolId={poolId} />
-        </View>
-
-        <View style={styles.itemBlock}>
-          <Text style={styles.heading}>{strings.stakePoolHash}</Text>
-
-          <Text testID="stakePoolHashText" style={styles.text}>
-            {poolId}
-          </Text>
-        </View>
-
-        <View testID="stakingAmount">
-          <Text small style={styles.fees}>
-            {`+ ${fee} ${strings.ofFees}`}
-          </Text>
-
-          {/* requires a handler so we pass on a dummy function */}
-
-          <ValidatedTextInput
-            onChangeText={() => undefined}
-            editable={false}
-            value={formatTokenAmount(stakingAmount.quantity, wallet.portfolioPrimaryTokenInfo)}
-            label={strings.amount}
-          />
-        </View>
-
-        {!meta.isEasyConfirmationEnabled && !meta.isHW && (
-          <View testID="spendingPassword">
-            <ValidatedTextInput secureTextEntry value={password} label={strings.password} onChangeText={setPassword} />
-          </View>
-        )}
-
-        <View style={styles.itemBlock}>
-          <Text style={styles.text}>{strings.rewardsExplanation}</Text>
-        </View>
-
-        {meta.isHW && <HWInstructions useUSB={useUSB} addMargin />}
-      </ScrollView>
-
-      <Space height="lg" />
-
-      <ConfirmTx
-        buttonProps={{
-          title: strings.delegateButtonLabel,
-        }}
-        isProvidingPassword
-        providedPassword={password}
-        onSuccess={onSuccess}
-        setUseUSB={setUseUSB}
-        useUSB={useUSB}
-        yoroiUnsignedTx={yoroiUnsignedTx}
-        chooseTransportOnConfirmation
-      />
-
-      {/* hack to fix weird KeyboardAvoidingView bug in THIS SCREEN */}
-      {Platform.OS === 'ios' && <KeyboardSpacer />}
-    </View>
-  )
-}
-
-const StakePoolName = ({stakePoolId}: {stakePoolId: string}) => {
-  const strings = useStrings()
-  const styles = useStyles()
-  const {wallet} = useSelectedWallet()
-  const {stakePoolInfoAndHistory, isLoading, error} = useStakePoolInfoAndHistory({wallet, stakePoolId})
-
-  return (
-    <Text style={styles.text}>
-      {isLoading ? '...' : error ? strings.unknownPool : stakePoolInfoAndHistory?.info.name}
-    </Text>
-  )
-}
-
-const useStyles = () => {
-  const {atoms, color} = useTheme()
-  const styles = StyleSheet.create({
-    container: {
-      backgroundColor: color.bg_color_max,
-      ...atoms.px_lg,
-      ...atoms.pb_2xl,
-      flex: 1,
-    },
-    itemBlock: {
-      ...atoms.pt_2xl,
-    },
-    heading: {
-      color: color.gray_900,
-      ...atoms.body_1_lg_medium,
-    },
-    text: {
-      color: color.gray_900,
-      ...atoms.body_2_md_regular,
-    },
-    fees: {
-      textAlign: 'right',
-      color: color.gray_900,
-    },
-  })
-  return styles
-}
-
-const useStrings = () => {
-  const intl = useIntl()
-
-  return {
-    stakePoolName: intl.formatMessage(globalMessages.stakePoolName),
-    stakePoolHash: intl.formatMessage(globalMessages.stakePoolHash),
-    ofFees: intl.formatMessage(messages.ofFees),
-    amount: intl.formatMessage(txLabels.amount),
-    password: intl.formatMessage(txLabels.password),
-    rewardsExplanation: intl.formatMessage(messages.rewardsExplanation),
-    delegateButtonLabel: intl.formatMessage(messages.delegateButtonLabel),
-    unknownPool: intl.formatMessage(messages.unknownPool),
-  }
-}
-
-const messages = defineMessages({
-  delegateButtonLabel: {
-    id: 'components.stakingcenter.confirmDelegation.delegateButtonLabel',
-    defaultMessage: '!!!Delegate',
-  },
-  ofFees: {
-    id: 'components.stakingcenter.confirmDelegation.ofFees',
-    defaultMessage: '!!!of fees',
-  },
-  rewardsExplanation: {
-    id: 'components.stakingcenter.confirmDelegation.rewardsExplanation',
-    defaultMessage: '!!!Current approximation of rewards that you will receive per epoch:',
-  },
-  unknownPool: {
-    id: 'components.delegationsummary.delegatedStakepoolInfo.unknownPool',
-    defaultMessage: '!!!Unknown pool',
-  },
-})
diff --git a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/index.ts b/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/index.ts
deleted file mode 100644
index 3007ac4817..0000000000
--- a/apps/wallet-mobile/src/legacy/Staking/DelegationConfirmation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './DelegationConfirmation'
diff --git a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/usePoolTransition.tsx
index 65cebf2c76..d6bd535031 100644
--- a/apps/wallet-mobile/src/legacy/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/PoolTransition/usePoolTransition.tsx
@@ -7,9 +7,12 @@ import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {useQuery} from 'react-query'
 
+import {DelegateStakeOperation} from '../../../features/ReviewTx/common/operations'
+import {useReviewTx} from '../../../features/ReviewTx/common/ReviewTxProvider'
 import {useSelectedNetwork} from '../../../features/WalletManager/common/hooks/useSelectedNetwork'
 import {useSelectedWallet} from '../../../features/WalletManager/common/hooks/useSelectedWallet'
 import {features} from '../../../kernel/features'
+import {AppRouteNavigation, StakingCenterRouteNavigation, useWalletNavigation} from '../../../kernel/navigation'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 import {asQuantity, Quantities} from '../../../yoroi-wallets/utils/utils'
 import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
@@ -33,9 +36,12 @@ const createDelegationTx = async (wallet: YoroiWallet, poolId: string, meta: Wal
 }
 
 export const usePoolTransition = () => {
-  const navigation = useNavigation()
+  const navigation = useNavigation<StakingCenterRouteNavigation & AppRouteNavigation>()
+
   const {wallet, meta} = useSelectedWallet()
   const {networkManager} = useSelectedNetwork()
+  const {navigateToTxReview, resetToTxHistory} = useWalletNavigation()
+  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, operationsChanged} = useReviewTx()
   const {stakingInfo, isLoading} = useStakingInfo(wallet)
   const poolInfoApi = React.useMemo(
     () => new PoolInfoApi(networkManager.legacyApiBaseUrl),
@@ -59,17 +65,13 @@ export const usePoolTransition = () => {
   const navigateToUpdate = React.useCallback(async () => {
     try {
       const yoroiUnsignedTx = await createDelegationTx(wallet, poolId, meta)
-      navigation.navigate('manage-wallets', {
-        screen: 'staking-dashboard',
-        params: {
-          screen: 'delegation-confirmation',
-          initial: false,
-          params: {
-            poolId,
-            yoroiUnsignedTx,
-          },
-        },
+      operationsChanged([<DelegateStakeOperation poolId={poolId} key="0" />])
+      unsignedTxChanged(yoroiUnsignedTx)
+      onSuccessChanged(() => {
+        resetToTxHistory()
       })
+      onErrorChanged(() => navigation.navigate('delegation-failed-tx'))
+      navigateToTxReview()
     } catch (err) {
       navigation.navigate('manage-wallets', {
         screen: 'staking-dashboard',
@@ -79,7 +81,18 @@ export const usePoolTransition = () => {
         },
       })
     }
-  }, [meta, navigation, poolId, wallet])
+  }, [
+    wallet,
+    poolId,
+    meta,
+    operationsChanged,
+    unsignedTxChanged,
+    onSuccessChanged,
+    onErrorChanged,
+    navigateToTxReview,
+    resetToTxHistory,
+    navigation,
+  ])
 
   return {
     ...poolTransitionQuery,
diff --git a/apps/wallet-mobile/src/legacy/Staking/StakingCenter/StakingCenter.tsx b/apps/wallet-mobile/src/legacy/Staking/StakingCenter/StakingCenter.tsx
index 344d817bfa..425290317f 100644
--- a/apps/wallet-mobile/src/legacy/Staking/StakingCenter/StakingCenter.tsx
+++ b/apps/wallet-mobile/src/legacy/Staking/StakingCenter/StakingCenter.tsx
@@ -5,9 +5,12 @@ import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {WebView, WebViewMessageEvent} from 'react-native-webview'
+import {useQueryClient} from 'react-query'
 
 import {PleaseWaitModal} from '../../../components/PleaseWaitModal'
 import {Spacer} from '../../../components/Spacer/Spacer'
+import {DelegateStakeOperation, RegisterStakingKeyOperation} from '../../../features/ReviewTx/common/operations'
+import {useReviewTx} from '../../../features/ReviewTx/common/ReviewTxProvider'
 import {useSelectedWallet} from '../../../features/WalletManager/common/hooks/useSelectedWallet'
 import {useWalletManager} from '../../../features/WalletManager/context/WalletManagerProvider'
 import {showErrorDialog} from '../../../kernel/dialogs'
@@ -15,9 +18,9 @@ import {useLanguage} from '../../../kernel/i18n'
 import globalMessages from '../../../kernel/i18n/global-messages'
 import {logger} from '../../../kernel/logger/logger'
 import {useMetrics} from '../../../kernel/metrics/metricsManager'
-import {StakingCenterRouteNavigation} from '../../../kernel/navigation'
+import {StakingCenterRouteNavigation, useWalletNavigation} from '../../../kernel/navigation'
 import {NotEnoughMoneyToSendError} from '../../../yoroi-wallets/cardano/types'
-import {useStakingTx} from '../../Dashboard/StakePoolInfos'
+import {useStakingInfo, useStakingTx} from '../../Dashboard/StakePoolInfos'
 import {PoolDetailScreen} from '../PoolDetails'
 
 export const StakingCenter = () => {
@@ -25,12 +28,17 @@ export const StakingCenter = () => {
   const navigation = useNavigation<StakingCenterRouteNavigation>()
   const {isDark} = useTheme()
   const {styles} = useStyles()
+  const queryClient = useQueryClient()
 
   const {languageCode} = useLanguage()
   const {wallet, meta} = useSelectedWallet()
   const {walletManager} = useWalletManager()
   const {track} = useMetrics()
   const {plate} = walletManager.checksum(wallet.publicKeyHex)
+  const {navigateToTxReview, resetToTxHistory} = useWalletNavigation()
+  const {unsignedTxChanged, onSuccessChanged, onErrorChanged, operationsChanged} = useReviewTx()
+  const stakingInfo = useStakingInfo(wallet, {suspense: true})
+  const hasStakingKeyRegistered = stakingInfo?.data?.status !== 'not-registered'
 
   useFocusEffect(
     React.useCallback(() => {
@@ -49,10 +57,17 @@ export const StakingCenter = () => {
       onSuccess: (yoroiUnsignedTx) => {
         if (selectedPoolId == null) return
 
-        navigation.navigate('delegation-confirmation', {
-          poolId: selectedPoolId,
-          yoroiUnsignedTx,
+        let operations = [<DelegateStakeOperation poolId={selectedPoolId} key="0" />]
+        if (!hasStakingKeyRegistered) operations = [<RegisterStakingKeyOperation key="-1" />, ...operations]
+
+        operationsChanged(operations)
+        unsignedTxChanged(yoroiUnsignedTx)
+        onSuccessChanged(() => {
+          queryClient.resetQueries([wallet.id, 'stakingInfo'])
+          resetToTxHistory()
         })
+        onErrorChanged(() => navigation.navigate('delegation-failed-tx'))
+        navigateToTxReview()
       },
       onError: (error) => {
         if (error instanceof NotEnoughMoneyToSendError) {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
index c524c6d73e..cadc956a99 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
@@ -112,6 +112,16 @@ const isValidPoolId = async (poolId: string): Promise<boolean> => {
   }
 }
 
+export const getPoolBech32Id = async (poolId: string) => {
+  const {csl, release} = wrappedCsl()
+  try {
+    const keyHash = await csl.Ed25519KeyHash.fromHex(poolId)
+    return keyHash.toBech32('pool')
+  } finally {
+    release()
+  }
+}
+
 const isValidPoolHash = async (poolHash: string): Promise<boolean> => {
   if (poolHash.length === 0) return false
 
diff --git a/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
index fdeb1cc006..9e1a48b052 100644
--- a/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/ReviewTx/common/hooks/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 42,
+      "line": 47,
       "column": 11,
-      "index": 1976
+      "index": 2325
     },
     "end": {
-      "line": 45,
+      "line": 50,
       "column": 3,
-      "index": 2043
+      "index": 2392
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!UTxOs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 46,
+      "line": 51,
       "column": 9,
-      "index": 2054
+      "index": 2403
     },
     "end": {
-      "line": 49,
+      "line": 54,
       "column": 3,
-      "index": 2117
+      "index": 2466
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!UTxOs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 50,
+      "line": 55,
       "column": 12,
-      "index": 2131
+      "index": 2480
     },
     "end": {
-      "line": 53,
+      "line": 58,
       "column": 3,
-      "index": 2203
+      "index": 2552
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 54,
+      "line": 59,
       "column": 15,
-      "index": 2220
+      "index": 2569
     },
     "end": {
-      "line": 57,
+      "line": 62,
       "column": 3,
-      "index": 2298
+      "index": 2647
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 58,
+      "line": 63,
       "column": 15,
-      "index": 2315
+      "index": 2664
     },
     "end": {
-      "line": 61,
+      "line": 66,
       "column": 3,
-      "index": 2396
+      "index": 2745
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Metadata hash",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 62,
+      "line": 67,
       "column": 16,
-      "index": 2414
+      "index": 2763
     },
     "end": {
-      "line": 65,
+      "line": 70,
       "column": 3,
-      "index": 2501
+      "index": 2850
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 66,
+      "line": 71,
       "column": 21,
-      "index": 2524
+      "index": 2873
     },
     "end": {
-      "line": 69,
+      "line": 74,
       "column": 3,
-      "index": 2611
+      "index": 2960
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 70,
+      "line": 75,
       "column": 15,
-      "index": 2628
+      "index": 2977
     },
     "end": {
-      "line": 73,
+      "line": 78,
       "column": 3,
-      "index": 2702
+      "index": 3051
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 74,
+      "line": 79,
       "column": 12,
-      "index": 2716
+      "index": 3065
     },
     "end": {
-      "line": 77,
+      "line": 82,
       "column": 3,
-      "index": 2775
+      "index": 3124
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Your Wallet",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 78,
+      "line": 83,
       "column": 17,
-      "index": 2794
+      "index": 3143
     },
     "end": {
-      "line": 81,
+      "line": 86,
       "column": 3,
-      "index": 2880
+      "index": 3229
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 82,
+      "line": 87,
       "column": 13,
-      "index": 2895
+      "index": 3244
     },
     "end": {
-      "line": 85,
+      "line": 90,
       "column": 3,
-      "index": 2970
+      "index": 3319
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!To",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 86,
+      "line": 91,
       "column": 18,
-      "index": 2990
+      "index": 3339
     },
     "end": {
-      "line": 89,
+      "line": 94,
       "column": 3,
-      "index": 3068
+      "index": 3417
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!To script",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 90,
+      "line": 95,
       "column": 24,
-      "index": 3094
+      "index": 3443
     },
     "end": {
-      "line": 93,
+      "line": 98,
       "column": 3,
-      "index": 3185
+      "index": 3534
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Inputs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 94,
+      "line": 99,
       "column": 20,
-      "index": 3207
+      "index": 3556
     },
     "end": {
-      "line": 97,
+      "line": 102,
       "column": 3,
-      "index": 3288
+      "index": 3637
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Outputs",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 98,
+      "line": 103,
       "column": 21,
-      "index": 3311
+      "index": 3660
     },
     "end": {
-      "line": 101,
+      "line": 106,
       "column": 3,
-      "index": 3394
+      "index": 3743
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Your address",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 102,
+      "line": 107,
       "column": 25,
-      "index": 3421
+      "index": 3770
     },
     "end": {
-      "line": 105,
+      "line": 110,
       "column": 3,
-      "index": 3513
+      "index": 3862
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Foreign address",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 106,
+      "line": 111,
       "column": 28,
-      "index": 3543
+      "index": 3892
     },
     "end": {
-      "line": 109,
+      "line": 114,
       "column": 3,
-      "index": 3641
+      "index": 3990
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 110,
+      "line": 115,
       "column": 12,
-      "index": 3655
+      "index": 4004
     },
     "end": {
-      "line": 113,
+      "line": 118,
       "column": 3,
-      "index": 3746
+      "index": 4095
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!JSON",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 114,
+      "line": 119,
       "column": 8,
-      "index": 3756
+      "index": 4105
     },
     "end": {
-      "line": 117,
+      "line": 122,
       "column": 3,
-      "index": 3839
+      "index": 4188
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 118,
+      "line": 123,
       "column": 12,
-      "index": 3853
+      "index": 4202
     },
     "end": {
-      "line": 121,
+      "line": 126,
       "column": 3,
-      "index": 3943
+      "index": 4292
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!Policy ID",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 122,
+      "line": 127,
       "column": 12,
-      "index": 3957
+      "index": 4306
     },
     "end": {
-      "line": 125,
+      "line": 130,
       "column": 3,
-      "index": 4046
+      "index": 4395
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Fingerprint",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 126,
+      "line": 131,
       "column": 15,
-      "index": 4063
+      "index": 4412
     },
     "end": {
-      "line": 129,
+      "line": 134,
       "column": 3,
-      "index": 4157
+      "index": 4506
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 130,
+      "line": 135,
       "column": 8,
-      "index": 4167
+      "index": 4516
     },
     "end": {
-      "line": 133,
+      "line": 138,
       "column": 3,
-      "index": 4259
+      "index": 4608
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!Token Supply",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 134,
+      "line": 139,
       "column": 15,
-      "index": 4276
+      "index": 4625
     },
     "end": {
-      "line": 137,
+      "line": 142,
       "column": 3,
-      "index": 4383
+      "index": 4732
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Symbol",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 138,
+      "line": 143,
       "column": 10,
-      "index": 4395
+      "index": 4744
     },
     "end": {
-      "line": 141,
+      "line": 146,
       "column": 3,
-      "index": 4491
+      "index": 4840
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Description",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 142,
+      "line": 147,
       "column": 15,
-      "index": 4508
+      "index": 4857
     },
     "end": {
-      "line": 145,
+      "line": 150,
       "column": 3,
-      "index": 4614
+      "index": 4963
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Details on",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 146,
+      "line": 151,
       "column": 11,
-      "index": 4627
+      "index": 4976
     },
     "end": {
-      "line": 149,
+      "line": 154,
       "column": 3,
-      "index": 4728
+      "index": 5077
     }
   },
   {
@@ -409,14 +409,89 @@
     "defaultMessage": "!!!Asset Details",
     "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
     "start": {
-      "line": 150,
+      "line": 155,
       "column": 21,
-      "index": 4751
+      "index": 5100
+    },
+    "end": {
+      "line": 158,
+      "column": 3,
+      "index": 5184
+    }
+  },
+  {
+    "id": "txReview.operations.registerStakingKey",
+    "defaultMessage": "!!!Register staking key deposit",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 159,
+      "column": 22,
+      "index": 5208
+    },
+    "end": {
+      "line": 162,
+      "column": 3,
+      "index": 5318
+    }
+  },
+  {
+    "id": "txReview.operations.selectAbstain",
+    "defaultMessage": "!!!Select abstain",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 163,
+      "column": 17,
+      "index": 5337
+    },
+    "end": {
+      "line": 166,
+      "column": 3,
+      "index": 5428
+    }
+  },
+  {
+    "id": "txReview.operations.selectNoConfidence",
+    "defaultMessage": "!!!Select no confidence",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 167,
+      "column": 22,
+      "index": 5452
+    },
+    "end": {
+      "line": 170,
+      "column": 3,
+      "index": 5554
+    }
+  },
+  {
+    "id": "txReview.operations.delegateVotingToDRep",
+    "defaultMessage": "!!!Delegate voting to",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 171,
+      "column": 24,
+      "index": 5580
+    },
+    "end": {
+      "line": 174,
+      "column": 3,
+      "index": 5682
+    }
+  },
+  {
+    "id": "txReview.operations.delegateStake",
+    "defaultMessage": "!!!Stake entire wallet balance to",
+    "file": "src/features/ReviewTx/common/hooks/useStrings.tsx",
+    "start": {
+      "line": 175,
+      "column": 17,
+      "index": 5701
     },
     "end": {
-      "line": 153,
+      "line": 178,
       "column": 3,
-      "index": 4835
+      "index": 5808
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
index 7f80182884..27dd43c7e4 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/DashboardNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Staking Center",
     "file": "src/legacy/Dashboard/DashboardNavigator.tsx",
     "start": {
-      "line": 64,
+      "line": 61,
       "column": 9,
-      "index": 2092
+      "index": 1927
     },
     "end": {
-      "line": 67,
+      "line": 64,
       "column": 3,
-      "index": 2180
+      "index": 2015
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolTransition/usePoolTransition.json
index 14002a4758..1ec5530969 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolTransition/usePoolTransition.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Staking/PoolTransition/usePoolTransition.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Upgrade your stake pool",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 114,
+      "line": 127,
       "column": 9,
-      "index": 4057
+      "index": 4719
     },
     "end": {
-      "line": 117,
+      "line": 130,
       "column": 3,
-      "index": 4155
+      "index": 4817
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 118,
+      "line": 131,
       "column": 11,
-      "index": 4168
+      "index": 4830
     },
     "end": {
-      "line": 122,
+      "line": 135,
       "column": 3,
-      "index": 4364
+      "index": 5026
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 123,
+      "line": 136,
       "column": 16,
-      "index": 4382
+      "index": 5044
     },
     "end": {
-      "line": 127,
+      "line": 140,
       "column": 3,
-      "index": 4588
+      "index": 5250
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Current pool",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 128,
+      "line": 141,
       "column": 15,
-      "index": 4605
+      "index": 5267
     },
     "end": {
-      "line": 131,
+      "line": 144,
       "column": 3,
-      "index": 4698
+      "index": 5360
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!New pool",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 132,
+      "line": 145,
       "column": 11,
-      "index": 4711
+      "index": 5373
     },
     "end": {
-      "line": 135,
+      "line": 148,
       "column": 3,
-      "index": 4796
+      "index": 5458
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Estimated ROA",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 136,
+      "line": 149,
       "column": 16,
-      "index": 4814
+      "index": 5476
     },
     "end": {
-      "line": 139,
+      "line": 152,
       "column": 3,
-      "index": 4909
+      "index": 5571
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 140,
+      "line": 153,
       "column": 7,
-      "index": 4918
+      "index": 5580
     },
     "end": {
-      "line": 143,
+      "line": 156,
       "column": 3,
-      "index": 4994
+      "index": 5656
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!This pool continues to generate staking rewards",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 144,
+      "line": 157,
       "column": 24,
-      "index": 5020
+      "index": 5682
     },
     "end": {
-      "line": 147,
+      "line": 160,
       "column": 3,
-      "index": 5157
+      "index": 5819
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 148,
+      "line": 161,
       "column": 17,
-      "index": 5176
+      "index": 5838
     },
     "end": {
-      "line": 151,
+      "line": 164,
       "column": 3,
-      "index": 5310
+      "index": 5972
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!This pool will stop generating rewards in",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 152,
+      "line": 165,
       "column": 23,
-      "index": 5335
+      "index": 5997
     },
     "end": {
-      "line": 155,
+      "line": 168,
       "column": 3,
-      "index": 5465
+      "index": 6127
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Skip and stop receiving rewards",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 156,
+      "line": 169,
       "column": 17,
-      "index": 5484
+      "index": 6146
     },
     "end": {
-      "line": 159,
+      "line": 172,
       "column": 3,
-      "index": 5598
+      "index": 6260
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Update now and keep earning",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 160,
+      "line": 173,
       "column": 21,
-      "index": 5621
+      "index": 6283
     },
     "end": {
-      "line": 163,
+      "line": 176,
       "column": 3,
-      "index": 5735
+      "index": 6397
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Update pool",
     "file": "src/legacy/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 164,
+      "line": 177,
       "column": 10,
-      "index": 5747
+      "index": 6409
     },
     "end": {
-      "line": 167,
+      "line": 180,
       "column": 3,
-      "index": 5834
+      "index": 6496
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Staking/StakingCenter/StakingCenter.json b/apps/wallet-mobile/translations/messages/src/legacy/Staking/StakingCenter/StakingCenter.json
index 30704959bc..4f55b6775b 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Staking/StakingCenter/StakingCenter.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Staking/StakingCenter/StakingCenter.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Invalid Pool Data",
     "file": "src/legacy/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 131,
+      "line": 146,
       "column": 9,
-      "index": 4730
+      "index": 5740
     },
     "end": {
-      "line": 134,
+      "line": 149,
       "column": 3,
-      "index": 4838
+      "index": 5848
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!The data from the stake pool(s) you selected is invalid. Please try again",
     "file": "src/legacy/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 135,
+      "line": 150,
       "column": 11,
-      "index": 4851
+      "index": 5861
     },
     "end": {
-      "line": 138,
+      "line": 153,
       "column": 3,
-      "index": 5017
+      "index": 6027
     }
   }
 ]
\ No newline at end of file

From ddb429f78a6692a6041c3c2b5249411c36d94291 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 22 Oct 2024 10:46:11 +0200
Subject: [PATCH 15/15] refactor(staking): use votingPowerThreshold (#3697)

---
 .../.storybook/storybook.requires.js          |  1 -
 apps/wallet-mobile/src/YoroiApp.tsx           | 13 ++++-
 apps/wallet-mobile/src/features/Menu/Menu.tsx | 27 +++++++--
 .../RegisterCatalyst/CatalystNavigator.tsx    | 57 ++++++++-----------
 .../common/InsufficientFundsModal.tsx         |  7 ++-
 .../features/RegisterCatalyst/common/hooks.ts |  4 +-
 .../adapters/cardano/catalyst-config.ts       |  7 ---
 .../ListAmountsToSendScreen.json              |  4 +-
 .../src/catalyst/adapters/fund-info.mocks.ts  |  2 +-
 .../staking/src/catalyst/fund-info.mocks.ts   |  1 +
 packages/staking/src/catalyst/transformers.ts |  1 +
 .../staking/src/catalyst/validators.test.ts   |  2 +
 packages/staking/src/catalyst/validators.ts   |  1 +
 packages/staking/src/types.ts                 |  1 +
 14 files changed, 71 insertions(+), 57 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/WalletManager/common/adapters/cardano/catalyst-config.ts

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 6ec961a8f2..efdffe4715 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -283,7 +283,6 @@ const getStories = () => {
     "./src/legacy/HW/LedgerConnect/DeviceItem/DeviceItem.stories.tsx": require("../src/legacy/HW/LedgerConnect/DeviceItem/DeviceItem.stories.tsx"),
     "./src/legacy/HW/LedgerConnect/LedgerConnect.stories.tsx": require("../src/legacy/HW/LedgerConnect/LedgerConnect.stories.tsx"),
     "./src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.stories.tsx": require("../src/legacy/HW/LedgerTransportSwitchModal/LedgerTransportSwitchModal.stories.tsx"),
-    "./src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx": require("../src/legacy/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx"),
     "./src/legacy/Staking/FailedTx/FailedTxScreen.stories.tsx": require("../src/legacy/Staking/FailedTx/FailedTxScreen.stories.tsx"),
     "./src/legacy/Staking/PoolDetails/PoolDetailScreen.stories.tsx": require("../src/legacy/Staking/PoolDetails/PoolDetailScreen.stories.tsx"),
     "./src/legacy/Staking/PoolTransition/PoolTransitionModal.stories.tsx": require("../src/legacy/Staking/PoolTransition/PoolTransitionModal.stories.tsx"),
diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
index cfd5918dc8..7ed1645202 100644
--- a/apps/wallet-mobile/src/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -1,6 +1,7 @@
 import {AsyncStorageProvider} from '@yoroi/common'
 import {LinksProvider} from '@yoroi/links'
 import {SetupWalletProvider} from '@yoroi/setup-wallet'
+import {catalystApiMaker, catalystManagerMaker, CatalystProvider} from '@yoroi/staking'
 import {ThemeProvider} from '@yoroi/theme'
 import {TransferProvider} from '@yoroi/transfer'
 import React from 'react'
@@ -38,6 +39,10 @@ if (disableLogbox) {
 } else {
   LogBox.ignoreLogs(['Require cycle:'])
 }
+const catalystApi = catalystApiMaker()
+const catalystManager = catalystManagerMaker({
+  api: catalystApi,
+})
 
 const metricsManager = makeMetricsManager()
 
@@ -65,9 +70,11 @@ const Yoroi = () => {
                                 <PoolTransitionProvider>
                                   <BrowserProvider>
                                     <AutomaticWalletOpenerProvider>
-                                      <ReviewTxProvider>
-                                        <InitApp />
-                                      </ReviewTxProvider>
+                                      <CatalystProvider manager={catalystManager}>
+                                        <ReviewTxProvider>
+                                          <InitApp />
+                                        </ReviewTxProvider>
+                                      </CatalystProvider>
                                     </AutomaticWalletOpenerProvider>
                                   </BrowserProvider>
                                 </PoolTransitionProvider>
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index fdf416276d..8562a22230 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -4,10 +4,17 @@ import {createStackNavigator} from '@react-navigation/stack'
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {useIntl} from 'react-intl'
-import {Linking, ScrollView, StyleSheet, TouchableOpacity, useWindowDimensions, View} from 'react-native'
+import {
+  ActivityIndicator,
+  Linking,
+  ScrollView,
+  StyleSheet,
+  TouchableOpacity,
+  useWindowDimensions,
+  View,
+} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
-import {Boundary} from '../../components/Boundary/Boundary'
 import {Icon} from '../../components/Icon'
 import {useModal} from '../../components/Modal/ModalContext'
 import {Spacer} from '../../components/Spacer/Spacer'
@@ -82,13 +89,23 @@ export const Menu = () => {
           />
         )}
 
-        <Boundary loading={{size: 'small', style: {padding: 16}}} error={{size: 'inline'}}>
-          <Catalyst //
+        <React.Suspense
+          fallback={
+            <Item
+              disabled
+              onPress={() => null}
+              label={strings.catalystVoting}
+              left={<Icon.Catalyst size={24} color={color.gray_600} />}
+              right={<ActivityIndicator color={color.gray_600} />}
+            />
+          }
+        >
+          <Catalyst
             label={strings.catalystVoting}
             onPress={navigateTo.catalystVoting}
             left={<Icon.Catalyst size={24} color={color.gray_600} />}
           />
-        </Boundary>
+        </React.Suspense>
 
         <KnowledgeBase //
           label={strings.knowledgeBase}
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
index 99c9e521d4..f3f2c125c2 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/CatalystNavigator.tsx
@@ -1,7 +1,5 @@
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {createStackNavigator} from '@react-navigation/stack'
-import {catalystManagerMaker, CatalystProvider} from '@yoroi/staking'
-import {catalystApiMaker} from '@yoroi/staking/src'
 import {useTheme} from '@yoroi/theme'
 import React from 'react'
 import {useIntl} from 'react-intl'
@@ -21,11 +19,6 @@ import {DisplayPin} from './useCases/DisplayPin/DisplayPin'
 import {DownloadCatalystAppScreen} from './useCases/DownloadCatalystAppScreen/DownloadCatalystAppScreen'
 import {QrCode} from './useCases/ShowQrCode/ShowQrCode'
 
-const catalystApi = catalystApiMaker()
-const catalystManager = catalystManagerMaker({
-  api: catalystApi,
-})
-
 const Stack = createStackNavigator<VotingRegistrationRoutes>()
 export const CatalystNavigator = () => {
   const {atoms, color} = useTheme()
@@ -41,35 +34,33 @@ export const CatalystNavigator = () => {
   const navigationOptions = React.useMemo(() => defaultStackNavigationOptions(atoms, color), [atoms, color])
 
   return (
-    <CatalystProvider manager={catalystManager}>
-      <Stack.Navigator
-        screenOptions={{
-          ...navigationOptions,
-          title: strings.title,
-          headerTitle: ({children}) => <NetworkTag>{children}</NetworkTag>,
-        }}
-      >
-        <Stack.Group>
-          {/* STEP 1 */}
-          <Stack.Screen name="download-catalyst">
-            {() => (
-              <Boundary loading={{size: 'full'}}>
-                <DownloadCatalystAppScreen />
-              </Boundary>
-            )}
-          </Stack.Screen>
+    <Stack.Navigator
+      screenOptions={{
+        ...navigationOptions,
+        title: strings.title,
+        headerTitle: ({children}) => <NetworkTag>{children}</NetworkTag>,
+      }}
+    >
+      <Stack.Group>
+        {/* STEP 1 */}
+        <Stack.Screen name="download-catalyst">
+          {() => (
+            <Boundary loading={{size: 'full'}}>
+              <DownloadCatalystAppScreen />
+            </Boundary>
+          )}
+        </Stack.Screen>
 
-          {/* STEP 2 */}
-          <Stack.Screen name="display-pin" component={DisplayPin} />
+        {/* STEP 2 */}
+        <Stack.Screen name="display-pin" component={DisplayPin} />
 
-          {/* STEP 3 */}
-          <Stack.Screen name="confirm-pin" component={ConfirmPin} />
+        {/* STEP 3 */}
+        <Stack.Screen name="confirm-pin" component={ConfirmPin} />
 
-          {/* STEP 4 */}
-          <Stack.Screen component={QrCode} name="qr-code" options={{...navigationOptions, headerLeft: () => null}} />
-        </Stack.Group>
-      </Stack.Navigator>
-    </CatalystProvider>
+        {/* STEP 4 */}
+        <Stack.Screen component={QrCode} name="qr-code" options={{...navigationOptions, headerLeft: () => null}} />
+      </Stack.Group>
+    </Stack.Navigator>
   )
 }
 
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx b/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
index 57bbf80c2a..f642cfd492 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/common/InsufficientFundsModal.tsx
@@ -9,8 +9,8 @@ import {useModal} from '../../../components/Modal/ModalContext'
 import {Space} from '../../../components/Space/Space'
 import globalMessages, {confirmationMessages} from '../../../kernel/i18n/global-messages'
 import {usePortfolioPrimaryBalance} from '../../Portfolio/common/hooks/usePortfolioPrimaryBalance'
-import {catalystConfig} from '../../WalletManager/common/adapters/cardano/catalyst-config'
 import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
+import {useCatalystCurrentFund} from './hooks'
 
 const formatter = amountFormatter({template: `{{value}} {{ticker}}`, dropTraillingZeros: true})
 
@@ -19,11 +19,12 @@ export const InsufficientFundsModal = () => {
   const styles = useStyles()
   const {wallet} = useSelectedWallet()
   const {closeModal} = useModal()
-
   const primaryBalance = usePortfolioPrimaryBalance({wallet})
+  const {fund} = useCatalystCurrentFund()
+
   const fmtMinPrimaryBalance = formatter({
     info: wallet.portfolioPrimaryTokenInfo,
-    quantity: catalystConfig.minAda,
+    quantity: BigInt(fund.info.votingPowerThreshold),
   })
   const fmtPrimaryBalance = formatter(primaryBalance)
 
diff --git a/apps/wallet-mobile/src/features/RegisterCatalyst/common/hooks.ts b/apps/wallet-mobile/src/features/RegisterCatalyst/common/hooks.ts
index 38c9650131..8021da827d 100644
--- a/apps/wallet-mobile/src/features/RegisterCatalyst/common/hooks.ts
+++ b/apps/wallet-mobile/src/features/RegisterCatalyst/common/hooks.ts
@@ -8,13 +8,13 @@ import {queryInfo} from '../../../kernel/query-client'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 import {isShelley} from '../../../yoroi-wallets/cardano/utils'
 import {usePortfolioPrimaryBalance} from '../../Portfolio/common/hooks/usePortfolioPrimaryBalance'
-import {catalystConfig} from '../../WalletManager/common/adapters/cardano/catalyst-config'
 import {useSelectedWallet} from '../../WalletManager/common/hooks/useSelectedWallet'
 
 export const useCanVote = (wallet: YoroiWallet) => {
   const {meta} = useSelectedWallet()
   const amount = usePortfolioPrimaryBalance({wallet})
-  const sufficientFunds = amount.quantity >= catalystConfig.minAda
+  const {fund} = useCatalystCurrentFund()
+  const sufficientFunds = amount.quantity >= fund.info.votingPowerThreshold
 
   return {
     canVote: !meta.isReadOnly && isShelley(meta.implementation),
diff --git a/apps/wallet-mobile/src/features/WalletManager/common/adapters/cardano/catalyst-config.ts b/apps/wallet-mobile/src/features/WalletManager/common/adapters/cardano/catalyst-config.ts
deleted file mode 100644
index 9f141bcf5d..0000000000
--- a/apps/wallet-mobile/src/features/WalletManager/common/adapters/cardano/catalyst-config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {freeze} from 'immer'
-
-import {cardanoConfig} from './cardano-config'
-
-export const catalystConfig = freeze({
-  minAda: 25n * cardanoConfig.denominations.ada,
-} as const)
diff --git a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
index ce25e2fc6f..e786d91a44 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Send/useCases/ListAmountsToSend/ListAmountsToSendScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 219,
       "column": 12,
-      "index": 7280
+      "index": 7301
     },
     "end": {
       "line": 222,
       "column": 3,
-      "index": 7357
+      "index": 7378
     }
   }
 ]
\ No newline at end of file
diff --git a/packages/staking/src/catalyst/adapters/fund-info.mocks.ts b/packages/staking/src/catalyst/adapters/fund-info.mocks.ts
index 46281c1db2..0515c327a5 100644
--- a/packages/staking/src/catalyst/adapters/fund-info.mocks.ts
+++ b/packages/staking/src/catalyst/adapters/fund-info.mocks.ts
@@ -5,7 +5,7 @@ export const mockCatalystApiFundInfo: Catalyst.CatalystApiFundInfo = {
   fund_name: 'Fund12',
   fund_goal:
     "{'timestamp': '2024-06-25T17:29:31Z', 'themes': ['API', 'DAO', 'DApp', 'Data tools', 'DeFi', 'Education', 'Events', 'Exchanges', 'Explorers', 'Gaming', 'Governance', 'Identity solutions', 'NFTs', 'RealFi', 'SDK', 'Wallet', 'Cardano Ambassadors', 'Marketing', 'Hackathon', 'Incubation', 'Regional expansion', 'Standards and regulation', 'Translation', 'Dev ecosystem collaboration', 'Dev team', 'Developer tools', 'SPOs', 'Node', 'Other']}",
-  voting_power_threshold: 500000000,
+  voting_power_threshold: 25000000,
   fund_start_time: '2024-06-27T12:00:00Z',
   fund_end_time: '2024-07-11T11:00:00Z',
   next_fund_start_time: '1970-01-01T00:00:00Z',
diff --git a/packages/staking/src/catalyst/fund-info.mocks.ts b/packages/staking/src/catalyst/fund-info.mocks.ts
index d9cf9ddee7..a4331a6417 100644
--- a/packages/staking/src/catalyst/fund-info.mocks.ts
+++ b/packages/staking/src/catalyst/fund-info.mocks.ts
@@ -81,4 +81,5 @@ export const mockFundInfo: Catalyst.FundInfo = {
   resultsUrl: 'https://projectcatalyst.io/funds/12',
   surveyUrl:
     'https://docs.google.com/forms/d/e/1FAIpQLSdg76N8zAtZn35hclY2pEDf9mY0wUb-vsejfaYZJqoW-CZDrg/viewform?usp=sf_link',
+  votingPowerThreshold: 25000000,
 }
diff --git a/packages/staking/src/catalyst/transformers.ts b/packages/staking/src/catalyst/transformers.ts
index 8d7df9ea57..fb23202c26 100644
--- a/packages/staking/src/catalyst/transformers.ts
+++ b/packages/staking/src/catalyst/transformers.ts
@@ -17,6 +17,7 @@ export function toFundInfo(
       tallyingEnd: new Date(fundInfo.tallying_end),
       resultsUrl: fundInfo.results_url,
       surveyUrl: fundInfo.survey_url,
+      votingPowerThreshold: fundInfo.voting_power_threshold,
 
       challenges: fundInfo.challenges?.map((challenge) => ({
         id: challenge.id,
diff --git a/packages/staking/src/catalyst/validators.test.ts b/packages/staking/src/catalyst/validators.test.ts
index 64d4d96d1d..41010666b7 100644
--- a/packages/staking/src/catalyst/validators.test.ts
+++ b/packages/staking/src/catalyst/validators.test.ts
@@ -44,6 +44,7 @@ describe('Validators', () => {
         tallyingEnd: new Date('2022-01-30'),
         resultsUrl: 'https://results.com',
         surveyUrl: 'https://survey.com',
+        votingPowerThreshold: 25000000,
       }
 
       expect(parseFundInfo(validData)).toEqual(validData)
@@ -84,6 +85,7 @@ describe('Validators', () => {
         tallyingEnd: new Date('2022-01-30'),
         resultsUrl: 'https://results.com',
         surveyUrl: 'https://survey.com',
+        votingPowerThreshold: 25000000,
       }
 
       expect(isFundInfo(validData)).toBe(true)
diff --git a/packages/staking/src/catalyst/validators.ts b/packages/staking/src/catalyst/validators.ts
index ce656c55bf..b5a3c00563 100644
--- a/packages/staking/src/catalyst/validators.ts
+++ b/packages/staking/src/catalyst/validators.ts
@@ -25,6 +25,7 @@ export const FundInfoSchema = z.object({
   tallyingEnd: z.date(),
   resultsUrl: z.string(),
   surveyUrl: z.string(),
+  votingPowerThreshold: z.number(),
 })
 
 export const isFundInfo =
diff --git a/packages/staking/src/types.ts b/packages/staking/src/types.ts
index b7fa447859..f7338a0f92 100644
--- a/packages/staking/src/types.ts
+++ b/packages/staking/src/types.ts
@@ -94,6 +94,7 @@ export namespace Catalyst {
     tallyingEnd: Date
     resultsUrl: string
     surveyUrl: string
+    votingPowerThreshold: number
   }
 
   export type FundChallenge = {