From 52df775a2928a67a3361768b5a2a6fb4aec6f8b6 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:32:05 +0200
Subject: [PATCH 1/9] feature(pool-transition): Adds Pool transition modal and
 warnings (#3184)

---
 .../.storybook/storybook.requires.js          |   2 +
 apps/wallet-mobile/package.json               |  10 +-
 .../wallet-mobile/src/Dashboard/Dashboard.tsx |  98 ++++---
 .../src/Dashboard/DashboardNavigator.tsx      |   4 +-
 .../src/Staking/FailedTx/FailedTxImage.tsx    |  47 ++++
 .../FailedTx/FailedTxScreen.stories.tsx       |   8 +
 .../src/Staking/FailedTx/FailedTxScreen.tsx   | 131 ++++++++++
 .../PoolTransitionModal.stories.tsx           |  42 +++
 .../PoolTransition/PoolTransitionModal.tsx    | 241 ++++++++++++++++++
 .../PoolTransition/PoolTransitionNotice.tsx   |  90 +++++++
 .../PoolTransition/usePoolTransition.tsx      | 156 ++++++++++++
 .../PoolTransition/usePoolTransitionModal.tsx |  24 ++
 .../Staking/StakingCenter/StakingCenter.tsx   |   8 +-
 apps/wallet-mobile/src/Staking/index.ts       |   1 +
 .../wallet-mobile/src/TxHistory/TxHistory.tsx |   6 +-
 .../src/components/Icon/ArrowDown.tsx         |  17 ++
 .../src/components/Icon/index.ts              |   2 +
 apps/wallet-mobile/src/features/Menu/Menu.tsx |  49 ++--
 .../wallet-mobile/src/i18n/locales/en-US.json |  20 +-
 apps/wallet-mobile/src/navigation.tsx         |   7 +-
 .../cardano/assetUtils/assetUtils.test.ts     |   2 +-
 .../cardano/getMinAmounts.test.ts             |   4 +-
 .../src/yoroi-wallets/utils/timeUtils.test.ts |  14 +
 .../src/yoroi-wallets/utils/timeUtils.ts      |  17 ++
 .../messages/src/Dashboard/Dashboard.json     |  10 +-
 .../src/Dashboard/DashboardNavigator.json     |  10 +-
 .../src/Staking/FailedTx/FailedTxScreen.json  |  62 +++++
 .../PoolTransition/usePoolTransition.json     | 197 ++++++++++++++
 .../Staking/StakingCenter/StakingCenter.json  |  18 +-
 .../messages/src/TxHistory/TxHistory.json     |  18 +-
 .../src/TxHistory/usePoolTransition.json      | 197 ++++++++++++++
 packages/swap/package.json                    |   4 +-
 yarn.lock                                     |  79 +++---
 33 files changed, 1459 insertions(+), 136 deletions(-)
 create mode 100644 apps/wallet-mobile/src/Staking/FailedTx/FailedTxImage.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.stories.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionNotice.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
 create mode 100644 apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransitionModal.tsx
 create mode 100644 apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
 create mode 100644 apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.test.ts
 create mode 100644 apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
 create mode 100644 apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 8d43d52f4b..f3a090b1da 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -254,7 +254,9 @@ const getStories = () => {
     "./src/Nfts/Nfts.stories.tsx": require("../src/Nfts/Nfts.stories.tsx"),
     "./src/Nfts/NoNftsScreen.stories.tsx": require("../src/Nfts/NoNftsScreen.stories.tsx"),
     "./src/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx": require("../src/Staking/DelegationConfirmation/DelegationConfirmation.stories.tsx"),
+    "./src/Staking/FailedTx/FailedTxScreen.stories.tsx": require("../src/Staking/FailedTx/FailedTxScreen.stories.tsx"),
     "./src/Staking/PoolDetails/PoolDetailScreen.stories.tsx": require("../src/Staking/PoolDetails/PoolDetailScreen.stories.tsx"),
+    "./src/Staking/PoolTransition/PoolTransitionModal.stories.tsx": require("../src/Staking/PoolTransition/PoolTransitionModal.stories.tsx"),
     "./src/Staking/PoolWarningModal/PoolWarningModal.stories.tsx": require("../src/Staking/PoolWarningModal/PoolWarningModal.stories.tsx"),
     "./src/Staking/StakingCenter/StakingCenter.stories.tsx": require("../src/Staking/StakingCenter/StakingCenter.stories.tsx"),
     "./src/TxHistory/AssetList/ActionsBanner.stories.tsx": require("../src/TxHistory/AssetList/ActionsBanner.stories.tsx"),
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index c19605b760..311186f4ed 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -90,16 +90,16 @@
     ]
   },
   "dependencies": {
-    "@amplitude/analytics-react-native": "^1.3.1",
+    "@amplitude/analytics-react-native": "1.3.1",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
     "@emurgo/cip14-js": "^3.0.1",
     "@emurgo/cip4-js": "1.0.7",
-    "@emurgo/cross-csl-core": "^4.2.0",
-    "@emurgo/cross-csl-mobile": "^4.2.0",
+    "@emurgo/cross-csl-core": "4.4.0",
+    "@emurgo/cross-csl-mobile": "4.4.0",
     "@emurgo/csl-mobile-bridge": "6.0.0-alpha.4",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "0.15.1",
+    "@emurgo/yoroi-lib": "0.15.4-alpha.1",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",
@@ -214,7 +214,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/runtime": "^7.20.0",
     "@emurgo/cardano-serialization-lib-nodejs": "^9.1.4",
-    "@emurgo/cross-csl-nodejs": "^4.2.0",
+    "@emurgo/cross-csl-nodejs": "4.4.0",
     "@formatjs/cli": "^6.1.0",
     "@formatjs/ts-transformer": "^3.13.0",
     "@react-navigation/devtools": "^6.0.13",
diff --git a/apps/wallet-mobile/src/Dashboard/Dashboard.tsx b/apps/wallet-mobile/src/Dashboard/Dashboard.tsx
index 1c869f96ba..46ba5036a4 100644
--- a/apps/wallet-mobile/src/Dashboard/Dashboard.tsx
+++ b/apps/wallet-mobile/src/Dashboard/Dashboard.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {useNavigation} from '@react-navigation/native'
+import {useTheme} from '@yoroi/theme'
 import BigNumber from 'bignumber.js'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
@@ -16,6 +17,8 @@ import {useSelectedWallet} from '../features/WalletManager/Context/SelectedWalle
 import globalMessages from '../i18n/global-messages'
 import {Modal} from '../legacy/Modal'
 import {useWalletNavigation} from '../navigation'
+import {PoolTransitionNotice} from '../Staking/PoolTransition/PoolTransitionNotice'
+import {usePoolTransition} from '../Staking/PoolTransition/usePoolTransition'
 import {isEmptyString} from '../utils/utils'
 import {getCardanoNetworkConfigById} from '../yoroi-wallets/cardano/networks'
 import {getCardanoBaseConfig} from '../yoroi-wallets/cardano/utils'
@@ -34,9 +37,11 @@ import {UserSummary} from './UserSummary'
 import {WithdrawStakingRewards} from './WithdrawStakingRewards'
 
 export const Dashboard = () => {
+  const {styles} = useStyles()
   const intl = useIntl()
   const navigateTo = useNavigateTo()
   const governanceStrings = useGovernanceStrings()
+  const {isPoolRetiring} = usePoolTransition()
 
   const wallet = useSelectedWallet()
   const {isLoading: isSyncing, sync} = useSync(wallet)
@@ -90,6 +95,12 @@ export const Dashboard = () => {
         >
           {stakingInfo?.status !== 'staked' && <NotDelegatedInfo />}
 
+          {isPoolRetiring && (
+            <Row>
+              <PoolTransitionNotice />
+            </Row>
+          )}
+
           <Row>
             <EpochInfo />
           </Row>
@@ -169,8 +180,6 @@ const useNavigateTo = () => {
   }
 }
 
-const Row = ({style, ...props}: ViewProps) => <View {...props} style={[style, styles.row]} />
-
 const SyncErrorBanner = ({showRefresh}: {showRefresh: boolean}) => {
   const intl = useIntl()
 
@@ -239,8 +248,6 @@ const EpochInfo = () => {
   )
 }
 
-const Actions = (props: ViewProps) => <View {...props} style={styles.actions} />
-
 const messages = defineMessages({
   stakingCenterButton: {
     id: 'components.delegation.delegationnavigationbuttons.stakingCenterButton',
@@ -248,36 +255,53 @@ const messages = defineMessages({
   },
 })
 
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-  },
-  container: {
-    flexDirection: 'column',
-    flex: 1,
-  },
-  scrollView: {
-    flex: 1,
-    backgroundColor: '#fff',
-  },
-  contentContainer: {
-    paddingTop: 16,
-    paddingHorizontal: 16,
-  },
-  row: {
-    flex: 1,
-    paddingVertical: 12,
-  },
-  actions: {
-    flexDirection: 'row',
-    backgroundColor: '#fff',
-    padding: 16,
-    borderTopLeftRadius: 8,
-    borderTopRightRadius: 8,
-    elevation: 1,
-    shadowOpacity: 0.06,
-    shadowColor: 'black',
-    shadowRadius: 6,
-    shadowOffset: {width: 0, height: -8},
-  },
-})
+const useStyles = () => {
+  const {theme} = useTheme()
+  const {color} = theme
+
+  const styles = StyleSheet.create({
+    root: {
+      flex: 1,
+    },
+    container: {
+      flexDirection: 'column',
+      flex: 1,
+    },
+    scrollView: {
+      flex: 1,
+      backgroundColor: color.gray.min,
+    },
+    contentContainer: {
+      paddingTop: 16,
+      paddingHorizontal: 16,
+    },
+    row: {
+      flex: 1,
+      paddingVertical: 12,
+    },
+    actions: {
+      flexDirection: 'row',
+      backgroundColor: color.gray.min,
+      padding: 16,
+      borderTopLeftRadius: 8,
+      borderTopRightRadius: 8,
+      elevation: 1,
+      shadowOpacity: 0.06,
+      shadowColor: color['black-static'],
+      shadowRadius: 6,
+      shadowOffset: {width: 0, height: -8},
+    },
+  })
+
+  return {styles}
+}
+
+const Actions = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.actions} />
+}
+
+const Row = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.row} />
+}
diff --git a/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx b/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx
index 06c599f736..d7ecc0ae43 100644
--- a/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx
+++ b/apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx
@@ -9,7 +9,7 @@ import {SettingsButton} from '../components/Button'
 import {useGovernanceManagerMaker} from '../features/Staking/Governance'
 import {useSelectedWallet} from '../features/WalletManager/Context/SelectedWalletContext'
 import {DashboardRoutes, defaultStackNavigationOptions, useWalletNavigation} from '../navigation'
-import {DelegationConfirmation} from '../Staking'
+import {DelegationConfirmation, FailedTxScreen} from '../Staking'
 import {StakingCenter} from '../Staking/StakingCenter'
 import {useWalletName} from '../yoroi-wallets/hooks'
 import {Dashboard} from './Dashboard'
@@ -46,6 +46,8 @@ export const DashboardNavigator = () => {
           component={DelegationConfirmation}
           options={{title: strings.title}}
         />
+
+        <Stack.Screen name="delegation-failed-tx" component={FailedTxScreen} options={{title: strings.title}} />
       </Stack.Navigator>
     </GovernanceProvider>
   )
diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxImage.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxImage.tsx
new file mode 100644
index 0000000000..b63d5b8dd2
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxImage.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react'
+import Svg, {Defs, LinearGradient, Path, Stop, SvgProps} from 'react-native-svg'
+
+export const FailedTxImage = (props: SvgProps) => {
+  return (
+    <Svg width={201} height={200} viewBox="0 0 201 200" fill="none" {...props}>
+      <Path
+        d="M48.477 17.513l-7.55 4.102 5.251 7.501-.249 68.963c-.031 8.886 5.61 19.231 12.623 23.104l46.822 25.889c.219 1.907.504 3.988.867 6.256a32.813 32.813 0 002.081 7.316l-2.19-1.644 2.089 8.886 9.506 15.758 7.862-4.443a2.16 2.16 0 00.483-.266c.838-.575 1.086-1.657.577-2.511a30.503 30.503 0 01-2.72-6.805c-.91-3.13 1.004-7.765 2.599-10.849l17.05 9.427 6.787 9.694 8.641-4.295c3.148-1.207 5.237-4.762 5.237-10.093l.257-71.533c.031-8.886-5.61-19.23-12.623-23.104L58.918 17.468c-2.626-1.459-5.072-1.792-7.106-1.17a20.427 20.427 0 00-3.335 1.215z"
+        fill="url(#paint0_linear_20568_11560)"
+      />
+
+      <Path
+        opacity={0.8}
+        d="M36.757 31.198c0-8.886 5.735-12.96 12.732-9.086l92.959 51.405c7.013 3.873 12.654 14.218 12.623 23.104l-.257 71.525c0 8.886-5.735 12.959-12.732 9.086l-28.714-15.876a23.321 23.321 0 001.605 13.292 80.522 80.522 0 003.398 6.435c.449.79.281 1.769-.409 2.383a2.165 2.165 0 01-2.529.231c-6.701-4.147-16.036-12.152-18.148-25.318a133.949 133.949 0 01-.88-6.405l-47.282-26.148c-7.013-3.872-12.654-14.217-12.623-23.103l.257-71.525z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M54.364 77.083c-.317.137-.478.433-.478.889s.161.934.478 1.436c.315.5.714.897 1.19 1.193.477.295.891.4 1.24.311l6.242-2.1 6.242 9.84c.35.52.748.917 1.192 1.193.444.276.841.369 1.19.282.352-.087.526-.359.526-.814 0-.456-.174-.96-.526-1.509l-6.194-9.81 6.194-2.13c.352-.118.526-.406.526-.86 0-.455-.174-.944-.526-1.464-.349-.52-.746-.918-1.19-1.194-.444-.276-.843-.37-1.192-.284l-6.242 2.101-6.242-9.838a4.115 4.115 0 00-1.24-1.225c-.476-.294-.875-.39-1.19-.281-.317.105-.478.387-.478.843 0 .456.161.949.478 1.482l6.242 9.838-6.242 2.1zM109.146 109.906c-.317.137-.476.433-.476.891 0 .454.159.932.476 1.434.317.499.716.899 1.192 1.193.475.297.889.4 1.238.313l6.242-2.101 6.244 9.839c.349.52.746.917 1.192 1.193.444.276.839.371 1.188.284.351-.087.526-.359.526-.814 0-.456-.175-.96-.526-1.511l-6.194-9.809 6.194-2.13c.351-.119.526-.404.526-.86 0-.456-.175-.943-.526-1.463-.349-.52-.744-.92-1.188-1.196-.446-.275-.843-.369-1.192-.282l-6.244 2.101-6.242-9.84a4.116 4.116 0 00-1.238-1.222c-.476-.297-.875-.39-1.192-.282-.317.105-.476.387-.476.843 0 .456.159.95.476 1.48l6.244 9.838-6.244 2.101zM88.083 124.986c3.767 2.226 6.821 1.102 6.821-2.511 0-3.612-3.054-8.346-6.82-10.572-3.768-2.226-6.822-1.102-6.822 2.511 0 3.613 3.054 8.346 6.821 10.572z"
+        fill="#FF1351"
+      />
+
+      <Defs>
+        <LinearGradient
+          id="paint0_linear_20568_11560"
+          x1={40.9268}
+          y1={183.645}
+          x2={164.5}
+          y2={183.645}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.15} stopColor="#1ACBAF" />
+
+          <Stop offset={0.37} stopColor="#21B8BC" />
+
+          <Stop offset={0.62} stopColor="#2E9BD3" />
+
+          <Stop offset={0.89} stopColor="#3F71F1" />
+
+          <Stop offset={1} stopColor="#475FFF" />
+        </LinearGradient>
+      </Defs>
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.stories.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.stories.tsx
new file mode 100644
index 0000000000..21536f6847
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.stories.tsx
@@ -0,0 +1,8 @@
+import {storiesOf} from '@storybook/react-native'
+import React from 'react'
+
+import {FailedTxScreen} from './FailedTxScreen'
+
+storiesOf('Staking/Failed Tx Screen', module).add('initial', () => {
+  return <FailedTxScreen />
+})
diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
new file mode 100644
index 0000000000..702d68f605
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
@@ -0,0 +1,131 @@
+import {useNavigation} from '@react-navigation/native'
+import {useTheme} from '@yoroi/theme'
+import React from 'react'
+import {defineMessages, useIntl} from 'react-intl'
+import {StyleSheet, View} from 'react-native'
+
+import {Button, Spacer, Text} from '../../components'
+import {Space} from '../../components/Space/Space'
+import {FailedTxImage} from './FailedTxImage'
+
+export const FailedTxScreen = () => {
+  const strings = useStrings()
+  const styles = useStyles()
+  const navigateTo = useNavigateTo()
+
+  return (
+    <View style={styles.container}>
+      <FailedTxImage />
+
+      <Space height="l" />
+
+      <Text style={styles.title}>{strings.notEnoughFunds}</Text>
+
+      <Text style={styles.text}>{strings.noFundsToProcess}</Text>
+
+      <Spacer height={22} />
+
+      <Button onPress={navigateTo.buyAda} title={strings.buyAda} style={styles.button} shelleyTheme />
+
+      <Space height="l" />
+
+      <Button
+        onPress={navigateTo.main}
+        title={strings.goToMain}
+        style={styles.button}
+        textStyles={styles.outlineText}
+        outline
+      />
+    </View>
+  )
+}
+
+const useNavigateTo = () => {
+  const navigation = useNavigation()
+
+  return {
+    buyAda: () =>
+      navigation.navigate('app-root', {
+        screen: 'main-wallet-routes',
+        params: {
+          screen: 'history',
+          params: {
+            screen: 'exchange-create-order',
+          },
+        },
+      }),
+    main: () =>
+      navigation.navigate('app-root', {
+        screen: 'main-wallet-routes',
+        params: {
+          screen: 'history',
+          params: {
+            screen: 'history-list',
+          },
+        },
+      }),
+  }
+}
+
+const useStyles = () => {
+  const {theme} = useTheme()
+  const {color, typography, padding} = theme
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      alignItems: 'center',
+      justifyContent: 'center',
+      ...padding['l'],
+    },
+    title: {
+      color: color.gray.max,
+      ...typography['heading-3-medium'],
+      ...padding['x-s'],
+      textAlign: 'center',
+    },
+    text: {
+      color: color.gray[600],
+      ...typography['body-2-m-regular'],
+      textAlign: 'center',
+      maxWidth: 330,
+    },
+    button: {
+      ...padding['x-l'],
+      ...typography['button-2-m'],
+    },
+    outlineText: {
+      color: theme.color.primary[500],
+    },
+  })
+  return styles
+}
+
+const useStrings = () => {
+  const intl = useIntl()
+
+  return {
+    notEnoughFunds: intl.formatMessage(messages.notEnoughFunds),
+    noFundsToProcess: intl.formatMessage(messages.noFundsToProcess),
+    buyAda: intl.formatMessage(messages.buyAda),
+    goToMain: intl.formatMessage(messages.goToMain),
+  }
+}
+
+const messages = defineMessages({
+  notEnoughFunds: {
+    id: 'components.stakingcenter.failedDelegation.notEnoughFunds',
+    defaultMessage: '!!!Not enough funds',
+  },
+  noFundsToProcess: {
+    id: 'components.stakingcenter.failedDelegation.noFundsToProcess',
+    defaultMessage: '!!!Your transaction cannot be processed due to lack of funds on your wallet balance',
+  },
+  buyAda: {
+    id: 'components.stakingcenter.failedDelegation.buyAda',
+    defaultMessage: '!!!Buy ada',
+  },
+  goToMain: {
+    id: 'components.stakingcenter.failedDelegation.goToMain',
+    defaultMessage: '!!!Go to main wallet page',
+  },
+})
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
new file mode 100644
index 0000000000..9433158b97
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
@@ -0,0 +1,42 @@
+import {PoolInfo} from '@emurgo/yoroi-lib'
+import {action} from '@storybook/addon-actions'
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+import {View} from 'react-native'
+
+import {PoolTransitionModal} from './PoolTransitionModal'
+
+const mock = {
+  current: {
+    pic: 'https://img.cexplorer.io/a/5/5/f/2/pool12eht6dqxpzqj87xuextrpufz2gxmt4reuesuw26r2utzw0kw906.png',
+    ticker: 'EMRG',
+    name: 'emurgo old',
+    roa: '0',
+    taxRate: '0.05',
+  } as unknown as PoolInfo,
+  suggested: {
+    pic: 'https://img.cexplorer.io/e/c/2/3/1/pool1dkww2vlysa8lsnuf5rca979zdsyr3zvt59hu7e420yxfunkka2z.png',
+    id: 'df1750df9b2df285fcfb50f4740657a18ee3af42727d410c37b86207',
+    name: 'emurgo new',
+    roa: '5.1',
+    ticker: 'EMRG',
+    taxRate: '0.02',
+  } as unknown as PoolInfo,
+  deadlineMilliseconds: Date.now() + 2999777000,
+}
+
+storiesOf('PoolTransitionModal', module)
+  .add('Future deadline', () => (
+    <View style={{flex: 1, justifyContent: 'flex-end'}}>
+      <View style={{height: 600, padding: 8}}>
+        <PoolTransitionModal onContinue={action('Navigate')} poolTransition={mock} />
+      </View>
+    </View>
+  ))
+  .add('Past deadline', () => (
+    <View style={{flex: 1, justifyContent: 'flex-end'}}>
+      <View style={{height: 600, padding: 8}}>
+        <PoolTransitionModal onContinue={action('Navigate')} poolTransition={{...mock, deadlineMilliseconds: 0}} />
+      </View>
+    </View>
+  ))
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
new file mode 100644
index 0000000000..f38525c718
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
@@ -0,0 +1,241 @@
+import {PoolTransition} from '@emurgo/yoroi-lib'
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {Image, StyleSheet, Text, View, ViewProps} from 'react-native'
+import LinearGradient from 'react-native-linear-gradient'
+
+import {Button, Icon, useModal} from '../../components'
+import {Space} from '../../components/Space/Space'
+import {formatTimeSpan} from '../../yoroi-wallets/utils'
+import {useStrings} from './usePoolTransition'
+
+export const PoolTransitionModal = ({
+  poolTransition,
+  onContinue,
+}: {
+  poolTransition: PoolTransition
+  onContinue: () => void
+}) => {
+  const {styles, colors} = useStyles()
+  const strings = useStrings()
+
+  const {closeModal} = useModal()
+
+  const handleOnSkip = () => {
+    closeModal()
+  }
+
+  const handleOnUpdate = () => {
+    closeModal()
+    onContinue()
+  }
+
+  const timeSpan = poolTransition.deadlineMilliseconds - Date.now()
+  const isActive = timeSpan > 0
+
+  return (
+    <View style={styles.modal}>
+      <Text style={styles.details}>{isActive ? strings.warning : strings.finalWarning}</Text>
+
+      <Space fill height="l" />
+
+      <View style={[styles.card, isActive ? styles.border : styles.warningBorder]}>
+        <Row>
+          <Text style={styles.label}>{strings.currentPool}</Text>
+
+          <View style={styles.poolTicker}>
+            {poolTransition.current.pic != null && (
+              <Image source={{uri: poolTransition.current.pic}} style={styles.pic} />
+            )}
+
+            <Text
+              style={styles.poolTickerText}
+            >{`[${poolTransition.current.ticker}] ${poolTransition.current.name}`}</Text>
+          </View>
+        </Row>
+
+        <Row>
+          <Text style={styles.label}>{strings.estimatedRoa}</Text>
+
+          <Text style={styles.currentValue}>{poolTransition.current.roa} %</Text>
+        </Row>
+
+        <Row>
+          <Text style={styles.label}>{strings.fee}</Text>
+
+          <Text style={styles.currentValue}>{formatFee(poolTransition.current.taxRatio)} %</Text>
+        </Row>
+
+        <Text style={styles.warning}>
+          <Text style={styles.warningText}>{isActive ? strings.poolWillStopRewards : strings.poolNoRewards}</Text>
+
+          {isActive && (
+            <Text style={styles.warningTimer}>
+              {'\n'}
+
+              {formatTimeSpan(timeSpan)}
+            </Text>
+          )}
+        </Text>
+      </View>
+
+      <Space height="s" />
+
+      <Icon.ArrowDown size={17} />
+
+      <Space height="s" />
+
+      <View style={styles.card}>
+        <LinearGradient
+          style={[StyleSheet.absoluteFill, {opacity: 1, borderRadius: 8}]}
+          start={{x: 0, y: 0}}
+          end={{x: 1, y: 0.5}}
+          colors={colors.backgroundGradientCard}
+        />
+
+        <Row>
+          <Text style={styles.label}>{strings.newPool}</Text>
+
+          <View style={styles.poolTicker}>
+            {poolTransition.suggested.pic != null && (
+              <Image source={{uri: poolTransition.suggested.pic}} style={styles.pic} />
+            )}
+
+            <Text
+              style={styles.poolTickerText}
+            >{`[${poolTransition.suggested.ticker}] ${poolTransition.suggested.name}`}</Text>
+          </View>
+        </Row>
+
+        <Row>
+          <Text style={styles.label}>{strings.estimatedRoa}</Text>
+
+          <Text style={styles.suggestedValue}>{poolTransition.suggested.roa} %</Text>
+        </Row>
+
+        <Row>
+          <Text style={styles.label}>{strings.fee}</Text>
+
+          <Text style={styles.suggestedValue}>{formatFee(poolTransition.suggested.taxRatio)} %</Text>
+        </Row>
+
+        <Text style={styles.currentValue}>{strings.poolGeneratesRewards}</Text>
+      </View>
+
+      <Space height="xl" />
+
+      <Actions>
+        <Button outline title={strings.skipNoRewards} textStyles={styles.outlineButton} onPress={handleOnSkip} />
+
+        <Button shelleyTheme title={strings.updateKeepEarning} onPress={handleOnUpdate} textStyles={styles.button} />
+      </Actions>
+
+      <Space height="xl" />
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {theme} = useTheme()
+
+  const styles = StyleSheet.create({
+    modal: {
+      backgroundColor: theme.color['bottom-sheet-background'],
+      alignItems: 'center',
+      flex: 1,
+      justifyContent: 'flex-end',
+    },
+    card: {
+      borderRadius: 8,
+      gap: 8,
+      ...theme.padding.l,
+      width: '100%',
+      overflow: 'hidden',
+    },
+    border: {
+      borderWidth: 1,
+      borderColor: theme.color.gray['300'],
+    },
+    warningBorder: {
+      borderWidth: 1,
+      borderColor: theme.color.magenta['500'],
+    },
+    poolTicker: {
+      alignItems: 'center',
+      flexDirection: 'row',
+      gap: 8,
+    },
+    poolTickerText: {
+      ...theme.typography['body-1-l-regular'],
+      color: theme.color.primary[600],
+    },
+    pic: {
+      width: 24,
+      height: 24,
+      borderRadius: 100,
+    },
+    label: {
+      ...theme.typography['body-1-l-regular'],
+      color: theme.color.gray['600'],
+    },
+    currentValue: {
+      ...theme.typography['body-1-l-regular'],
+      color: theme.color.gray['max'],
+    },
+    suggestedValue: {
+      ...theme.typography['body-1-l-medium'],
+      color: theme.color.gray['max'],
+    },
+    warning: {
+      color: theme.color.magenta['500'],
+    },
+    warningText: {
+      ...theme.typography['body-1-l-regular'],
+    },
+    warningTimer: {
+      ...theme.typography['body-1-l-medium'],
+    },
+    row: {
+      width: '100%',
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      height: 24,
+      alignItems: 'center',
+    },
+    actions: {
+      alignSelf: 'stretch',
+      backgroundColor: theme.color.gray.min,
+      gap: 4,
+    },
+    details: {
+      ...theme.typography['body-1-l-regular'],
+      color: theme.color.gray['900'],
+      width: '100%',
+    },
+    outlineButton: {
+      color: theme.color.gray[900],
+      ...theme.typography['button-2-m'],
+    },
+    button: {
+      ...theme.typography['button-1-l'],
+    },
+  })
+
+  const colors = {
+    backgroundGradientCard: theme.color.gradients['blue-green'],
+  }
+
+  return {styles, colors} as const
+}
+
+const Actions = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.actions} />
+}
+
+const Row = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.row} />
+}
+
+const formatFee = (fee: string) => Number((Number(fee) * 100).toFixed(2))
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionNotice.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionNotice.tsx
new file mode 100644
index 0000000000..5044eeb734
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionNotice.tsx
@@ -0,0 +1,90 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View, ViewProps} from 'react-native'
+
+import {Button, Icon} from '../../components'
+import {Space} from '../../components/Space/Space'
+import {formatTimeSpan} from '../../yoroi-wallets/utils'
+import {usePoolTransition, useStrings} from './usePoolTransition'
+
+export const PoolTransitionNotice = () => {
+  const {styles, color} = useStyles()
+  const strings = useStrings()
+  const {poolTransition, navigateToUpdate} = usePoolTransition()
+  if (poolTransition === null) return null
+
+  const timeSpan = poolTransition.deadlineMilliseconds - Date.now()
+  const isActive = timeSpan > 0
+
+  return (
+    <View style={styles.notice}>
+      <Row>
+        <Icon.Warning size={20} color={color.magenta[500]} />
+      </Row>
+
+      <Text style={styles.text}>
+        <Text>{isActive ? strings.poolWillStopRewards : strings.poolNoRewards}</Text>
+
+        {isActive && (
+          <Text style={styles.bold}>
+            {'\n'}
+
+            {formatTimeSpan(timeSpan)}
+          </Text>
+        )}
+      </Text>
+
+      <Actions>
+        <Button style={styles.noticeButton} onPress={navigateToUpdate} title={strings.update} block />
+
+        <Space fill />
+      </Actions>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {theme} = useTheme()
+  const {color, typography} = theme
+
+  const styles = StyleSheet.create({
+    notice: {
+      flex: 1,
+      padding: 16,
+      gap: 12,
+      backgroundColor: color.magenta[100],
+      borderRadius: 8,
+    },
+    text: {
+      color: color.gray.max,
+      ...typography['body-2-m-regular'],
+    },
+    bold: {
+      ...typography['body-2-m-medium'],
+    },
+    noticeButton: {
+      flexGrow: 0,
+      backgroundColor: color.magenta[500],
+      ...typography['button-2-m'],
+    },
+    actions: {
+      flexDirection: 'row',
+    },
+    row: {
+      flexDirection: 'row',
+      gap: 4,
+    },
+  })
+
+  return {styles, color}
+}
+
+const Actions = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.actions} />
+}
+
+const Row = (props: ViewProps) => {
+  const {styles} = useStyles()
+  return <View {...props} style={styles.row} />
+}
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
new file mode 100644
index 0000000000..1ccccc375a
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -0,0 +1,156 @@
+import {PoolInfoApi} from '@emurgo/yoroi-lib'
+import {useNavigation} from '@react-navigation/native'
+import BigNumber from 'bignumber.js'
+import * as React from 'react'
+import {defineMessages, useIntl} from 'react-intl'
+import {useQuery} from 'react-query'
+
+import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
+import {useSelectedWallet} from '../../features/WalletManager/Context'
+import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
+import {asQuantity, Quantities} from '../../yoroi-wallets/utils'
+
+const createDelegationTx = async (wallet: YoroiWallet, poolId: string) => {
+  const accountStates = await wallet.fetchAccountState()
+  const accountState = accountStates[wallet.rewardAddressHex]
+  if (!accountState) throw new Error('Account state not found')
+
+  const stakingUtxos = await wallet.getAllUtxosForKey()
+  const amountToDelegate = Quantities.sum([
+    ...stakingUtxos.map((utxo) => asQuantity(utxo.amount)),
+    asQuantity(accountState.remainingAmount),
+  ])
+
+  return wallet.createDelegationTx(poolId, new BigNumber(amountToDelegate))
+}
+
+const poolInfoApi = new PoolInfoApi()
+
+export const usePoolTransition = () => {
+  const navigation = useNavigation()
+  const wallet = useSelectedWallet()
+  const {stakingInfo} = useStakingInfo(wallet)
+
+  const isStaked = stakingInfo?.status === 'staked'
+  const currentPoolId = isStaked ? stakingInfo?.poolId : ''
+
+  const poolTransitionQuery = useQuery({
+    enabled: isStaked,
+    retry: false,
+    staleTime: 20 * 1000,
+    queryKey: [wallet.id, 'poolTransition', currentPoolId],
+    queryFn: () => poolInfoApi.getTransition(currentPoolId),
+  })
+
+  const poolTransition = poolTransitionQuery.data ?? null
+  const poolId = poolTransition?.suggested.id ?? ''
+
+  const navigateToUpdate = React.useCallback(async () => {
+    try {
+      const yoroiUnsignedTx = await createDelegationTx(wallet, poolId)
+      navigation.navigate('app-root', {
+        screen: 'staking-dashboard',
+        params: {
+          screen: 'delegation-confirmation',
+          initial: false,
+          params: {
+            poolId,
+            yoroiUnsignedTx,
+          },
+        },
+      })
+    } catch (err) {
+      navigation.navigate('app-root', {
+        screen: 'staking-dashboard',
+        params: {
+          screen: 'delegation-failed-tx',
+          initial: false,
+        },
+      })
+    }
+  }, [navigation, poolId, wallet])
+
+  return {
+    ...poolTransitionQuery,
+    poolTransition,
+    isPoolRetiring: poolTransition !== null,
+    navigateToUpdate,
+  }
+}
+
+export const useStrings = () => {
+  const intl = useIntl()
+
+  return {
+    title: intl.formatMessage(messages.title),
+    warning: intl.formatMessage(messages.warning),
+    finalWarning: intl.formatMessage(messages.finalWarning),
+    currentPool: intl.formatMessage(messages.currentPool),
+    newPool: intl.formatMessage(messages.newPool),
+    estimatedRoa: intl.formatMessage(messages.estimatedRoa),
+    fee: intl.formatMessage(messages.fee),
+    poolGeneratesRewards: intl.formatMessage(messages.poolGeneratesRewards),
+    poolNoRewards: intl.formatMessage(messages.poolNoRewards),
+    poolWillStopRewards: intl.formatMessage(messages.poolWillStopRewards),
+    skipNoRewards: intl.formatMessage(messages.skipNoRewards),
+    updateKeepEarning: intl.formatMessage(messages.updateKeepEarning),
+    update: intl.formatMessage(messages.update),
+  }
+}
+
+const messages = defineMessages({
+  title: {
+    id: 'components.pooltransition.title',
+    defaultMessage: '!!!Upgrade your stake pool',
+  },
+  warning: {
+    id: 'components.pooltransition.warning',
+    defaultMessage:
+      "!!!The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.",
+  },
+  finalWarning: {
+    id: 'components.pooltransition.finalWarning',
+    defaultMessage:
+      "!!!The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning",
+  },
+  currentPool: {
+    id: 'components.pooltransition.currentPool',
+    defaultMessage: '!!!Current pool',
+  },
+  newPool: {
+    id: 'components.pooltransition.newPool',
+    defaultMessage: '!!!New pool',
+  },
+  estimatedRoa: {
+    id: 'components.pooltransition.estimatedRoa',
+    defaultMessage: '!!!Estimated ROA',
+  },
+  fee: {
+    id: 'components.pooltransition.fee',
+    defaultMessage: '!!!Fee',
+  },
+  poolGeneratesRewards: {
+    id: 'components.pooltransition.poolGeneratesRewards',
+    defaultMessage: '!!!This pool continues to generate staking rewards',
+  },
+  poolNoRewards: {
+    id: 'components.pooltransition.poolNoRewards',
+    defaultMessage: '!!!This pool is NOT generating staking rewards anymore',
+  },
+  poolWillStopRewards: {
+    id: 'components.pooltransition.poolWillStopRewards',
+    defaultMessage: '!!!This pool will stop generating rewards in',
+  },
+  skipNoRewards: {
+    id: 'components.pooltransition.skipNoRewards',
+    defaultMessage: '!!!Skip and stop receiving rewards',
+  },
+  updateKeepEarning: {
+    id: 'components.pooltransition.updateKeepEarning',
+    defaultMessage: '!!!Update now and keep earning',
+  },
+  update: {
+    id: 'components.pooltransition.update',
+    defaultMessage: '!!!Update pool',
+  },
+})
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransitionModal.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransitionModal.tsx
new file mode 100644
index 0000000000..eaa793b2c1
--- /dev/null
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransitionModal.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react'
+
+import {useModal} from '../../components'
+import {PoolTransitionModal} from './PoolTransitionModal'
+import {usePoolTransition, useStrings} from './usePoolTransition'
+
+export const usePoolTransitionModal = () => {
+  const {poolTransition, isPoolRetiring, isLoading, navigateToUpdate} = usePoolTransition()
+  const {openModal} = useModal()
+  const strings = useStrings()
+  const modalHeight = 700
+
+  React.useEffect(() => {
+    if (isPoolRetiring && poolTransition !== null) {
+      openModal(
+        strings.title,
+        <PoolTransitionModal poolTransition={poolTransition} onContinue={navigateToUpdate} />,
+        modalHeight,
+      )
+    }
+  }, [isPoolRetiring, modalHeight, navigateToUpdate, openModal, poolTransition, strings.title])
+
+  return {isLoading}
+}
diff --git a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
index 3481ba22e2..992ba8f449 100644
--- a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
+++ b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
@@ -11,7 +11,7 @@ import {showErrorDialog} from '../../dialogs'
 import {features} from '../../features'
 import {useSelectedWallet} from '../../features/WalletManager/Context/SelectedWalletContext'
 import {useLanguage} from '../../i18n'
-import globalMessages, {errorMessages} from '../../i18n/global-messages'
+import globalMessages from '../../i18n/global-messages'
 import {isNightly} from '../../legacy/config'
 import {Logger} from '../../legacy/logging'
 import {useMetrics} from '../../metrics/metricsManager'
@@ -49,12 +49,10 @@ export const StakingCenter = () => {
       },
       onError: (error) => {
         if (error instanceof NotEnoughMoneyToSendError) {
-          showErrorDialog(errorMessages.insufficientBalance, intl)
+          navigation.navigate('delegation-failed-tx')
         } else {
           Logger.error(error as any)
-          showErrorDialog(errorMessages.generalError, intl, {
-            message: error.message,
-          })
+          navigation.navigate('delegation-failed-tx')
         }
       },
     },
diff --git a/apps/wallet-mobile/src/Staking/index.ts b/apps/wallet-mobile/src/Staking/index.ts
index 170105ff05..60fbe83239 100644
--- a/apps/wallet-mobile/src/Staking/index.ts
+++ b/apps/wallet-mobile/src/Staking/index.ts
@@ -1,2 +1,3 @@
 export * from './DelegationConfirmation'
+export * from './FailedTx/FailedTxScreen'
 export * from './StakingCenter'
diff --git a/apps/wallet-mobile/src/TxHistory/TxHistory.tsx b/apps/wallet-mobile/src/TxHistory/TxHistory.tsx
index 555bdf1212..fb3022cb50 100644
--- a/apps/wallet-mobile/src/TxHistory/TxHistory.tsx
+++ b/apps/wallet-mobile/src/TxHistory/TxHistory.tsx
@@ -9,6 +9,7 @@ import {Boundary, ResetErrorRef, Spacer} from '../components'
 import {Tab, TabPanel, TabPanels, Tabs} from '../components/Tabs'
 import {useSelectedWallet} from '../features/WalletManager/Context/SelectedWalletContext'
 import {assetMessages, txLabels} from '../i18n/global-messages'
+import {usePoolTransitionModal} from '../Staking/PoolTransition/usePoolTransitionModal'
 import {isByron} from '../yoroi-wallets/cardano/utils'
 import {useSync} from '../yoroi-wallets/hooks'
 import {ActionsBanner} from './ActionsBanner'
@@ -36,7 +37,10 @@ export const TxHistory = () => {
     setActiveTab(tab)
   }
 
-  const {sync, isLoading} = useSync(wallet)
+  const {sync, isLoading: isLoadingWallet} = useSync(wallet)
+  const {isLoading: isLoadingPoolTransition} = usePoolTransitionModal()
+  const isLoading = isLoadingWallet || isLoadingPoolTransition
+
   useFocusEffect(React.useCallback(() => sync(), [sync]))
 
   const [expanded, setExpanded] = useState(true)
diff --git a/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx b/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
new file mode 100644
index 0000000000..8ec8da1f29
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Icon/ArrowDown.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react'
+import Svg, {Path} from 'react-native-svg'
+
+type Props = {
+  size?: number
+}
+
+export const ArrowDown = ({size}: Props) => {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 15 17" fill="none">
+      <Path
+        fill="#000"
+        d="M6.793 16.707a1 1 0 001.414 0l6.364-6.364a1 1 0 00-1.414-1.414L8.514 13.615 6.493 13.616 1.843 8.929A1 1 0 00.43 10.343l6.364 6.364zM6.5 0v13.615h2.011V0h-2z"
+      />
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/components/Icon/index.ts b/apps/wallet-mobile/src/components/Icon/index.ts
index 72b5107fdf..53d175bae6 100644
--- a/apps/wallet-mobile/src/components/Icon/index.ts
+++ b/apps/wallet-mobile/src/components/Icon/index.ts
@@ -1,5 +1,6 @@
 import {Ada} from './Ada'
 import {Analytics} from './Analytics'
+import {ArrowDown} from './ArrowDown'
 import {ArrowRight} from './ArrowRight'
 import {Assets} from './Assets'
 import {Bio} from './Bio'
@@ -217,6 +218,7 @@ export const Icon = {
   Share,
   Governance,
   ArrowRight,
+  ArrowDown,
   Close,
   Warning,
   Collateral,
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index ca92a0fb62..fda1d1a13f 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -13,7 +13,7 @@ import {Boundary, Icon, Spacer, Text} from '../../components'
 import {usePrefetchStakingInfo} from '../../Dashboard/StakePoolInfos'
 import {useMetrics} from '../../metrics/metricsManager'
 import {defaultStackNavigationOptions, useWalletNavigation} from '../../navigation'
-import {lightPalette} from '../../theme'
+import {usePoolTransition} from '../../Staking/PoolTransition/usePoolTransition'
 import {useIsGovernanceFeatureEnabled} from '../Staking/Governance'
 import {useSelectedWallet} from '../WalletManager/Context/SelectedWalletContext'
 
@@ -39,9 +39,10 @@ export const MenuNavigator = () => {
 
 export const Menu = () => {
   const strings = useStrings()
-  const styles = useStyles()
+  const {styles, color} = useStyles()
   const navigateTo = useNavigateTo()
   const wallet = useSelectedWallet()
+  const {isPoolRetiring} = usePoolTransition()
   const {track} = useMetrics()
 
   useFocusEffect(
@@ -57,29 +58,36 @@ export const Menu = () => {
         <AppSettings //
           label={strings.settings}
           onPress={navigateTo.settings}
-          left={<Icon.Gear size={24} color={lightPalette.gray['600']} />}
+          left={<Icon.Gear size={24} color={color.gray['600']} />}
         />
 
-        <Boundary loading={{size: 'small', style: {padding: 16}}} error={{size: 'inline'}}>
-          <Catalyst //
-            label={strings.catalystVoting}
-            onPress={navigateTo.catalystVoting}
-            left={<Icon.Catalyst size={24} color={lightPalette.gray['600']} />}
-          />
-        </Boundary>
+        <Staking
+          label={strings.stakingCenter}
+          onPress={navigateTo.stakingCenter}
+          left={<Icon.TabStaking size={24} color={color.gray['600']} />}
+          right={isPoolRetiring ? <Icon.Warning size={24} color={color.magenta[500]} /> : null}
+        />
 
         {isGovernanceFeatureEnabled && (
           <Governance
             label={strings.governanceCentre}
             onPress={navigateTo.governanceCentre}
-            left={<Icon.Governance size={24} color={lightPalette.gray['600']} />}
+            left={<Icon.Governance size={24} color={color.gray['600']} />}
           />
         )}
 
+        <Boundary loading={{size: 'small', style: {padding: 16}}} error={{size: 'inline'}}>
+          <Catalyst //
+            label={strings.catalystVoting}
+            onPress={navigateTo.catalystVoting}
+            left={<Icon.Catalyst size={24} color={color.gray['600']} />}
+          />
+        </Boundary>
+
         <KnowledgeBase //
           label={strings.knowledgeBase}
           onPress={navigateTo.knowledgeBase}
-          left={<Icon.Info size={24} color={lightPalette.gray['600']} />}
+          left={<Icon.Info size={24} color={color.gray['600']} />}
         />
 
         <Spacer fill />
@@ -92,7 +100,7 @@ export const Menu = () => {
 
 const SupportLink = () => {
   const strings = useStrings()
-  const styles = useStyles()
+  const {styles} = useStyles()
   const navigateTo = useNavigateTo()
 
   return (
@@ -129,7 +137,7 @@ const Item = ({
   right?: React.ReactElement | null
   onPress: () => void
 }) => {
-  const styles = useStyles()
+  const {styles, color} = useStyles()
 
   return (
     <TouchableOpacity onPress={onPress} style={styles.item} disabled={disabled}>
@@ -137,9 +145,7 @@ const Item = ({
 
       <Spacer width={12} />
 
-      <Text style={{fontFamily: 'Rubik-Medium', fontSize: 16, lineHeight: 24, color: lightPalette.gray['900']}}>
-        {label}
-      </Text>
+      <Text style={{fontFamily: 'Rubik-Medium', fontSize: 16, lineHeight: 24, color: color.gray['900']}}>{label}</Text>
 
       <Spacer fill />
 
@@ -147,11 +153,12 @@ const Item = ({
 
       <Spacer width={8} />
 
-      <Icon.Chevron direction="right" size={28} color={lightPalette.gray['600']} />
+      <Icon.Chevron direction="right" size={28} color={color.gray['600']} />
     </TouchableOpacity>
   )
 }
 
+const Staking = Item
 const Governance = Item
 const AppSettings = Item
 const KnowledgeBase = Item
@@ -220,6 +227,10 @@ const useStrings = () => {
 }
 
 const messages = defineMessage({
+  staking: {
+    id: 'menu.staking',
+    defaultMessage: '!!!Staking center',
+  },
   catalystVoting: {
     id: 'menu.catalystVoting',
     defaultMessage: '!!!Catalyst voting',
@@ -294,5 +305,5 @@ const useStyles = () => {
     },
   })
 
-  return styles
+  return {styles, color}
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 764049fbff..d53253093b 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -200,6 +200,19 @@
   "components.login.appstartscreen.loginButton": "Login",
   "components.login.custompinlogin.title": "Enter PIN",
   "components.ma.assetSelector.placeHolder": "Select an asset",
+  "components.pooltransition.title": "Upgrade your stake pool",
+  "components.pooltransition.warning": "The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.",
+  "components.pooltransition.finalWarning": "The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning",
+  "components.pooltransition.currentPool": "Current pool",
+  "components.pooltransition.newPool": "New pool",
+  "components.pooltransition.estimatedRoa": "Estimated ROA",
+  "components.pooltransition.fee": "Fee",
+  "components.pooltransition.poolGeneratesRewards": "This pool continues to generate staking rewards",
+  "components.pooltransition.poolNoRewards": "This pool is NOT generating staking rewards anymore",
+  "components.pooltransition.poolWillStopRewards": "This pool will stop generating rewards in",
+  "components.pooltransition.skipNoRewards": "Skip and stop receiving rewards",
+  "components.pooltransition.updateKeepEarning": "Update now and keep earning",
+  "components.pooltransition.update": "Update pool",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
   "components.receive.addressmodal.copyLabel": "Copy address",
@@ -420,7 +433,7 @@
   "components.settings.walletsettingscreen.byronWallet": "Byron-era wallet",
   "components.settings.walletsettingscreen.changePassword": "Change spending password",
   "components.settings.walletsettingscreen.easyConfirmation": "Easy transaction confirmation",
-  "components.settings.walletsettingscreen.easyConfirmationInfo":"Skip the password and approve transactions with biometrics",
+  "components.settings.walletsettingscreen.easyConfirmationInfo": "Skip the password and approve transactions with biometrics",
   "components.settings.walletsettingscreen.general": "General",
   "components.settings.walletsettingscreen.logout": "Logout",
   "components.settings.walletsettingscreen.removeWallet": "Remove wallet",
@@ -440,6 +453,10 @@
   "components.stakingcenter.delegationbyid.stakePoolId": "Stake pool id",
   "components.stakingcenter.delegationbyid.title": "Delegation by Id",
   "components.stakingcenter.delegationTxBuildError": "Error while building delegation transaction",
+  "components.stakingcenter.failedDelegation.notEnoughFunds": "Not enough funds",
+  "components.stakingcenter.failedDelegation.noFundsToProcess": "Your transaction cannot be processed due to lack of funds on your wallet balance",
+  "components.stakingcenter.failedDelegation.buyAda": "Buy ada",
+  "components.stakingcenter.failedDelegation.goToMain": "Go to main wallet page",
   "components.stakingcenter.noPoolDataDialog.message": "The data from the stake pool(s) you selected is invalid. Please try again",
   "components.stakingcenter.noPoolDataDialog.title": "Invalid pool data",
   "components.stakingcenter.pooldetailscreen.title": "Nightly TESTING POOL",
@@ -834,6 +851,7 @@
   "links.untrusted.paymentRequested.description": "A request from an untrusted app has been made. Engaging with this request could pose potential security risk to your wallet. Do not proceed without verifying the authenticity of the request. If you didn't start this action, please cancel it.",
   "menu.appSettings": "App Settings",
   "menu.catalystVoting": "Catalyst Voting",
+  "menu.staking": "Staking center",
   "menu.governanceCentre": "Governance centre",
   "menu.knowledgeBase": "Knowledge base",
   "menu.releases": "Releases",
diff --git a/apps/wallet-mobile/src/navigation.tsx b/apps/wallet-mobile/src/navigation.tsx
index 1afee6140d..7a21f55b5a 100644
--- a/apps/wallet-mobile/src/navigation.tsx
+++ b/apps/wallet-mobile/src/navigation.tsx
@@ -190,6 +190,7 @@ export type StakingCenterRoutes = {
     poolId: string
     yoroiUnsignedTx: YoroiUnsignedTx
   }
+  'delegation-failed-tx': undefined
 }
 
 export type SwapTabRoutes = {
@@ -258,7 +259,11 @@ export type SendConfirmParams = {
 export type DashboardRoutes = {
   'staking-dashboard-main': undefined
   'staking-center': NavigatorScreenParams<StakingCenterRoutes>
-  'delegation-confirmation': undefined
+  'delegation-confirmation': {
+    poolId: string
+    yoroiUnsignedTx: YoroiUnsignedTx
+  }
+  'delegation-failed-tx': undefined
 }
 
 export type VotingRegistrationRoutes = {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
index a45a96b222..ddc48942ab 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
@@ -10,7 +10,7 @@ describe('assetUtils', () => {
     it('should calculate when there are assets', async () => {
       const lockedDeposit = await calcLockedDeposit(mocks.utxos, address, '4310')
 
-      expect(lockedDeposit).toEqual(new BigNumber('20360440'))
+      expect(lockedDeposit).toEqual(new BigNumber('18149410'))
     })
 
     it('should return 0 when there are no assets', async () => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
index bad1199fb5..52aee3905d 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
@@ -14,7 +14,7 @@ describe('withMinAmounts()', () => {
     }
 
     expect(await withMinAmounts(address, amounts, walletMocks.wallet.primaryToken)).toEqual({
-      '': '1301620',
+      '': '1055950',
       '698a6ea0ca99f315034072af31eaac6ec11fe8558d3f48e9775aab9d.7444524950': '12',
       '29d222ce763455e3d7a09a665ce554f00ac89d2e99a1a83d267170c6.4d494e': '55',
     })
@@ -69,7 +69,7 @@ describe('getMinAmounts()', () => {
       'addr_test1qrrdv3uxj8shu27ea9djvnn3rl4w3lvh3cyck6yc36mvf6ctlqxj9g0azvpycncr9u600p6t556qhc3psk06uzzw6saq4kvdpq'
 
     expect(await getMinAmounts(address, amounts, walletMocks.wallet.primaryToken)).toEqual({
-      [walletMocks.wallet.primaryToken.identifier]: '1301620',
+      [walletMocks.wallet.primaryToken.identifier]: '1055950',
     })
   })
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.test.ts b/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.test.ts
new file mode 100644
index 0000000000..4edafa1575
--- /dev/null
+++ b/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.test.ts
@@ -0,0 +1,14 @@
+import {formatTimeSpan} from './timeUtils'
+
+describe('formatTimeSpan', () => {
+  it('should return return empty for negative', () => {
+    expect(formatTimeSpan(-3245)).toEqual('')
+  })
+  it('should return valid', () => {
+    expect(formatTimeSpan(1000 * 60)).toBe('00d : 00h : 01m')
+    expect(formatTimeSpan(1000 * 60 * 59)).toBe('00d : 00h : 59m')
+    expect(formatTimeSpan(1000 * 60 * 60)).toBe('00d : 01h : 00m')
+    expect(formatTimeSpan(1000 * 60 * 85)).toBe('00d : 01h : 25m')
+    expect(formatTimeSpan(1000 * 60 * 8595)).toBe('05d : 23h : 15m')
+  })
+})
diff --git a/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.ts
index 674e5c24dc..9b7d3d218a 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/utils/timeUtils.ts
@@ -298,3 +298,20 @@ export function genToRealTime(
 }
 
 export const delay = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms))
+
+const ms_in_sec = 1000,
+  sec_in_day = 86400,
+  sec_in_hour = 3600,
+  sec_in_min = 60
+export const formatTimeSpan = (ms: number) => {
+  if (ms < 0) return ''
+
+  let seconds = Math.round(Math.abs(ms) / ms_in_sec)
+  const days = Math.floor(seconds / sec_in_day)
+  seconds = Math.floor(seconds % sec_in_day)
+  const hours = Math.floor(seconds / sec_in_hour)
+  seconds = Math.floor(seconds % sec_in_hour)
+  const minutes = Math.floor(seconds / sec_in_min)
+  const [dd, hh, mm] = [days, hours, minutes].map((item) => (item < 10 ? '0' + item : item.toString()))
+  return `${dd}d : ${hh}h : ${mm}m`
+}
diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
index e44d94dee2..6116ff6c5e 100644
--- a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
+++ b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Go to Staking Center",
     "file": "src/Dashboard/Dashboard.tsx",
     "start": {
-      "line": 245,
+      "line": 240,
       "column": 23,
-      "index": 7842
+      "index": 7906
     },
     "end": {
-      "line": 248,
+      "line": 243,
       "column": 3,
-      "index": 7975
+      "index": 8039
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
index 8d995088e0..9a6623fad5 100644
--- a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Staking Center",
     "file": "src/Dashboard/DashboardNavigator.tsx",
     "start": {
-      "line": 63,
+      "line": 65,
       "column": 9,
-      "index": 1956
+      "index": 2064
     },
     "end": {
-      "line": 66,
+      "line": 68,
       "column": 3,
-      "index": 2044
+      "index": 2152
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
new file mode 100644
index 0000000000..bd87a91195
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
@@ -0,0 +1,62 @@
+[
+  {
+    "id": "components.stakingcenter.failedDelegation.notEnoughFunds",
+    "defaultMessage": "!!!Not enough funds",
+    "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
+    "start": {
+      "line": 115,
+      "column": 18,
+      "index": 2722
+    },
+    "end": {
+      "line": 118,
+      "column": 3,
+      "index": 2838
+    }
+  },
+  {
+    "id": "components.stakingcenter.failedDelegation.noFundsToProcess",
+    "defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance",
+    "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
+    "start": {
+      "line": 119,
+      "column": 20,
+      "index": 2860
+    },
+    "end": {
+      "line": 122,
+      "column": 3,
+      "index": 3042
+    }
+  },
+  {
+    "id": "components.stakingcenter.failedDelegation.buyAda",
+    "defaultMessage": "!!!Buy ada",
+    "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
+    "start": {
+      "line": 123,
+      "column": 10,
+      "index": 3054
+    },
+    "end": {
+      "line": 126,
+      "column": 3,
+      "index": 3153
+    }
+  },
+  {
+    "id": "components.stakingcenter.failedDelegation.goToMain",
+    "defaultMessage": "!!!Go to main wallet page",
+    "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
+    "start": {
+      "line": 127,
+      "column": 12,
+      "index": 3167
+    },
+    "end": {
+      "line": 130,
+      "column": 3,
+      "index": 3283
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
new file mode 100644
index 0000000000..f3da422597
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "components.pooltransition.title",
+    "defaultMessage": "!!!Upgrade your stake pool",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 102,
+      "column": 9,
+      "index": 3432
+    },
+    "end": {
+      "line": 105,
+      "column": 3,
+      "index": 3530
+    }
+  },
+  {
+    "id": "components.pooltransition.warning",
+    "defaultMessage": "!!!The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 106,
+      "column": 11,
+      "index": 3543
+    },
+    "end": {
+      "line": 110,
+      "column": 3,
+      "index": 3739
+    }
+  },
+  {
+    "id": "components.pooltransition.finalWarning",
+    "defaultMessage": "!!!The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 111,
+      "column": 16,
+      "index": 3757
+    },
+    "end": {
+      "line": 115,
+      "column": 3,
+      "index": 3963
+    }
+  },
+  {
+    "id": "components.pooltransition.currentPool",
+    "defaultMessage": "!!!Current pool",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 116,
+      "column": 15,
+      "index": 3980
+    },
+    "end": {
+      "line": 119,
+      "column": 3,
+      "index": 4073
+    }
+  },
+  {
+    "id": "components.pooltransition.newPool",
+    "defaultMessage": "!!!New pool",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 120,
+      "column": 11,
+      "index": 4086
+    },
+    "end": {
+      "line": 123,
+      "column": 3,
+      "index": 4171
+    }
+  },
+  {
+    "id": "components.pooltransition.estimatedRoa",
+    "defaultMessage": "!!!Estimated ROA",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 124,
+      "column": 16,
+      "index": 4189
+    },
+    "end": {
+      "line": 127,
+      "column": 3,
+      "index": 4284
+    }
+  },
+  {
+    "id": "components.pooltransition.fee",
+    "defaultMessage": "!!!Fee",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 128,
+      "column": 7,
+      "index": 4293
+    },
+    "end": {
+      "line": 131,
+      "column": 3,
+      "index": 4369
+    }
+  },
+  {
+    "id": "components.pooltransition.poolGeneratesRewards",
+    "defaultMessage": "!!!This pool continues to generate staking rewards",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 132,
+      "column": 24,
+      "index": 4395
+    },
+    "end": {
+      "line": 135,
+      "column": 3,
+      "index": 4532
+    }
+  },
+  {
+    "id": "components.pooltransition.poolNoRewards",
+    "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 136,
+      "column": 17,
+      "index": 4551
+    },
+    "end": {
+      "line": 139,
+      "column": 3,
+      "index": 4685
+    }
+  },
+  {
+    "id": "components.pooltransition.poolWillStopRewards",
+    "defaultMessage": "!!!This pool will stop generating rewards in",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 140,
+      "column": 23,
+      "index": 4710
+    },
+    "end": {
+      "line": 143,
+      "column": 3,
+      "index": 4840
+    }
+  },
+  {
+    "id": "components.pooltransition.skipNoRewards",
+    "defaultMessage": "!!!Skip and stop receiving rewards",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 144,
+      "column": 17,
+      "index": 4859
+    },
+    "end": {
+      "line": 147,
+      "column": 3,
+      "index": 4973
+    }
+  },
+  {
+    "id": "components.pooltransition.updateKeepEarning",
+    "defaultMessage": "!!!Update now and keep earning",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 148,
+      "column": 21,
+      "index": 4996
+    },
+    "end": {
+      "line": 151,
+      "column": 3,
+      "index": 5110
+    }
+  },
+  {
+    "id": "components.pooltransition.update",
+    "defaultMessage": "!!!Update pool",
+    "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
+    "start": {
+      "line": 152,
+      "column": 10,
+      "index": 5122
+    },
+    "end": {
+      "line": 155,
+      "column": 3,
+      "index": 5209
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
index 09a0f824d4..f5c80c46b5 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Invalid Pool Data",
     "file": "src/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 101,
+      "line": 99,
       "column": 9,
-      "index": 3448
+      "index": 3339
     },
     "end": {
-      "line": 104,
+      "line": 102,
       "column": 3,
-      "index": 3556
+      "index": 3447
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!The data from the stake pool(s) you selected is invalid. Please try again",
     "file": "src/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 105,
+      "line": 103,
       "column": 11,
-      "index": 3569
+      "index": 3460
     },
     "end": {
-      "line": 108,
+      "line": 106,
       "column": 3,
-      "index": 3735
+      "index": 3626
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
index d8ce271ddf..32cfc0a6ac 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Note:",
     "file": "src/TxHistory/TxHistory.tsx",
     "start": {
-      "line": 132,
+      "line": 136,
       "column": 9,
-      "index": 4207
+      "index": 4437
     },
     "end": {
-      "line": 135,
+      "line": 139,
       "column": 3,
-      "index": 4306
+      "index": 4536
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!The Shelley protocol upgrade adds a new Shelley wallet type which supports delegation.",
     "file": "src/TxHistory/TxHistory.tsx",
     "start": {
-      "line": 136,
+      "line": 140,
       "column": 11,
-      "index": 4319
+      "index": 4549
     },
     "end": {
-      "line": 139,
+      "line": 143,
       "column": 3,
-      "index": 4501
+      "index": 4731
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json
new file mode 100644
index 0000000000..ea76cbaed6
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json
@@ -0,0 +1,197 @@
+[
+  {
+    "id": "components.pooltransition.title",
+    "defaultMessage": "!!!Upgrade your stake pool",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 273,
+      "column": 20,
+      "index": 8407
+    },
+    "end": {
+      "line": 276,
+      "column": 3,
+      "index": 8516
+    }
+  },
+  {
+    "id": "components.pooltransition.warning",
+    "defaultMessage": "!!!The current stake pool you're using will soon close. Migrate to the new EMURGO pool to sustain reward generation.",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 277,
+      "column": 11,
+      "index": 8529
+    },
+    "end": {
+      "line": 281,
+      "column": 3,
+      "index": 8725
+    }
+  },
+  {
+    "id": "components.pooltransition.finalWarning",
+    "defaultMessage": "!!!The current stake pool you're using is decommissioned and NOT generating reward anymore. Update it to continue earning",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 282,
+      "column": 16,
+      "index": 8743
+    },
+    "end": {
+      "line": 286,
+      "column": 3,
+      "index": 8949
+    }
+  },
+  {
+    "id": "components.pooltransition.currentPool",
+    "defaultMessage": "!!!Current pool",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 287,
+      "column": 15,
+      "index": 8966
+    },
+    "end": {
+      "line": 290,
+      "column": 3,
+      "index": 9059
+    }
+  },
+  {
+    "id": "components.pooltransition.newPool",
+    "defaultMessage": "!!!New pool",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 291,
+      "column": 11,
+      "index": 9072
+    },
+    "end": {
+      "line": 294,
+      "column": 3,
+      "index": 9157
+    }
+  },
+  {
+    "id": "components.pooltransition.estimatedRoa",
+    "defaultMessage": "!!!Estimated ROA",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 295,
+      "column": 16,
+      "index": 9175
+    },
+    "end": {
+      "line": 298,
+      "column": 3,
+      "index": 9270
+    }
+  },
+  {
+    "id": "components.pooltransition.fee",
+    "defaultMessage": "!!!Fee",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 299,
+      "column": 7,
+      "index": 9279
+    },
+    "end": {
+      "line": 302,
+      "column": 3,
+      "index": 9355
+    }
+  },
+  {
+    "id": "components.pooltransition.poolGeneratesRewards",
+    "defaultMessage": "!!!This pool continues to generate staking rewards",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 303,
+      "column": 24,
+      "index": 9381
+    },
+    "end": {
+      "line": 306,
+      "column": 3,
+      "index": 9518
+    }
+  },
+  {
+    "id": "components.pooltransition.poolNoRewards",
+    "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 307,
+      "column": 17,
+      "index": 9537
+    },
+    "end": {
+      "line": 310,
+      "column": 3,
+      "index": 9671
+    }
+  },
+  {
+    "id": "components.pooltransition.poolWillStopRewards",
+    "defaultMessage": "!!!This pool will stop generating rewards in",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 311,
+      "column": 23,
+      "index": 9696
+    },
+    "end": {
+      "line": 314,
+      "column": 3,
+      "index": 9826
+    }
+  },
+  {
+    "id": "components.pooltransition.skipNoRewards",
+    "defaultMessage": "!!!Skip and stop receiving rewards",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 315,
+      "column": 17,
+      "index": 9845
+    },
+    "end": {
+      "line": 318,
+      "column": 3,
+      "index": 9959
+    }
+  },
+  {
+    "id": "components.pooltransition.updateKeepEarning",
+    "defaultMessage": "!!!Update now and keep earning",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 319,
+      "column": 21,
+      "index": 9982
+    },
+    "end": {
+      "line": 322,
+      "column": 3,
+      "index": 10096
+    }
+  },
+  {
+    "id": "components.pooltransition.update",
+    "defaultMessage": "!!!Update pool",
+    "file": "src/TxHistory/usePoolTransition.tsx",
+    "start": {
+      "line": 323,
+      "column": 10,
+      "index": 10108
+    },
+    "end": {
+      "line": 326,
+      "column": 3,
+      "index": 10195
+    }
+  }
+]
diff --git a/packages/swap/package.json b/packages/swap/package.json
index 597e17ed4d..72badee65b 100644
--- a/packages/swap/package.json
+++ b/packages/swap/package.json
@@ -142,7 +142,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
-    "@emurgo/yoroi-lib": "0.15.1",
+    "@emurgo/yoroi-lib": "0.15.3",
     "@react-native-async-storage/async-storage": "^1.19.3",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",
@@ -173,7 +173,7 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@emurgo/yoroi-lib": "0.15.1",
+    "@emurgo/yoroi-lib": "0.15.3",
     "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
     "immer": "^10.0.2",
     "react": ">= 16.8.0 <= 19.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9a003bca20..89d8c8f2d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -97,7 +97,7 @@
     "@amplitude/analytics-types" "^1.3.1"
     tslib "^2.4.1"
 
-"@amplitude/analytics-react-native@^1.3.1":
+"@amplitude/analytics-react-native@1.3.1":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@amplitude/analytics-react-native/-/analytics-react-native-1.3.1.tgz#8e8d9e8b3f130a59efa77ff5098e642cd47c74cd"
   integrity sha512-aoZzRN1xPD1eUgF6fiPQtGSJTc+96+Xnu0QPD85m+zyXrsZ1ReYVKB48KckAXLlWUIvrgRLBe+vhO0W4Jku96Q==
@@ -2673,10 +2673,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@emurgo/cardano-serialization-lib-nodejs@12.0.0-alpha.18":
-  version "12.0.0-alpha.18"
-  resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0-alpha.18.tgz#8696720e2ca839d6b2e64d1add1b35893713cd22"
-  integrity sha512-r2AiqV7Ip8+UlOxiWEM0ANi+aeKx7pimUpTTUDSbl/PGrxPLLB39Gs/d2UzVlfe1+uKQ6PLOBMFS3qf0m8/JJQ==
+"@emurgo/cardano-serialization-lib-nodejs@12.0.0-alpha.26":
+  version "12.0.0-alpha.26"
+  resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0-alpha.26.tgz#4e5fea7ba6d72888e21c5a9bea6bcff367834a4b"
+  integrity sha512-QheEm7wVZ4Tc0gOIYMUyf2VUb8a1ZjnDy4zNcGSRmuO1zlbJfjLDGv+uXG+pKqZN4fzMAzOtUwolTtbxzTzYbA==
 
 "@emurgo/cardano-serialization-lib-nodejs@^9.1.4":
   version "9.1.4"
@@ -2700,10 +2700,10 @@
     buffer-crc32 "0.2.13"
     fnv-plus "1.3.1"
 
-"@emurgo/cross-csl-core@4.2.0", "@emurgo/cross-csl-core@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-core/-/cross-csl-core-4.2.0.tgz#d6e2c00c0ae867f372d36daf37868b0f9fc39ad2"
-  integrity sha512-cXqGlcLl034dCpfcrzl+BaeTOeNQhSZErDU7rAOAm+yc9Ow+rATF/ApSbdQTq2uEifsC5eRJLhBpdi7PAU0X0w==
+"@emurgo/cross-csl-core@4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-core/-/cross-csl-core-4.4.0.tgz#b808b562f2c2442784a46384aea750718f6e5a59"
+  integrity sha512-R12cAHmkjeLb7g0+Og5zoi8is7jh5uONICaKLCvebqV6kHhCShSSHSdCbvqmCH3H8szPodkOkLp5qXNmxqfNxA==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^5.0.0"
     "@types/mocha" "^9.1.1"
@@ -2714,28 +2714,21 @@
     hash-wasm "^4.9.0"
     mocha "^10.0.0"
 
-"@emurgo/cross-csl-mobile@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-mobile/-/cross-csl-mobile-4.2.0.tgz#7f7fe1312c0a65b290e62f761cdc60d7c50aa79e"
-  integrity sha512-2K9M7EJPkv0PKlrQsRb6A/kpUZSIOcur/cBgejEUa0MmMu2kUsSm4HgLutw5PzXkhlVqD6ux2NbfvTr0TLqEOw==
-  dependencies:
-    "@emurgo/cross-csl-core" "4.2.0"
-    "@emurgo/csl-mobile-bridge" "6.0.0-alpha.3"
-
-"@emurgo/cross-csl-nodejs@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-nodejs/-/cross-csl-nodejs-4.2.0.tgz#6ed4524ca5478d6e60e10469600636803a8115b9"
-  integrity sha512-RqUWCBEospYZVSvYGWb6Hw6zde6ktJckBL88NlwcHedNmOXL2EA16STfHDrnqhOzAOJhxDV4fFrDaBmNGrYVUg==
+"@emurgo/cross-csl-mobile@4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-mobile/-/cross-csl-mobile-4.4.0.tgz#9109897e4da4c396e123894c131533a4812a499c"
+  integrity sha512-ZxdGxYiImSC6ldIAmClRsQzPN6dDa0ONpEuITcp2NNo9TvZmA0rScG/tYaEB/iQ3PIktGfotptASwImC4F+lLA==
   dependencies:
-    "@emurgo/cardano-serialization-lib-nodejs" "12.0.0-alpha.18"
-    "@emurgo/cross-csl-core" "4.2.0"
+    "@emurgo/cross-csl-core" "4.4.0"
+    "@emurgo/csl-mobile-bridge" "6.0.0-alpha.7"
 
-"@emurgo/csl-mobile-bridge@6.0.0-alpha.3":
-  version "6.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-6.0.0-alpha.3.tgz#4626eed0209b464e4bdc2d0dd7311151949dd935"
-  integrity sha512-/mX45uyKEx16XEQKCgPjfRRNLD7wcV3zyB5BLdO8LpPg2M43H5SUnN+hvvRXUcJ+7GzfwD/HFXGoj+ItK9qhHQ==
+"@emurgo/cross-csl-nodejs@4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@emurgo/cross-csl-nodejs/-/cross-csl-nodejs-4.4.0.tgz#7a8c8b7078018080283a9dc5340326e0e9a8d59c"
+  integrity sha512-yDtNFCYobYL7hILvico3Q85DIvDhc5H24UjDd8gdYApu6YGyR5C+Roz34VALxHlR8y2RA9cUM2GUt+a8Ev/Kxg==
   dependencies:
-    base-64 "0.1.0"
+    "@emurgo/cardano-serialization-lib-nodejs" "12.0.0-alpha.26"
+    "@emurgo/cross-csl-core" "4.4.0"
 
 "@emurgo/csl-mobile-bridge@6.0.0-alpha.4":
   version "6.0.0-alpha.4"
@@ -2744,6 +2737,13 @@
   dependencies:
     base-64 "0.1.0"
 
+"@emurgo/csl-mobile-bridge@6.0.0-alpha.7":
+  version "6.0.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-6.0.0-alpha.7.tgz#63349d0f2e70d568ce628849c8d8b085892531aa"
+  integrity sha512-oOdiUCbbljHUOS8J0HHK6nHRVXIPeQWm4VfizZKfSLN9KgcRJFRlUAE0UxESdk4QlV/xtlb5qZ9FjjT2RmEvwg==
+  dependencies:
+    base-64 "0.1.0"
+
 "@emurgo/react-native-blockies-svg@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@emurgo/react-native-blockies-svg/-/react-native-blockies-svg-0.0.2.tgz#afe2ce2776b0c6430ce3bc9a94ceb4f9fcb302f9"
@@ -2762,13 +2762,26 @@
     "@ledgerhq/logs" "^5.15.0"
     rxjs "^6.5.5"
 
-"@emurgo/yoroi-lib@0.15.1":
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.1.tgz#fdaa2be49067ab5be840f7eb64a8d92f94b37238"
-  integrity sha512-aCH+w0MMwFhyl0UBt8r/MmAsdKtYWibP/9GIJPQxmCi0HMLornRm/laRyINsaXyoNvsej85Mb2V+ItTs2fu7Mw==
+"@emurgo/yoroi-lib@0.15.3":
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.3.tgz#629cf1119c3b5b1946d64e7a031c1b21e6fca652"
+  integrity sha512-TOykcWUwybOlAMo+ELzapTv1uAXpYcXI1KDA2CYfZmdrsT8rnV2xc6Si085cKk/kviEZwMRn8XWmHhbGknT0Cg==
+  dependencies:
+    "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
+    "@emurgo/cross-csl-core" "4.4.0"
+    "@noble/hashes" "^1.3.2"
+    axios "^0.24.0"
+    bech32 "^2.0.0"
+    bignumber.js "^9.0.1"
+    easy-crc "1.1.0"
+
+"@emurgo/yoroi-lib@0.15.4-alpha.1":
+  version "0.15.4-alpha.1"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.1.tgz#8841116cf3a0c45e520e8d13ee36b0b70d98c85d"
+  integrity sha512-aGkmoSk5fiaY/Ocx7fN3ic/AEpZEasYim8fVXcirlntIowitIId8fGyJKPFUaVJn3S5BOee4mT4ytXYlnXqRmg==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
-    "@emurgo/cross-csl-core" "^4.2.0"
+    "@emurgo/cross-csl-core" "4.4.0"
     "@noble/hashes" "^1.3.2"
     axios "^0.24.0"
     bech32 "^2.0.0"

From e2baa83c920231bcf161f778bb2c5de6addeaa45 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:32:00 +0200
Subject: [PATCH 2/9] fix: Pool transition behind feature flag (#3210)

---
 .../src/Staking/PoolTransition/usePoolTransition.tsx  |  3 ++-
 apps/wallet-mobile/src/features/index.ts              | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
index 1ccccc375a..24f7d6ab24 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -6,6 +6,7 @@ import {defineMessages, useIntl} from 'react-intl'
 import {useQuery} from 'react-query'
 
 import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
+import {features} from '../../features'
 import {useSelectedWallet} from '../../features/WalletManager/Context'
 import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
 import {asQuantity, Quantities} from '../../yoroi-wallets/utils'
@@ -39,7 +40,7 @@ export const usePoolTransition = () => {
     retry: false,
     staleTime: 20 * 1000,
     queryKey: [wallet.id, 'poolTransition', currentPoolId],
-    queryFn: () => poolInfoApi.getTransition(currentPoolId),
+    queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId) : null),
   })
 
   const poolTransition = poolTransitionQuery.data ?? null
diff --git a/apps/wallet-mobile/src/features/index.ts b/apps/wallet-mobile/src/features/index.ts
index 324f09cf72..738b1ab56e 100644
--- a/apps/wallet-mobile/src/features/index.ts
+++ b/apps/wallet-mobile/src/features/index.ts
@@ -4,11 +4,12 @@ export const features = {
     search: __DEV__ || false,
     nfts: __DEV__ || false,
   },
-  useTestnet: __DEV__ ? false : false,
-  startWithIndexScreen: __DEV__ ? false : false,
-  prefillWalletInfo: __DEV__ ? false : false,
-  showProdPoolsInDev: __DEV__ ? false : false,
-  moderatingNftsEnabled: __DEV__ ? false : false,
+  useTestnet: false,
+  prefillWalletInfo: false,
+  showProdPoolsInDev: __DEV__,
+  moderatingNftsEnabled: false,
+  walletListFeedback: __DEV__,
+  poolTransition: __DEV__,
 }
 
 export const debugWalletInfo = {

From cb45b04aac4faa3a925e8f5e028855b8e39e017c Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Fri, 3 May 2024 17:09:30 +0200
Subject: [PATCH 3/9] fix(wallet-mobile): Dependency updates for stake pool
 delegation (#3232)

Co-authored-by: lisicky <lisicky@inbox.ru>
---
 apps/wallet-mobile/ios/Podfile.lock           |   4 +-
 apps/wallet-mobile/package.json               |   6 +-
 .../src/Staking/FailedTx/FailedTxScreen.tsx   |  14 +--
 .../PoolTransition/PoolTransitionModal.tsx    |   1 -
 .../PoolTransition/usePoolTransition.tsx      |   7 +-
 .../src/components/Modal/ModalScreen.tsx      |   2 +-
 .../SingleOrMultipleAddressesModal.tsx        |   1 -
 .../src/Staking/FailedTx/FailedTxScreen.json  |  34 +++---
 .../PoolTransition/usePoolTransition.json     | 106 +++++++++---------
 yarn.lock                                     |  44 ++++----
 10 files changed, 104 insertions(+), 115 deletions(-)

diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index dc43a58c8a..a4779cbf97 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -325,7 +325,7 @@ PODS:
     - react-native-config/App (= 1.5.1)
   - react-native-config/App (1.5.1):
     - React-Core
-  - react-native-haskell-shelley (6.0.0-alpha.4):
+  - react-native-haskell-shelley (6.0.0-alpha.9):
     - React
   - react-native-mmkv (2.11.0):
     - MMKV (>= 1.2.13)
@@ -816,7 +816,7 @@ SPEC CHECKSUMS:
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
-  react-native-haskell-shelley: 46f5fa9068996637c969e9526c22bd3867c27810
+  react-native-haskell-shelley: 4015aef14eca3ecf5e8d8718e8d1b47cdcf60f84
   react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
   react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
   react-native-quick-base64: 62290829c619fbabca4c41cfec75ae759d08fc1c
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 311186f4ed..09a8fdfcab 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -96,10 +96,10 @@
     "@emurgo/cip4-js": "1.0.7",
     "@emurgo/cross-csl-core": "4.4.0",
     "@emurgo/cross-csl-mobile": "4.4.0",
-    "@emurgo/csl-mobile-bridge": "6.0.0-alpha.4",
+    "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "0.15.4-alpha.1",
+    "@emurgo/yoroi-lib": "0.15.4-alpha.6",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",
@@ -213,7 +213,7 @@
     "@babel/preset-env": "^7.20.0",
     "@babel/preset-react": "^7.16.7",
     "@babel/runtime": "^7.20.0",
-    "@emurgo/cardano-serialization-lib-nodejs": "^9.1.4",
+    "@emurgo/cardano-serialization-lib-nodejs": "12.0.0-alpha.28",
     "@emurgo/cross-csl-nodejs": "4.4.0",
     "@formatjs/cli": "^6.1.0",
     "@formatjs/ts-transformer": "^3.13.0",
diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
index 702d68f605..8b5cf31ce4 100644
--- a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
@@ -25,17 +25,11 @@ export const FailedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={navigateTo.buyAda} title={strings.buyAda} style={styles.button} shelleyTheme />
+      <Button onPress={navigateTo.buyAda} title={strings.buyAda} shelleyTheme />
 
       <Space height="l" />
 
-      <Button
-        onPress={navigateTo.main}
-        title={strings.goToMain}
-        style={styles.button}
-        textStyles={styles.outlineText}
-        outline
-      />
+      <Button onPress={navigateTo.main} title={strings.goToMain} textStyles={styles.outlineText} outline />
     </View>
   )
 }
@@ -89,10 +83,6 @@ const useStyles = () => {
       textAlign: 'center',
       maxWidth: 330,
     },
-    button: {
-      ...padding['x-l'],
-      ...typography['button-2-m'],
-    },
     outlineText: {
       color: theme.color.primary[500],
     },
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
index f38525c718..183973402f 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.tsx
@@ -140,7 +140,6 @@ const useStyles = () => {
 
   const styles = StyleSheet.create({
     modal: {
-      backgroundColor: theme.color['bottom-sheet-background'],
       alignItems: 'center',
       flex: 1,
       justifyContent: 'flex-end',
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
index 24f7d6ab24..ed57bc99d5 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -1,3 +1,4 @@
+import {init} from '@emurgo/cross-csl-mobile'
 import {PoolInfoApi} from '@emurgo/yoroi-lib'
 import {useNavigation} from '@react-navigation/native'
 import BigNumber from 'bignumber.js'
@@ -38,13 +39,13 @@ export const usePoolTransition = () => {
   const poolTransitionQuery = useQuery({
     enabled: isStaked,
     retry: false,
-    staleTime: 20 * 1000,
+    staleTime: Infinity,
     queryKey: [wallet.id, 'poolTransition', currentPoolId],
-    queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId) : null),
+    queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId, init) : null),
   })
 
   const poolTransition = poolTransitionQuery.data ?? null
-  const poolId = poolTransition?.suggested.id ?? ''
+  const poolId = poolTransition?.suggested.hash ?? ''
 
   const navigateToUpdate = React.useCallback(async () => {
     try {
diff --git a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
index 569a5192d9..e5b6db04b0 100644
--- a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
+++ b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
@@ -108,7 +108,7 @@ const useStyles = () => {
     },
     sheet: {
       flex: 1,
-      backgroundColor: color['bottom-sheet-background'],
+      backgroundColor: color.gray_cmin,
       alignSelf: 'stretch',
       paddingHorizontal: 16,
       paddingBottom: 16,
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 851042e531..22dc2dae22 100644
--- a/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx
+++ b/apps/wallet-mobile/src/features/Receive/common/SingleOrMultipleAddressesModal/SingleOrMultipleAddressesModal.tsx
@@ -72,7 +72,6 @@ const useStyles = () => {
   const styles = StyleSheet.create({
     modal: {
       flex: 1,
-      backgroundColor: theme.color['bottom-sheet-background'],
       alignItems: 'center',
       justifyContent: 'space-between',
     },
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
index bd87a91195..804caa0440 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not enough funds",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 115,
+      "line": 104,
       "column": 18,
-      "index": 2722
+      "index": 2490
     },
     "end": {
-      "line": 118,
+      "line": 107,
       "column": 3,
-      "index": 2838
+      "index": 2606
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 119,
+      "line": 108,
       "column": 20,
-      "index": 2860
+      "index": 2628
     },
     "end": {
-      "line": 122,
+      "line": 111,
       "column": 3,
-      "index": 3042
+      "index": 2810
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Buy ada",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 123,
+      "line": 112,
       "column": 10,
-      "index": 3054
+      "index": 2822
     },
     "end": {
-      "line": 126,
+      "line": 115,
       "column": 3,
-      "index": 3153
+      "index": 2921
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Go to main wallet page",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 127,
+      "line": 116,
       "column": 12,
-      "index": 3167
+      "index": 2935
     },
     "end": {
-      "line": 130,
+      "line": 119,
       "column": 3,
-      "index": 3283
+      "index": 3051
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
index f3da422597..b1c231d712 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Upgrade your stake pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 102,
+      "line": 104,
       "column": 9,
-      "index": 3432
+      "index": 3537
     },
     "end": {
-      "line": 105,
+      "line": 107,
       "column": 3,
-      "index": 3530
+      "index": 3635
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 106,
+      "line": 108,
       "column": 11,
-      "index": 3543
+      "index": 3648
     },
     "end": {
-      "line": 110,
+      "line": 112,
       "column": 3,
-      "index": 3739
+      "index": 3844
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 111,
+      "line": 113,
       "column": 16,
-      "index": 3757
+      "index": 3862
     },
     "end": {
-      "line": 115,
+      "line": 117,
       "column": 3,
-      "index": 3963
+      "index": 4068
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Current pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 116,
+      "line": 118,
       "column": 15,
-      "index": 3980
+      "index": 4085
     },
     "end": {
-      "line": 119,
+      "line": 121,
       "column": 3,
-      "index": 4073
+      "index": 4178
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!New pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 120,
+      "line": 122,
       "column": 11,
-      "index": 4086
+      "index": 4191
     },
     "end": {
-      "line": 123,
+      "line": 125,
       "column": 3,
-      "index": 4171
+      "index": 4276
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Estimated ROA",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 124,
+      "line": 126,
       "column": 16,
-      "index": 4189
+      "index": 4294
     },
     "end": {
-      "line": 127,
+      "line": 129,
       "column": 3,
-      "index": 4284
+      "index": 4389
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 128,
+      "line": 130,
       "column": 7,
-      "index": 4293
+      "index": 4398
     },
     "end": {
-      "line": 131,
+      "line": 133,
       "column": 3,
-      "index": 4369
+      "index": 4474
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!This pool continues to generate staking rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 132,
+      "line": 134,
       "column": 24,
-      "index": 4395
+      "index": 4500
     },
     "end": {
-      "line": 135,
+      "line": 137,
       "column": 3,
-      "index": 4532
+      "index": 4637
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 136,
+      "line": 138,
       "column": 17,
-      "index": 4551
+      "index": 4656
     },
     "end": {
-      "line": 139,
+      "line": 141,
       "column": 3,
-      "index": 4685
+      "index": 4790
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!This pool will stop generating rewards in",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 140,
+      "line": 142,
       "column": 23,
-      "index": 4710
+      "index": 4815
     },
     "end": {
-      "line": 143,
+      "line": 145,
       "column": 3,
-      "index": 4840
+      "index": 4945
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Skip and stop receiving rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 144,
+      "line": 146,
       "column": 17,
-      "index": 4859
+      "index": 4964
     },
     "end": {
-      "line": 147,
+      "line": 149,
       "column": 3,
-      "index": 4973
+      "index": 5078
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Update now and keep earning",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 148,
+      "line": 150,
       "column": 21,
-      "index": 4996
+      "index": 5101
     },
     "end": {
-      "line": 151,
+      "line": 153,
       "column": 3,
-      "index": 5110
+      "index": 5215
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Update pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 152,
+      "line": 154,
       "column": 10,
-      "index": 5122
+      "index": 5227
     },
     "end": {
-      "line": 155,
+      "line": 157,
       "column": 3,
-      "index": 5209
+      "index": 5314
     }
   }
-]
\ No newline at end of file
+]
diff --git a/yarn.lock b/yarn.lock
index 89d8c8f2d1..78d602428e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -627,9 +627,9 @@
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
 "@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
@@ -2358,10 +2358,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.22.19":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
-  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+"@babel/types@^7.23.6":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
+  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
   dependencies:
     "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
@@ -2678,10 +2678,10 @@
   resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0-alpha.26.tgz#4e5fea7ba6d72888e21c5a9bea6bcff367834a4b"
   integrity sha512-QheEm7wVZ4Tc0gOIYMUyf2VUb8a1ZjnDy4zNcGSRmuO1zlbJfjLDGv+uXG+pKqZN4fzMAzOtUwolTtbxzTzYbA==
 
-"@emurgo/cardano-serialization-lib-nodejs@^9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-9.1.4.tgz#802396562ee35312003713e3a48f0dfef7ee1bd6"
-  integrity sha512-zDYQ4E5CAz89OuXCPV7k3v5kLWkwUS5Jg7QZ5m/4vPkeuZolOXyqo84p6AYf0qZ14xkgxnvHIRY+heJKNs7Ddw==
+"@emurgo/cardano-serialization-lib-nodejs@12.0.0-alpha.28":
+  version "12.0.0-alpha.28"
+  resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.0-alpha.28.tgz#1051d8b7975c555c1df6e7bd68fb5bf5e0ca0811"
+  integrity sha512-J8xtulw0ZMYws0aFIIigg7Ss4aQAV4z7cx1QhUaHYoI8JuABIDhczBEV+Wl6mZP6EQnkQYExmO1/NdvO5PzT3g==
 
 "@emurgo/cip14-js@^3.0.1":
   version "3.0.1"
@@ -2730,13 +2730,6 @@
     "@emurgo/cardano-serialization-lib-nodejs" "12.0.0-alpha.26"
     "@emurgo/cross-csl-core" "4.4.0"
 
-"@emurgo/csl-mobile-bridge@6.0.0-alpha.4":
-  version "6.0.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-6.0.0-alpha.4.tgz#114b1094892fdfda90441a159f14a4da975e253c"
-  integrity sha512-ffnVpmN6bbMHSX80aqeIYNGXEvkvuTyAsMwX+31pRV6sYC49Q72zWCJWcRT7i1UIi4kfYsN3mACeMLeYL2K+Kw==
-  dependencies:
-    base-64 "0.1.0"
-
 "@emurgo/csl-mobile-bridge@6.0.0-alpha.7":
   version "6.0.0-alpha.7"
   resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-6.0.0-alpha.7.tgz#63349d0f2e70d568ce628849c8d8b085892531aa"
@@ -2744,6 +2737,13 @@
   dependencies:
     base-64 "0.1.0"
 
+"@emurgo/csl-mobile-bridge@6.0.0-alpha.9":
+  version "6.0.0-alpha.9"
+  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-6.0.0-alpha.9.tgz#b4a8be282518bc94c37e2c92aa340dc3d51743a7"
+  integrity sha512-ys8IyzVMk0yC6qRiqtMamb47NpNZZ0blITUcYv/8uJ7HNhm8swyq9tRwUwbl8GtrzbdkFeBzUX1/cXunvGXETw==
+  dependencies:
+    base-64 "0.1.0"
+
 "@emurgo/react-native-blockies-svg@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@emurgo/react-native-blockies-svg/-/react-native-blockies-svg-0.0.2.tgz#afe2ce2776b0c6430ce3bc9a94ceb4f9fcb302f9"
@@ -2775,10 +2775,10 @@
     bignumber.js "^9.0.1"
     easy-crc "1.1.0"
 
-"@emurgo/yoroi-lib@0.15.4-alpha.1":
-  version "0.15.4-alpha.1"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.1.tgz#8841116cf3a0c45e520e8d13ee36b0b70d98c85d"
-  integrity sha512-aGkmoSk5fiaY/Ocx7fN3ic/AEpZEasYim8fVXcirlntIowitIId8fGyJKPFUaVJn3S5BOee4mT4ytXYlnXqRmg==
+"@emurgo/yoroi-lib@0.15.4-alpha.6":
+  version "0.15.4-alpha.6"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.6.tgz#2287b75a00ee0a20f24a670b48aba051cae705cc"
+  integrity sha512-fKO+fKOz7WaBtEeTVw5TL06PJanDsYdSyb/WPGNA5xiS4BaOXCzJj2cgh39cjwuI8pvChYtyA+7JlSgWuFehpQ==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
     "@emurgo/cross-csl-core" "4.4.0"

From 3f23bc96fe06d2c53b18ca9d6a35e9e10bdec24e Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Mon, 13 May 2024 11:04:28 +0200
Subject: [PATCH 4/9] fix(wallet-mobile): Adds tx history loading while
 checking for stake pool (#3251)

---
 .../PoolTransition/usePoolTransition.tsx      |   3 +-
 apps/wallet-mobile/src/features/Menu/Menu.tsx |  15 ++-
 .../PoolTransition/usePoolTransition.json     | 104 +++++++++---------
 3 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
index ed57bc99d5..cf647cb285 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -31,7 +31,7 @@ const poolInfoApi = new PoolInfoApi()
 export const usePoolTransition = () => {
   const navigation = useNavigation()
   const wallet = useSelectedWallet()
-  const {stakingInfo} = useStakingInfo(wallet)
+  const {stakingInfo, isLoading} = useStakingInfo(wallet)
 
   const isStaked = stakingInfo?.status === 'staked'
   const currentPoolId = isStaked ? stakingInfo?.poolId : ''
@@ -74,6 +74,7 @@ export const usePoolTransition = () => {
 
   return {
     ...poolTransitionQuery,
+    isLoading: isLoading || poolTransitionQuery.isLoading,
     poolTransition,
     isPoolRetiring: poolTransition !== null,
     navigateToUpdate,
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index fda1d1a13f..c880506ab7 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -11,6 +11,7 @@ import {useCanVote} from '../../Catalyst/hooks'
 import {InsufficientFundsModal} from '../../Catalyst/InsufficientFundsModal'
 import {Boundary, Icon, Spacer, Text} from '../../components'
 import {usePrefetchStakingInfo} from '../../Dashboard/StakePoolInfos'
+import {CONFIG} from '../../legacy/config'
 import {useMetrics} from '../../metrics/metricsManager'
 import {defaultStackNavigationOptions, useWalletNavigation} from '../../navigation'
 import {usePoolTransition} from '../../Staking/PoolTransition/usePoolTransition'
@@ -61,12 +62,14 @@ export const Menu = () => {
           left={<Icon.Gear size={24} color={color.gray['600']} />}
         />
 
-        <Staking
-          label={strings.stakingCenter}
-          onPress={navigateTo.stakingCenter}
-          left={<Icon.TabStaking size={24} color={color.gray['600']} />}
-          right={isPoolRetiring ? <Icon.Warning size={24} color={color.magenta[500]} /> : null}
-        />
+        {CONFIG.DAPP_EXPLORER_ENABLED && (
+          <Staking
+            label={strings.stakingCenter}
+            onPress={navigateTo.stakingCenter}
+            left={<Icon.TabStaking size={24} color={color.gray_c600} />}
+            right={isPoolRetiring ? <Icon.Warning size={24} color={color.sys_magenta_c500} /> : null}
+          />
+        )}
 
         {isGovernanceFeatureEnabled && (
           <Governance
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
index b1c231d712..46c7862438 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Upgrade your stake pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 104,
+      "line": 105,
       "column": 9,
-      "index": 3537
+      "index": 3607
     },
     "end": {
-      "line": 107,
+      "line": 108,
       "column": 3,
-      "index": 3635
+      "index": 3705
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 108,
+      "line": 109,
       "column": 11,
-      "index": 3648
+      "index": 3718
     },
     "end": {
-      "line": 112,
+      "line": 113,
       "column": 3,
-      "index": 3844
+      "index": 3914
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 113,
+      "line": 114,
       "column": 16,
-      "index": 3862
+      "index": 3932
     },
     "end": {
-      "line": 117,
+      "line": 118,
       "column": 3,
-      "index": 4068
+      "index": 4138
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Current pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 118,
+      "line": 119,
       "column": 15,
-      "index": 4085
+      "index": 4155
     },
     "end": {
-      "line": 121,
+      "line": 122,
       "column": 3,
-      "index": 4178
+      "index": 4248
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!New pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 122,
+      "line": 123,
       "column": 11,
-      "index": 4191
+      "index": 4261
     },
     "end": {
-      "line": 125,
+      "line": 126,
       "column": 3,
-      "index": 4276
+      "index": 4346
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Estimated ROA",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 126,
+      "line": 127,
       "column": 16,
-      "index": 4294
+      "index": 4364
     },
     "end": {
-      "line": 129,
+      "line": 130,
       "column": 3,
-      "index": 4389
+      "index": 4459
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 130,
+      "line": 131,
       "column": 7,
-      "index": 4398
+      "index": 4468
     },
     "end": {
-      "line": 133,
+      "line": 134,
       "column": 3,
-      "index": 4474
+      "index": 4544
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!This pool continues to generate staking rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 134,
+      "line": 135,
       "column": 24,
-      "index": 4500
+      "index": 4570
     },
     "end": {
-      "line": 137,
+      "line": 138,
       "column": 3,
-      "index": 4637
+      "index": 4707
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 138,
+      "line": 139,
       "column": 17,
-      "index": 4656
+      "index": 4726
     },
     "end": {
-      "line": 141,
+      "line": 142,
       "column": 3,
-      "index": 4790
+      "index": 4860
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!This pool will stop generating rewards in",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 142,
+      "line": 143,
       "column": 23,
-      "index": 4815
+      "index": 4885
     },
     "end": {
-      "line": 145,
+      "line": 146,
       "column": 3,
-      "index": 4945
+      "index": 5015
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Skip and stop receiving rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 146,
+      "line": 147,
       "column": 17,
-      "index": 4964
+      "index": 5034
     },
     "end": {
-      "line": 149,
+      "line": 150,
       "column": 3,
-      "index": 5078
+      "index": 5148
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Update now and keep earning",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 150,
+      "line": 151,
       "column": 21,
-      "index": 5101
+      "index": 5171
     },
     "end": {
-      "line": 153,
+      "line": 154,
       "column": 3,
-      "index": 5215
+      "index": 5285
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Update pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 154,
+      "line": 155,
       "column": 10,
-      "index": 5227
+      "index": 5297
     },
     "end": {
-      "line": 157,
+      "line": 158,
       "column": 3,
-      "index": 5314
+      "index": 5384
     }
   }
 ]

From 9fad6c9557d8192b4ca072248160efaf6f776b44 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@gmail.com>
Date: Thu, 16 May 2024 15:43:02 +0200
Subject: [PATCH 5/9] Fix addres normalization

---
 .../features/Send/common/useSendAddress.tsx   |  8 ++++---
 .../cardano/assetUtils/assetUtils.ts          |  5 ++--
 .../yoroi-wallets/cardano/getMinAmounts.ts    |  5 ++--
 .../cardano/shelley/delegationUtils.ts        |  4 ++--
 .../src/yoroi-wallets/cardano/utils.ts        | 23 -------------------
 5 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx b/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
index d2fa2d5440..7fc3e9d8a9 100644
--- a/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
+++ b/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
@@ -1,9 +1,11 @@
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import {useTransfer} from '@yoroi/transfer'
 import * as React from 'react'
 import {useQuery, UseQueryOptions} from 'react-query'
 
-import {normalizeToAddress, toCardanoNetworkId} from '../../../yoroi-wallets/cardano/utils'
-import {useSelectedWallet} from '../../WalletManager/Context/SelectedWalletContext'
+import {toCardanoNetworkId} from '../../../yoroi-wallets/cardano/utils'
+import {CardanoMobile} from '../../../yoroi-wallets/wallets'
+import {useSelectedWallet} from '../../WalletManager/context/SelectedWalletContext'
 import {AddressErrorInvalid, AddressErrorWrongNetwork} from './errors'
 
 export const useSendAddress = () => {
@@ -58,7 +60,7 @@ const useValidateAddress = (
 
 // NOTE: should be a wallet function from address manager
 const validateAddress = async (address: string, chainId: number) => {
-  const chainAddress = await normalizeToAddress(address)
+  const chainAddress = await normalizeToAddress(CardanoMobile, address)
   if (!chainAddress) throw new AddressErrorInvalid()
 
   const chainAddressChainId = await chainAddress.networkId()
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.ts
index 6a36cce437..420490b815 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.ts
@@ -1,17 +1,18 @@
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import BigNumber from 'bignumber.js'
 
 import {Address} from '../../types'
 import {RawUtxo} from '../../types/other'
 import {CardanoMobile} from '../../wallets'
 import {COINS_PER_UTXO_BYTE} from '../constants/common'
-import {cardanoValueFromRemoteFormat, normalizeToAddress} from '../utils'
+import {cardanoValueFromRemoteFormat} from '../utils'
 
 export async function calcLockedDeposit(utxos: RawUtxo[], address: Address, coinsPerUtxoByteStr: string) {
   const utxosWithAssets = utxos.filter((u) => u.assets.length > 0)
 
   const coinsPerUtxoByte = await CardanoMobile.BigNum.fromStr(coinsPerUtxoByteStr ?? COINS_PER_UTXO_BYTE)
   const dataCost = await CardanoMobile.DataCost.newCoinsPerByte(coinsPerUtxoByte)
-  const normalizedAddress = await normalizeToAddress(address)
+  const normalizedAddress = await normalizeToAddress(CardanoMobile, address)
   if (normalizedAddress === undefined) throw new Error('calcLockedDeposit::Error not a valid address')
 
   const promises = utxosWithAssets.map((u) => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
index 911f5872a8..9c8e60484b 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
@@ -1,4 +1,5 @@
 import {BigNum} from '@emurgo/cross-csl-core'
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import {Balance} from '@yoroi/types'
 import BigNumber from 'bignumber.js'
 
@@ -7,7 +8,7 @@ import {Amounts, asQuantity, Quantities} from '../utils'
 import {CardanoMobile} from '../wallets'
 import {COINS_PER_UTXO_BYTE} from './constants/common'
 import {MultiToken} from './MultiToken'
-import {cardanoValueFromMultiToken, normalizeToAddress} from './utils'
+import {cardanoValueFromMultiToken} from './utils'
 
 export const withMinAmounts = async (
   address: Address,
@@ -39,7 +40,7 @@ export const getMinAmounts = async (address: Address, amounts: Balance.Amounts,
   const [value, coinsPerUtxoByte, normalizedAddress] = await Promise.all([
     cardanoValueFromMultiToken(multiToken),
     CardanoMobile.BigNum.fromStr(COINS_PER_UTXO_BYTE),
-    normalizeToAddress(address),
+    normalizeToAddress(CardanoMobile, address),
   ])
 
   if (normalizedAddress === undefined) throw new Error('getMinAmounts::Error not a valid address')
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/delegationUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/delegationUtils.ts
index 6618efbc7f..5eec1abd2b 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/delegationUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/delegationUtils.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import {CardanoAddressedUtxo} from '@emurgo/yoroi-lib'
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import assert from 'assert'
 import {sortBy} from 'lodash'
 
@@ -9,14 +10,13 @@ import {StakingStatus} from '../../types'
 import {CardanoMobile} from '../../wallets'
 import type {TimestampedCertMeta} from '../transactionManager'
 import {CardanoTypes} from '../types'
-import {normalizeToAddress} from '../utils'
 
 const addrContainsAccountKey = async (
   address: string,
   targetAccountKey: CardanoTypes.StakeCredential,
   acceptTypeMismatch: boolean,
 ) => {
-  const wasmAddr = await normalizeToAddress(address)
+  const wasmAddr = await normalizeToAddress(CardanoMobile, address)
 
   if (wasmAddr == null) {
     throw new Error(`addrContainsAccountKey: invalid address ${address}`)
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
index 4b329290ae..e83857e780 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
@@ -30,29 +30,6 @@ import {CardanoHaskellShelleyNetwork, PRIMARY_ASSET_CONSTANTS} from './networks'
 import {NUMBERS} from './numbers'
 import {CardanoTypes, WalletImplementation} from './types'
 
-export const normalizeToAddress = async (addr: string) => {
-  // in Shelley, addresses can be base16, bech32 or base58
-  // in this function, we try parsing in all encodings possible
-  // 1) Try converting from base58
-  try {
-    if (await CardanoMobile.ByronAddress.isValid(addr)) {
-      return await (await CardanoMobile.ByronAddress.fromBase58(addr)).toAddress()
-    }
-  } catch (_e) {}
-
-  // 2) If already base16, simply return
-  try {
-    return await CardanoMobile.Address.fromBytes(Buffer.from(addr, 'hex'))
-  } catch (_e) {}
-
-  // 3) Try converting from bech32
-  try {
-    return await CardanoMobile.Address.fromBech32(addr)
-  } catch (_e) {}
-
-  return undefined
-}
-
 // need to format shelley addresses as base16 but only legacy addresses as base58
 
 export const verifyFromBip44Root = (request: Addressing['addressing']) => {

From c3ae2f17bc54aa23e37bc64b1ea4ec068e717199 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@gmail.com>
Date: Thu, 16 May 2024 16:59:49 +0200
Subject: [PATCH 6/9] Fix tests

---
 .../yoroi-wallets/cardano/assetUtils/assetUtils.test.ts    | 2 +-
 .../src/yoroi-wallets/cardano/getMinAmounts.test.ts        | 4 ++--
 .../src/yoroi-wallets/cardano/getMinAmounts.ts             | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
index ddc48942ab..a45a96b222 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/assetUtils/assetUtils.test.ts
@@ -10,7 +10,7 @@ describe('assetUtils', () => {
     it('should calculate when there are assets', async () => {
       const lockedDeposit = await calcLockedDeposit(mocks.utxos, address, '4310')
 
-      expect(lockedDeposit).toEqual(new BigNumber('18149410'))
+      expect(lockedDeposit).toEqual(new BigNumber('20360440'))
     })
 
     it('should return 0 when there are no assets', async () => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
index 52aee3905d..bad1199fb5 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.test.ts
@@ -14,7 +14,7 @@ describe('withMinAmounts()', () => {
     }
 
     expect(await withMinAmounts(address, amounts, walletMocks.wallet.primaryToken)).toEqual({
-      '': '1055950',
+      '': '1301620',
       '698a6ea0ca99f315034072af31eaac6ec11fe8558d3f48e9775aab9d.7444524950': '12',
       '29d222ce763455e3d7a09a665ce554f00ac89d2e99a1a83d267170c6.4d494e': '55',
     })
@@ -69,7 +69,7 @@ describe('getMinAmounts()', () => {
       'addr_test1qrrdv3uxj8shu27ea9djvnn3rl4w3lvh3cyck6yc36mvf6ctlqxj9g0azvpycncr9u600p6t556qhc3psk06uzzw6saq4kvdpq'
 
     expect(await getMinAmounts(address, amounts, walletMocks.wallet.primaryToken)).toEqual({
-      [walletMocks.wallet.primaryToken.identifier]: '1055950',
+      [walletMocks.wallet.primaryToken.identifier]: '1301620',
     })
   })
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
index 9c8e60484b..d04b3eb2eb 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/getMinAmounts.ts
@@ -37,12 +37,15 @@ export const getMinAmounts = async (address: Address, amounts: Balance.Amounts,
     {defaultNetworkId: primaryToken.networkId, defaultIdentifier: primaryToken.identifier},
   )
 
-  const [value, coinsPerUtxoByte, normalizedAddress] = await Promise.all([
+  const [value, coinsPerUtxoByte] = await Promise.all([
     cardanoValueFromMultiToken(multiToken),
     CardanoMobile.BigNum.fromStr(COINS_PER_UTXO_BYTE),
-    normalizeToAddress(CardanoMobile, address),
   ])
 
+  const normalizedAddress = await normalizeToAddress(CardanoMobile, address).catch(() => {
+    throw new Error('getMinAmounts::Error not a valid address')
+  })
+
   if (normalizedAddress === undefined) throw new Error('getMinAmounts::Error not a valid address')
 
   const [txOutput, dataCost] = await Promise.all([

From fdf83b56842485991ad607464afcd03a014b7c93 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:08:25 +0200
Subject: [PATCH 7/9] feat(pool-transition) Update pool transition api and
 staking (#3285)

---
 .../.storybook/storybook.requires.js          |   2 +-
 apps/wallet-mobile/package.json               |   2 +-
 .../PoolTransitionModal.stories.tsx           |  23 +++-
 .../PoolTransition/usePoolTransition.tsx      |  11 +-
 .../Staking/StakingCenter/StakingCenter.tsx   |  21 +++-
 .../src/TxHistory/usePoolTransition.json      | 106 +++++++++---------
 yarn.lock                                     |  39 +++++--
 7 files changed, 130 insertions(+), 74 deletions(-)

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index f3a090b1da..2445910993 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -182,7 +182,6 @@ const getStories = () => {
     "./src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx": require("../src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx"),
     "./src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx": require("../src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx"),
     "./src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx": require("../src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx"),
-    "./src/features/SetupWallet/common/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/common/TextInput/TextInput.stories.tsx"),
     "./src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx"),
     "./src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx"),
     "./src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx"),
@@ -198,6 +197,7 @@ const getStories = () => {
     "./src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx"),
     "./src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx"),
     "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx"),
+    "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx"),
     "./src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx"),
     "./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"),
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 09a8fdfcab..e92c5f104a 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -99,7 +99,7 @@
     "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "0.15.4-alpha.6",
+    "@emurgo/yoroi-lib": "0.15.5-alpha.7",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
index 9433158b97..dfd2f04ff3 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/PoolTransitionModal.stories.tsx
@@ -1,4 +1,4 @@
-import {PoolInfo} from '@emurgo/yoroi-lib'
+import {PoolTransition} from '@emurgo/yoroi-lib'
 import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import * as React from 'react'
@@ -6,22 +6,33 @@ import {View} from 'react-native'
 
 import {PoolTransitionModal} from './PoolTransitionModal'
 
-const mock = {
+const mock: PoolTransition = {
   current: {
+    id: '',
+    hash: '',
+    saturation: '',
+    taxFix: '',
+    stake: '',
+    share: '',
     pic: 'https://img.cexplorer.io/a/5/5/f/2/pool12eht6dqxpzqj87xuextrpufz2gxmt4reuesuw26r2utzw0kw906.png',
     ticker: 'EMRG',
     name: 'emurgo old',
     roa: '0',
-    taxRate: '0.05',
-  } as unknown as PoolInfo,
+    taxRatio: '0.05',
+  },
   suggested: {
+    hash: '',
+    saturation: '',
+    taxFix: '',
+    stake: '',
+    share: '',
     pic: 'https://img.cexplorer.io/e/c/2/3/1/pool1dkww2vlysa8lsnuf5rca979zdsyr3zvt59hu7e420yxfunkka2z.png',
     id: 'df1750df9b2df285fcfb50f4740657a18ee3af42727d410c37b86207',
     name: 'emurgo new',
     roa: '5.1',
     ticker: 'EMRG',
-    taxRate: '0.02',
-  } as unknown as PoolInfo,
+    taxRatio: '0.02',
+  },
   deadlineMilliseconds: Date.now() + 2999777000,
 }
 
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
index cf647cb285..9ebf0b3eb5 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -6,6 +6,11 @@ import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {useQuery} from 'react-query'
 
+import {features} from '../../../features'
+import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext'
+import {getCardanoNetworkConfigById} from '../../../yoroi-wallets/cardano/networks'
+import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
+import {asQuantity, Quantities} from '../../../yoroi-wallets/utils'
 import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
 import {features} from '../../features'
 import {useSelectedWallet} from '../../features/WalletManager/Context'
@@ -26,12 +31,14 @@ const createDelegationTx = async (wallet: YoroiWallet, poolId: string) => {
   return wallet.createDelegationTx(poolId, new BigNumber(amountToDelegate))
 }
 
-const poolInfoApi = new PoolInfoApi()
-
 export const usePoolTransition = () => {
   const navigation = useNavigation()
   const wallet = useSelectedWallet()
   const {stakingInfo, isLoading} = useStakingInfo(wallet)
+  const poolInfoApi = React.useMemo(
+    () => new PoolInfoApi(getCardanoNetworkConfigById(wallet.networkId).BACKEND.API_ROOT),
+    [wallet.networkId],
+  )
 
   const isStaked = stakingInfo?.status === 'staked'
   const currentPoolId = isStaked ? stakingInfo?.poolId : ''
diff --git a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
index 992ba8f449..fd72c1ecef 100644
--- a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
+++ b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
@@ -5,7 +5,18 @@ import {defineMessages, useIntl} from 'react-intl'
 import {View} from 'react-native'
 import {WebView, WebViewMessageEvent} from 'react-native-webview'
 
-import {PleaseWaitModal, Spacer} from '../../components'
+import {PleaseWaitModal, Spacer} from '../../../components'
+import {features} from '../../../features'
+import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext'
+import {showErrorDialog} from '../../../kernel/dialogs'
+import {isNightly} from '../../../kernel/env'
+import {useLanguage} from '../../../kernel/i18n'
+import globalMessages from '../../../kernel/i18n/global-messages'
+import {useMetrics} from '../../../kernel/metrics/metricsManager'
+import {StakingCenterRouteNavigation} from '../../../kernel/navigation'
+import {NETWORKS} from '../../../yoroi-wallets/cardano/networks'
+import {NotEnoughMoneyToSendError} from '../../../yoroi-wallets/cardano/types'
+import {usePlate} from '../../../yoroi-wallets/hooks'
 import {useStakingTx} from '../../Dashboard/StakePoolInfos'
 import {showErrorDialog} from '../../dialogs'
 import {features} from '../../features'
@@ -27,7 +38,7 @@ export const StakingCenter = () => {
   const {languageCode} = useLanguage()
   const wallet = useSelectedWallet()
   const {track} = useMetrics()
-
+  const plate = usePlate({networkId: wallet.networkId, publicKeyHex: wallet.publicKeyHex})
   useFocusEffect(
     React.useCallback(() => {
       track.stakingCenterPageViewed()
@@ -84,7 +95,7 @@ export const StakingCenter = () => {
           <WebView
             originWhitelist={['*']}
             androidLayerType="software"
-            source={{uri: prepareStakingURL(languageCode)}}
+            source={{uri: prepareStakingURL(languageCode, plate.accountPlate.TextPart)}}
             onMessage={(event) => handleOnMessage(event)}
           />
         </View>
@@ -110,12 +121,14 @@ const noPoolDataDialog = defineMessages({
  * Prepares WebView's target staking URI
  * @param {*} poolList : Array of delegated pool hash
  */
-const prepareStakingURL = (locale: string): string => {
+const prepareStakingURL = (locale: string, plate: string): string => {
   // source=mobile is constant and already included
   let finalURL = NETWORKS.HASKELL_SHELLEY.POOL_EXPLORER
 
   const lang = locale.slice(0, 2)
   finalURL += `&lang=${lang}`
 
+  finalURL += `&bias=${plate}`
+
   return finalURL
 }
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json
index ea76cbaed6..a167c2d935 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/usePoolTransition.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Upgrade your stake pool",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 273,
-      "column": 20,
-      "index": 8407
+      "line": 108,
+      "column": 9,
+      "index": 3854
     },
     "end": {
-      "line": 276,
+      "line": 111,
       "column": 3,
-      "index": 8516
+      "index": 3952
     }
   },
   {
@@ -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/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 277,
+      "line": 112,
       "column": 11,
-      "index": 8529
+      "index": 3965
     },
     "end": {
-      "line": 281,
+      "line": 116,
       "column": 3,
-      "index": 8725
+      "index": 4161
     }
   },
   {
@@ -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/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 282,
+      "line": 117,
       "column": 16,
-      "index": 8743
+      "index": 4179
     },
     "end": {
-      "line": 286,
+      "line": 121,
       "column": 3,
-      "index": 8949
+      "index": 4385
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Current pool",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 287,
+      "line": 122,
       "column": 15,
-      "index": 8966
+      "index": 4402
     },
     "end": {
-      "line": 290,
+      "line": 125,
       "column": 3,
-      "index": 9059
+      "index": 4495
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!New pool",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 291,
+      "line": 126,
       "column": 11,
-      "index": 9072
+      "index": 4508
     },
     "end": {
-      "line": 294,
+      "line": 129,
       "column": 3,
-      "index": 9157
+      "index": 4593
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Estimated ROA",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 295,
+      "line": 130,
       "column": 16,
-      "index": 9175
+      "index": 4611
     },
     "end": {
-      "line": 298,
+      "line": 133,
       "column": 3,
-      "index": 9270
+      "index": 4706
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 299,
+      "line": 134,
       "column": 7,
-      "index": 9279
+      "index": 4715
     },
     "end": {
-      "line": 302,
+      "line": 137,
       "column": 3,
-      "index": 9355
+      "index": 4791
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!This pool continues to generate staking rewards",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 303,
+      "line": 138,
       "column": 24,
-      "index": 9381
+      "index": 4817
     },
     "end": {
-      "line": 306,
+      "line": 141,
       "column": 3,
-      "index": 9518
+      "index": 4954
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 307,
+      "line": 142,
       "column": 17,
-      "index": 9537
+      "index": 4973
     },
     "end": {
-      "line": 310,
+      "line": 145,
       "column": 3,
-      "index": 9671
+      "index": 5107
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!This pool will stop generating rewards in",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 311,
+      "line": 146,
       "column": 23,
-      "index": 9696
+      "index": 5132
     },
     "end": {
-      "line": 314,
+      "line": 149,
       "column": 3,
-      "index": 9826
+      "index": 5262
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Skip and stop receiving rewards",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 315,
+      "line": 150,
       "column": 17,
-      "index": 9845
+      "index": 5281
     },
     "end": {
-      "line": 318,
+      "line": 153,
       "column": 3,
-      "index": 9959
+      "index": 5395
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Update now and keep earning",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 319,
+      "line": 154,
       "column": 21,
-      "index": 9982
+      "index": 5418
     },
     "end": {
-      "line": 322,
+      "line": 157,
       "column": 3,
-      "index": 10096
+      "index": 5532
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Update pool",
     "file": "src/TxHistory/usePoolTransition.tsx",
     "start": {
-      "line": 323,
+      "line": 158,
       "column": 10,
-      "index": 10108
+      "index": 5544
     },
     "end": {
-      "line": 326,
+      "line": 161,
       "column": 3,
-      "index": 10195
+      "index": 5631
     }
   }
 ]
diff --git a/yarn.lock b/yarn.lock
index 78d602428e..b7018762a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2775,10 +2775,10 @@
     bignumber.js "^9.0.1"
     easy-crc "1.1.0"
 
-"@emurgo/yoroi-lib@0.15.4-alpha.6":
-  version "0.15.4-alpha.6"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.6.tgz#2287b75a00ee0a20f24a670b48aba051cae705cc"
-  integrity sha512-fKO+fKOz7WaBtEeTVw5TL06PJanDsYdSyb/WPGNA5xiS4BaOXCzJj2cgh39cjwuI8pvChYtyA+7JlSgWuFehpQ==
+"@emurgo/yoroi-lib@0.15.5-alpha.7":
+  version "0.15.5-alpha.7"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5-alpha.7.tgz#08c5f5e6b6cd611dc3134d5f1d5363aec0f49227"
+  integrity sha512-e5MK8rE8z2b9lJGY2NpGAzbZNpAI+KIxrou5OOi5skIlNJWGDbCpZg8HvwLOjWBYuS8pI+ii4rui5X0kTNqPjA==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
     "@emurgo/cross-csl-core" "4.4.0"
@@ -21728,7 +21728,16 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -21841,7 +21850,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -21869,6 +21878,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -23499,7 +23515,7 @@ workerpool@6.2.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -23535,6 +23551,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 2d190c27bef05fc6d8429cd73ff38c85f5220d78 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@gmail.com>
Date: Mon, 10 Jun 2024 16:21:49 +0200
Subject: [PATCH 8/9] Fix conflicts

---
 .../.storybook/storybook.requires.js          |   2 +-
 apps/wallet-mobile/package.json               |   4 +-
 .../src/Staking/FailedTx/FailedTxScreen.tsx   |   4 +-
 .../PoolTransition/usePoolTransition.tsx      |  34 +++---
 .../Staking/StakingCenter/StakingCenter.tsx   |  14 +--
 .../src/components/Modal/ModalScreen.tsx      |   2 +-
 apps/wallet-mobile/src/features/Menu/Menu.tsx |  13 ---
 .../features/Send/common/useSendAddress.tsx   |   2 +-
 .../messages/src/Dashboard/Dashboard.json     |  10 +-
 .../src/Dashboard/DashboardNavigator.json     |   6 +-
 .../src/Staking/FailedTx/FailedTxScreen.json  |  34 +++---
 .../PoolTransition/usePoolTransition.json     | 106 +++++++++---------
 .../Staking/StakingCenter/StakingCenter.json  |  18 +--
 .../messages/src/TxHistory/TxHistory.json     |  10 +-
 yarn.lock                                     |  33 +++---
 15 files changed, 138 insertions(+), 154 deletions(-)

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 2445910993..f3a090b1da 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -182,6 +182,7 @@ const getStories = () => {
     "./src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx": require("../src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx"),
     "./src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx": require("../src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx"),
     "./src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx": require("../src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx"),
+    "./src/features/SetupWallet/common/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/common/TextInput/TextInput.stories.tsx"),
     "./src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx"),
     "./src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ConnectNanoX/ConnectNanoXScreen.stories.tsx"),
     "./src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx": require("../src/features/SetupWallet/legacy/ImportReadOnlyWallet/ImportReadOnlyWalletScreen.stories.tsx"),
@@ -197,7 +198,6 @@ const getStories = () => {
     "./src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/VerifyRecoveryPhraseScreen.stories.tsx"),
     "./src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.stories.tsx"),
     "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/MnemonicInput.stories.tsx"),
-    "./src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/MnemonicInput/TextInput/TextInput.stories.tsx"),
     "./src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx": require("../src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.stories.tsx"),
     "./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"),
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index e92c5f104a..d6d3abd0d5 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -99,7 +99,7 @@
     "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "0.15.5-alpha.7",
+    "@emurgo/yoroi-lib": "0.15.5-alpha.8",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",
@@ -127,11 +127,11 @@
     "@yoroi/exchange": "2.0.1",
     "@yoroi/links": "1.5.4",
     "@yoroi/resolver": "2.0.5",
+    "@yoroi/setup-wallet": "1.0.0",
     "@yoroi/staking": "1.5.1",
     "@yoroi/swap": "1.5.2",
     "@yoroi/theme": "^1.0.0",
     "@yoroi/transfer": "1.0.0",
-    "@yoroi/setup-wallet": "1.0.0",
     "add": "2.0.6",
     "assert": "^2.0.0",
     "axios": "^1.5.0",
diff --git a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
index 8b5cf31ce4..5271bf4187 100644
--- a/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/Staking/FailedTx/FailedTxScreen.tsx
@@ -39,7 +39,7 @@ const useNavigateTo = () => {
 
   return {
     buyAda: () =>
-      navigation.navigate('app-root', {
+      navigation.navigate('manage-wallets', {
         screen: 'main-wallet-routes',
         params: {
           screen: 'history',
@@ -49,7 +49,7 @@ const useNavigateTo = () => {
         },
       }),
     main: () =>
-      navigation.navigate('app-root', {
+      navigation.navigate('manage-wallets', {
         screen: 'main-wallet-routes',
         params: {
           screen: 'history',
diff --git a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
index 9ebf0b3eb5..43c4655ca1 100644
--- a/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
+++ b/apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx
@@ -6,14 +6,10 @@ import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {useQuery} from 'react-query'
 
-import {features} from '../../../features'
-import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext'
-import {getCardanoNetworkConfigById} from '../../../yoroi-wallets/cardano/networks'
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {asQuantity, Quantities} from '../../../yoroi-wallets/utils'
 import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
 import {features} from '../../features'
-import {useSelectedWallet} from '../../features/WalletManager/Context'
+import {useSelectedWallet} from '../../features/WalletManager/Context/SelectedWalletContext'
+import {getCardanoNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
 import {asQuantity, Quantities} from '../../yoroi-wallets/utils'
 
@@ -57,23 +53,29 @@ export const usePoolTransition = () => {
   const navigateToUpdate = React.useCallback(async () => {
     try {
       const yoroiUnsignedTx = await createDelegationTx(wallet, poolId)
-      navigation.navigate('app-root', {
-        screen: 'staking-dashboard',
+      navigation.navigate('manage-wallets', {
+        screen: 'main-wallet-routes',
         params: {
-          screen: 'delegation-confirmation',
-          initial: false,
+          screen: 'staking-dashboard',
           params: {
-            poolId,
-            yoroiUnsignedTx,
+            screen: 'delegation-confirmation',
+            initial: false,
+            params: {
+              poolId,
+              yoroiUnsignedTx,
+            },
           },
         },
       })
     } catch (err) {
-      navigation.navigate('app-root', {
-        screen: 'staking-dashboard',
+      navigation.navigate('manage-wallets', {
+        screen: 'main-wallet-routes',
         params: {
-          screen: 'delegation-failed-tx',
-          initial: false,
+          screen: 'staking-dashboard',
+          params: {
+            screen: 'delegation-failed-tx',
+            initial: false,
+          },
         },
       })
     }
diff --git a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
index fd72c1ecef..87c611d9b7 100644
--- a/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
+++ b/apps/wallet-mobile/src/Staking/StakingCenter/StakingCenter.tsx
@@ -5,18 +5,7 @@ import {defineMessages, useIntl} from 'react-intl'
 import {View} from 'react-native'
 import {WebView, WebViewMessageEvent} from 'react-native-webview'
 
-import {PleaseWaitModal, Spacer} from '../../../components'
-import {features} from '../../../features'
-import {useSelectedWallet} from '../../../features/WalletManager/context/SelectedWalletContext'
-import {showErrorDialog} from '../../../kernel/dialogs'
-import {isNightly} from '../../../kernel/env'
-import {useLanguage} from '../../../kernel/i18n'
-import globalMessages from '../../../kernel/i18n/global-messages'
-import {useMetrics} from '../../../kernel/metrics/metricsManager'
-import {StakingCenterRouteNavigation} from '../../../kernel/navigation'
-import {NETWORKS} from '../../../yoroi-wallets/cardano/networks'
-import {NotEnoughMoneyToSendError} from '../../../yoroi-wallets/cardano/types'
-import {usePlate} from '../../../yoroi-wallets/hooks'
+import {PleaseWaitModal, Spacer} from '../../components'
 import {useStakingTx} from '../../Dashboard/StakePoolInfos'
 import {showErrorDialog} from '../../dialogs'
 import {features} from '../../features'
@@ -29,6 +18,7 @@ import {useMetrics} from '../../metrics/metricsManager'
 import {StakingCenterRouteNavigation} from '../../navigation'
 import {getNetworkConfigById, NETWORKS} from '../../yoroi-wallets/cardano/networks'
 import {NotEnoughMoneyToSendError} from '../../yoroi-wallets/cardano/types'
+import {usePlate} from '../../yoroi-wallets/hooks'
 import {PoolDetailScreen} from '../PoolDetails'
 
 export const StakingCenter = () => {
diff --git a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
index e5b6db04b0..33e9cc8754 100644
--- a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
+++ b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
@@ -108,7 +108,7 @@ const useStyles = () => {
     },
     sheet: {
       flex: 1,
-      backgroundColor: color.gray_cmin,
+      backgroundColor: color.gray['min'],
       alignSelf: 'stretch',
       paddingHorizontal: 16,
       paddingBottom: 16,
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index c880506ab7..148a1a2f3e 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -11,10 +11,8 @@ import {useCanVote} from '../../Catalyst/hooks'
 import {InsufficientFundsModal} from '../../Catalyst/InsufficientFundsModal'
 import {Boundary, Icon, Spacer, Text} from '../../components'
 import {usePrefetchStakingInfo} from '../../Dashboard/StakePoolInfos'
-import {CONFIG} from '../../legacy/config'
 import {useMetrics} from '../../metrics/metricsManager'
 import {defaultStackNavigationOptions, useWalletNavigation} from '../../navigation'
-import {usePoolTransition} from '../../Staking/PoolTransition/usePoolTransition'
 import {useIsGovernanceFeatureEnabled} from '../Staking/Governance'
 import {useSelectedWallet} from '../WalletManager/Context/SelectedWalletContext'
 
@@ -43,7 +41,6 @@ export const Menu = () => {
   const {styles, color} = useStyles()
   const navigateTo = useNavigateTo()
   const wallet = useSelectedWallet()
-  const {isPoolRetiring} = usePoolTransition()
   const {track} = useMetrics()
 
   useFocusEffect(
@@ -62,15 +59,6 @@ export const Menu = () => {
           left={<Icon.Gear size={24} color={color.gray['600']} />}
         />
 
-        {CONFIG.DAPP_EXPLORER_ENABLED && (
-          <Staking
-            label={strings.stakingCenter}
-            onPress={navigateTo.stakingCenter}
-            left={<Icon.TabStaking size={24} color={color.gray_c600} />}
-            right={isPoolRetiring ? <Icon.Warning size={24} color={color.sys_magenta_c500} /> : null}
-          />
-        )}
-
         {isGovernanceFeatureEnabled && (
           <Governance
             label={strings.governanceCentre}
@@ -161,7 +149,6 @@ const Item = ({
   )
 }
 
-const Staking = Item
 const Governance = Item
 const AppSettings = Item
 const KnowledgeBase = Item
diff --git a/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx b/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
index 7fc3e9d8a9..5db9e4de51 100644
--- a/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
+++ b/apps/wallet-mobile/src/features/Send/common/useSendAddress.tsx
@@ -5,7 +5,7 @@ import {useQuery, UseQueryOptions} from 'react-query'
 
 import {toCardanoNetworkId} from '../../../yoroi-wallets/cardano/utils'
 import {CardanoMobile} from '../../../yoroi-wallets/wallets'
-import {useSelectedWallet} from '../../WalletManager/context/SelectedWalletContext'
+import {useSelectedWallet} from '../../WalletManager/Context/SelectedWalletContext'
 import {AddressErrorInvalid, AddressErrorWrongNetwork} from './errors'
 
 export const useSendAddress = () => {
diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
index 6116ff6c5e..345e991e8f 100644
--- a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
+++ b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Go to Staking Center",
     "file": "src/Dashboard/Dashboard.tsx",
     "start": {
-      "line": 240,
+      "line": 252,
       "column": 23,
-      "index": 7906
+      "index": 8064
     },
     "end": {
-      "line": 243,
+      "line": 255,
       "column": 3,
-      "index": 8039
+      "index": 8197
     }
   }
-]
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
index 9a6623fad5..836bb0b0f3 100644
--- a/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/Dashboard/DashboardNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 65,
       "column": 9,
-      "index": 2064
+      "index": 2086
     },
     "end": {
       "line": 68,
       "column": 3,
-      "index": 2152
+      "index": 2174
     }
   }
-]
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
index 804caa0440..f245ca9780 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/FailedTx/FailedTxScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Not enough funds",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 104,
+      "line": 105,
       "column": 18,
-      "index": 2490
+      "index": 2563
     },
     "end": {
-      "line": 107,
+      "line": 108,
       "column": 3,
-      "index": 2606
+      "index": 2679
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Your transaction cannot be processed due to lack of funds on your wallet balance",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 108,
+      "line": 109,
       "column": 20,
-      "index": 2628
+      "index": 2701
     },
     "end": {
-      "line": 111,
+      "line": 112,
       "column": 3,
-      "index": 2810
+      "index": 2883
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Buy ada",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 112,
+      "line": 113,
       "column": 10,
-      "index": 2822
+      "index": 2895
     },
     "end": {
-      "line": 115,
+      "line": 116,
       "column": 3,
-      "index": 2921
+      "index": 2994
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Go to main wallet page",
     "file": "src/Staking/FailedTx/FailedTxScreen.tsx",
     "start": {
-      "line": 116,
+      "line": 117,
       "column": 12,
-      "index": 2935
+      "index": 3008
     },
     "end": {
-      "line": 119,
+      "line": 120,
       "column": 3,
-      "index": 3051
+      "index": 3124
     }
   }
-]
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
index 46c7862438..c5cd53b40f 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/PoolTransition/usePoolTransition.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Upgrade your stake pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 105,
+      "line": 114,
       "column": 9,
-      "index": 3607
+      "index": 4001
     },
     "end": {
-      "line": 108,
+      "line": 117,
       "column": 3,
-      "index": 3705
+      "index": 4099
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 109,
+      "line": 118,
       "column": 11,
-      "index": 3718
+      "index": 4112
     },
     "end": {
-      "line": 113,
+      "line": 122,
       "column": 3,
-      "index": 3914
+      "index": 4308
     }
   },
   {
@@ -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/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 114,
+      "line": 123,
       "column": 16,
-      "index": 3932
+      "index": 4326
     },
     "end": {
-      "line": 118,
+      "line": 127,
       "column": 3,
-      "index": 4138
+      "index": 4532
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Current pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 119,
+      "line": 128,
       "column": 15,
-      "index": 4155
+      "index": 4549
     },
     "end": {
-      "line": 122,
+      "line": 131,
       "column": 3,
-      "index": 4248
+      "index": 4642
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!New pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 123,
+      "line": 132,
       "column": 11,
-      "index": 4261
+      "index": 4655
     },
     "end": {
-      "line": 126,
+      "line": 135,
       "column": 3,
-      "index": 4346
+      "index": 4740
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Estimated ROA",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 127,
+      "line": 136,
       "column": 16,
-      "index": 4364
+      "index": 4758
     },
     "end": {
-      "line": 130,
+      "line": 139,
       "column": 3,
-      "index": 4459
+      "index": 4853
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 131,
+      "line": 140,
       "column": 7,
-      "index": 4468
+      "index": 4862
     },
     "end": {
-      "line": 134,
+      "line": 143,
       "column": 3,
-      "index": 4544
+      "index": 4938
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!This pool continues to generate staking rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 135,
+      "line": 144,
       "column": 24,
-      "index": 4570
+      "index": 4964
     },
     "end": {
-      "line": 138,
+      "line": 147,
       "column": 3,
-      "index": 4707
+      "index": 5101
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This pool is NOT generating staking rewards anymore",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 139,
+      "line": 148,
       "column": 17,
-      "index": 4726
+      "index": 5120
     },
     "end": {
-      "line": 142,
+      "line": 151,
       "column": 3,
-      "index": 4860
+      "index": 5254
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!This pool will stop generating rewards in",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 143,
+      "line": 152,
       "column": 23,
-      "index": 4885
+      "index": 5279
     },
     "end": {
-      "line": 146,
+      "line": 155,
       "column": 3,
-      "index": 5015
+      "index": 5409
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Skip and stop receiving rewards",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 147,
+      "line": 156,
       "column": 17,
-      "index": 5034
+      "index": 5428
     },
     "end": {
-      "line": 150,
+      "line": 159,
       "column": 3,
-      "index": 5148
+      "index": 5542
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Update now and keep earning",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 151,
+      "line": 160,
       "column": 21,
-      "index": 5171
+      "index": 5565
     },
     "end": {
-      "line": 154,
+      "line": 163,
       "column": 3,
-      "index": 5285
+      "index": 5679
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Update pool",
     "file": "src/Staking/PoolTransition/usePoolTransition.tsx",
     "start": {
-      "line": 155,
+      "line": 164,
       "column": 10,
-      "index": 5297
+      "index": 5691
     },
     "end": {
-      "line": 158,
+      "line": 167,
       "column": 3,
-      "index": 5384
+      "index": 5778
     }
   }
-]
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
index f5c80c46b5..50eff097e6 100644
--- a/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
+++ b/apps/wallet-mobile/translations/messages/src/Staking/StakingCenter/StakingCenter.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Invalid Pool Data",
     "file": "src/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 99,
+      "line": 100,
       "column": 9,
-      "index": 3339
+      "index": 3531
     },
     "end": {
-      "line": 102,
+      "line": 103,
       "column": 3,
-      "index": 3447
+      "index": 3639
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!The data from the stake pool(s) you selected is invalid. Please try again",
     "file": "src/Staking/StakingCenter/StakingCenter.tsx",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 11,
-      "index": 3460
+      "index": 3652
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 3,
-      "index": 3626
+      "index": 3818
     }
   }
-]
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
index 32cfc0a6ac..bc9469f272 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 136,
       "column": 9,
-      "index": 4437
+      "index": 4448
     },
     "end": {
       "line": 139,
       "column": 3,
-      "index": 4536
+      "index": 4547
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 140,
       "column": 11,
-      "index": 4549
+      "index": 4560
     },
     "end": {
       "line": 143,
       "column": 3,
-      "index": 4731
+      "index": 4742
     }
   }
-]
+]
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index b7018762a7..d9785c077a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -626,10 +626,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
-  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
+"@babel/helper-string-parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"
+  integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==
 
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
@@ -641,6 +641,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
   integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
 "@babel/helper-validator-option@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
@@ -2358,13 +2363,13 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.23.6":
-  version "7.23.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
-  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
+"@babel/types@^7.22.19":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
+  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -2775,10 +2780,10 @@
     bignumber.js "^9.0.1"
     easy-crc "1.1.0"
 
-"@emurgo/yoroi-lib@0.15.5-alpha.7":
-  version "0.15.5-alpha.7"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5-alpha.7.tgz#08c5f5e6b6cd611dc3134d5f1d5363aec0f49227"
-  integrity sha512-e5MK8rE8z2b9lJGY2NpGAzbZNpAI+KIxrou5OOi5skIlNJWGDbCpZg8HvwLOjWBYuS8pI+ii4rui5X0kTNqPjA==
+"@emurgo/yoroi-lib@0.15.5-alpha.8":
+  version "0.15.5-alpha.8"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5-alpha.8.tgz#71791392419f718d19256c4aaedd1ac8d3a37bbe"
+  integrity sha512-avc0cwttCgEgBMflxKK2Kaxw4IbErLa+ezlWWgJ4iGN0fgHYcpY335xXd2g+cQmsRKpPyhNWWqPXafo6e8lT8Q==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
     "@emurgo/cross-csl-core" "4.4.0"

From 5191bd118ea5f3e5e7dd6f27798700c04dcc39ed Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@gmail.com>
Date: Mon, 10 Jun 2024 16:24:21 +0200
Subject: [PATCH 9/9] Update version

---
 apps/wallet-mobile/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index d6d3abd0d5..2cfd62051c 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/wallet-mobile",
-  "version": "4.27.0",
+  "version": "4.27.1",
   "private": true,
   "scripts": {
     "android-bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",