From 8d7ff81cfc8391a4f75209a0042d6d615b9f95d4 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Sun, 16 Jul 2023 16:10:31 +0100
Subject: [PATCH 1/9] refactor: Revamp qr scanner (#2527)

Signed-off-by: jemubm <105349292+jemubm@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../src/TxHistory/TxHistoryNavigator.tsx      |   6 +-
 .../QRCodeScanner/QRCodeScanner.stories.tsx   |  32 +-
 .../QRCodeScanner/QRCodeScanner.tsx           | 281 +++++++++++++++++-
 .../src/features/Send/common/strings.ts       |   5 +
 .../InputReceiver/ReadQRCodeScreen.tsx        |   4 +-
 .../wallet-mobile/src/i18n/locales/en-US.json |   1 +
 apps/wallet-mobile/src/navigation.tsx         |  12 +-
 7 files changed, 314 insertions(+), 27 deletions(-)

diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
index 4ad78dba1f..9655590e5c 100644
--- a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
+++ b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
@@ -15,6 +15,7 @@ import {EditAmountScreen} from '../features/Send/useCases/ListAmountsToSend/Edit
 import {ReadQRCodeScreen} from '../features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen'
 import {StartMultiTokenTxScreen} from '../features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen'
 import {
+  BackButton,
   defaultStackNavigationOptions,
   defaultStackNavigationOptionsV2,
   TxHistoryRoutes,
@@ -141,8 +142,11 @@ export const TxHistoryNavigator = () => {
           name="send-read-qr-code"
           component={ReadQRCodeScreen}
           options={{
-            title: strings.qrScannerTitle,
             ...sendOptions,
+            headerTransparent: true,
+            title: strings.qrScannerTitle,
+            headerTintColor: '#fff',
+            headerLeft: (props) => <BackButton color="#fff" {...props} />,
           }}
         />
 
diff --git a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.stories.tsx b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.stories.tsx
index 11726062f8..3865a7037c 100644
--- a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.stories.tsx
+++ b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.stories.tsx
@@ -4,6 +4,7 @@ import {Camera} from 'expo-camera'
 import React from 'react'
 import {Text, View} from 'react-native'
 
+import {Button} from '../Button'
 import {Spacer} from '../Spacer'
 import {QRCodeScanner} from './QRCodeScanner'
 
@@ -13,44 +14,51 @@ const Wrapper = () => {
   const [status] = Camera.useCameraPermissions()
   const [publicKeyHex, setPublicKeyHex] = React.useState(null)
   const [path, setPath] = React.useState(null)
+  const [withMask, setMaskEnabled] = React.useState(true)
 
   const handleOnRead = async ({data}) => {
     const parsedData = JSON.parse(data)
+
     setPublicKeyHex(parsedData.publicKeyHex)
     setPath(parsedData.path)
     action('onRead')
-    return Promise.resolve(false)
+
+    return Promise.resolve(true)
   }
 
   return (
     <View style={{justifyContent: 'space-between', flex: 1}}>
-      <QRCodeScanner onRead={handleOnRead} />
+      <QRCodeScanner onRead={handleOnRead} withMask={withMask} />
 
-      <View style={{padding: 30, justifyContent: 'center'}}>
-        <Text>QR DATA</Text>
+      <View style={{padding: 10}}>
+        <Info text="QR DATA" />
 
         <Spacer height={5} />
 
-        <Text>{`publicKeyHex: ${publicKeyHex}`}</Text>
+        <Info text={`publicKeyHex: ${publicKeyHex}`} />
 
-        <Text>{`path: ${path}`}</Text>
+        <Info text={`path: ${path}`} />
 
         <Spacer height={20} />
 
-        <Text>PREMISSIONS STATUS</Text>
+        <Info text="PREMISSIONS STATUS" />
 
-        <Text>NOTE: To reset permissions, reinstall the app</Text>
+        <Info text="NOTE: To reset permissions, reinstall the app" />
 
         <Spacer height={5} />
 
-        <Text>{`status: ${status?.status}`}</Text>
+        <Info text={`status: ${status?.status}`} />
 
-        <Text>{`granted: ${status?.granted}`}</Text>
+        <Info text={`granted: ${status?.granted}`} />
 
-        <Text>{`expires: ${status?.expires}`}</Text>
+        <Info text={`expires: ${status?.expires}`} />
 
-        <Text>{`canAskAgain: ${status?.canAskAgain}`}</Text>
+        <Info text={`canAskAgain: ${status?.canAskAgain}`} />
       </View>
+
+      <Button title={withMask ? 'Remove Mask' : 'Add Mask'} onPress={() => setMaskEnabled(!withMask)} />
     </View>
   )
 }
+
+const Info = ({text}) => <Text style={{color: 'white'}}>{text}</Text>
diff --git a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
index 7d5efaee5f..712be911e4 100644
--- a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
+++ b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
@@ -1,11 +1,23 @@
-import {BarCodeScanner} from 'expo-barcode-scanner'
+import {BarCodeBounds, BarCodeScanner, BarCodeScannerResult} from 'expo-barcode-scanner'
 import {Camera} from 'expo-camera'
 import * as React from 'react'
-import {StyleSheet} from 'react-native'
+import {StyleSheet, Text, useWindowDimensions, View} from 'react-native'
+import {Path, Svg} from 'react-native-svg'
 
-export const QRCodeScanner = ({onRead}: {onRead: ({data}: {data: string}) => Promise<boolean>}) => {
+export const QRCodeScanner = ({
+  onRead,
+  withMask,
+  maskText = '',
+}: {
+  onRead: (event: BarCodeScannerResult) => Promise<boolean>
+  withMask?: boolean
+  maskText?: string
+}) => {
   const [status, requestPermissions] = Camera.useCameraPermissions()
+  const {height: deviceHeight, width: deviceWidth} = useWindowDimensions()
   const [qrScanned, setQrScanned] = React.useState(false)
+
+  const scannerBounds = getScannerBounds({deviceHeight, deviceWidth})
   const granted = status && status.granted
 
   React.useEffect(() => {
@@ -15,7 +27,18 @@ export const QRCodeScanner = ({onRead}: {onRead: ({data}: {data: string}) => Pro
   }, [granted, requestPermissions])
 
   const handleBarCodeScanned = async (event) => {
-    if (!qrScanned) {
+    const isQrInsideScannerBounds =
+      withMask && (event.bounds !== undefined || event.boundingBox !== undefined)
+        ? getIsQrInsideScannerBounds({
+            qrBounds: event.bounds,
+            qrBoundingBox: event.boundingBox,
+            scannerBounds,
+            deviceHeight,
+            deviceWidth,
+          })
+        : true
+
+    if (!qrScanned && isQrInsideScannerBounds) {
       setQrScanned(true)
       const error = await onRead(event)
 
@@ -30,15 +53,257 @@ export const QRCodeScanner = ({onRead}: {onRead: ({data}: {data: string}) => Pro
   }
 
   return (
-    // expo-barcode-scanner issue in android https://github.com/expo/expo/issues/5212
-    // so expo-camera is used
+    /*
+     * expo-barcode-scanner issue in android https://github.com/expo/expo/issues/5212
+     * so expo-camera is used
+     */
     <Camera
-      style={StyleSheet.absoluteFill}
+      style={[StyleSheet.absoluteFill, styles.container]}
       ratio="16:9"
       barCodeScannerSettings={{
         barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
       }}
       onBarCodeScanned={handleBarCodeScanned}
-    />
+    >
+      {withMask && <Mask maskText={maskText} />}
+    </Camera>
+  )
+}
+
+const Mask = ({maskText}: {maskText: string}) => (
+  <View style={styles.maskContainer}>
+    <LayerTop />
+
+    <LayerCenter>
+      <LayerCenterLeft />
+
+      <CameraOpening>
+        <InnerCameraOpeningTop>
+          <TopLeftCorner />
+
+          <TopRightCorner />
+        </InnerCameraOpeningTop>
+
+        <InnerCameraOpeningCenter />
+
+        <InnerCameraOpeningBottom>
+          <BottomRightCorner />
+
+          <BottomLeftCorner />
+        </InnerCameraOpeningBottom>
+      </CameraOpening>
+
+      <LayerCenterRight />
+    </LayerCenter>
+
+    <LayerBottom>
+      <MaskText>{maskText}</MaskText>
+    </LayerBottom>
+  </View>
+)
+
+const LayerTop = ({children}: {children?: React.ReactNode}) => <View style={styles.layerTop}>{children}</View>
+const LayerCenter = ({children}: {children?: React.ReactNode}) => <View style={styles.layerCenter}>{children}</View>
+const LayerCenterLeft = ({children}: {children?: React.ReactNode}) => (
+  <View style={styles.layerCenterLeft}>{children}</View>
+)
+const LayerCenterRight = ({children}: {children?: React.ReactNode}) => (
+  <View style={styles.layerCenterRight}>{children}</View>
+)
+const LayerBottom = ({children}: {children?: React.ReactNode}) => <View style={styles.layerBottom}>{children}</View>
+const CameraOpening = ({children}: {children?: React.ReactNode}) => <View style={styles.cameraOpening}>{children}</View>
+const InnerCameraOpeningTop = ({children}: {children?: React.ReactNode}) => (
+  <View style={styles.innerCameraOpeningTop}>{children}</View>
+)
+const InnerCameraOpeningCenter = ({children}: {children?: React.ReactNode}) => (
+  <View style={styles.innerCameraOpeningCenter}>{children}</View>
+)
+const InnerCameraOpeningBottom = ({children}: {children?: React.ReactNode}) => (
+  <View style={styles.innerCameraOpeningBottom}>{children}</View>
+)
+const TopLeftCorner = () => <Corner style={styles.topLeftCorner} />
+const TopRightCorner = () => <Corner style={styles.topRightCorner} />
+const BottomRightCorner = () => <Corner style={styles.bottomRightCorner} />
+const BottomLeftCorner = () => <Corner style={styles.bottomLeftCorner} />
+
+const MaskText = ({children}: {children?: React.ReactNode}) => <Text style={styles.text}>{children}</Text>
+
+const Corner = ({style}) => {
+  return <ArcSvg style={{position: 'absolute', ...style}} />
+}
+
+const ArcSvg = (props) => {
+  return (
+    <Svg
+      width={42}
+      height={42}
+      viewBox="0 0 42 42"
+      preserveAspectRatio="xMidYMid slice"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <Path d="M0 0h15L5.5 6 0 16V0z" fill="#000" fillOpacity={0.7} />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M15.5 3C8.596 3 3 8.596 3 15.5v26a1.5 1.5 0 01-3 0v-26C0 6.94 6.94 0 15.5 0h26a1.5 1.5 0 010 3h-26z"
+        fill="#fff"
+      />
+    </Svg>
   )
 }
+
+export const getScannerBounds = ({deviceHeight, deviceWidth}: {deviceHeight: number; deviceWidth: number}) => {
+  const top = deviceHeight / 2 - QR_MAX_HEIGHT / 2
+  const bottom = top + QR_MAX_HEIGHT
+  const left = deviceWidth / 2 - QR_MAX_WIDTH / 2
+  const right = left + QR_MAX_WIDTH
+
+  return {
+    width: QR_MAX_WIDTH,
+    height: QR_MAX_HEIGHT,
+    top,
+    bottom,
+    left,
+    right,
+  }
+}
+
+export const getScaledQrBounds = ({
+  qrBounds,
+  qrBoundingBox,
+  deviceHeight,
+  deviceWidth,
+}: {
+  qrBounds: BarCodeBounds
+  qrBoundingBox: BarCodeBounds
+  deviceHeight: number
+  deviceWidth: number
+}) => {
+  // qr bounds values are inversely proportioned + issues in some android devices https://github.com/expo/expo/issues/17795
+  const height = qrBoundingBox !== undefined ? qrBoundingBox.size.width : Number(qrBounds.size.width) * deviceHeight
+  const width = qrBoundingBox !== undefined ? qrBoundingBox.size.height : Number(qrBounds.size.height) * deviceWidth
+  const left = qrBoundingBox !== undefined ? qrBoundingBox.origin.y : Number(qrBounds.origin.y) * deviceWidth
+  const top = qrBoundingBox !== undefined ? qrBoundingBox.origin.x : Number(qrBounds.origin.x) * deviceHeight
+  const bottom = top + height
+  const right = left + width
+
+  return {
+    height,
+    width,
+    right,
+    top,
+    bottom,
+    left,
+  }
+}
+
+export const getIsQrInsideScannerBounds = ({
+  qrBounds,
+  qrBoundingBox,
+  scannerBounds,
+  deviceHeight,
+  deviceWidth,
+}: {
+  qrBounds: BarCodeBounds
+  qrBoundingBox: BarCodeBounds
+  scannerBounds: ReturnType<typeof getScannerBounds>
+  deviceHeight: number
+  deviceWidth: number
+}) => {
+  const scaledQrBounds = getScaledQrBounds({qrBounds, qrBoundingBox, deviceHeight, deviceWidth})
+
+  return (
+    scaledQrBounds.top > scannerBounds.top &&
+    scaledQrBounds.bottom < scannerBounds.bottom &&
+    scaledQrBounds.left > scannerBounds.left &&
+    scaledQrBounds.right < scannerBounds.right
+  )
+}
+
+const QR_MAX_WIDTH = 310 // divisible number. Pixel ratio issue on low end android devices
+const QR_MAX_HEIGHT = 310 // divisible number. Pixel ratio issue on low end android devices
+const opacity = 'rgba(0, 0, 0, .7)'
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  maskContainer: {
+    flex: 1,
+  },
+  layerTop: {
+    flex: 1,
+    backgroundColor: opacity,
+    marginBottom: 0,
+  },
+  layerCenter: {
+    flexDirection: 'row',
+    borderWidth: 0,
+  },
+  layerCenterLeft: {
+    flex: 1,
+    backgroundColor: opacity,
+    borderWidth: 0,
+  },
+  cameraOpening: {
+    height: QR_MAX_HEIGHT,
+    width: QR_MAX_WIDTH,
+  },
+  layerCenterRight: {
+    flex: 1,
+    backgroundColor: opacity,
+  },
+  layerBottom: {
+    flex: 1,
+    backgroundColor: opacity,
+    alignItems: 'center',
+  },
+  innerCameraOpeningTop: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    position: 'relative',
+  },
+  innerCameraOpeningCenter: {
+    flex: 1,
+  },
+  innerCameraOpeningBottom: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    position: 'relative',
+  },
+  topLeftCorner: {
+    top: 0,
+    left: 0,
+    flex: 1,
+  },
+  topRightCorner: {
+    top: 0,
+    right: 0,
+    flex: 1,
+    transform: [{rotate: '90deg'}],
+  },
+  bottomLeftCorner: {
+    bottom: 0,
+    left: 0,
+    transform: [{rotate: '270deg'}],
+  },
+  bottomRightCorner: {
+    bottom: 0,
+    right: 0,
+    transform: [{rotate: '180deg'}],
+  },
+  text: {
+    color: '#fff',
+    fontWeight: 'bold',
+    lineHeight: 24,
+    fontSize: 16,
+    maxWidth: 240,
+    textAlign: 'center',
+    paddingTop: 20,
+  },
+})
diff --git a/apps/wallet-mobile/src/features/Send/common/strings.ts b/apps/wallet-mobile/src/features/Send/common/strings.ts
index 4149b0b2a7..c9fd2134e9 100644
--- a/apps/wallet-mobile/src/features/Send/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Send/common/strings.ts
@@ -57,6 +57,7 @@ export const useStrings = () => {
     failedTxTitle: intl.formatMessage(messages.failedTxTitle),
     failedTxText: intl.formatMessage(messages.failedTxText),
     failedTxButton: intl.formatMessage(messages.failedTxButton),
+    addressReaderQrText: intl.formatMessage(messages.addressReaderQrText),
   }
 }
 
@@ -250,4 +251,8 @@ export const messages = defineMessages({
     id: 'global.assets.assetLabel',
     defaultMessage: '!!!Asset',
   },
+  addressReaderQrText: {
+    id: 'components.send.addressreaderqr.text',
+    defaultMessage: '!!!Scan recipients QR code to add a crypto address',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.tsx
index 68acb01548..690f7f9a3c 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/InputReceiver/ReadQRCodeScreen.tsx
@@ -7,11 +7,13 @@ import {useSelectedWallet} from '../../../../../SelectedWallet'
 import {Quantity} from '../../../../../yoroi-wallets/types'
 import {pastedFormatter} from '../../../../../yoroi-wallets/utils'
 import {useSend} from '../../../common/SendContext'
+import {useStrings} from '../../../common/strings'
 
 export const ReadQRCodeScreen = () => {
   const navigation = useNavigation<TxHistoryRouteNavigation>()
   const wallet = useSelectedWallet()
   const {receiverChanged, amountChanged, tokenSelectedChanged} = useSend()
+  const strings = useStrings()
 
   const handleOnRead = ({data: qrData}) => {
     const regex = /(cardano):([a-zA-Z1-9]\w+)\??/
@@ -36,7 +38,7 @@ export const ReadQRCodeScreen = () => {
     return Promise.resolve(false)
   }
 
-  return <QRCodeScanner onRead={handleOnRead} />
+  return <QRCodeScanner onRead={handleOnRead} withMask maskText={strings.addressReaderQrText} />
 }
 
 const getParams = (params: string) => {
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index efd6864b5d..c3957021b6 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -131,6 +131,7 @@
   "components.send.assetselectorscreen.youHave": "You have",
   "components.send.assetselectorscreen.noAssetsAddedYet": "No {fungible} added yet",
   "components.send.addressreaderqr.title": "Scan QR code address",
+  "components.send.addressreaderqr.text": "Scan recipients QR code to add a wallet address",
   "components.send.amountfield.label": "Amount",
   "components.send.editamountscreen.title": "Asset amount",
   "components.send.memofield.label": "Memo",
diff --git a/apps/wallet-mobile/src/navigation.tsx b/apps/wallet-mobile/src/navigation.tsx
index 620672c509..3886408aa1 100644
--- a/apps/wallet-mobile/src/navigation.tsx
+++ b/apps/wallet-mobile/src/navigation.tsx
@@ -28,6 +28,12 @@ export const useParams = <Params, >(guard: Guard<Params>): Params => {
 
 type Guard<Params> = (params: Params | object) => params is Params
 
+export const BackButton = (props) => (
+  <TouchableOpacity {...props}>
+    <Icon.Chevron direction="left" color={props.color ?? '#000000'} />
+  </TouchableOpacity>
+)
+
 // OPTIONS
 const WIDTH = Dimensions.get('window').width
 export const defaultStackNavigationOptionsV2: StackNavigationOptions = {
@@ -54,11 +60,7 @@ export const defaultStackNavigationOptionsV2: StackNavigationOptions = {
   headerRightContainerStyle: {
     paddingRight: 10,
   },
-  headerLeft: (props) => (
-    <TouchableOpacity {...props}>
-      <Icon.Chevron direction="left" color="#000000" />
-    </TouchableOpacity>
-  ),
+  headerLeft: (props) => <BackButton {...props} />,
 }
 
 export const defaultStackNavigationOptions: StackNavigationOptions = {

From 4155c9115f8c90afc6d5e8f9b22d6038a1cd8241 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:33:13 +0200
Subject: [PATCH 2/9] fix: Input password dots color on android (#2537)

---
 apps/wallet-mobile/android/app/src/dev/res/values/styles.xml    | 2 +-
 .../wallet-mobile/android/app/src/nightly/res/values/styles.xml | 2 +-
 .../android/app/src/production/res/values/styles.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-mobile/android/app/src/dev/res/values/styles.xml b/apps/wallet-mobile/android/app/src/dev/res/values/styles.xml
index 45104b3922..cf13b945bd 100644
--- a/apps/wallet-mobile/android/app/src/dev/res/values/styles.xml
+++ b/apps/wallet-mobile/android/app/src/dev/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
diff --git a/apps/wallet-mobile/android/app/src/nightly/res/values/styles.xml b/apps/wallet-mobile/android/app/src/nightly/res/values/styles.xml
index 45104b3922..cf13b945bd 100644
--- a/apps/wallet-mobile/android/app/src/nightly/res/values/styles.xml
+++ b/apps/wallet-mobile/android/app/src/nightly/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
diff --git a/apps/wallet-mobile/android/app/src/production/res/values/styles.xml b/apps/wallet-mobile/android/app/src/production/res/values/styles.xml
index 45104b3922..cf13b945bd 100644
--- a/apps/wallet-mobile/android/app/src/production/res/values/styles.xml
+++ b/apps/wallet-mobile/android/app/src/production/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>

From a00878ec421b61370f102f50ad02d2af74e63c28 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:52:01 +0200
Subject: [PATCH 3/9] fix: Splash screen color on android (#2535)

---
 apps/wallet-mobile/android/app/src/dev/res/values/colors.xml    | 2 +-
 .../wallet-mobile/android/app/src/nightly/res/values/colors.xml | 2 +-
 .../android/app/src/production/res/values/colors.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-mobile/android/app/src/dev/res/values/colors.xml b/apps/wallet-mobile/android/app/src/dev/res/values/colors.xml
index 651f1f619f..f5f54542fb 100644
--- a/apps/wallet-mobile/android/app/src/dev/res/values/colors.xml
+++ b/apps/wallet-mobile/android/app/src/dev/res/values/colors.xml
@@ -1,3 +1,3 @@
 <resources>
-    <color name="bootsplash_background">#1036A0</color>
+    <color name="bootsplash_background">#3154CB</color>
 </resources>
diff --git a/apps/wallet-mobile/android/app/src/nightly/res/values/colors.xml b/apps/wallet-mobile/android/app/src/nightly/res/values/colors.xml
index 651f1f619f..f5f54542fb 100644
--- a/apps/wallet-mobile/android/app/src/nightly/res/values/colors.xml
+++ b/apps/wallet-mobile/android/app/src/nightly/res/values/colors.xml
@@ -1,3 +1,3 @@
 <resources>
-    <color name="bootsplash_background">#1036A0</color>
+    <color name="bootsplash_background">#3154CB</color>
 </resources>
diff --git a/apps/wallet-mobile/android/app/src/production/res/values/colors.xml b/apps/wallet-mobile/android/app/src/production/res/values/colors.xml
index 651f1f619f..f5f54542fb 100644
--- a/apps/wallet-mobile/android/app/src/production/res/values/colors.xml
+++ b/apps/wallet-mobile/android/app/src/production/res/values/colors.xml
@@ -1,3 +1,3 @@
 <resources>
-    <color name="bootsplash_background">#1036A0</color>
+    <color name="bootsplash_background">#3154CB</color>
 </resources>

From 8ce71aad7f32ab2a77167b430c8dd8a4d665f2e9 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:54:27 +0200
Subject: [PATCH 4/9] chore: Hide tabs on send when reading QR code (#2534)

Signed-off-by: jemubm <105349292+jemubm@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 apps/wallet-mobile/src/WalletNavigator.tsx                  | 6 ++++--
 .../src/components/QRCodeScanner/QRCodeScanner.tsx          | 2 +-
 apps/wallet-mobile/src/features/Send/common/strings.ts      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
index 2460ee2495..f94299041a 100644
--- a/apps/wallet-mobile/src/WalletNavigator.tsx
+++ b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -1,4 +1,5 @@
 import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'
+import {getFocusedRouteNameFromRoute} from '@react-navigation/native'
 import {createStackNavigator} from '@react-navigation/stack'
 import {useMetrics} from '@yoroi/metrics-react-native'
 import React from 'react'
@@ -41,7 +42,7 @@ const WalletTabNavigator = () => {
       >
         <Tab.Screen
           name="history"
-          options={{
+          options={(route) => ({
             tabBarIcon: ({focused}) => (
               <Icon.TabWallet
                 size={24}
@@ -50,7 +51,8 @@ const WalletTabNavigator = () => {
             ),
             tabBarLabel: strings.walletTabBarLabel,
             tabBarTestID: 'walletTabBarButton',
-          }}
+            tabBarStyle: getFocusedRouteNameFromRoute(route.route) === 'send-read-qr-code' ? {display: 'none'} : {},
+          })}
         >
           {() => (
             <SearchProvider>
diff --git a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
index 712be911e4..be5bc7205a 100644
--- a/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
+++ b/apps/wallet-mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
@@ -182,7 +182,7 @@ export const getScaledQrBounds = ({
   deviceHeight: number
   deviceWidth: number
 }) => {
-  // qr bounds values are inversely proportioned + issues in some android devices https://github.com/expo/expo/issues/17795
+  // qr bounds values are inversely proportioned
   const height = qrBoundingBox !== undefined ? qrBoundingBox.size.width : Number(qrBounds.size.width) * deviceHeight
   const width = qrBoundingBox !== undefined ? qrBoundingBox.size.height : Number(qrBounds.size.height) * deviceWidth
   const left = qrBoundingBox !== undefined ? qrBoundingBox.origin.y : Number(qrBounds.origin.y) * deviceWidth
diff --git a/apps/wallet-mobile/src/features/Send/common/strings.ts b/apps/wallet-mobile/src/features/Send/common/strings.ts
index c9fd2134e9..a4b9cecb6c 100644
--- a/apps/wallet-mobile/src/features/Send/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Send/common/strings.ts
@@ -253,6 +253,6 @@ export const messages = defineMessages({
   },
   addressReaderQrText: {
     id: 'components.send.addressreaderqr.text',
-    defaultMessage: '!!!Scan recipients QR code to add a crypto address',
+    defaultMessage: '!!!Scan recipients QR code to add a wallet address',
   },
 })

From 67c153d80e14522f30f050a8f2d29251b85b09c8 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Thu, 20 Jul 2023 12:22:06 +0200
Subject: [PATCH 5/9] fix: Privacy mode (#2541)

---
 .../src/Settings/PrivacyMode/PrivacyMode.tsx  |  2 +-
 .../src/TxHistory/AssetList/AssetList.tsx     |  4 +++-
 .../src/TxHistory/BalanceBanner.tsx           | 24 ++++++++++++-------
 .../src/TxHistory/PairedBalance.stories.tsx   |  2 +-
 .../src/TxHistory/PairedBalance.tsx           | 11 +++++----
 .../TxHistoryList/TxHistoryListItem.tsx       |  8 +++++--
 .../src/components/AmountItem/AmountItem.tsx  |  8 ++++---
 7 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/apps/wallet-mobile/src/Settings/PrivacyMode/PrivacyMode.tsx b/apps/wallet-mobile/src/Settings/PrivacyMode/PrivacyMode.tsx
index db64e54ce2..0bc67b6fa2 100644
--- a/apps/wallet-mobile/src/Settings/PrivacyMode/PrivacyMode.tsx
+++ b/apps/wallet-mobile/src/Settings/PrivacyMode/PrivacyMode.tsx
@@ -33,7 +33,7 @@ export const useSetPrivacyMode = ({...options}: UseMutationOptions<void, Error,
   return mutation.mutate
 }
 
-type PrivacyMode = 'SHOWN' | 'HIDDEN'
+export type PrivacyMode = 'SHOWN' | 'HIDDEN'
 const defaultPrivacyMode: PrivacyMode = 'SHOWN'
 
 const parsePrivacyMode = (data: unknown) => {
diff --git a/apps/wallet-mobile/src/TxHistory/AssetList/AssetList.tsx b/apps/wallet-mobile/src/TxHistory/AssetList/AssetList.tsx
index 4706723c73..aa365c4cbe 100644
--- a/apps/wallet-mobile/src/TxHistory/AssetList/AssetList.tsx
+++ b/apps/wallet-mobile/src/TxHistory/AssetList/AssetList.tsx
@@ -7,6 +7,7 @@ import {AmountItem, AmountItemProps} from '../../components/AmountItem/AmountIte
 import {Spacer} from '../../components/Spacer'
 import globalMessages, {actionMessages} from '../../i18n/global-messages'
 import {useSelectedWallet} from '../../SelectedWallet'
+import {usePrivacyMode} from '../../Settings/PrivacyMode/PrivacyMode'
 import {sortTokenInfos} from '../../utils'
 import {getNetworkConfigById} from '../../yoroi-wallets/cardano/networks'
 import {useBalances, useTokenInfos} from '../../yoroi-wallets/hooks'
@@ -69,9 +70,10 @@ type ExplorableAssetItemProps = AmountItemProps & {
   onPress(): void
 }
 const ExplorableAssetItem = ({wallet, amount, onPress}: ExplorableAssetItemProps) => {
+  const privacyMode = usePrivacyMode()
   return (
     <TouchableOpacity style={styles.button} onPress={onPress} testID="assetSelectorItem">
-      <AmountItem wallet={wallet} amount={amount} />
+      <AmountItem privacyMode={privacyMode} wallet={wallet} amount={amount} />
     </TouchableOpacity>
   )
 }
diff --git a/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx b/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
index 64897b1697..8fe53e1546 100644
--- a/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
@@ -1,10 +1,11 @@
-import React, {useState} from 'react'
+import React from 'react'
 import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {Boundary, ResetErrorRef, Spacer} from '../components'
 import {Icon} from '../components/Icon'
 import {formatTokenWithText, formatTokenWithTextWhenHidden} from '../legacy/format'
 import {useSelectedWallet} from '../SelectedWallet'
+import {PrivacyMode, usePrivacyMode, useSetPrivacyMode} from '../Settings/PrivacyMode/PrivacyMode'
 import {COLORS} from '../theme'
 import {useBalances} from '../yoroi-wallets/hooks'
 import {Amounts} from '../yoroi-wallets/utils'
@@ -14,7 +15,8 @@ export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
   const wallet = useSelectedWallet()
   const balances = useBalances(wallet)
   const primaryAmount = Amounts.getAmount(balances, wallet.primaryTokenInfo.id)
-  const [privacy, setPrivacy] = useState(false)
+  const setPrivacyMode = useSetPrivacyMode()
+  const privacyMode = usePrivacyMode()
 
   return (
     <View style={styles.banner}>
@@ -26,15 +28,18 @@ export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
 
       <Spacer height={10} />
 
-      <TouchableOpacity onPress={() => setPrivacy(!privacy)} style={styles.button}>
+      <TouchableOpacity
+        onPress={() => setPrivacyMode(privacyMode === 'SHOWN' ? 'HIDDEN' : 'SHOWN')}
+        style={styles.button}
+      >
         <Row>
           <Boundary loading={{size: 'small'}} error={{size: 'inline'}}>
-            <Balance privacy={privacy} />
+            <Balance privacyMode={privacyMode} />
           </Boundary>
         </Row>
 
         <Row>
-          <PairedBalance privacy={privacy} amount={primaryAmount} ref={ref} />
+          <PairedBalance privacyMode={privacyMode} amount={primaryAmount} ref={ref} />
         </Row>
       </TouchableOpacity>
     </View>
@@ -42,13 +47,14 @@ export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
 })
 
 const hiddenBalance = '*.******'
-const Balance = ({privacy}: {privacy: boolean}) => {
+const Balance = ({privacyMode}: {privacyMode: PrivacyMode}) => {
   const wallet = useSelectedWallet()
   const balances = useBalances(wallet)
 
-  const balance = privacy
-    ? formatTokenWithTextWhenHidden(hiddenBalance, wallet.primaryToken)
-    : formatTokenWithText(Amounts.getAmount(balances, wallet.primaryToken.identifier).quantity, wallet.primaryToken)
+  const balance =
+    privacyMode === 'HIDDEN'
+      ? formatTokenWithTextWhenHidden(hiddenBalance, wallet.primaryToken)
+      : formatTokenWithText(Amounts.getAmount(balances, wallet.primaryToken.identifier).quantity, wallet.primaryToken)
 
   return (
     <Row>
diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx b/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx
index 0bbb4120e9..587cb7f07e 100644
--- a/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx
+++ b/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx
@@ -55,7 +55,7 @@ storiesOf('PairedBalance', module)
         >
           <View style={{flex: 1, justifyContent: 'center'}}>
             <View style={{borderWidth: 1}}>
-              <PairedBalance amount={{quantity: '2', tokenId: mocks.wallet.primaryTokenInfo.id}} privacy />
+              <PairedBalance amount={{quantity: '2', tokenId: mocks.wallet.primaryTokenInfo.id}} privacyMode="HIDDEN" />
             </View>
           </View>
         </SelectedWalletProvider>
diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
index 6cec3bb7ef..da59ea54b4 100644
--- a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
+++ b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, Text} from 'react-native'
+import {PrivacyMode} from 'src/Settings/PrivacyMode/PrivacyMode'
 
 import {Boundary, ResetError, ResetErrorRef} from '../components'
 import {useSelectedWallet} from '../SelectedWallet'
@@ -11,10 +12,10 @@ import {CurrencySymbol, YoroiAmount} from '../yoroi-wallets/types'
 import {Quantities} from '../yoroi-wallets/utils'
 
 type Props = {
-  privacy?: boolean
+  privacyMode?: PrivacyMode
   amount: YoroiAmount
 }
-export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({privacy, amount}, ref) => {
+export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({privacyMode, amount}, ref) => {
   const {currency} = useCurrencyContext()
 
   return (
@@ -29,13 +30,13 @@ export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({privacy, a
         ),
       }}
     >
-      <Balance privacy={privacy} amount={amount} />
+      <Balance privacyMode={privacyMode} amount={amount} />
     </Boundary>
   )
 })
 
 const hiddenPairedTotal = '*.**'
-const Balance = ({privacy, amount}: Props) => {
+const Balance = ({privacyMode, amount}: Props) => {
   const wallet = useSelectedWallet()
   const {currency, config} = useCurrencyContext()
   const rate = useExchangeRate({wallet, to: currency})
@@ -61,7 +62,7 @@ const Balance = ({privacy, amount}: Props) => {
     Quantities.product([primaryExchangeQuantity, `${rate}`]),
     config.decimals,
   )
-  const pairedTotal = privacy ? hiddenPairedTotal : secondaryExchangeQuantity
+  const pairedTotal = privacyMode === 'HIDDEN' ? hiddenPairedTotal : secondaryExchangeQuantity
   return (
     <Text style={styles.pairedBalanceText} testID="pairedTotalText">
       {`${pairedTotal} ${currency}`}
diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryList/TxHistoryListItem.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryList/TxHistoryListItem.tsx
index e1a6dcfa74..ac7612adcf 100644
--- a/apps/wallet-mobile/src/TxHistory/TxHistoryList/TxHistoryListItem.tsx
+++ b/apps/wallet-mobile/src/TxHistory/TxHistoryList/TxHistoryListItem.tsx
@@ -12,6 +12,7 @@ import {formatTime, formatTokenFractional, formatTokenInteger} from '../../legac
 import utfSymbols from '../../legacy/utfSymbols'
 import {TxHistoryRouteNavigation} from '../../navigation'
 import {useSelectedWallet} from '../../SelectedWallet'
+import {usePrivacyMode} from '../../Settings/PrivacyMode/PrivacyMode'
 import {COLORS} from '../../theme'
 import {isEmptyString} from '../../utils/utils'
 import {MultiToken} from '../../yoroi-wallets/cardano/MultiToken'
@@ -105,6 +106,7 @@ const Middle = ({style, ...props}: ViewProps) => (
 )
 const Right = ({style, ...props}: ViewProps) => <View style={[style, {padding: 4}]} {...props} />
 const Amount = ({wallet, transaction}: {wallet: YoroiWallet; transaction: TransactionInfo}) => {
+  const privacyMode = usePrivacyMode()
   const amountAsMT = MultiToken.fromArray(transaction.amount)
   const amount: BigNumber = amountAsMT.getDefault()
   const fee = transaction.fee ? transaction.fee[0] : null
@@ -118,9 +120,11 @@ const Amount = ({wallet, transaction}: {wallet: YoroiWallet; transaction: Transa
   return (
     <View style={styles.amount} testID="transactionAmount">
       <Text style={style} secondary={transaction.assurance === 'PENDING'}>
-        <Text>{formatTokenInteger(asQuantity(amount), wallet.primaryToken)}</Text>
+        <Text>{privacyMode === 'HIDDEN' ? '*' : formatTokenInteger(asQuantity(amount), wallet.primaryToken)}</Text>
 
-        <Text small>{formatTokenFractional(asQuantity(amount), wallet.primaryToken)}</Text>
+        <Text small>
+          {privacyMode === 'HIDDEN' ? '.******' : formatTokenFractional(asQuantity(amount), wallet.primaryToken)}
+        </Text>
       </Text>
 
       <Text style={style}>{`${utfSymbols.NBSP}${wallet.primaryTokenInfo.symbol}`}</Text>
diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
index 2a363f00bb..e03ba165e6 100644
--- a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
+++ b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import {StyleSheet, View, ViewProps} from 'react-native'
 
+import {PrivacyMode} from '../../Settings/PrivacyMode/PrivacyMode'
 import {COLORS} from '../../theme'
 import {PairedBalance} from '../../TxHistory/PairedBalance'
 import {isEmptyString} from '../../utils'
@@ -14,9 +15,10 @@ export type AmountItemProps = {
   wallet: YoroiWallet
   amount: YoroiAmount
   style?: ViewProps['style']
+  privacyMode?: PrivacyMode
 }
 
-export const AmountItem = ({wallet, style, amount}: AmountItemProps) => {
+export const AmountItem = ({privacyMode, wallet, style, amount}: AmountItemProps) => {
   const {quantity, tokenId} = amount
   const tokenInfo = useTokenInfo({wallet, tokenId})
 
@@ -46,11 +48,11 @@ export const AmountItem = ({wallet, style, amount}: AmountItemProps) => {
       <Right>
         {tokenInfo.kind !== 'nft' && (
           <Text style={styles.quantity} testID="tokenAmountText">
-            {denominatedQuantity}
+            {privacyMode === 'HIDDEN' ? '**.*******' : denominatedQuantity}
           </Text>
         )}
 
-        {isPrimary && <PairedBalance amount={{quantity, tokenId: tokenInfo.id}} />}
+        {isPrimary && <PairedBalance privacyMode={privacyMode} amount={{quantity, tokenId: tokenInfo.id}} />}
       </Right>
     </View>
   )

From 1bfec55b9c18dfa6f573139d8107d59e5b856876 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Thu, 20 Jul 2023 14:54:20 +0200
Subject: [PATCH 6/9] fix(Ledger): Add Ledger Cardano app V5 voting support
 (#2536)

---
 apps/wallet-mobile/package.json               |   2 +-
 .../src/Catalyst/ConfirmVotingTx.tsx          |  13 +-
 .../src/components/ConfirmTx/ConfirmTx.tsx    |  38 +-
 .../cardano/byron/ByronWallet.ts              |  60 ++-
 .../yoroi-wallets/cardano/constants/common.ts |  16 -
 .../src/yoroi-wallets/cardano/hw/hw.ts        |  14 +-
 .../cardano/shelley/ShelleyWallet.ts          |  60 ++-
 .../tests/mainnet/ShelleyWallet.test.ts       |  14 +-
 .../testnet/ShelleyWalletTestnet.test.ts      |   8 +-
 .../ShelleyWalletTestnet.test.ts.snap         |   4 +-
 .../src/yoroi-wallets/cardano/types.ts        |   8 +-
 .../src/yoroi-wallets/hooks/index.ts          |  15 +-
 .../src/yoroi-wallets/mocks/wallet.ts         |   4 +-
 .../src/Catalyst/ConfirmVotingTx.json         |  24 +-
 .../src/TxHistory/TxHistoryNavigator.json     |  66 +--
 .../messages/src/WalletNavigator.json         |  74 ++--
 .../src/features/Send/common/strings.json     | 377 +++++++++---------
 yarn.lock                                     |   9 +-
 18 files changed, 467 insertions(+), 339 deletions(-)

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 6957d86868..4ab3a509ca 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -89,7 +89,7 @@
     "@emurgo/csl-mobile-bridge": "^5.1.2",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "^0.5.2",
+    "@emurgo/yoroi-lib": "0.5.3",
     "@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/Catalyst/ConfirmVotingTx.tsx b/apps/wallet-mobile/src/Catalyst/ConfirmVotingTx.tsx
index 2fab2bb30c..bd233ba1a8 100644
--- a/apps/wallet-mobile/src/Catalyst/ConfirmVotingTx.tsx
+++ b/apps/wallet-mobile/src/Catalyst/ConfirmVotingTx.tsx
@@ -25,14 +25,20 @@ export const ConfirmVotingTx = ({
   onNext: () => void
   pin: string
 }) => {
+  const [supportsCIP36, setSupportsCIP36] = useState(true)
+
   const strings = useStrings()
   const wallet = useSelectedWallet()
   const votingRegTx = useVotingRegTx(
-    {wallet, pin}, //
+    {wallet, pin, supportsCIP36},
     {onSuccess: ({votingKeyEncrypted}) => onSuccess(votingKeyEncrypted)},
   )
   const [password, setPassword] = useState(features.prefillWalletInfo ? debugWalletInfo.PASSWORD : '')
-  const [useUSB, setUseUSB] = useState<boolean>(false)
+  const [useUSB, setUseUSB] = useState(false)
+
+  const handleCIP36SupportChange = (supportsCIP36: boolean) => {
+    setSupportsCIP36(supportsCIP36)
+  }
 
   return (
     <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.safeAreaView}>
@@ -88,6 +94,9 @@ export const ConfirmVotingTx = ({
           yoroiUnsignedTx={votingRegTx}
           biometricInstructions={[strings.authOsInstructions]}
           chooseTransportOnConfirmation
+          onCIP36SupportChange={handleCIP36SupportChange}
+          autoConfirm={!supportsCIP36}
+          supportsCIP36={supportsCIP36}
         />
       </Actions>
     </SafeAreaView>
diff --git a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
index 028edb94d9..3a4cce37f4 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
@@ -33,12 +33,15 @@ type Props = {
   yoroiUnsignedTx: YoroiUnsignedTx
   useUSB: boolean
   setUseUSB: (useUSB: boolean) => void
+  supportsCIP36?: boolean
+  onCIP36SupportChange?: (isSupported: boolean) => void
   isProvidingPassword?: boolean
   providedPassword?: string
   disabled?: boolean
   autoSignIfEasyConfirmation?: boolean
   chooseTransportOnConfirmation?: boolean
   biometricInstructions?: Array<string>
+  autoConfirm?: boolean
 }
 
 export const ConfirmTx = ({
@@ -53,6 +56,9 @@ export const ConfirmTx = ({
   disabled,
   autoSignIfEasyConfirmation,
   chooseTransportOnConfirmation,
+  supportsCIP36,
+  onCIP36SupportChange,
+  autoConfirm,
 }: Props) => {
   const strings = useStrings()
   const navigation = useNavigation()
@@ -62,6 +68,7 @@ export const ConfirmTx = ({
   const {mutateAsync: submitTx} = useSubmitTx({wallet})
 
   const [password, setPassword] = useState('')
+  const [isProcessed, setIsProcessed] = useState(false)
   const [isProcessing, setIsProcessing] = useState(false)
   const [dialogStep, setDialogStep] = useState(DialogStep.Closed)
   const [errorData, setErrorData] = useState<ErrorData>({
@@ -92,16 +99,17 @@ export const ConfirmTx = ({
   const onConfirmationChooseTransport = (useUSB: boolean) => {
     if (!wallet.hwDeviceInfo) throw new Error('No device info')
     setUseUSB(useUSB)
+
     setDialogStep(DialogStep.LedgerConnect)
   }
 
   const onMountChooseTransport = (useUSB: boolean) => {
     if (!wallet.hwDeviceInfo) throw new Error('No device info')
     setUseUSB(useUSB)
-    if (
-      (useUSB && wallet.hwDeviceInfo.hwFeatures.deviceObj == null) ||
-      (!useUSB && wallet.hwDeviceInfo.hwFeatures.deviceId == null)
-    ) {
+
+    const hwFeatures = wallet.hwDeviceInfo.hwFeatures
+
+    if ((useUSB && hwFeatures.deviceObj == null) || (!useUSB && hwFeatures.deviceId == null)) {
       setDialogStep(DialogStep.LedgerConnect)
     } else {
       setDialogStep(DialogStep.Closed)
@@ -111,6 +119,14 @@ export const ConfirmTx = ({
   const onConnectUSB = async (deviceObj: DeviceObj) => {
     await walletManager.updateHWDeviceInfo(wallet, withUSB(wallet, deviceObj))
 
+    if (yoroiUnsignedTx.unsignedTx.catalystRegistrationData && onCIP36SupportChange) {
+      const isCIP36Supported = await wallet.ledgerSupportsCIP36(useUSB)
+      if (supportsCIP36 !== isCIP36Supported) {
+        onCIP36SupportChange(isCIP36Supported)
+        return
+      }
+    }
+
     if (chooseTransportOnConfirmation) {
       await delay(1000)
       onConfirm()
@@ -122,6 +138,14 @@ export const ConfirmTx = ({
   const onConnectBLE = async (deviceId: DeviceId) => {
     await walletManager.updateHWDeviceInfo(wallet, withBLE(wallet, deviceId))
 
+    if (yoroiUnsignedTx.unsignedTx.catalystRegistrationData && onCIP36SupportChange) {
+      const isCIP36Supported = await wallet.ledgerSupportsCIP36(useUSB)
+      if (supportsCIP36 !== isCIP36Supported) {
+        onCIP36SupportChange(isCIP36Supported)
+        return
+      }
+    }
+
     if (chooseTransportOnConfirmation) {
       await delay(1000)
       onConfirm()
@@ -189,6 +213,7 @@ export const ConfirmTx = ({
           })
         }
       } finally {
+        setIsProcessed(true)
         setIsProcessing(false)
       }
     },
@@ -215,6 +240,11 @@ export const ConfirmTx = ({
     }
   }, [autoSignIfEasyConfirmation, wallet.isEasyConfirmationEnabled, _onConfirm])
 
+  useEffect(() => {
+    if (!autoConfirm || isProcessing || isProcessed) return
+    onConfirm()
+  }, [autoConfirm, onConfirm, isProcessing, isProcessed])
+
   useEffect(() => {
     if (wallet.isHW && !chooseTransportOnConfirmation) {
       setDialogStep(DialogStep.ChooseTransport)
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
index cc9bc5467a..7a2abc9b1e 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
@@ -56,7 +56,7 @@ import {
 import {CardanoError, InvalidState} from '../errors'
 import {ADDRESS_TYPE_TO_CHANGE} from '../formatPath'
 import {withMinAmounts} from '../getMinAmounts'
-import {signTxWithLedger} from '../hw'
+import {doesCardanoAppVersionSupportCIP36, getCardanoAppMajorVersion, signTxWithLedger} from '../hw'
 import {
   CardanoHaskellShelleyNetwork,
   getCardanoNetworkConfigById,
@@ -521,11 +521,8 @@ export class ByronWallet implements YoroiWallet {
   private async getRewardAddress() {
     if (this.walletImplementationId == null) throw new Error('Invalid wallet: walletImplementationId')
 
-    assert(isHaskellShelley(this.walletImplementationId), 'cannot get reward address from a byron-era wallet')
-    const stakingKey = await this.getStakingKey()
-    const credential = await CardanoMobile.StakeCredential.fromKeyhash(await stakingKey.hash())
-    const rewardAddr = await CardanoMobile.RewardAddress.new(Number.parseInt(this.getChainNetworkId(), 10), credential)
-    return rewardAddr.toAddress()
+    const baseAddr = await this.getFirstPaymentAddress()
+    return baseAddr.toAddress()
   }
 
   private getRewardAddressAddressing() {
@@ -793,7 +790,12 @@ export class ByronWallet implements YoroiWallet {
     return Cardano.Wasm.BaseAddress.fromAddress(addr)
   }
 
-  async createVotingRegTx(pin: string) {
+  async ledgerSupportsCIP36(useUSB): Promise<boolean> {
+    if (!this.hwDeviceInfo) throw new Error('Invalid wallet state')
+    return doesCardanoAppVersionSupportCIP36(await getCardanoAppMajorVersion(this.hwDeviceInfo, useUSB))
+  }
+
+  async createVotingRegTx(pin: string, supportsCIP36: boolean) {
     Logger.debug('CardanoWallet::createVotingRegTx called')
 
     const bytes = await generatePrivateKeyForCatalyst()
@@ -833,12 +835,12 @@ export class ByronWallet implements YoroiWallet {
       const addressedUtxos = await this.getAddressedUtxos()
 
       const baseAddr = await this.getFirstPaymentAddress()
-      const paymentAddress = await baseAddr
+      const paymentAddressCIP36 = await baseAddr
         .toAddress()
         .then((a) => a.toBytes())
         .then((b) => Buffer.from(b).toString('hex'))
 
-      const addressing = this.getAddressing(await baseAddr.toAddress().then((a) => a.toBech32()))
+      const addressingCIP36 = this.getAddressing(await baseAddr.toAddress().then((a) => a.toBech32()))
 
       const unsignedTx = await Cardano.createUnsignedVotingTx(
         absSlotNumber,
@@ -852,10 +854,13 @@ export class ByronWallet implements YoroiWallet {
         txOptions,
         nonce,
         chainNetworkConfig,
-        paymentAddress,
-        addressing.path,
+        paymentAddressCIP36,
+        addressingCIP36.path,
+        supportsCIP36,
       )
 
+      const rewardAddress = await this.getRewardAddress().then((address) => address.toBech32())
+
       const votingRegistration: {
         votingPublicKey: string
         stakingPublicKey: string
@@ -864,7 +869,7 @@ export class ByronWallet implements YoroiWallet {
       } = {
         votingPublicKey: await votingPublicKey.toBech32(),
         stakingPublicKey: await stakingPublicKey.toBech32(),
-        rewardAddress: await baseAddr.toAddress().then((address) => address.toBech32()),
+        rewardAddress,
         nonce,
       }
 
@@ -939,6 +944,32 @@ export class ByronWallet implements YoroiWallet {
   async signTxWithLedger(unsignedTx: YoroiUnsignedTx, useUSB: boolean): Promise<YoroiSignedTx> {
     if (!this.hwDeviceInfo) throw new Error('Invalid wallet state')
 
+    const appAdaVersion = await getCardanoAppMajorVersion(this.hwDeviceInfo, useUSB)
+
+    if (!doesCardanoAppVersionSupportCIP36(appAdaVersion) && unsignedTx.voting.registration) {
+      Logger.info('CardanoWallet::signTxWithLedger: Ledger app version <= 5')
+      const ledgerPayload = await Cardano.buildVotingLedgerPayloadV5(
+        unsignedTx.unsignedTx,
+        Number.parseInt(this.getChainNetworkId(), 10),
+        (this.getBaseNetworkConfig() as any).PROTOCOL_MAGIC,
+        this.stakingKeyPath,
+      )
+
+      const signedLedgerTx = await signTxWithLedger(ledgerPayload, this.hwDeviceInfo, useUSB)
+
+      const signedTx = await Cardano.buildLedgerSignedTx(
+        unsignedTx.unsignedTx,
+        signedLedgerTx,
+        this.getPurpose(),
+        this.publicKeyHex,
+        false,
+      )
+
+      return yoroiSignedTx({unsignedTx, signedTx})
+    }
+
+    Logger.info('CardanoWallet::signTxWithLedger: Ledger app version > 5, using CIP-36')
+
     const ledgerPayload = await Cardano.buildLedgerPayload(
       unsignedTx.unsignedTx,
       Number.parseInt(this.getChainNetworkId(), 10),
@@ -954,10 +985,7 @@ export class ByronWallet implements YoroiWallet {
       this.publicKeyHex,
     )
 
-    return yoroiSignedTx({
-      unsignedTx,
-      signedTx,
-    })
+    return yoroiSignedTx({unsignedTx, signedTx})
   }
 
   // =================== backend API =================== //
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/constants/common.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/constants/common.ts
index d8d56ac52c..9fc48e46eb 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/constants/common.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/constants/common.ts
@@ -57,19 +57,3 @@ export const MINIMUM_UTXO_VAL = '1000000'
 export const HISTORY_REFRESH_TIME = 25000
 
 export const COINS_PER_UTXO_WORD = '34482'
-
-export const SHELLEY_VOTING_KEY_PATH = [
-  1852 + HARD_DERIVATION_START,
-  1815 + HARD_DERIVATION_START,
-  0 + HARD_DERIVATION_START,
-  0,
-  0,
-]
-
-export const BYRON_VOTING_KEY_PATH = [
-  44 + HARD_DERIVATION_START,
-  1815 + HARD_DERIVATION_START,
-  0 + HARD_DERIVATION_START,
-  0,
-  0,
-]
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.ts
index f76c426d95..b39e2cf63f 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.ts
@@ -29,6 +29,7 @@ import {NUMBERS} from '../numbers'
 import {isByron, isHaskellShelley} from '../utils'
 
 const MIN_ADA_APP_VERSION = '2.2.1'
+const MIN_ADA_APP_VERSION_SUPPORTING_CIP36 = 6
 
 export type WalletType = 'BIP44' | 'CIP1852'
 
@@ -259,15 +260,26 @@ export const normalizeHWResponse = (resp: LedgerConnectionResponse): HWDeviceInf
   }
 }
 
+export const doesCardanoAppVersionSupportCIP36 = (majorVersion: number) => {
+  return majorVersion >= MIN_ADA_APP_VERSION_SUPPORTING_CIP36
+}
+
 //
 // ============== transaction logic ==================
 //
 
+export const getCardanoAppMajorVersion = async (hwDeviceInfo: HWDeviceInfo, useUSB: boolean) => {
+  const appAda = await connectionHandler(hwDeviceInfo.hwFeatures.deviceId, hwDeviceInfo.hwFeatures.deviceObj, useUSB)
+  const {version} = await appAda.getVersion()
+  Logger.debug('ledgerUtils::getCardanoAppMajorVersion', version.major)
+  return version.major
+}
+
 export const signTxWithLedger = async (
   signRequest: SignTransactionRequest,
   hwDeviceInfo: HWDeviceInfo,
   useUSB: boolean,
-): Promise<SignTransactionResponse> => {
+) => {
   try {
     Logger.debug('ledgerUtils::signTxWithLedger called')
     const appAda = await connectionHandler(hwDeviceInfo.hwFeatures.deviceId, hwDeviceInfo.hwFeatures.deviceObj, useUSB)
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
index b96dab12f2..0e50ecf7ab 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
@@ -43,7 +43,7 @@ import {CardanoError} from '../errors'
 import {ADDRESS_TYPE_TO_CHANGE} from '../formatPath'
 import {withMinAmounts} from '../getMinAmounts'
 import {getTime} from '../getTime'
-import {signTxWithLedger} from '../hw'
+import {doesCardanoAppVersionSupportCIP36, getCardanoAppMajorVersion, signTxWithLedger} from '../hw'
 import {processTxHistoryData} from '../processTransactions'
 import {IsLockedError, nonblockingSynchronize, synchronize} from '../promise'
 import {filterAddressesByStakingKey, getDelegationStatus} from '../shelley/delegationUtils'
@@ -454,10 +454,8 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
     }
 
     private async getRewardAddress() {
-      const stakingKey = await this.getStakingKey()
-      const credential = await CardanoMobile.StakeCredential.fromKeyhash(await stakingKey.hash())
-      const rewardAddr = await CardanoMobile.RewardAddress.new(CHAIN_NETWORK_ID, credential)
-      return rewardAddr.toAddress()
+      const baseAddr = await this.getFirstPaymentAddress()
+      return baseAddr.toAddress()
     }
 
     async getAllUtxosForKey() {
@@ -708,7 +706,7 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
       return Cardano.Wasm.BaseAddress.fromAddress(addr)
     }
 
-    async createVotingRegTx(pin: string) {
+    async createVotingRegTx(pin: string, supportsCIP36: boolean) {
       Logger.debug('CardanoWallet::createVotingRegTx called')
 
       const bytes = await generatePrivateKeyForCatalyst()
@@ -745,12 +743,13 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
         const addressedUtxos = await this.getAddressedUtxos()
 
         const baseAddr = await this.getFirstPaymentAddress()
-        const paymentAddress = await baseAddr
+
+        const paymentAddressCIP36 = await baseAddr
           .toAddress()
           .then((a) => a.toBytes())
           .then((b) => Buffer.from(b).toString('hex'))
 
-        const addressing = this.getAddressing(await baseAddr.toAddress().then((a) => a.toBech32()))
+        const addressingCIP36 = this.getAddressing(await baseAddr.toAddress().then((a) => a.toBech32()))
 
         const unsignedTx = await Cardano.createUnsignedVotingTx(
           absSlotNumber,
@@ -764,10 +763,12 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
           txOptions,
           nonce,
           CHAIN_NETWORK_ID,
-          paymentAddress,
-          addressing.path,
+          paymentAddressCIP36,
+          addressingCIP36.path,
+          supportsCIP36,
         )
 
+        const rewardAddress = await this.getRewardAddress().then((address) => address.toBech32())
         const votingRegistration: {
           votingPublicKey: string
           stakingPublicKey: string
@@ -776,7 +777,7 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
         } = {
           votingPublicKey: await votingPublicKey.toBech32(),
           stakingPublicKey: await stakingPublicKey.toBech32(),
-          rewardAddress: await baseAddr.toAddress().then((address) => address.toBech32()),
+          rewardAddress,
           nonce,
         }
 
@@ -843,9 +844,40 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
       })
     }
 
+    async ledgerSupportsCIP36(useUSB): Promise<boolean> {
+      if (!this.hwDeviceInfo) throw new Error('Invalid wallet state')
+      return doesCardanoAppVersionSupportCIP36(await getCardanoAppMajorVersion(this.hwDeviceInfo, useUSB))
+    }
+
     async signTxWithLedger(unsignedTx: YoroiUnsignedTx, useUSB: boolean): Promise<YoroiSignedTx> {
       if (!this.hwDeviceInfo) throw new Error('Invalid wallet state')
 
+      const appAdaVersion = await getCardanoAppMajorVersion(this.hwDeviceInfo, useUSB)
+
+      if (!doesCardanoAppVersionSupportCIP36(appAdaVersion) && unsignedTx.voting.registration) {
+        Logger.info('CardanoWallet::signTxWithLedger: Ledger app version <= 5')
+        const ledgerPayload = await Cardano.buildVotingLedgerPayloadV5(
+          unsignedTx.unsignedTx,
+          CHAIN_NETWORK_ID,
+          PROTOCOL_MAGIC,
+          STAKING_KEY_PATH,
+        )
+
+        const signedLedgerTx = await signTxWithLedger(ledgerPayload, this.hwDeviceInfo, useUSB)
+
+        const signedTx = await Cardano.buildLedgerSignedTx(
+          unsignedTx.unsignedTx,
+          signedLedgerTx,
+          PURPOSE,
+          this.publicKeyHex,
+          false,
+        )
+
+        return yoroiSignedTx({unsignedTx, signedTx})
+      }
+
+      Logger.info('CardanoWallet::signTxWithLedger: Ledger app version > 5, using CIP-36')
+
       const ledgerPayload = await Cardano.buildLedgerPayload(
         unsignedTx.unsignedTx,
         CHAIN_NETWORK_ID,
@@ -860,12 +892,10 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET) =>
         signedLedgerTx,
         PURPOSE,
         this.publicKeyHex,
+        true,
       )
 
-      return yoroiSignedTx({
-        unsignedTx,
-        signedTx,
-      })
+      return yoroiSignedTx({unsignedTx, signedTx})
     }
 
     // =================== backend API =================== //
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
index 1f1221ddf1..458b2a8cec 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/mainnet/ShelleyWallet.test.ts
@@ -87,7 +87,9 @@ describe('ShelleyWallet', () => {
       'addr1q90qj49u70m8xa9v0f6d2frtvv33v5x4gwckvxllv6regw7prmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9sv69ppj',
     )
 
-    await expect(getRewardAddress(wallet)).resolves.toBe('stake1u8q3auyvgnekzzm72m2xuzrtjqvxcyhf568s2gdhcnrjujcr25kkv')
+    await expect(getRewardAddress(wallet)).resolves.toBe(
+      'addr1qxddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9suclpck',
+    )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
       identifier: '',
@@ -198,7 +200,9 @@ describe('ShelleyWallet', () => {
       'addr1q90qj49u70m8xa9v0f6d2frtvv33v5x4gwckvxllv6regw7prmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9sv69ppj',
     )
 
-    await expect(getRewardAddress(wallet)).resolves.toBe('stake1u8q3auyvgnekzzm72m2xuzrtjqvxcyhf568s2gdhcnrjujcr25kkv')
+    await expect(getRewardAddress(wallet)).resolves.toBe(
+      'addr1qxddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9suclpck',
+    )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
       identifier: '',
@@ -299,7 +303,9 @@ describe('ShelleyWallet', () => {
       'addr1qyeacjehv4qpyr68hszxdxrsx4whts8ctkeez4s0e0an6qy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3q85yacp',
     )
 
-    await expect(getRewardAddress(wallet)).resolves.toBe('stake1uxdr3c77jn9px6c6srafp4ekpmqluk5dhsndgfllanj5acsqkljgd')
+    await expect(getRewardAddress(wallet)).resolves.toBe(
+      'addr1q9yz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3q8rhh6l',
+    )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
       identifier: '',
@@ -377,7 +383,7 @@ describe('ShelleyWallet', () => {
       ],
     }
 
-    const tx = await wallet.createVotingRegTx('1111')
+    const tx = await wallet.createVotingRegTx('1111', true)
     expect(tx.votingRegTx.voting.registration?.votingPublicKey).toMatch(/ed25519/)
     expect(tx.votingRegTx.voting.registration?.stakingPublicKey).toEqual(
       'ed25519_pk1n924uy8z37svs59hprukk9s38j0ctuqudgcmkadrgq8wam6mjvrqfhtxte',
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
index 3a1cd85711..0de322550f 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/ShelleyWalletTestnet.test.ts
@@ -85,7 +85,7 @@ describe('ShelleyWalletTestnet', () => {
     )
 
     await expect(getRewardAddress(wallet)).resolves.toBe(
-      'stake_test1urq3auyvgnekzzm72m2xuzrtjqvxcyhf568s2gdhcnrjujcyq75j3',
+      'addr_test1qzddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9slwzp5f',
     )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
@@ -198,7 +198,7 @@ describe('ShelleyWalletTestnet', () => {
     )
 
     await expect(getRewardAddress(wallet)).resolves.toBe(
-      'stake_test1urq3auyvgnekzzm72m2xuzrtjqvxcyhf568s2gdhcnrjujcyq75j3',
+      'addr_test1qpyz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3qy42hkq',
     )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
@@ -300,7 +300,7 @@ describe('ShelleyWalletTestnet', () => {
     )
 
     await expect(getRewardAddress(wallet)).resolves.toBe(
-      'stake_test1uzdr3c77jn9px6c6srafp4ekpmqluk5dhsndgfllanj5acs8u4svs',
+      'addr_test1qpyz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3qy42hkq',
     )
 
     expect(wallet.primaryToken).toEqual<DefaultAsset>({
@@ -424,7 +424,7 @@ const data: WalletJSON = {
     gapLimit: 20,
     blockSize: 50,
     addresses: [
-      'addr_test1qxddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9suclpck',
+      'addr_test1qpyz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3qy42hkq',
       'addr_test1qyxg9e0wj478cd6ckvgwgxj075q6hxz2aeepgf6uxv8ju0kprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9s7yq5yx',
       'addr_test1qxkpmv5pzle28wv52v9p0gpsuw90r35wyj903ay99ehpcwkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9snaf0vm',
       'addr_test1q9fzmrqgzs4hwrelsckyc4d7hwe4flns7ctdfe2v3p2m8mkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9sgsalrm',
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/__snapshots__/ShelleyWalletTestnet.test.ts.snap b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/__snapshots__/ShelleyWalletTestnet.test.ts.snap
index 6779843299..6579010650 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/__snapshots__/ShelleyWalletTestnet.test.ts.snap
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/tests/testnet/__snapshots__/ShelleyWalletTestnet.test.ts.snap
@@ -554,7 +554,7 @@ exports[`ShelleyWalletTestnet restore 1`] = `
 
 exports[`ShelleyWalletTestnet restore 2`] = `
 [
-  "addr_test1qxddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9suclpck",
+  "addr_test1qpyz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3qy42hkq",
   "addr_test1qyxg9e0wj478cd6ckvgwgxj075q6hxz2aeepgf6uxv8ju0kprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9s7yq5yx",
   "addr_test1qxkpmv5pzle28wv52v9p0gpsuw90r35wyj903ay99ehpcwkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9snaf0vm",
   "addr_test1q9fzmrqgzs4hwrelsckyc4d7hwe4flns7ctdfe2v3p2m8mkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9sgsalrm",
@@ -616,7 +616,7 @@ exports[`ShelleyWalletTestnet restore 6`] = `
       "walletImplementationId": "haskell-shelley",
     },
     "addresses": [
-      "addr_test1qxddgtdqxmsvn0rqp0ltdfpddudvf76qs3esyn3zqf44drkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9suclpck",
+      "addr_test1qpyz4c9m9ak7y6nzg8qdgz8u5ulyyjkdz853cr98hyu69yy68r3aa9x2zd434q86jrtnvrkpledgm0px6snllm89fm3qy42hkq",
       "addr_test1qyxg9e0wj478cd6ckvgwgxj075q6hxz2aeepgf6uxv8ju0kprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9s7yq5yx",
       "addr_test1qxkpmv5pzle28wv52v9p0gpsuw90r35wyj903ay99ehpcwkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9snaf0vm",
       "addr_test1q9fzmrqgzs4hwrelsckyc4d7hwe4flns7ctdfe2v3p2m8mkprmcgc38nvy9hu4k5dcyxhyqcdsfwnf50q5sm03x89e9sgsalrm",
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
index 0f9f3e4a05..91221639c2 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
@@ -101,9 +101,15 @@ export type YoroiWallet = {
   submitTransaction(signedTx: string): Promise<[]>
 
   // Voting
-  createVotingRegTx(pin: string): Promise<{votingRegTx: YoroiUnsignedTx; votingKeyEncrypted: string}>
+  createVotingRegTx(
+    pin: string,
+    supportsCIP36: boolean,
+  ): Promise<{votingRegTx: YoroiUnsignedTx; votingKeyEncrypted: string}>
   fetchFundInfo(): Promise<FundInfoResponse>
 
+  // CIP36
+  ledgerSupportsCIP36(useUSB: boolean): Promise<boolean>
+
   // Staking
   rewardAddressHex: string
   createDelegationTx(poolRequest: string, valueInAccount: BigNumber): Promise<YoroiUnsignedTx>
diff --git a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
index 93d198fee0..191f06c373 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
@@ -335,17 +335,22 @@ export type VotingRegTxAndEncryptedKey = {
 }
 
 export const useVotingRegTx = (
-  {wallet, pin}: {wallet: YoroiWallet; pin: string},
-
-  options?: UseQueryOptions<VotingRegTxAndEncryptedKey, Error, VotingRegTxAndEncryptedKey, [string, 'voting-reg-tx']>,
+  {wallet, pin, supportsCIP36}: {wallet: YoroiWallet; pin: string; supportsCIP36: boolean},
+
+  options?: UseQueryOptions<
+    VotingRegTxAndEncryptedKey,
+    Error,
+    VotingRegTxAndEncryptedKey,
+    [string, 'voting-reg-tx', string]
+  >,
 ) => {
   const query = useQuery({
     ...options,
     retry: false,
     cacheTime: 0,
     suspense: true,
-    queryKey: [wallet.id, 'voting-reg-tx'],
-    queryFn: () => wallet.createVotingRegTx(pin),
+    queryKey: [wallet.id, 'voting-reg-tx', JSON.stringify({supportsCIP36})],
+    queryFn: () => wallet.createVotingRegTx(pin, supportsCIP36),
   })
 
   if (!query.data) throw new Error('invalid state')
diff --git a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
index 0389f27911..4b49a28f47 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
@@ -62,7 +62,9 @@ const wallet: YoroiWallet = {
     throw new Error('not implemented: getStakingInfo')
   },
   encryptedStorage: mockEncryptedStorage,
-
+  ledgerSupportsCIP36: async () => {
+    return true
+  },
   createUnsignedTx: () => {
     throw new Error('not implemented: createUnsignedTx')
   },
diff --git a/apps/wallet-mobile/translations/messages/src/Catalyst/ConfirmVotingTx.json b/apps/wallet-mobile/translations/messages/src/Catalyst/ConfirmVotingTx.json
index 4f1fc996f9..d3466177a2 100644
--- a/apps/wallet-mobile/translations/messages/src/Catalyst/ConfirmVotingTx.json
+++ b/apps/wallet-mobile/translations/messages/src/Catalyst/ConfirmVotingTx.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Confirm Registration",
     "file": "src/Catalyst/ConfirmVotingTx.tsx",
     "start": {
-      "line": 98,
+      "line": 107,
       "column": 12,
-      "index": 3041
+      "index": 3365
     },
     "end": {
-      "line": 101,
+      "line": 110,
       "column": 3,
-      "index": 3139
+      "index": 3463
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Please enter your spending password again to confirm your voting registration and submit the certificate generated in the previous step.",
     "file": "src/Catalyst/ConfirmVotingTx.tsx",
     "start": {
-      "line": 102,
+      "line": 111,
       "column": 15,
-      "index": 3156
+      "index": 3480
     },
     "end": {
-      "line": 108,
+      "line": 117,
       "column": 3,
-      "index": 3401
+      "index": 3725
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Please authenticate so that Yoroi can generate the required certificate for voting",
     "file": "src/Catalyst/ConfirmVotingTx.tsx",
     "start": {
-      "line": 109,
+      "line": 118,
       "column": 22,
-      "index": 3425
+      "index": 3749
     },
     "end": {
-      "line": 112,
+      "line": 121,
       "column": 3,
-      "index": 3596
+      "index": 3920
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
index 4219797708..b1a5808af7 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 188,
+      "line": 192,
       "column": 16,
-      "index": 5905
+      "index": 6068
     },
     "end": {
-      "line": 191,
+      "line": 195,
       "column": 3,
-      "index": 5994
+      "index": 6157
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 192,
+      "line": 196,
       "column": 13,
-      "index": 6009
+      "index": 6172
     },
     "end": {
-      "line": 195,
+      "line": 199,
       "column": 3,
-      "index": 6089
+      "index": 6252
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Scan QR code address",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 196,
+      "line": 200,
       "column": 18,
-      "index": 6109
+      "index": 6272
     },
     "end": {
-      "line": 199,
+      "line": 203,
       "column": 3,
-      "index": 6210
+      "index": 6373
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 200,
+      "line": 204,
       "column": 20,
-      "index": 6232
+      "index": 6395
     },
     "end": {
-      "line": 203,
+      "line": 207,
       "column": 3,
-      "index": 6321
+      "index": 6484
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Selected tokens",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 204,
+      "line": 208,
       "column": 26,
-      "index": 6349
+      "index": 6512
     },
     "end": {
-      "line": 207,
+      "line": 211,
       "column": 3,
-      "index": 6453
+      "index": 6616
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Edit amount",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 208,
+      "line": 212,
       "column": 19,
-      "index": 6474
+      "index": 6637
     },
     "end": {
-      "line": 211,
+      "line": 215,
       "column": 3,
-      "index": 6567
+      "index": 6730
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 212,
+      "line": 216,
       "column": 16,
-      "index": 6585
+      "index": 6748
     },
     "end": {
-      "line": 215,
+      "line": 219,
       "column": 3,
-      "index": 6671
+      "index": 6834
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 216,
+      "line": 220,
       "column": 19,
-      "index": 6692
+      "index": 6855
     },
     "end": {
-      "line": 222,
+      "line": 226,
       "column": 3,
-      "index": 6930
+      "index": 7093
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index ee252b8d9f..f78017eb14 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Transactions",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 143,
+      "line": 145,
       "column": 22,
-      "index": 4705
+      "index": 4905
     },
     "end": {
-      "line": 146,
+      "line": 148,
       "column": 3,
-      "index": 4808
+      "index": 5008
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 147,
+      "line": 149,
       "column": 14,
-      "index": 4824
+      "index": 5024
     },
     "end": {
-      "line": 150,
+      "line": 152,
       "column": 3,
-      "index": 4923
+      "index": 5123
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 151,
+      "line": 153,
       "column": 17,
-      "index": 4942
+      "index": 5142
     },
     "end": {
-      "line": 154,
+      "line": 156,
       "column": 3,
-      "index": 5047
+      "index": 5247
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 155,
+      "line": 157,
       "column": 19,
-      "index": 5068
+      "index": 5268
     },
     "end": {
-      "line": 158,
+      "line": 160,
       "column": 3,
-      "index": 5165
+      "index": 5365
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 159,
+      "line": 161,
       "column": 18,
-      "index": 5185
+      "index": 5385
     },
     "end": {
-      "line": 162,
+      "line": 164,
       "column": 3,
-      "index": 5280
+      "index": 5480
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 163,
+      "line": 165,
       "column": 16,
-      "index": 5298
+      "index": 5498
     },
     "end": {
-      "line": 166,
+      "line": 168,
       "column": 3,
-      "index": 5396
+      "index": 5596
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 167,
+      "line": 169,
       "column": 17,
-      "index": 5415
+      "index": 5615
     },
     "end": {
-      "line": 170,
+      "line": 172,
       "column": 3,
-      "index": 5480
+      "index": 5680
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 171,
+      "line": 173,
       "column": 14,
-      "index": 5496
+      "index": 5696
     },
     "end": {
-      "line": 174,
+      "line": 176,
       "column": 3,
-      "index": 5590
+      "index": 5790
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 175,
+      "line": 177,
       "column": 14,
-      "index": 5606
+      "index": 5806
     },
     "end": {
-      "line": 178,
+      "line": 180,
       "column": 3,
-      "index": 5658
+      "index": 5858
     }
   }
-]
\ No newline at end of file
+]
diff --git a/apps/wallet-mobile/translations/messages/src/features/Send/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Send/common/strings.json
index e603ea9e48..cd5dc7b91e 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Send/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Send/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Please enter valid amount",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 18,
-      "index": 4012
+      "index": 4087
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3,
-      "index": 4140
+      "index": 4215
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Please enter valid amount",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 27,
-      "index": 4169
+      "index": 4244
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3,
-      "index": 4306
+      "index": 4381
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Amount too large",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 13,
-      "index": 4321
+      "index": 4396
     },
     "end": {
-      "line": 75,
+      "line": 76,
       "column": 3,
-      "index": 4435
+      "index": 4510
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Amount is too low",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 76,
+      "line": 77,
       "column": 11,
-      "index": 4448
+      "index": 4523
     },
     "end": {
-      "line": 79,
+      "line": 80,
       "column": 3,
-      "index": 4561
+      "index": 4636
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Cannot send less than {minUtxo} {ticker}",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 80,
+      "line": 81,
       "column": 15,
-      "index": 4578
+      "index": 4653
     },
     "end": {
-      "line": 83,
+      "line": 84,
       "column": 3,
-      "index": 4718
+      "index": 4793
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Amount must be positive",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 84,
+      "line": 85,
       "column": 12,
-      "index": 4732
+      "index": 4807
     },
     "end": {
-      "line": 87,
+      "line": 88,
       "column": 3,
-      "index": 4852
+      "index": 4927
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Not enough money to make this transaction",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 88,
+      "line": 89,
       "column": 23,
-      "index": 4877
+      "index": 4952
     },
     "end": {
-      "line": 91,
+      "line": 92,
       "column": 3,
-      "index": 5026
+      "index": 5101
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!!Maximum value of a token inside a UTXO exceeded (overflow).",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 92,
+      "line": 93,
       "column": 17,
-      "index": 5045
+      "index": 5120
     },
     "end": {
-      "line": 95,
+      "line": 96,
       "column": 3,
-      "index": 5207
+      "index": 5282
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Keep some balance for tokens",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 96,
+      "line": 97,
       "column": 30,
-      "index": 5239
+      "index": 5314
     },
     "end": {
-      "line": 99,
+      "line": 100,
       "column": 3,
-      "index": 5349
+      "index": 5424
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Fee",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 12,
-      "index": 5408
+      "index": 5483
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 3,
-      "index": 5490
+      "index": 5565
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!-",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 19,
-      "index": 5511
+      "index": 5586
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 3,
-      "index": 5598
+      "index": 5673
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Balance after",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 21,
-      "index": 5621
+      "index": 5696
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 3,
-      "index": 5708
+      "index": 5783
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!-",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 28,
-      "index": 5738
+      "index": 5813
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 3,
-      "index": 5834
+      "index": 5909
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Checking balance...",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 34,
-      "index": 5870
+      "index": 5945
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 3,
-      "index": 5990
+      "index": 6065
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!-",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 36,
-      "index": 6028
+      "index": 6103
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 3,
-      "index": 6132
+      "index": 6207
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Please enter valid address",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 35,
-      "index": 6169
+      "index": 6244
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3,
-      "index": 6297
+      "index": 6372
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Address",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 21,
-      "index": 6320
+      "index": 6395
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 3,
-      "index": 6409
+      "index": 6484
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Send all assets (including all tokens)",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 25,
-      "index": 6436
+      "index": 6511
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 3,
-      "index": 6566
+      "index": 6641
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Send all {assetId}",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 19,
-      "index": 6587
+      "index": 6662
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 3,
-      "index": 6691
+      "index": 6766
     }
   },
   {
@@ -290,14 +290,14 @@
     "defaultMessage": "!!!Domain is not registered",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 28,
-      "index": 6721
+      "index": 6796
     },
     "end": {
-      "line": 147,
+      "line": 148,
       "column": 3,
-      "index": 6870
+      "index": 6945
     }
   },
   {
@@ -306,14 +306,14 @@
     "defaultMessage": "!!!No Cardano record found for this domain",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 148,
+      "line": 149,
       "column": 29,
-      "index": 6901
+      "index": 6976
     },
     "end": {
-      "line": 152,
+      "line": 153,
       "column": 3,
-      "index": 7066
+      "index": 7141
     }
   },
   {
@@ -322,14 +322,14 @@
     "defaultMessage": "!!!Domain is not supported",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 153,
+      "line": 154,
       "column": 26,
-      "index": 7094
+      "index": 7169
     },
     "end": {
-      "line": 157,
+      "line": 158,
       "column": 3,
-      "index": 7240
+      "index": 7315
     }
   },
   {
@@ -337,14 +337,14 @@
     "defaultMessage": "!!!Resolves to",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 158,
+      "line": 159,
       "column": 14,
-      "index": 7256
+      "index": 7331
     },
     "end": {
-      "line": 161,
+      "line": 162,
       "column": 3,
-      "index": 7348
+      "index": 7423
     }
   },
   {
@@ -352,14 +352,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 162,
+      "line": 163,
       "column": 16,
-      "index": 7366
+      "index": 7441
     },
     "end": {
-      "line": 165,
+      "line": 166,
       "column": 3,
-      "index": 7462
+      "index": 7537
     }
   },
   {
@@ -367,14 +367,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 166,
+      "line": 167,
       "column": 20,
-      "index": 7484
+      "index": 7559
     },
     "end": {
-      "line": 169,
+      "line": 170,
       "column": 3,
-      "index": 7573
+      "index": 7648
     }
   },
   {
@@ -382,14 +382,14 @@
     "defaultMessage": "!!!Unknown asset",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 170,
+      "line": 171,
       "column": 16,
-      "index": 7591
+      "index": 7666
     },
     "end": {
-      "line": 173,
+      "line": 174,
       "column": 3,
-      "index": 7696
+      "index": 7771
     }
   },
   {
@@ -397,14 +397,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 174,
+      "line": 175,
       "column": 12,
-      "index": 7710
+      "index": 7785
     },
     "end": {
-      "line": 177,
+      "line": 178,
       "column": 3,
-      "index": 7813
+      "index": 7888
     }
   },
   {
@@ -412,14 +412,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 178,
+      "line": 179,
       "column": 9,
-      "index": 7824
+      "index": 7899
     },
     "end": {
-      "line": 181,
+      "line": 182,
       "column": 3,
-      "index": 7914
+      "index": 7989
     }
   },
   {
@@ -427,14 +427,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 182,
+      "line": 183,
       "column": 11,
-      "index": 7927
+      "index": 8002
     },
     "end": {
-      "line": 185,
+      "line": 186,
       "column": 3,
-      "index": 8022
+      "index": 8097
     }
   },
   {
@@ -442,14 +442,14 @@
     "defaultMessage": "!!!No {fungible} added yet",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 186,
+      "line": 187,
       "column": 20,
-      "index": 8044
+      "index": 8119
     },
     "end": {
-      "line": 189,
+      "line": 190,
       "column": 3,
-      "index": 8163
+      "index": 8238
     }
   },
   {
@@ -457,14 +457,14 @@
     "defaultMessage": "!!!Do you really want to send all?",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 190,
+      "line": 191,
       "column": 23,
-      "index": 8188
+      "index": 8263
     },
     "end": {
-      "line": 193,
+      "line": 194,
       "column": 3,
-      "index": 8309
+      "index": 8384
     }
   },
   {
@@ -472,14 +472,14 @@
     "defaultMessage": "!!!You have selected the send all option. Please confirm that you understand how this feature works.",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 194,
+      "line": 195,
       "column": 22,
-      "index": 8333
+      "index": 8408
     },
     "end": {
-      "line": 198,
+      "line": 199,
       "column": 3,
-      "index": 8525
+      "index": 8600
     }
   },
   {
@@ -487,14 +487,14 @@
     "defaultMessage": "!!!All you {assetNameOrId} balance will be transferred in this transaction.",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 199,
+      "line": 200,
       "column": 24,
-      "index": 8551
+      "index": 8626
     },
     "end": {
-      "line": 202,
+      "line": 203,
       "column": 3,
-      "index": 8714
+      "index": 8789
     }
   },
   {
@@ -502,14 +502,14 @@
     "defaultMessage": "!!!All your tokens, including NFTs and any other native assets in your wallet, will also be transferred in this transaction.",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 203,
+      "line": 204,
       "column": 24,
-      "index": 8740
+      "index": 8815
     },
     "end": {
-      "line": 208,
+      "line": 209,
       "column": 3,
-      "index": 8969
+      "index": 9044
     }
   },
   {
@@ -517,14 +517,14 @@
     "defaultMessage": "!!!After you confirm the transaction in the next screen, your wallet will be emptied.",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 209,
+      "line": 210,
       "column": 24,
-      "index": 8995
+      "index": 9070
     },
     "end": {
-      "line": 212,
+      "line": 213,
       "column": 3,
-      "index": 9168
+      "index": 9243
     }
   },
   {
@@ -532,14 +532,14 @@
     "defaultMessage": "!!!Continue",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 213,
+      "line": 214,
       "column": 18,
-      "index": 9188
+      "index": 9263
     },
     "end": {
-      "line": 216,
+      "line": 217,
       "column": 3,
-      "index": 9281
+      "index": 9356
     }
   },
   {
@@ -547,14 +547,14 @@
     "defaultMessage": "!!!We are experiencing issues with fetching your current balance. Click to retry.",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 217,
+      "line": 218,
       "column": 27,
-      "index": 9310
+      "index": 9385
     },
     "end": {
-      "line": 220,
+      "line": 221,
       "column": 3,
-      "index": 9482
+      "index": 9557
     }
   },
   {
@@ -562,14 +562,14 @@
     "defaultMessage": "!!!You cannot send a new transaction while an existing one is still pending",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 221,
+      "line": 222,
       "column": 41,
-      "index": 9525
+      "index": 9600
     },
     "end": {
-      "line": 224,
+      "line": 225,
       "column": 3,
-      "index": 9705
+      "index": 9780
     }
   },
   {
@@ -577,14 +577,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 225,
+      "line": 226,
       "column": 20,
-      "index": 9727
+      "index": 9802
     },
     "end": {
-      "line": 228,
+      "line": 229,
       "column": 3,
-      "index": 9835
+      "index": 9910
     }
   },
   {
@@ -592,14 +592,14 @@
     "defaultMessage": "!!!Check this transaction in the list of wallet transactions",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 229,
+      "line": 230,
       "column": 19,
-      "index": 9856
+      "index": 9931
     },
     "end": {
-      "line": 232,
+      "line": 233,
       "column": 3,
-      "index": 9999
+      "index": 10074
     }
   },
   {
@@ -607,14 +607,14 @@
     "defaultMessage": "!!!Go to transactions",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 233,
+      "line": 234,
       "column": 21,
-      "index": 10022
+      "index": 10097
     },
     "end": {
-      "line": 236,
+      "line": 237,
       "column": 3,
-      "index": 10128
+      "index": 10203
     }
   },
   {
@@ -622,14 +622,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 237,
+      "line": 238,
       "column": 17,
-      "index": 10147
+      "index": 10222
     },
     "end": {
-      "line": 240,
+      "line": 241,
       "column": 3,
-      "index": 10249
+      "index": 10324
     }
   },
   {
@@ -637,14 +637,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 241,
+      "line": 242,
       "column": 16,
-      "index": 10267
+      "index": 10342
     },
     "end": {
-      "line": 244,
+      "line": 245,
       "column": 3,
-      "index": 10422
+      "index": 10497
     }
   },
   {
@@ -652,14 +652,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 245,
+      "line": 246,
       "column": 18,
-      "index": 10442
+      "index": 10517
     },
     "end": {
-      "line": 248,
+      "line": 249,
       "column": 3,
-      "index": 10536
+      "index": 10611
     }
   },
   {
@@ -667,14 +667,29 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Send/common/strings.ts",
     "start": {
-      "line": 249,
+      "line": 250,
       "column": 9,
-      "index": 10547
+      "index": 10622
+    },
+    "end": {
+      "line": 253,
+      "column": 3,
+      "index": 10695
+    }
+  },
+  {
+    "id": "components.send.addressreaderqr.text",
+    "defaultMessage": "!!!Scan recipients QR code to add a wallet address",
+    "file": "src/features/Send/common/strings.ts",
+    "start": {
+      "line": 254,
+      "column": 23,
+      "index": 10720
     },
     "end": {
-      "line": 252,
+      "line": 257,
       "column": 3,
-      "index": 10620
+      "index": 10847
     }
   }
-]
\ No newline at end of file
+]
diff --git a/yarn.lock b/yarn.lock
index dbe8c354c5..8cd22423b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1382,6 +1382,7 @@
     hoist-non-react-statics "^3.3.0"
 
 "@cardano-foundation/ledgerjs-hw-app-cardano@^5.0.0":
+  name "@cardano-foundation/ledgerjs-hw-app-cardanoV5"
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-5.1.0.tgz#69b94f7c5055bdb19aa719ff277fa5f683d11067"
   integrity sha512-ucuz/XbS/0ZD0Bal/GI/kiTm9jDIl8J+A7ypEqcAcBDGicFsyWmtPotOTwuDovTsiM8+eA/5OGTFX0oRqzxstQ==
@@ -1791,10 +1792,10 @@
     "@ledgerhq/logs" "^5.15.0"
     rxjs "^6.5.5"
 
-"@emurgo/yoroi-lib@^0.5.2":
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.5.2.tgz#55cd2c8a272dfd90b3a540f6132202d1c1945d9e"
-  integrity sha512-gKWWVUQ2evzAMQBqQt6waG07BNG/TDxWJTRBfk2wGLJN8jXrW7Slf+/DsFzLtym63YRqJntmQH2yTDpjKj1Jfw==
+"@emurgo/yoroi-lib@0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.5.3.tgz#a2ad2a3bfd67bf9da18a10ced21e23aa64468788"
+  integrity sha512-JzEbvj1f+XEYLmUR8TvQteXXR+AuUGqFAvFk+331pGHvWlnVdpkoEXjr+u1Sye3x1X0ecGDPq+pZpEd1EeOgCw==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
     "@emurgo/cross-csl-core" "^2.3.1"

From 5013a3254605c223050a55ddccb02f6c48431f30 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Fri, 21 Jul 2023 12:04:32 +0200
Subject: [PATCH 7/9] fix: Navigation from failed tx screen  (#2539)

---
 .../src/components/ConfirmTx/ConfirmTx.tsx    |  1 +
 .../src/features/Send/common/navigation.ts    | 31 +++++++++++++++++--
 .../ConfirmTx/FailedTx/FailedTxScreen.tsx     | 14 ++++-----
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
index 3a4cce37f4..8211a1be1d 100644
--- a/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
+++ b/apps/wallet-mobile/src/components/ConfirmTx/ConfirmTx.tsx
@@ -212,6 +212,7 @@ export const ConfirmTx = ({
             errorLogs: (err as any).message,
           })
         }
+        onError?.(err as Error)
       } finally {
         setIsProcessed(true)
         setIsProcessing(false)
diff --git a/apps/wallet-mobile/src/features/Send/common/navigation.ts b/apps/wallet-mobile/src/features/Send/common/navigation.ts
index 7a5fb0bbce..8900102036 100644
--- a/apps/wallet-mobile/src/features/Send/common/navigation.ts
+++ b/apps/wallet-mobile/src/features/Send/common/navigation.ts
@@ -1,10 +1,10 @@
 import {useNavigation} from '@react-navigation/native'
 import {useRef} from 'react'
 
-import {TxHistoryRouteNavigation} from '../../../navigation'
+import {AppRouteNavigation, TxHistoryRouteNavigation} from '../../../navigation'
 
 export const useNavigateTo = () => {
-  const navigation = useNavigation<TxHistoryRouteNavigation>()
+  const navigation = useNavigation<TxHistoryRouteNavigation & AppRouteNavigation>()
 
   return useRef({
     selectedTokens: () => navigation.navigate('send-list-amounts-to-send'),
@@ -15,5 +15,32 @@ export const useNavigateTo = () => {
     reader: () => navigation.navigate('send-read-qr-code'),
     submittedTx: () => navigation.navigate('send-submitted-tx'),
     failedTx: () => navigation.navigate('send-failed-tx'),
+    startTxAfterReset: () =>
+      navigation.reset({
+        index: 0,
+        routes: [
+          {
+            name: 'app-root',
+            state: {
+              routes: [
+                {name: 'wallet-selection'},
+                {
+                  name: 'main-wallet-routes',
+                  state: {
+                    routes: [
+                      {
+                        name: 'history',
+                        state: {
+                          routes: [{name: 'send-start-tx'}],
+                        },
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      }),
   }).current
 }
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
index 14e71fdf98..3e50327998 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ConfirmTx/FailedTx/FailedTxScreen.tsx
@@ -5,7 +5,6 @@ import {Button, Spacer, Text} from '../../../../../components'
 import {useBlockGoBack} from '../../../../../navigation'
 import {COLORS} from '../../../../../theme'
 import {useNavigateTo} from '../../../common/navigation'
-import {useSend} from '../../../common/SendContext'
 import {useStrings} from '../../../common/strings'
 import {FailedTxImage} from './FailedTxImage'
 
@@ -13,12 +12,6 @@ export const FailedTxScreen = () => {
   useBlockGoBack()
   const strings = useStrings()
   const navigateTo = useNavigateTo()
-  const {resetForm} = useSend()
-
-  const goToStart = () => {
-    resetForm()
-    navigateTo.startTx()
-  }
 
   return (
     <View style={styles.container}>
@@ -30,7 +23,12 @@ export const FailedTxScreen = () => {
 
       <Spacer height={22} />
 
-      <Button onPress={goToStart} title={strings.failedTxButton} style={styles.button} shelleyTheme />
+      <Button
+        onPress={navigateTo.startTxAfterReset}
+        title={strings.failedTxButton}
+        style={styles.button}
+        shelleyTheme
+      />
     </View>
   )
 }

From 065de969013d87a41a5ce2cb1b8c01ec229b22f2 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:56:27 +0200
Subject: [PATCH 8/9] fix: send tx edit amounts (#2545)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../ListAmountsToSend/EditAmount/EditAmountScreen.tsx        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
index f42774921d..0400b40e39 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -42,6 +42,11 @@ export const EditAmountScreen = () => {
     Quantities.denominated(initialQuantity, tokenInfo.decimals ?? 0),
   )
 
+  React.useEffect(() => {
+    setQuantity(initialQuantity)
+    setInputValue(Quantities.denominated(initialQuantity, tokenInfo.decimals ?? 0))
+  }, [initialQuantity, tokenInfo.decimals])
+
   useOverrideBackNavigate(() => {
     navigateTo.selectedTokens()
     return true

From 05724a569bae3a421b64e1f53926635a63363596 Mon Sep 17 00:00:00 2001
From: jemubm <105349292+jemubm@users.noreply.github.com>
Date: Tue, 25 Jul 2023 12:46:48 +0200
Subject: [PATCH 9/9] fix(mat): rebuilding history after send tx submit fail
 (#2546)

---
 apps/wallet-mobile/src/features/Send/common/navigation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/src/features/Send/common/navigation.ts b/apps/wallet-mobile/src/features/Send/common/navigation.ts
index 8900102036..69d3b85b94 100644
--- a/apps/wallet-mobile/src/features/Send/common/navigation.ts
+++ b/apps/wallet-mobile/src/features/Send/common/navigation.ts
@@ -31,7 +31,7 @@ export const useNavigateTo = () => {
                       {
                         name: 'history',
                         state: {
-                          routes: [{name: 'send-start-tx'}],
+                          routes: [{name: 'history-list'}, {name: 'send-start-tx'}],
                         },
                       },
                     ],