From 52c3aa4ccac5e8c0f193d10721b271b81f07349f Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:48:42 +0100
Subject: [PATCH 01/14] fix(wallet-mobile): flickering when nav back to
 portfolio

---
 .../Portfolio/common/hooks/useNavigateTo.tsx  | 12 ++-
 .../PortfolioTokenDetails/Actions.tsx         |  8 +-
 .../messages/src/WalletNavigator.json         | 96 +++++++++----------
 3 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index 3b0e41d5b8..d64e0eb909 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -15,7 +15,17 @@ export const useNavigateTo = () => {
     nftsList: () => navigation.navigate('portfolio-nfts', {screen: 'nft-gallery'}),
     nftDetails: (id: Portfolio.Token.Id) =>
       navigation.navigate('portfolio-nfts', {screen: 'nft-details', params: {id}, initial: false}),
-    send: () => navigation.navigate('history', {screen: 'send-start-tx'}),
+    resetTabAndSend: () => {
+      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
+      navigation.navigate('history', {screen: 'send-start-tx'})
+    },
+    resetTabAndSwap: () => {
+      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
+      navigation.navigate('history', {
+        screen: 'swap-start-swap',
+        params: {screen: 'token-swap'},
+      })
+    },
     swap: () =>
       navigation.navigate('history', {
         screen: 'swap-start-swap',
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
index bba9c7d567..97a7e0e032 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -45,14 +45,12 @@ export const Actions = ({tokenInfo}: Props) => {
       from_asset: [
         {asset_name: portfolioPrimaryTokenInfo.name, asset_ticker: portfolioPrimaryTokenInfo.ticker, policy_id: ''},
       ],
-      to_asset: [
-        {asset_name: tokenInfo.name ?? '', asset_ticker: tokenInfo.ticker ?? '', policy_id: tokenInfo.id ?? ''},
-      ],
+      to_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.id}],
       order_type: swap.orderData.type,
       slippage_tolerance: swap.orderData.slippage,
     })
 
-    navigateTo.swap()
+    navigateTo.resetTabAndSwap()
   }
 
   return (
@@ -64,7 +62,7 @@ export const Actions = ({tokenInfo}: Props) => {
           outlineOnLight
           title={strings.send.toLocaleUpperCase()}
           startContent={<Icon.Send color={colors.primary} size={24} />}
-          onPress={navigateTo.send}
+          onPress={navigateTo.resetTabAndSend}
         />
 
         <Button
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index 71382422a2..0a23067a8f 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": 308,
+      "line": 306,
       "column": 22,
-      "index": 10768
+      "index": 10644
     },
     "end": {
-      "line": 311,
+      "line": 309,
       "column": 3,
-      "index": 10871
+      "index": 10747
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 312,
+      "line": 310,
       "column": 14,
-      "index": 10887
+      "index": 10763
     },
     "end": {
-      "line": 315,
+      "line": 313,
       "column": 3,
-      "index": 10986
+      "index": 10862
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 316,
+      "line": 314,
       "column": 17,
-      "index": 11005
+      "index": 10881
     },
     "end": {
-      "line": 319,
+      "line": 317,
       "column": 3,
-      "index": 11110
+      "index": 10986
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 320,
+      "line": 318,
       "column": 19,
-      "index": 11131
+      "index": 11007
     },
     "end": {
-      "line": 323,
+      "line": 321,
       "column": 3,
-      "index": 11228
+      "index": 11104
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 324,
+      "line": 322,
       "column": 18,
-      "index": 11248
+      "index": 11124
     },
     "end": {
-      "line": 327,
+      "line": 325,
       "column": 3,
-      "index": 11343
+      "index": 11219
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 328,
+      "line": 326,
       "column": 16,
-      "index": 11361
+      "index": 11237
     },
     "end": {
-      "line": 331,
+      "line": 329,
       "column": 3,
-      "index": 11459
+      "index": 11335
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 332,
+      "line": 330,
       "column": 17,
-      "index": 11478
+      "index": 11354
     },
     "end": {
-      "line": 335,
+      "line": 333,
       "column": 3,
-      "index": 11543
+      "index": 11419
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 336,
+      "line": 334,
       "column": 14,
-      "index": 11559
+      "index": 11435
     },
     "end": {
-      "line": 339,
+      "line": 337,
       "column": 3,
-      "index": 11653
+      "index": 11529
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 340,
+      "line": 338,
       "column": 14,
-      "index": 11669
+      "index": 11545
     },
     "end": {
-      "line": 343,
+      "line": 341,
       "column": 3,
-      "index": 11721
+      "index": 11597
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Discover",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 344,
+      "line": 342,
       "column": 18,
-      "index": 11741
+      "index": 11617
     },
     "end": {
-      "line": 347,
+      "line": 345,
       "column": 3,
-      "index": 11830
+      "index": 11706
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 348,
+      "line": 346,
       "column": 31,
-      "index": 11863
+      "index": 11739
     },
     "end": {
-      "line": 351,
+      "line": 349,
       "column": 3,
-      "index": 11972
+      "index": 11848
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Portfolio",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 352,
+      "line": 350,
       "column": 19,
-      "index": 11993
+      "index": 11869
     },
     "end": {
-      "line": 355,
+      "line": 353,
       "column": 3,
-      "index": 12062
+      "index": 11938
     }
   }
 ]
\ No newline at end of file

From fc356b616e68149b8591291acb4f38c767eaffb9 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:53:34 +0100
Subject: [PATCH 02/14] chore(wallet-mobile): dropped portfolio dev screen +
 navigation

---
 apps/wallet-mobile/src/AppNavigator.tsx       |   3 -
 .../src/features/Dev/DeveloperScreen.tsx      |   2 -
 .../features/Portfolio/PortfolioNavigator.tsx |   4 +-
 .../Portfolio/common/hooks/useNavigateTo.tsx  |   6 +-
 .../Portfolio/useCases/PortfolioScreen.tsx    | 110 ------------------
 apps/wallet-mobile/src/kernel/navigation.tsx  |  10 +-
 .../messages/src/AppNavigator.json            |  32 ++---
 7 files changed, 24 insertions(+), 143 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx

diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index 9057d5410f..69d986fd38 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -31,7 +31,6 @@ import {
   useShowDarkThemeAnnouncementScreen,
 } from './features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement'
 import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
-import {PortfolioScreen} from './features/Portfolio/useCases/PortfolioScreen'
 import {SearchProvider} from './features/Search/SearchContext'
 import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {useHasWallets} from './features/WalletManager/common/hooks/useHasWallets'
@@ -202,8 +201,6 @@ export const AppNavigator = () => {
               <Stack.Screen name="storybook" component={StorybookScreen} />
 
               <Stack.Screen name="playground" component={Playground} />
-
-              <Stack.Screen name="portfolio-dashboard" component={PortfolioScreen} />
             </Stack.Group>
           )}
         </Stack.Navigator>
diff --git a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
index 8dc4b7f7df..a9e2072c23 100644
--- a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
@@ -88,8 +88,6 @@ export const DeveloperScreen = () => {
           onPress={() => storageVersionMaker(rootStorage).remove()}
         />
 
-        <Button title="Portfolio" style={styles.button} onPress={() => navigation.navigate('portfolio-dashboard')} />
-
         <Button
           title="Logout"
           style={styles.button}
diff --git a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
index 9ca226fec0..9d934d67c0 100644
--- a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
@@ -3,7 +3,7 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 
 import {Boundary} from '../../components/Boundary/Boundary'
-import {defaultStackNavigationOptions, Portfolio2Routes} from '../../kernel/navigation'
+import {defaultStackNavigationOptions, PortfolioRoutes} from '../../kernel/navigation'
 import {SearchProvider} from '../Search/SearchContext'
 import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
 import {TxDetails} from '../Transactions/useCases/TxDetails/TxDetails'
@@ -15,7 +15,7 @@ import ExportTokenTransactions from './useCases/PortfolioTokenDetails/ExportToke
 import {PortfolioTokenDetailsScreen} from './useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen'
 import {PortfolioTokenListScreen} from './useCases/PortfolioTokensList/PortfolioTokenListScreen'
 
-const Stack = createStackNavigator<Portfolio2Routes>()
+const Stack = createStackNavigator<PortfolioRoutes>()
 
 export const PortfolioNavigator = () => {
   const {atoms, color} = useTheme()
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index d64e0eb909..083f4277d4 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -2,11 +2,11 @@ import {NavigationProp, useNavigation} from '@react-navigation/native'
 import {Portfolio} from '@yoroi/types'
 import * as React from 'react'
 
-import {Portfolio2Routes, useParams} from '../../../../kernel/navigation'
+import {PortfolioRoutes, useParams} from '../../../../kernel/navigation'
 import {isEmptyString} from '../../../../kernel/utils'
 
 export const useNavigateTo = () => {
-  const navigation = useNavigation<NavigationProp<Portfolio2Routes>>()
+  const navigation = useNavigation<NavigationProp<PortfolioRoutes>>()
 
   return React.useRef({
     tokensList: () => navigation.navigate('portfolio-tokens-list'),
@@ -43,7 +43,7 @@ export const useNavigateTo = () => {
   } as const).current
 }
 
-type PortfolioTokenDetailParams = Portfolio2Routes['portfolio-token-details']
+type PortfolioTokenDetailParams = PortfolioRoutes['portfolio-token-details']
 
 const isPortfolioTokenDetailParams = (
   params?: PortfolioTokenDetailParams | object | undefined,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
deleted file mode 100644
index 6a6ebd63b4..0000000000
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import {Chain} from '@yoroi/types'
-import * as React from 'react'
-import {FlatList, Text, View} from 'react-native'
-import {SafeAreaView} from 'react-native-safe-area-context'
-
-import {Button} from '../../../components/Button/Button'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
-
-export const PortfolioScreen = () => {
-  const {walletManager} = useWalletManager()
-  const [openedWalletsByNetwork] = React.useState<Map<Chain.SupportedNetworks, Set<YoroiWallet['id']>>>(
-    walletManager.getWalletsByNetwork(),
-  )
-  const [canWipe, setCanWipe] = React.useState(!walletManager.isSyncActive && !walletManager.isSyncing)
-  const [isActive, setIsActive] = React.useState(walletManager.isSyncActive)
-
-  React.useEffect(() => {
-    const subSyncActivity = walletManager.syncActive$.subscribe((isActive) => {
-      setIsActive(isActive)
-      setCanWipe(() => !isActive && !walletManager.isSyncing)
-    })
-    const subIsSyncing = walletManager.syncing$.subscribe((isSyncing) => {
-      setCanWipe(() => !isSyncing)
-    })
-
-    return () => {
-      subSyncActivity.unsubscribe()
-      subIsSyncing.unsubscribe()
-    }
-  })
-
-  const handleOnReset = () => {
-    walletManager.pauseSyncing()
-    openedWalletsByNetwork.forEach((walletIds, network) => {
-      const tm = walletManager.getTokenManager(network)
-      walletIds.forEach((walletId) => {
-        const wallet = walletManager.getWalletById(walletId)
-        if (wallet) wallet.balanceManager.clear()
-      })
-      tm.clear({sourceId: 'PortfolioScreen'})
-    })
-  }
-
-  const handleOnSync = () => {
-    if (!isActive) {
-      walletManager.resumeSyncing()
-    } else {
-      walletManager.pauseSyncing()
-    }
-  }
-
-  return (
-    <SafeAreaView edges={['bottom', 'top', 'left', 'right']}>
-      <View style={{padding: 16}}>
-        <Text>Portfolio playground</Text>
-
-        <Text>{walletManager.isSyncActive ? 'active' : 'stopped'}</Text>
-
-        <Spacer height={16} />
-
-        <Button title={!isActive ? 'start sync' : 'stop sync'} onPress={handleOnSync} shelleyTheme />
-
-        <Spacer height={16} />
-
-        <Button title="reset" onPress={handleOnReset} outlineShelley disabled={!canWipe} />
-
-        <Spacer height={16} />
-
-        {Array.from(openedWalletsByNetwork).map(([network, walletIds]) => {
-          return Array.from(walletIds).map((walletId, index) => {
-            const wallet = walletManager.getWalletById(walletId)
-            return (
-              <View key={walletId}>
-                {index === 0 && <Text>{network}</Text>}
-
-                {wallet && (
-                  <FlatList
-                    style={{height: 120}}
-                    ListHeaderComponent={() => {
-                      return (
-                        <View>
-                          <Text>wallet: {walletId}</Text>
-
-                          <Text>balance: {wallet.primaryBalance.quantity.toString()}</Text>
-
-                          <Text>locked: {wallet.primaryBreakdown.lockedAsStorageCost.toString()}</Text>
-                        </View>
-                      )
-                    }}
-                    data={wallet.balances.all}
-                    keyExtractor={(item) => item.info.id}
-                    renderItem={({item}) => (
-                      <View style={{padding: 8, backgroundColor: 'lightgray', marginVertical: 4}}>
-                        <Text>{item.info.name}</Text>
-
-                        <Text>{item.quantity.toString()}</Text>
-                      </View>
-                    )}
-                  />
-                )}
-              </View>
-            )
-          })
-        })}
-      </View>
-    </SafeAreaView>
-  )
-}
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index fbb1e53a62..e8c1aa69ea 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -107,7 +107,7 @@ export const defaultMaterialTopTabNavigationOptions = (
 // ROUTES
 export type WalletTabRoutes = {
   history: NavigatorScreenParams<TxHistoryRoutes>
-  portfolio: NavigatorScreenParams<Portfolio2Routes>
+  portfolio: NavigatorScreenParams<PortfolioRoutes>
   discover: NavigatorScreenParams<DiscoverRoutes>
   menu: NavigatorScreenParams<MenuRoutes>
 }
@@ -283,7 +283,7 @@ export type DashboardRoutes = {
   'delegation-failed-tx': undefined
 }
 
-export type Portfolio2Routes = {
+export type PortfolioRoutes = {
   'dashboard-portfolio': undefined
   'portfolio-tokens-list': undefined
   'portfolio-token-details': {id: Portfolio.Token.Id}
@@ -335,11 +335,7 @@ type MenuRoutes = {
   'voting-registration': undefined
 }
 
-type PortfolioRoutes = {
-  'portfolio-dashboard': undefined
-}
-
-export type AppRoutes = PortfolioRoutes & {
+export type AppRoutes = {
   'first-run': NavigatorScreenParams<FirstRunRoutes>
   developer: undefined
   storybook: undefined
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 04368d7964..8902a072e3 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 233,
+      "line": 230,
       "column": 17,
-      "index": 8555
+      "index": 8390
     },
     "end": {
-      "line": 236,
+      "line": 233,
       "column": 3,
-      "index": 8645
+      "index": 8480
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 237,
+      "line": 234,
       "column": 18,
-      "index": 8665
+      "index": 8500
     },
     "end": {
-      "line": 240,
+      "line": 237,
       "column": 3,
-      "index": 8763
+      "index": 8598
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 241,
+      "line": 238,
       "column": 25,
-      "index": 8790
+      "index": 8625
     },
     "end": {
-      "line": 244,
+      "line": 241,
       "column": 3,
-      "index": 8904
+      "index": 8739
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 245,
+      "line": 242,
       "column": 27,
-      "index": 8933
+      "index": 8768
     },
     "end": {
-      "line": 248,
+      "line": 245,
       "column": 3,
-      "index": 9054
+      "index": 8889
     }
   }
 ]
\ No newline at end of file

From e98bc7e2179ff9a4ae27559297c1a8c1fab49b2d Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:01:47 +0100
Subject: [PATCH 03/14] Revert "chore(wallet-mobile): dropped portfolio dev
 screen + navigation"

This reverts commit fc356b616e68149b8591291acb4f38c767eaffb9.
---
 apps/wallet-mobile/src/AppNavigator.tsx       |   3 +
 .../src/features/Dev/DeveloperScreen.tsx      |   2 +
 .../features/Portfolio/PortfolioNavigator.tsx |   4 +-
 .../Portfolio/common/hooks/useNavigateTo.tsx  |   6 +-
 .../Portfolio/useCases/PortfolioScreen.tsx    | 110 ++++++++++++++++++
 apps/wallet-mobile/src/kernel/navigation.tsx  |  10 +-
 .../messages/src/AppNavigator.json            |  32 ++---
 7 files changed, 143 insertions(+), 24 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx

diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index 69d986fd38..9057d5410f 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -31,6 +31,7 @@ import {
   useShowDarkThemeAnnouncementScreen,
 } from './features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement'
 import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
+import {PortfolioScreen} from './features/Portfolio/useCases/PortfolioScreen'
 import {SearchProvider} from './features/Search/SearchContext'
 import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {useHasWallets} from './features/WalletManager/common/hooks/useHasWallets'
@@ -201,6 +202,8 @@ export const AppNavigator = () => {
               <Stack.Screen name="storybook" component={StorybookScreen} />
 
               <Stack.Screen name="playground" component={Playground} />
+
+              <Stack.Screen name="portfolio-dashboard" component={PortfolioScreen} />
             </Stack.Group>
           )}
         </Stack.Navigator>
diff --git a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
index a9e2072c23..8dc4b7f7df 100644
--- a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
@@ -88,6 +88,8 @@ export const DeveloperScreen = () => {
           onPress={() => storageVersionMaker(rootStorage).remove()}
         />
 
+        <Button title="Portfolio" style={styles.button} onPress={() => navigation.navigate('portfolio-dashboard')} />
+
         <Button
           title="Logout"
           style={styles.button}
diff --git a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
index 9d934d67c0..9ca226fec0 100644
--- a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
@@ -3,7 +3,7 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 
 import {Boundary} from '../../components/Boundary/Boundary'
-import {defaultStackNavigationOptions, PortfolioRoutes} from '../../kernel/navigation'
+import {defaultStackNavigationOptions, Portfolio2Routes} from '../../kernel/navigation'
 import {SearchProvider} from '../Search/SearchContext'
 import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
 import {TxDetails} from '../Transactions/useCases/TxDetails/TxDetails'
@@ -15,7 +15,7 @@ import ExportTokenTransactions from './useCases/PortfolioTokenDetails/ExportToke
 import {PortfolioTokenDetailsScreen} from './useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen'
 import {PortfolioTokenListScreen} from './useCases/PortfolioTokensList/PortfolioTokenListScreen'
 
-const Stack = createStackNavigator<PortfolioRoutes>()
+const Stack = createStackNavigator<Portfolio2Routes>()
 
 export const PortfolioNavigator = () => {
   const {atoms, color} = useTheme()
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index 083f4277d4..d64e0eb909 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -2,11 +2,11 @@ import {NavigationProp, useNavigation} from '@react-navigation/native'
 import {Portfolio} from '@yoroi/types'
 import * as React from 'react'
 
-import {PortfolioRoutes, useParams} from '../../../../kernel/navigation'
+import {Portfolio2Routes, useParams} from '../../../../kernel/navigation'
 import {isEmptyString} from '../../../../kernel/utils'
 
 export const useNavigateTo = () => {
-  const navigation = useNavigation<NavigationProp<PortfolioRoutes>>()
+  const navigation = useNavigation<NavigationProp<Portfolio2Routes>>()
 
   return React.useRef({
     tokensList: () => navigation.navigate('portfolio-tokens-list'),
@@ -43,7 +43,7 @@ export const useNavigateTo = () => {
   } as const).current
 }
 
-type PortfolioTokenDetailParams = PortfolioRoutes['portfolio-token-details']
+type PortfolioTokenDetailParams = Portfolio2Routes['portfolio-token-details']
 
 const isPortfolioTokenDetailParams = (
   params?: PortfolioTokenDetailParams | object | undefined,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
new file mode 100644
index 0000000000..6a6ebd63b4
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
@@ -0,0 +1,110 @@
+import {Chain} from '@yoroi/types'
+import * as React from 'react'
+import {FlatList, Text, View} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
+
+import {Button} from '../../../components/Button/Button'
+import {Spacer} from '../../../components/Spacer/Spacer'
+import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
+import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
+
+export const PortfolioScreen = () => {
+  const {walletManager} = useWalletManager()
+  const [openedWalletsByNetwork] = React.useState<Map<Chain.SupportedNetworks, Set<YoroiWallet['id']>>>(
+    walletManager.getWalletsByNetwork(),
+  )
+  const [canWipe, setCanWipe] = React.useState(!walletManager.isSyncActive && !walletManager.isSyncing)
+  const [isActive, setIsActive] = React.useState(walletManager.isSyncActive)
+
+  React.useEffect(() => {
+    const subSyncActivity = walletManager.syncActive$.subscribe((isActive) => {
+      setIsActive(isActive)
+      setCanWipe(() => !isActive && !walletManager.isSyncing)
+    })
+    const subIsSyncing = walletManager.syncing$.subscribe((isSyncing) => {
+      setCanWipe(() => !isSyncing)
+    })
+
+    return () => {
+      subSyncActivity.unsubscribe()
+      subIsSyncing.unsubscribe()
+    }
+  })
+
+  const handleOnReset = () => {
+    walletManager.pauseSyncing()
+    openedWalletsByNetwork.forEach((walletIds, network) => {
+      const tm = walletManager.getTokenManager(network)
+      walletIds.forEach((walletId) => {
+        const wallet = walletManager.getWalletById(walletId)
+        if (wallet) wallet.balanceManager.clear()
+      })
+      tm.clear({sourceId: 'PortfolioScreen'})
+    })
+  }
+
+  const handleOnSync = () => {
+    if (!isActive) {
+      walletManager.resumeSyncing()
+    } else {
+      walletManager.pauseSyncing()
+    }
+  }
+
+  return (
+    <SafeAreaView edges={['bottom', 'top', 'left', 'right']}>
+      <View style={{padding: 16}}>
+        <Text>Portfolio playground</Text>
+
+        <Text>{walletManager.isSyncActive ? 'active' : 'stopped'}</Text>
+
+        <Spacer height={16} />
+
+        <Button title={!isActive ? 'start sync' : 'stop sync'} onPress={handleOnSync} shelleyTheme />
+
+        <Spacer height={16} />
+
+        <Button title="reset" onPress={handleOnReset} outlineShelley disabled={!canWipe} />
+
+        <Spacer height={16} />
+
+        {Array.from(openedWalletsByNetwork).map(([network, walletIds]) => {
+          return Array.from(walletIds).map((walletId, index) => {
+            const wallet = walletManager.getWalletById(walletId)
+            return (
+              <View key={walletId}>
+                {index === 0 && <Text>{network}</Text>}
+
+                {wallet && (
+                  <FlatList
+                    style={{height: 120}}
+                    ListHeaderComponent={() => {
+                      return (
+                        <View>
+                          <Text>wallet: {walletId}</Text>
+
+                          <Text>balance: {wallet.primaryBalance.quantity.toString()}</Text>
+
+                          <Text>locked: {wallet.primaryBreakdown.lockedAsStorageCost.toString()}</Text>
+                        </View>
+                      )
+                    }}
+                    data={wallet.balances.all}
+                    keyExtractor={(item) => item.info.id}
+                    renderItem={({item}) => (
+                      <View style={{padding: 8, backgroundColor: 'lightgray', marginVertical: 4}}>
+                        <Text>{item.info.name}</Text>
+
+                        <Text>{item.quantity.toString()}</Text>
+                      </View>
+                    )}
+                  />
+                )}
+              </View>
+            )
+          })
+        })}
+      </View>
+    </SafeAreaView>
+  )
+}
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index e8c1aa69ea..fbb1e53a62 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -107,7 +107,7 @@ export const defaultMaterialTopTabNavigationOptions = (
 // ROUTES
 export type WalletTabRoutes = {
   history: NavigatorScreenParams<TxHistoryRoutes>
-  portfolio: NavigatorScreenParams<PortfolioRoutes>
+  portfolio: NavigatorScreenParams<Portfolio2Routes>
   discover: NavigatorScreenParams<DiscoverRoutes>
   menu: NavigatorScreenParams<MenuRoutes>
 }
@@ -283,7 +283,7 @@ export type DashboardRoutes = {
   'delegation-failed-tx': undefined
 }
 
-export type PortfolioRoutes = {
+export type Portfolio2Routes = {
   'dashboard-portfolio': undefined
   'portfolio-tokens-list': undefined
   'portfolio-token-details': {id: Portfolio.Token.Id}
@@ -335,7 +335,11 @@ type MenuRoutes = {
   'voting-registration': undefined
 }
 
-export type AppRoutes = {
+type PortfolioRoutes = {
+  'portfolio-dashboard': undefined
+}
+
+export type AppRoutes = PortfolioRoutes & {
   'first-run': NavigatorScreenParams<FirstRunRoutes>
   developer: undefined
   storybook: undefined
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 8902a072e3..04368d7964 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 230,
+      "line": 233,
       "column": 17,
-      "index": 8390
+      "index": 8555
     },
     "end": {
-      "line": 233,
+      "line": 236,
       "column": 3,
-      "index": 8480
+      "index": 8645
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 234,
+      "line": 237,
       "column": 18,
-      "index": 8500
+      "index": 8665
     },
     "end": {
-      "line": 237,
+      "line": 240,
       "column": 3,
-      "index": 8598
+      "index": 8763
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 238,
+      "line": 241,
       "column": 25,
-      "index": 8625
+      "index": 8790
     },
     "end": {
-      "line": 241,
+      "line": 244,
       "column": 3,
-      "index": 8739
+      "index": 8904
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 242,
+      "line": 245,
       "column": 27,
-      "index": 8768
+      "index": 8933
     },
     "end": {
-      "line": 245,
+      "line": 248,
       "column": 3,
-      "index": 8889
+      "index": 9054
     }
   }
 ]
\ No newline at end of file

From 30c3ac8a5510e046df55d6ee330459c53e7c19e5 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 09:02:03 +0100
Subject: [PATCH 04/14] Revert "fix(wallet-mobile): flickering when nav back to
 portfolio"

This reverts commit 52c3aa4ccac5e8c0f193d10721b271b81f07349f.
---
 .../Portfolio/common/hooks/useNavigateTo.tsx  | 12 +--
 .../PortfolioTokenDetails/Actions.tsx         |  8 +-
 .../messages/src/WalletNavigator.json         | 96 +++++++++----------
 3 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index d64e0eb909..3b0e41d5b8 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -15,17 +15,7 @@ export const useNavigateTo = () => {
     nftsList: () => navigation.navigate('portfolio-nfts', {screen: 'nft-gallery'}),
     nftDetails: (id: Portfolio.Token.Id) =>
       navigation.navigate('portfolio-nfts', {screen: 'nft-details', params: {id}, initial: false}),
-    resetTabAndSend: () => {
-      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
-      navigation.navigate('history', {screen: 'send-start-tx'})
-    },
-    resetTabAndSwap: () => {
-      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
-      navigation.navigate('history', {
-        screen: 'swap-start-swap',
-        params: {screen: 'token-swap'},
-      })
-    },
+    send: () => navigation.navigate('history', {screen: 'send-start-tx'}),
     swap: () =>
       navigation.navigate('history', {
         screen: 'swap-start-swap',
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
index 97a7e0e032..bba9c7d567 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -45,12 +45,14 @@ export const Actions = ({tokenInfo}: Props) => {
       from_asset: [
         {asset_name: portfolioPrimaryTokenInfo.name, asset_ticker: portfolioPrimaryTokenInfo.ticker, policy_id: ''},
       ],
-      to_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.id}],
+      to_asset: [
+        {asset_name: tokenInfo.name ?? '', asset_ticker: tokenInfo.ticker ?? '', policy_id: tokenInfo.id ?? ''},
+      ],
       order_type: swap.orderData.type,
       slippage_tolerance: swap.orderData.slippage,
     })
 
-    navigateTo.resetTabAndSwap()
+    navigateTo.swap()
   }
 
   return (
@@ -62,7 +64,7 @@ export const Actions = ({tokenInfo}: Props) => {
           outlineOnLight
           title={strings.send.toLocaleUpperCase()}
           startContent={<Icon.Send color={colors.primary} size={24} />}
-          onPress={navigateTo.resetTabAndSend}
+          onPress={navigateTo.send}
         />
 
         <Button
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index 0a23067a8f..71382422a2 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": 306,
+      "line": 308,
       "column": 22,
-      "index": 10644
+      "index": 10768
     },
     "end": {
-      "line": 309,
+      "line": 311,
       "column": 3,
-      "index": 10747
+      "index": 10871
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 310,
+      "line": 312,
       "column": 14,
-      "index": 10763
+      "index": 10887
     },
     "end": {
-      "line": 313,
+      "line": 315,
       "column": 3,
-      "index": 10862
+      "index": 10986
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 314,
+      "line": 316,
       "column": 17,
-      "index": 10881
+      "index": 11005
     },
     "end": {
-      "line": 317,
+      "line": 319,
       "column": 3,
-      "index": 10986
+      "index": 11110
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 318,
+      "line": 320,
       "column": 19,
-      "index": 11007
+      "index": 11131
     },
     "end": {
-      "line": 321,
+      "line": 323,
       "column": 3,
-      "index": 11104
+      "index": 11228
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 322,
+      "line": 324,
       "column": 18,
-      "index": 11124
+      "index": 11248
     },
     "end": {
-      "line": 325,
+      "line": 327,
       "column": 3,
-      "index": 11219
+      "index": 11343
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 326,
+      "line": 328,
       "column": 16,
-      "index": 11237
+      "index": 11361
     },
     "end": {
-      "line": 329,
+      "line": 331,
       "column": 3,
-      "index": 11335
+      "index": 11459
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 330,
+      "line": 332,
       "column": 17,
-      "index": 11354
+      "index": 11478
     },
     "end": {
-      "line": 333,
+      "line": 335,
       "column": 3,
-      "index": 11419
+      "index": 11543
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 334,
+      "line": 336,
       "column": 14,
-      "index": 11435
+      "index": 11559
     },
     "end": {
-      "line": 337,
+      "line": 339,
       "column": 3,
-      "index": 11529
+      "index": 11653
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 338,
+      "line": 340,
       "column": 14,
-      "index": 11545
+      "index": 11669
     },
     "end": {
-      "line": 341,
+      "line": 343,
       "column": 3,
-      "index": 11597
+      "index": 11721
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Discover",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 342,
+      "line": 344,
       "column": 18,
-      "index": 11617
+      "index": 11741
     },
     "end": {
-      "line": 345,
+      "line": 347,
       "column": 3,
-      "index": 11706
+      "index": 11830
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 346,
+      "line": 348,
       "column": 31,
-      "index": 11739
+      "index": 11863
     },
     "end": {
-      "line": 349,
+      "line": 351,
       "column": 3,
-      "index": 11848
+      "index": 11972
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Portfolio",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 350,
+      "line": 352,
       "column": 19,
-      "index": 11869
+      "index": 11993
     },
     "end": {
-      "line": 353,
+      "line": 355,
       "column": 3,
-      "index": 11938
+      "index": 12062
     }
   }
 ]
\ No newline at end of file

From f6cd0c3bec222f3111b98df35b98d4b17fbd5a89 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 10:00:06 +0100
Subject: [PATCH 05/14] chore(wallet-mobile): dropped portfolio dev screen +
 navigation (#3671)

---
 apps/wallet-mobile/src/AppNavigator.tsx       |   3 -
 .../src/features/Dev/DeveloperScreen.tsx      |   2 -
 .../features/Portfolio/PortfolioNavigator.tsx |   4 +-
 .../Portfolio/common/hooks/useNavigateTo.tsx  |  18 ++-
 .../Portfolio/useCases/PortfolioScreen.tsx    | 110 ------------------
 .../PortfolioTokenDetails/Actions.tsx         |   8 +-
 apps/wallet-mobile/src/kernel/navigation.tsx  |  10 +-
 .../messages/src/AppNavigator.json            |  32 ++---
 .../messages/src/WalletNavigator.json         |  96 +++++++--------
 9 files changed, 86 insertions(+), 197 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx

diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index 9057d5410f..69d986fd38 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -31,7 +31,6 @@ import {
   useShowDarkThemeAnnouncementScreen,
 } from './features/Initialization/DarkThemeAnnouncement/DarkThemeAnnouncement'
 import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
-import {PortfolioScreen} from './features/Portfolio/useCases/PortfolioScreen'
 import {SearchProvider} from './features/Search/SearchContext'
 import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {useHasWallets} from './features/WalletManager/common/hooks/useHasWallets'
@@ -202,8 +201,6 @@ export const AppNavigator = () => {
               <Stack.Screen name="storybook" component={StorybookScreen} />
 
               <Stack.Screen name="playground" component={Playground} />
-
-              <Stack.Screen name="portfolio-dashboard" component={PortfolioScreen} />
             </Stack.Group>
           )}
         </Stack.Navigator>
diff --git a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
index 8dc4b7f7df..a9e2072c23 100644
--- a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
@@ -88,8 +88,6 @@ export const DeveloperScreen = () => {
           onPress={() => storageVersionMaker(rootStorage).remove()}
         />
 
-        <Button title="Portfolio" style={styles.button} onPress={() => navigation.navigate('portfolio-dashboard')} />
-
         <Button
           title="Logout"
           style={styles.button}
diff --git a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
index 9ca226fec0..9d934d67c0 100644
--- a/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/PortfolioNavigator.tsx
@@ -3,7 +3,7 @@ import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 
 import {Boundary} from '../../components/Boundary/Boundary'
-import {defaultStackNavigationOptions, Portfolio2Routes} from '../../kernel/navigation'
+import {defaultStackNavigationOptions, PortfolioRoutes} from '../../kernel/navigation'
 import {SearchProvider} from '../Search/SearchContext'
 import {NetworkTag} from '../Settings/ChangeNetwork/NetworkTag'
 import {TxDetails} from '../Transactions/useCases/TxDetails/TxDetails'
@@ -15,7 +15,7 @@ import ExportTokenTransactions from './useCases/PortfolioTokenDetails/ExportToke
 import {PortfolioTokenDetailsScreen} from './useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen'
 import {PortfolioTokenListScreen} from './useCases/PortfolioTokensList/PortfolioTokenListScreen'
 
-const Stack = createStackNavigator<Portfolio2Routes>()
+const Stack = createStackNavigator<PortfolioRoutes>()
 
 export const PortfolioNavigator = () => {
   const {atoms, color} = useTheme()
diff --git a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
index 3b0e41d5b8..083f4277d4 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/hooks/useNavigateTo.tsx
@@ -2,11 +2,11 @@ import {NavigationProp, useNavigation} from '@react-navigation/native'
 import {Portfolio} from '@yoroi/types'
 import * as React from 'react'
 
-import {Portfolio2Routes, useParams} from '../../../../kernel/navigation'
+import {PortfolioRoutes, useParams} from '../../../../kernel/navigation'
 import {isEmptyString} from '../../../../kernel/utils'
 
 export const useNavigateTo = () => {
-  const navigation = useNavigation<NavigationProp<Portfolio2Routes>>()
+  const navigation = useNavigation<NavigationProp<PortfolioRoutes>>()
 
   return React.useRef({
     tokensList: () => navigation.navigate('portfolio-tokens-list'),
@@ -15,7 +15,17 @@ export const useNavigateTo = () => {
     nftsList: () => navigation.navigate('portfolio-nfts', {screen: 'nft-gallery'}),
     nftDetails: (id: Portfolio.Token.Id) =>
       navigation.navigate('portfolio-nfts', {screen: 'nft-details', params: {id}, initial: false}),
-    send: () => navigation.navigate('history', {screen: 'send-start-tx'}),
+    resetTabAndSend: () => {
+      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
+      navigation.navigate('history', {screen: 'send-start-tx'})
+    },
+    resetTabAndSwap: () => {
+      navigation.reset({index: 0, routes: [{name: 'dashboard-portfolio'}]})
+      navigation.navigate('history', {
+        screen: 'swap-start-swap',
+        params: {screen: 'token-swap'},
+      })
+    },
     swap: () =>
       navigation.navigate('history', {
         screen: 'swap-start-swap',
@@ -33,7 +43,7 @@ export const useNavigateTo = () => {
   } as const).current
 }
 
-type PortfolioTokenDetailParams = Portfolio2Routes['portfolio-token-details']
+type PortfolioTokenDetailParams = PortfolioRoutes['portfolio-token-details']
 
 const isPortfolioTokenDetailParams = (
   params?: PortfolioTokenDetailParams | object | undefined,
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
deleted file mode 100644
index 6a6ebd63b4..0000000000
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioScreen.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import {Chain} from '@yoroi/types'
-import * as React from 'react'
-import {FlatList, Text, View} from 'react-native'
-import {SafeAreaView} from 'react-native-safe-area-context'
-
-import {Button} from '../../../components/Button/Button'
-import {Spacer} from '../../../components/Spacer/Spacer'
-import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
-import {useWalletManager} from '../../WalletManager/context/WalletManagerProvider'
-
-export const PortfolioScreen = () => {
-  const {walletManager} = useWalletManager()
-  const [openedWalletsByNetwork] = React.useState<Map<Chain.SupportedNetworks, Set<YoroiWallet['id']>>>(
-    walletManager.getWalletsByNetwork(),
-  )
-  const [canWipe, setCanWipe] = React.useState(!walletManager.isSyncActive && !walletManager.isSyncing)
-  const [isActive, setIsActive] = React.useState(walletManager.isSyncActive)
-
-  React.useEffect(() => {
-    const subSyncActivity = walletManager.syncActive$.subscribe((isActive) => {
-      setIsActive(isActive)
-      setCanWipe(() => !isActive && !walletManager.isSyncing)
-    })
-    const subIsSyncing = walletManager.syncing$.subscribe((isSyncing) => {
-      setCanWipe(() => !isSyncing)
-    })
-
-    return () => {
-      subSyncActivity.unsubscribe()
-      subIsSyncing.unsubscribe()
-    }
-  })
-
-  const handleOnReset = () => {
-    walletManager.pauseSyncing()
-    openedWalletsByNetwork.forEach((walletIds, network) => {
-      const tm = walletManager.getTokenManager(network)
-      walletIds.forEach((walletId) => {
-        const wallet = walletManager.getWalletById(walletId)
-        if (wallet) wallet.balanceManager.clear()
-      })
-      tm.clear({sourceId: 'PortfolioScreen'})
-    })
-  }
-
-  const handleOnSync = () => {
-    if (!isActive) {
-      walletManager.resumeSyncing()
-    } else {
-      walletManager.pauseSyncing()
-    }
-  }
-
-  return (
-    <SafeAreaView edges={['bottom', 'top', 'left', 'right']}>
-      <View style={{padding: 16}}>
-        <Text>Portfolio playground</Text>
-
-        <Text>{walletManager.isSyncActive ? 'active' : 'stopped'}</Text>
-
-        <Spacer height={16} />
-
-        <Button title={!isActive ? 'start sync' : 'stop sync'} onPress={handleOnSync} shelleyTheme />
-
-        <Spacer height={16} />
-
-        <Button title="reset" onPress={handleOnReset} outlineShelley disabled={!canWipe} />
-
-        <Spacer height={16} />
-
-        {Array.from(openedWalletsByNetwork).map(([network, walletIds]) => {
-          return Array.from(walletIds).map((walletId, index) => {
-            const wallet = walletManager.getWalletById(walletId)
-            return (
-              <View key={walletId}>
-                {index === 0 && <Text>{network}</Text>}
-
-                {wallet && (
-                  <FlatList
-                    style={{height: 120}}
-                    ListHeaderComponent={() => {
-                      return (
-                        <View>
-                          <Text>wallet: {walletId}</Text>
-
-                          <Text>balance: {wallet.primaryBalance.quantity.toString()}</Text>
-
-                          <Text>locked: {wallet.primaryBreakdown.lockedAsStorageCost.toString()}</Text>
-                        </View>
-                      )
-                    }}
-                    data={wallet.balances.all}
-                    keyExtractor={(item) => item.info.id}
-                    renderItem={({item}) => (
-                      <View style={{padding: 8, backgroundColor: 'lightgray', marginVertical: 4}}>
-                        <Text>{item.info.name}</Text>
-
-                        <Text>{item.quantity.toString()}</Text>
-                      </View>
-                    )}
-                  />
-                )}
-              </View>
-            )
-          })
-        })}
-      </View>
-    </SafeAreaView>
-  )
-}
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
index bba9c7d567..97a7e0e032 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/Actions.tsx
@@ -45,14 +45,12 @@ export const Actions = ({tokenInfo}: Props) => {
       from_asset: [
         {asset_name: portfolioPrimaryTokenInfo.name, asset_ticker: portfolioPrimaryTokenInfo.ticker, policy_id: ''},
       ],
-      to_asset: [
-        {asset_name: tokenInfo.name ?? '', asset_ticker: tokenInfo.ticker ?? '', policy_id: tokenInfo.id ?? ''},
-      ],
+      to_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.id}],
       order_type: swap.orderData.type,
       slippage_tolerance: swap.orderData.slippage,
     })
 
-    navigateTo.swap()
+    navigateTo.resetTabAndSwap()
   }
 
   return (
@@ -64,7 +62,7 @@ export const Actions = ({tokenInfo}: Props) => {
           outlineOnLight
           title={strings.send.toLocaleUpperCase()}
           startContent={<Icon.Send color={colors.primary} size={24} />}
-          onPress={navigateTo.send}
+          onPress={navigateTo.resetTabAndSend}
         />
 
         <Button
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index fbb1e53a62..e8c1aa69ea 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -107,7 +107,7 @@ export const defaultMaterialTopTabNavigationOptions = (
 // ROUTES
 export type WalletTabRoutes = {
   history: NavigatorScreenParams<TxHistoryRoutes>
-  portfolio: NavigatorScreenParams<Portfolio2Routes>
+  portfolio: NavigatorScreenParams<PortfolioRoutes>
   discover: NavigatorScreenParams<DiscoverRoutes>
   menu: NavigatorScreenParams<MenuRoutes>
 }
@@ -283,7 +283,7 @@ export type DashboardRoutes = {
   'delegation-failed-tx': undefined
 }
 
-export type Portfolio2Routes = {
+export type PortfolioRoutes = {
   'dashboard-portfolio': undefined
   'portfolio-tokens-list': undefined
   'portfolio-token-details': {id: Portfolio.Token.Id}
@@ -335,11 +335,7 @@ type MenuRoutes = {
   'voting-registration': undefined
 }
 
-type PortfolioRoutes = {
-  'portfolio-dashboard': undefined
-}
-
-export type AppRoutes = PortfolioRoutes & {
+export type AppRoutes = {
   'first-run': NavigatorScreenParams<FirstRunRoutes>
   developer: undefined
   storybook: undefined
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 04368d7964..8902a072e3 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 233,
+      "line": 230,
       "column": 17,
-      "index": 8555
+      "index": 8390
     },
     "end": {
-      "line": 236,
+      "line": 233,
       "column": 3,
-      "index": 8645
+      "index": 8480
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 237,
+      "line": 234,
       "column": 18,
-      "index": 8665
+      "index": 8500
     },
     "end": {
-      "line": 240,
+      "line": 237,
       "column": 3,
-      "index": 8763
+      "index": 8598
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 241,
+      "line": 238,
       "column": 25,
-      "index": 8790
+      "index": 8625
     },
     "end": {
-      "line": 244,
+      "line": 241,
       "column": 3,
-      "index": 8904
+      "index": 8739
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 245,
+      "line": 242,
       "column": 27,
-      "index": 8933
+      "index": 8768
     },
     "end": {
-      "line": 248,
+      "line": 245,
       "column": 3,
-      "index": 9054
+      "index": 8889
     }
   }
 ]
\ 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 71382422a2..0a23067a8f 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": 308,
+      "line": 306,
       "column": 22,
-      "index": 10768
+      "index": 10644
     },
     "end": {
-      "line": 311,
+      "line": 309,
       "column": 3,
-      "index": 10871
+      "index": 10747
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 312,
+      "line": 310,
       "column": 14,
-      "index": 10887
+      "index": 10763
     },
     "end": {
-      "line": 315,
+      "line": 313,
       "column": 3,
-      "index": 10986
+      "index": 10862
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 316,
+      "line": 314,
       "column": 17,
-      "index": 11005
+      "index": 10881
     },
     "end": {
-      "line": 319,
+      "line": 317,
       "column": 3,
-      "index": 11110
+      "index": 10986
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 320,
+      "line": 318,
       "column": 19,
-      "index": 11131
+      "index": 11007
     },
     "end": {
-      "line": 323,
+      "line": 321,
       "column": 3,
-      "index": 11228
+      "index": 11104
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 324,
+      "line": 322,
       "column": 18,
-      "index": 11248
+      "index": 11124
     },
     "end": {
-      "line": 327,
+      "line": 325,
       "column": 3,
-      "index": 11343
+      "index": 11219
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 328,
+      "line": 326,
       "column": 16,
-      "index": 11361
+      "index": 11237
     },
     "end": {
-      "line": 331,
+      "line": 329,
       "column": 3,
-      "index": 11459
+      "index": 11335
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 332,
+      "line": 330,
       "column": 17,
-      "index": 11478
+      "index": 11354
     },
     "end": {
-      "line": 335,
+      "line": 333,
       "column": 3,
-      "index": 11543
+      "index": 11419
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 336,
+      "line": 334,
       "column": 14,
-      "index": 11559
+      "index": 11435
     },
     "end": {
-      "line": 339,
+      "line": 337,
       "column": 3,
-      "index": 11653
+      "index": 11529
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 340,
+      "line": 338,
       "column": 14,
-      "index": 11669
+      "index": 11545
     },
     "end": {
-      "line": 343,
+      "line": 341,
       "column": 3,
-      "index": 11721
+      "index": 11597
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Discover",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 344,
+      "line": 342,
       "column": 18,
-      "index": 11741
+      "index": 11617
     },
     "end": {
-      "line": 347,
+      "line": 345,
       "column": 3,
-      "index": 11830
+      "index": 11706
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 348,
+      "line": 346,
       "column": 31,
-      "index": 11863
+      "index": 11739
     },
     "end": {
-      "line": 351,
+      "line": 349,
       "column": 3,
-      "index": 11972
+      "index": 11848
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Portfolio",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 352,
+      "line": 350,
       "column": 19,
-      "index": 11993
+      "index": 11869
     },
     "end": {
-      "line": 355,
+      "line": 353,
       "column": 3,
-      "index": 12062
+      "index": 11938
     }
   }
 ]
\ No newline at end of file

From 5c1d9d1983cc94830f543c0be8267bfdfcf161e7 Mon Sep 17 00:00:00 2001
From: Michal S <miso.szorad@gmail.com>
Date: Fri, 4 Oct 2024 19:44:39 +0100
Subject: [PATCH 06/14] fix(wallet-mobile): Change copy and add warning in dapp
 explorer (#3673)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../InfoBanner/InfoBanner.stories.tsx         |  10 +
 .../src/components/InfoBanner/InfoBanner.tsx  |  43 ++
 .../features/Discover/common/useStrings.tsx   |  10 +-
 .../DAppListItem/DAppListItem.tsx             |   7 +-
 .../src/kernel/i18n/locales/en-US.json        |   5 +-
 .../features/Discover/common/useStrings.json  | 467 +++++++++---------
 6 files changed, 311 insertions(+), 231 deletions(-)
 create mode 100644 apps/wallet-mobile/src/components/InfoBanner/InfoBanner.stories.tsx
 create mode 100644 apps/wallet-mobile/src/components/InfoBanner/InfoBanner.tsx

diff --git a/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.stories.tsx b/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.stories.tsx
new file mode 100644
index 0000000000..32a9cfaec5
--- /dev/null
+++ b/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.stories.tsx
@@ -0,0 +1,10 @@
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+
+import {InfoBanner} from './InfoBanner'
+
+storiesOf('InfoBanner', module).add('initial', () => <Initial />)
+
+const Initial = () => {
+  return <InfoBanner content="Example info message" />
+}
diff --git a/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.tsx b/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.tsx
new file mode 100644
index 0000000000..c80776a70f
--- /dev/null
+++ b/apps/wallet-mobile/src/components/InfoBanner/InfoBanner.tsx
@@ -0,0 +1,43 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+
+import {Icon} from '../Icon'
+import {Space} from '../Space/Space'
+
+type Props = {content: React.ReactNode; iconSize?: number}
+
+export const InfoBanner = ({content, iconSize = 30}: Props) => {
+  const {styles, colors} = useStyles()
+
+  return (
+    <View style={styles.notice}>
+      <Icon.Info size={iconSize} color={colors.icon} />
+
+      <Space height="sm" />
+
+      <Text style={styles.text}>{content}</Text>
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const {color, atoms} = useTheme()
+  const styles = StyleSheet.create({
+    notice: {
+      backgroundColor: color.sys_cyan_100,
+      ...atoms.p_md,
+      borderRadius: 8,
+    },
+    text: {
+      ...atoms.body_2_md_regular,
+      color: color.gray_max,
+    },
+  })
+
+  const colors = {
+    icon: color.primary_500,
+  }
+
+  return {colors, styles}
+}
diff --git a/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx b/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
index 3deae5d170..7eab191f46 100644
--- a/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
@@ -66,6 +66,7 @@ export const useStrings = () => {
     filterParentOptionsNFT: intl.formatMessage(messages.filterParentOptionsNFT),
     filterParentOptionsTrading: intl.formatMessage(messages.filterParentOptionsTrading),
     learnMore: intl.formatMessage(globalMessages.learnMore),
+    disconnectWarning: intl.formatMessage(messages.disconnectWarning),
   }).current
 }
 
@@ -106,7 +107,7 @@ const messages = Object.freeze(
     },
     connected: {
       id: 'discover.discoverList.connected',
-      defaultMessage: '!!!Connected',
+      defaultMessage: '!!!Authorized',
     },
     singleAddress: {
       id: 'discover.discoverList.singleAddress',
@@ -126,7 +127,7 @@ const messages = Object.freeze(
     },
     disconnectWalletFromDApp: {
       id: 'discover.discoverList.disconnectWalletFromDApp',
-      defaultMessage: '!!!Disconnect wallet from DApp',
+      defaultMessage: '!!!Disconnect DApp',
     },
     dAppActions: {
       id: 'discover.discoverList.dAppActions',
@@ -299,6 +300,11 @@ const messages = Object.freeze(
       id: 'discover.filterOptions.parent.community',
       defaultMessage: '!!!Community',
     },
+    disconnectWarning: {
+      id: 'discover.modal.disconnectWarning',
+      defaultMessage:
+        '!!!Even if you disconnected Yoroi from the DApp, Yoroi is still authorized. If you want to remove such authorization, please click Disconnect DApp.',
+    },
   }),
 )
 
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
index d51384a147..7d02f5a848 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
@@ -7,6 +7,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import uuid from 'uuid'
 
 import {Icon} from '../../../../../components/Icon'
+import {InfoBanner} from '../../../../../components/InfoBanner/InfoBanner'
 import {useModal} from '../../../../../components/Modal/ModalContext'
 import {Space} from '../../../../../components/Space/Space'
 import {Spacer} from '../../../../../components/Spacer/Spacer'
@@ -37,7 +38,7 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
   const {manager} = useDappConnector()
   const {track} = useMetrics()
 
-  const heightDialogByHeightScreen = dApp.isSingleAddress ? 460 : 340
+  const heightDialogByHeightScreen = dApp.isSingleAddress ? 612 : 492
 
   const heightDialogByInit = INIT_DIALOG_DAPP_ACTIONS_HEIGHT + insets.bottom
   const dialogHeight = heightDialogByInit < heightDialogByHeightScreen ? heightDialogByHeightScreen : heightDialogByInit
@@ -111,6 +112,10 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
 
         <Space height="lg" />
 
+        <InfoBanner iconSize={20} content={strings.disconnectWarning} />
+
+        <Space height="lg" />
+
         <View>
           <DAppAction onPress={handleOpenDApp} icon={<Icon.DApp color={colors.icon} />} title={strings.openDApp} />
 
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index 4a6c87feaf..7809c1f4ff 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -1101,12 +1101,12 @@
   "discover.discoverList.welcomeToYoroiDAppExplorerDescription": "Discover, inspect, and connect to Cardano decentralized applications (DApps) with ease. Our solution helps to interact with DApps and their smart contracts, seamlessly enhancing your Cardano experience",
   "discover.discoverList.dAppAvailable": "{count} DApp(s) available",
   "discover.discoverList.dAppConnected": "{count} DApp(s) connected",
-  "discover.discoverList.connected": "Connected",
+  "discover.discoverList.connected": "Authorized",
   "discover.discoverList.singleAddress": "Single address",
   "discover.discoverList.recommended": "Recommended",
   "discover.discoverList.done": "DONE",
   "discover.discoverList.openDApp": "Open DApp",
-  "discover.discoverList.disconnectWalletFromDApp": "Disconnect wallet from DApp",
+  "discover.discoverList.disconnectWalletFromDApp": "Disconnect DApp",
   "discover.discoverList.dAppActions": "DApp actions",
   "discover.filterOptions.child.news": "News",
   "discover.filterOptions.child.entertainment": "Entertainment",
@@ -1122,6 +1122,7 @@
   "discover.filterOptions.parent.nft": "NFT",
   "discover.filterOptions.parent.trading": "Trading",
   "discover.filterOptions.parent.community": "Community",
+  "discover.modal.disconnectWarning": "Even if you disconnected Yoroi from the DApp, Yoroi is still authorized. If you want to remove such authorization, please click Disconnect DApp.",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
   "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
diff --git a/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
index a2ec35410f..7be852be6e 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Confirm transaction",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 74,
+      "line": 75,
       "column": 15,
-      "index": 4834
+      "index": 4905
     },
     "end": {
-      "line": 77,
+      "line": 78,
       "column": 5,
-      "index": 4933
+      "index": 5004
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Discover Cardano",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 78,
+      "line": 79,
       "column": 19,
-      "index": 4954
+      "index": 5025
     },
     "end": {
-      "line": 81,
+      "line": 82,
       "column": 5,
-      "index": 5055
+      "index": 5126
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Search DApps",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 82,
+      "line": 83,
       "column": 17,
-      "index": 5074
+      "index": 5145
     },
     "end": {
-      "line": 85,
+      "line": 86,
       "column": 5,
-      "index": 5169
+      "index": 5240
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Welcome to Yoroi DApp Explorer",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 86,
+      "line": 87,
       "column": 32,
-      "index": 5203
+      "index": 5274
     },
     "end": {
-      "line": 89,
+      "line": 90,
       "column": 5,
-      "index": 5331
+      "index": 5402
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Discover, inspect, and connect to Cardano decentralized applications (DApps) with ease. Our solution helps to interact with DApps and their smart contracts, seamlessly enhancing your Cardano experience",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 90,
+      "line": 91,
       "column": 43,
-      "index": 5376
+      "index": 5447
     },
     "end": {
-      "line": 94,
+      "line": 95,
       "column": 5,
-      "index": 5694
+      "index": 5765
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 95,
+      "line": 96,
       "column": 10,
-      "index": 5706
+      "index": 5777
     },
     "end": {
-      "line": 98,
+      "line": 99,
       "column": 5,
-      "index": 5771
+      "index": 5842
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!{count} DApp(s) available",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 99,
+      "line": 100,
       "column": 24,
-      "index": 5797
+      "index": 5868
     },
     "end": {
-      "line": 102,
+      "line": 103,
       "column": 5,
-      "index": 5907
+      "index": 5978
     }
   },
   {
@@ -109,29 +109,29 @@
     "defaultMessage": "!!!{count} DApp(s) connected",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 19,
-      "index": 5928
+      "index": 5999
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 5,
-      "index": 6038
+      "index": 6109
     }
   },
   {
     "id": "discover.discoverList.connected",
-    "defaultMessage": "!!!Connected",
+    "defaultMessage": "!!!Authorized",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 15,
-      "index": 6055
+      "index": 6126
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 5,
-      "index": 6145
+      "index": 6217
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Single address",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 19,
-      "index": 6166
+      "index": 6238
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 5,
-      "index": 6265
+      "index": 6337
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Recommended",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 17,
-      "index": 6284
+      "index": 6356
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 5,
-      "index": 6378
+      "index": 6450
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!DONE",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 10,
-      "index": 6390
+      "index": 6462
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 5,
-      "index": 6470
+      "index": 6542
     }
   },
   {
@@ -184,29 +184,29 @@
     "defaultMessage": "!!!Open DApp",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 14,
-      "index": 6486
+      "index": 6558
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 5,
-      "index": 6575
+      "index": 6647
     }
   },
   {
     "id": "discover.discoverList.disconnectWalletFromDApp",
-    "defaultMessage": "!!!Disconnect wallet from DApp",
+    "defaultMessage": "!!!Disconnect DApp",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 30,
-      "index": 6607
+      "index": 6679
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 5,
-      "index": 6730
+      "index": 6790
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!DApp actions",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 17,
-      "index": 6749
+      "index": 6809
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 5,
-      "index": 6844
+      "index": 6904
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Confirm connection",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 33,
-      "index": 6879
+      "index": 6939
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 5,
-      "index": 6984
+      "index": 7044
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Connect to",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 37,
-      "index": 7023
+      "index": 7083
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 5,
-      "index": 7124
+      "index": 7184
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Connect",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 35,
-      "index": 7161
+      "index": 7221
     },
     "end": {
-      "line": 146,
+      "line": 147,
       "column": 5,
-      "index": 7257
+      "index": 7317
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Allow this DApp to:",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 147,
+      "line": 148,
       "column": 43,
-      "index": 7302
+      "index": 7362
     },
     "end": {
-      "line": 150,
+      "line": 151,
       "column": 5,
-      "index": 7418
+      "index": 7478
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!View addresses, account balance, activity",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 151,
+      "line": 152,
       "column": 39,
-      "index": 7459
+      "index": 7519
     },
     "end": {
-      "line": 154,
+      "line": 155,
       "column": 5,
-      "index": 7593
+      "index": 7653
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!This DApp supports only single-address wallets. Your wallet balance might be displayed incorrectly.",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 155,
+      "line": 156,
       "column": 26,
-      "index": 7621
+      "index": 7681
     },
     "end": {
-      "line": 159,
+      "line": 160,
       "column": 5,
-      "index": 7830
+      "index": 7890
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Request approval for transactions",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 160,
+      "line": 161,
       "column": 39,
-      "index": 7871
+      "index": 7931
     },
     "end": {
-      "line": 163,
+      "line": 164,
       "column": 5,
-      "index": 7997
+      "index": 8057
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!I understand",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 164,
+      "line": 165,
       "column": 16,
-      "index": 8015
+      "index": 8075
     },
     "end": {
-      "line": 167,
+      "line": 168,
       "column": 5,
-      "index": 8116
+      "index": 8176
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!You are accessing a third-party Cardano application that is not verified by EMURGO, the developers of Yoroi Wallet, or any of its affiliated divisions. Make sure this DApp is reliable to stay safe from malicious apps in a sustainable way.",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 168,
+      "line": 169,
       "column": 25,
-      "index": 8143
+      "index": 8203
     },
     "end": {
-      "line": 172,
+      "line": 173,
       "column": 5,
-      "index": 8487
+      "index": 8547
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Disclaimer",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 173,
+      "line": 174,
       "column": 26,
-      "index": 8515
+      "index": 8575
     },
     "end": {
-      "line": 176,
+      "line": 177,
       "column": 5,
-      "index": 8624
+      "index": 8684
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Disconnect DApp",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 177,
+      "line": 178,
       "column": 20,
-      "index": 8646
+      "index": 8706
     },
     "end": {
-      "line": 180,
+      "line": 181,
       "column": 5,
-      "index": 8756
+      "index": 8816
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Are you sure you want to disconnect this DApp?",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 181,
+      "line": 182,
       "column": 38,
-      "index": 8796
+      "index": 8856
     },
     "end": {
-      "line": 184,
+      "line": 185,
       "column": 5,
-      "index": 8955
+      "index": 9015
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Cancel",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 185,
+      "line": 186,
       "column": 12,
-      "index": 8969
+      "index": 9029
     },
     "end": {
-      "line": 188,
+      "line": 189,
       "column": 5,
-      "index": 9074
+      "index": 9134
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 189,
+      "line": 190,
       "column": 13,
-      "index": 9089
+      "index": 9149
     },
     "end": {
-      "line": 192,
+      "line": 193,
       "column": 5,
-      "index": 9196
+      "index": 9256
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!The Ledger Cardano app does not support data signing at this moment.",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 193,
+      "line": 194,
       "column": 26,
-      "index": 9224
+      "index": 9284
     },
     "end": {
-      "line": 196,
+      "line": 197,
       "column": 5,
-      "index": 9378
+      "index": 9438
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Transaction review",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 197,
+      "line": 198,
       "column": 23,
-      "index": 9403
+      "index": 9463
     },
     "end": {
-      "line": 200,
+      "line": 201,
       "column": 5,
-      "index": 9515
+      "index": 9575
     }
   },
   {
@@ -469,14 +469,14 @@
     "defaultMessage": "!!!Inputs",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 201,
+      "line": 202,
       "column": 12,
-      "index": 9529
+      "index": 9589
     },
     "end": {
-      "line": 204,
+      "line": 205,
       "column": 5,
-      "index": 9618
+      "index": 9678
     }
   },
   {
@@ -484,14 +484,14 @@
     "defaultMessage": "!!!Outputs",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 205,
+      "line": 206,
       "column": 13,
-      "index": 9633
+      "index": 9693
     },
     "end": {
-      "line": 208,
+      "line": 209,
       "column": 5,
-      "index": 9724
+      "index": 9784
     }
   },
   {
@@ -499,14 +499,14 @@
     "defaultMessage": "!!!Transaction ID copied",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 209,
+      "line": 210,
       "column": 25,
-      "index": 9751
+      "index": 9811
     },
     "end": {
-      "line": 212,
+      "line": 213,
       "column": 5,
-      "index": 9868
+      "index": 9928
     }
   },
   {
@@ -514,14 +514,14 @@
     "defaultMessage": "!!!Address copied",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 213,
+      "line": 214,
       "column": 19,
-      "index": 9889
+      "index": 9949
     },
     "end": {
-      "line": 216,
+      "line": 217,
       "column": 5,
-      "index": 9993
+      "index": 10053
     }
   },
   {
@@ -529,14 +529,14 @@
     "defaultMessage": "!!!Your address",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 217,
+      "line": 218,
       "column": 17,
-      "index": 10012
+      "index": 10072
     },
     "end": {
-      "line": 220,
+      "line": 221,
       "column": 5,
-      "index": 10112
+      "index": 10172
     }
   },
   {
@@ -544,14 +544,14 @@
     "defaultMessage": "!!!Foreign address",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 221,
+      "line": 222,
       "column": 21,
-      "index": 10135
+      "index": 10195
     },
     "end": {
-      "line": 224,
+      "line": 225,
       "column": 5,
-      "index": 10242
+      "index": 10302
     }
   },
   {
@@ -559,14 +559,14 @@
     "defaultMessage": "!!!Transaction fee",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 225,
+      "line": 226,
       "column": 9,
-      "index": 10253
+      "index": 10313
     },
     "end": {
-      "line": 228,
+      "line": 229,
       "column": 5,
-      "index": 10348
+      "index": 10408
     }
   },
   {
@@ -574,14 +574,14 @@
     "defaultMessage": "!!!Sign data",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 229,
+      "line": 230,
       "column": 14,
-      "index": 10364
+      "index": 10424
     },
     "end": {
-      "line": 232,
+      "line": 233,
       "column": 5,
-      "index": 10458
+      "index": 10518
     }
   },
   {
@@ -589,14 +589,14 @@
     "defaultMessage": "!!!Sign message",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 233,
+      "line": 234,
       "column": 17,
-      "index": 10477
+      "index": 10537
     },
     "end": {
-      "line": 236,
+      "line": 237,
       "column": 5,
-      "index": 10577
+      "index": 10637
     }
   },
   {
@@ -604,14 +604,14 @@
     "defaultMessage": "!!!Testnet DApps 🚧",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 237,
+      "line": 238,
       "column": 25,
-      "index": 10604
+      "index": 10664
     },
     "end": {
-      "line": 240,
+      "line": 241,
       "column": 5,
-      "index": 10699
+      "index": 10759
     }
   },
   {
@@ -619,14 +619,14 @@
     "defaultMessage": "!!!This is a list of DApps designed for testnet use. Note that it may be limited, as not all DApps are deployed in the testnet environment.",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 241,
+      "line": 242,
       "column": 31,
-      "index": 10732
+      "index": 10792
     },
     "end": {
-      "line": 245,
+      "line": 246,
       "column": 5,
-      "index": 10961
+      "index": 11021
     }
   },
   {
@@ -634,14 +634,14 @@
     "defaultMessage": "!!!News",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 246,
+      "line": 247,
       "column": 28,
-      "index": 10991
+      "index": 11051
     },
     "end": {
-      "line": 249,
+      "line": 250,
       "column": 5,
-      "index": 11078
+      "index": 11138
     }
   },
   {
@@ -649,14 +649,14 @@
     "defaultMessage": "!!!Entertainment",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 250,
+      "line": 251,
       "column": 37,
-      "index": 11117
+      "index": 11177
     },
     "end": {
-      "line": 253,
+      "line": 254,
       "column": 5,
-      "index": 11222
+      "index": 11282
     }
   },
   {
@@ -664,14 +664,14 @@
     "defaultMessage": "!!!DeFi",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 254,
+      "line": 255,
       "column": 28,
-      "index": 11252
+      "index": 11312
     },
     "end": {
-      "line": 257,
+      "line": 258,
       "column": 5,
-      "index": 11339
+      "index": 11399
     }
   },
   {
@@ -679,14 +679,14 @@
     "defaultMessage": "!!!DEX",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 258,
+      "line": 259,
       "column": 27,
-      "index": 11368
+      "index": 11428
     },
     "end": {
-      "line": 261,
+      "line": 262,
       "column": 5,
-      "index": 11453
+      "index": 11513
     }
   },
   {
@@ -694,14 +694,14 @@
     "defaultMessage": "!!!NFT Marketplace",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 262,
+      "line": 263,
       "column": 38,
-      "index": 11493
+      "index": 11553
     },
     "end": {
-      "line": 265,
+      "line": 266,
       "column": 5,
-      "index": 11601
+      "index": 11661
     }
   },
   {
@@ -709,14 +709,14 @@
     "defaultMessage": "!!!Stablecoin",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 266,
+      "line": 267,
       "column": 34,
-      "index": 11637
+      "index": 11697
     },
     "end": {
-      "line": 269,
+      "line": 270,
       "column": 5,
-      "index": 11736
+      "index": 11796
     }
   },
   {
@@ -724,14 +724,14 @@
     "defaultMessage": "!!!Trading Tools",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 270,
+      "line": 271,
       "column": 36,
-      "index": 11774
+      "index": 11834
     },
     "end": {
-      "line": 273,
+      "line": 274,
       "column": 5,
-      "index": 11878
+      "index": 11938
     }
   },
   {
@@ -739,14 +739,14 @@
     "defaultMessage": "!!!DAO",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 274,
+      "line": 275,
       "column": 27,
-      "index": 11907
+      "index": 11967
     },
     "end": {
-      "line": 277,
+      "line": 278,
       "column": 5,
-      "index": 11992
+      "index": 12052
     }
   },
   {
@@ -754,14 +754,14 @@
     "defaultMessage": "!!!Decentralised Storage",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 278,
+      "line": 279,
       "column": 44,
-      "index": 12038
+      "index": 12098
     },
     "end": {
-      "line": 281,
+      "line": 282,
       "column": 5,
-      "index": 12158
+      "index": 12218
     }
   },
   {
@@ -769,14 +769,14 @@
     "defaultMessage": "!!!Media",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 282,
+      "line": 283,
       "column": 30,
-      "index": 12190
+      "index": 12250
     },
     "end": {
-      "line": 285,
+      "line": 286,
       "column": 5,
-      "index": 12280
+      "index": 12340
     }
   },
   {
@@ -784,14 +784,14 @@
     "defaultMessage": "!!!Investment",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 286,
+      "line": 287,
       "column": 35,
-      "index": 12317
+      "index": 12377
     },
     "end": {
-      "line": 289,
+      "line": 290,
       "column": 5,
-      "index": 12417
+      "index": 12477
     }
   },
   {
@@ -799,14 +799,14 @@
     "defaultMessage": "!!!NFT",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 290,
+      "line": 291,
       "column": 28,
-      "index": 12447
+      "index": 12507
     },
     "end": {
-      "line": 293,
+      "line": 294,
       "column": 5,
-      "index": 12533
+      "index": 12593
     }
   },
   {
@@ -814,14 +814,14 @@
     "defaultMessage": "!!!Trading",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 294,
+      "line": 295,
       "column": 32,
-      "index": 12567
+      "index": 12627
     },
     "end": {
-      "line": 297,
+      "line": 298,
       "column": 5,
-      "index": 12661
+      "index": 12721
     }
   },
   {
@@ -829,14 +829,29 @@
     "defaultMessage": "!!!Community",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 298,
+      "line": 299,
       "column": 34,
-      "index": 12697
+      "index": 12757
+    },
+    "end": {
+      "line": 302,
+      "column": 5,
+      "index": 12855
+    }
+  },
+  {
+    "id": "discover.modal.disconnectWarning",
+    "defaultMessage": "!!!Even if you disconnected Yoroi from the DApp, Yoroi is still authorized. If you want to remove such authorization, please click Disconnect DApp.",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 303,
+      "column": 23,
+      "index": 12880
     },
     "end": {
-      "line": 301,
+      "line": 307,
       "column": 5,
-      "index": 12795
+      "index": 13114
     }
   }
 ]
\ No newline at end of file

From 98a177ab5436ce22334a83239157c36574ba8f81 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:39:29 +0100
Subject: [PATCH 07/14] feature(wallet-mobile): cap to open secondary token
 link when NFT (#3676)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Michal S <miso.szorad@gmail.com>
---
 .../MediaDetailsScreen/MediaDetailsScreen.tsx |  72 +++++---
 .../PortfolioTokenInfo/Overview/Overview.tsx  |  16 +-
 .../MediaDetailsScreen.json                   |  88 +++++-----
 .../src/helpers/trait-value-expander.test.ts  | 158 ++++++++++++++++++
 .../src/helpers/trait-value-expander.ts       | 108 ++++++++++++
 packages/portfolio/src/index.ts               |   1 +
 packages/types/src/index.ts                   |   3 +-
 7 files changed, 373 insertions(+), 73 deletions(-)
 create mode 100644 packages/portfolio/src/helpers/trait-value-expander.test.ts
 create mode 100644 packages/portfolio/src/helpers/trait-value-expander.ts

diff --git a/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
index 8949d67b5c..bcd4e24f25 100644
--- a/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx
@@ -1,6 +1,6 @@
 import {RouteProp, useRoute} from '@react-navigation/native'
 import {isString} from '@yoroi/common'
-import {usePortfolioTokenDiscovery, usePortfolioTokenTraits} from '@yoroi/portfolio'
+import {traitValueExpander, usePortfolioTokenDiscovery, usePortfolioTokenTraits} from '@yoroi/portfolio'
 import {useTheme} from '@yoroi/theme'
 import {Explorers, Network, Portfolio} from '@yoroi/types'
 import React, {ReactNode, useState} from 'react'
@@ -19,6 +19,7 @@ import {
 import {Boundary} from '../../../../components/Boundary/Boundary'
 import {CopyButton} from '../../../../components/CopyButton'
 import {FadeIn} from '../../../../components/FadeIn'
+import {Hr} from '../../../../components/Hr/Hr'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {Tab, TabPanel, TabPanels, Tabs} from '../../../../components/Tabs/Tabs'
 import {Text} from '../../../../components/Text'
@@ -86,7 +87,7 @@ export const MediaDetailsScreen = () => {
             />
           </Tabs>
 
-          <Boundary>
+          <Boundary loading={{enabled: true}}>
             <Details info={amount.info} activeTab={activeTab} networkManager={networkManager} />
           </Boundary>
         </ScrollView>
@@ -204,13 +205,7 @@ const NftOverview = ({info, explorers, traits}: NftOverviewProps) => {
       </MetadataRow>
 
       {traits?.traits.map((trait) => (
-        <MetadataRow key={`${info.id}-trait-${trait.type}`} title={trait.type}>
-          <View style={styles.rowBetween}>
-            <Text style={styles.name}>{trait.value}</Text>
-
-            <Text style={styles.name}>{trait.rarity}</Text>
-          </View>
-        </MetadataRow>
+        <Trait key={`trait-${trait.type}`} trait={trait} />
       ))}
 
       <MetadataRow title={strings.detailsLinks}>
@@ -244,7 +239,7 @@ const NftOverview = ({info, explorers, traits}: NftOverviewProps) => {
         </View>
       </MetadataRow>
 
-      <HR />
+      <Hr />
 
       <Spacer height={24} />
     </View>
@@ -255,14 +250,29 @@ const normalizeMetadataString = (content?: unknown): string => {
   return !isString(content) || content.length === 0 ? '-' : content
 }
 
-const HR = () => (
-  <View
-    style={{
-      borderBottomWidth: 1,
-      borderColor: 'rgba(173, 174, 182, 0.3)',
-    }}
-  />
-)
+const Trait = ({trait}: {trait: Portfolio.Token.Trait}) => {
+  const styles = useStyles()
+  const expandedTraitValue = traitValueExpander(trait.value)
+  const isOpenableLink = expandedTraitValue.type === 'link' && isSupportedUrl(expandedTraitValue.transformedValue)
+
+  return (
+    <MetadataRow title={trait.type}>
+      <View style={styles.rowBetween}>
+        {isOpenableLink && expandedTraitValue.type === 'link' ? (
+          <View style={[styles.linkContent, styles.flex]}>
+            <TouchableOpacity onPress={() => Linking.openURL(expandedTraitValue.transformedValue)}>
+              <Text style={styles.linkText}>{trait.value}</Text>
+            </TouchableOpacity>
+          </View>
+        ) : (
+          <Text style={styles.name}>{trait.value}</Text>
+        )}
+
+        <Text style={styles.rarity}>{trait.rarity}</Text>
+      </View>
+    </MetadataRow>
+  )
+}
 
 const NftMetadata = ({discovery}: {discovery: Portfolio.Token.Discovery}) => {
   const styles = useStyles()
@@ -284,11 +294,16 @@ const NftMetadata = ({discovery}: {discovery: Portfolio.Token.Discovery}) => {
   )
 }
 
+const isSupportedUrl = (url: string) => url.toLocaleLowerCase().startsWith('https')
+
 type ActiveTab = 'overview' | 'metadata'
 
 const useStyles = () => {
   const {atoms, color} = useTheme()
   const styles = StyleSheet.create({
+    flex: {
+      ...atoms.flex_1,
+    },
     copyButton: {
       flex: 1,
       display: 'flex',
@@ -303,9 +318,8 @@ const useStyles = () => {
     },
     linkText: {
       color: color.primary_500,
-      ...atoms.body_1_lg_regular,
-      flex: 1,
-      textDecorationLine: 'underline',
+      ...atoms.link_1_lg_underline,
+      ...atoms.flex_1,
     },
     copyText: {
       color: color.gray_900,
@@ -327,11 +341,10 @@ const useStyles = () => {
       paddingVertical: imagePadding,
     },
     rowBetween: {
-      display: 'flex',
-      flexDirection: 'row',
-      alignItems: 'center',
-      flexWrap: 'nowrap',
-      justifyContent: 'space-between',
+      ...atoms.flex_row,
+      ...atoms.align_center,
+      ...atoms.justify_between,
+      ...atoms.gap_lg,
     },
     copyMetadata: {
       display: 'flex',
@@ -349,6 +362,13 @@ const useStyles = () => {
     name: {
       color: color.gray_600,
       ...atoms.body_2_md_regular,
+      ...atoms.flex_1,
+    },
+    rarity: {
+      minWidth: 60,
+      color: color.gray_600,
+      ...atoms.body_2_md_regular,
+      ...atoms.text_right,
     },
   })
   return styles
diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
index 68a2abf123..3d34c934b1 100644
--- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
+++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenInfo/Overview/Overview.tsx
@@ -7,6 +7,7 @@ import {Accordion} from '../../../../../../components/Accordion/Accordion'
 import {CopyButton} from '../../../../../../components/CopyButton'
 import {Spacer} from '../../../../../../components/Spacer/Spacer'
 import {features} from '../../../../../../kernel/features'
+import {isEmptyString} from '../../../../../../kernel/utils'
 import {useSelectedWallet} from '../../../../../WalletManager/common/hooks/useSelectedWallet'
 import {usePortfolioTokenDetailParams} from '../../../../common/hooks/useNavigateTo'
 import {useStrings} from '../../../../common/hooks/useStrings'
@@ -46,7 +47,7 @@ export const Overview = () => {
         <View style={styles.tokenInfoContainer}>
           <TokenInfoIcon size="sm" info={tokenInfo.info} imageStyle={styles.tokenLogo} />
 
-          <Text style={styles?.tokenName}>{tokenSymbol}</Text>
+          <Text style={styles.tokenName}>{tokenSymbol}</Text>
         </View>
 
         <Text style={styles.textBody}>{tokenInfo.info?.description}</Text>
@@ -58,7 +59,13 @@ export const Overview = () => {
 
           <Spacer height={4} />
 
-          <Text style={styles.textBody}>{tokenInfo.info?.website ?? '-'}</Text>
+          {!isEmptyString(tokenInfo.info?.website) ? (
+            <TouchableOpacity onPress={() => Linking.openURL(tokenInfo.info.website)}>
+              <Text style={styles.linkText}>{tokenInfo.info.website}</Text>
+            </TouchableOpacity>
+          ) : (
+            <Text style={styles.textBody}>-</Text>
+          )}
         </View>
 
         <Spacer height={24} />
@@ -161,6 +168,11 @@ const useStyles = () => {
       ...atoms.flex_row,
       ...atoms.gap_lg,
     },
+    linkText: {
+      color: color.primary_500,
+      ...atoms.link_1_lg_underline,
+      ...atoms.flex_1,
+    },
     title: {
       ...atoms.body_1_lg_medium,
       ...atoms.font_semibold,
diff --git a/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
index 8fed328406..3938849601 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!NFT Details",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 358,
+      "line": 378,
       "column": 9,
-      "index": 10056
+      "index": 10888
     },
     "end": {
-      "line": 361,
+      "line": 381,
       "column": 3,
-      "index": 10127
+      "index": 10959
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Overview",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 362,
+      "line": 382,
       "column": 12,
-      "index": 10141
+      "index": 10973
     },
     "end": {
-      "line": 365,
+      "line": 385,
       "column": 3,
-      "index": 10212
+      "index": 11044
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Metadata",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 366,
+      "line": 386,
       "column": 12,
-      "index": 10226
+      "index": 11058
     },
     "end": {
-      "line": 369,
+      "line": 389,
       "column": 3,
-      "index": 10297
+      "index": 11129
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!NFT Name",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 370,
+      "line": 390,
       "column": 11,
-      "index": 10310
+      "index": 11142
     },
     "end": {
-      "line": 373,
+      "line": 393,
       "column": 3,
-      "index": 10380
+      "index": 11212
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Created",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 374,
+      "line": 394,
       "column": 13,
-      "index": 10395
+      "index": 11227
     },
     "end": {
-      "line": 377,
+      "line": 397,
       "column": 3,
-      "index": 10466
+      "index": 11298
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Description",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 378,
+      "line": 398,
       "column": 15,
-      "index": 10483
+      "index": 11315
     },
     "end": {
-      "line": 381,
+      "line": 401,
       "column": 3,
-      "index": 10560
+      "index": 11392
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Author",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 382,
+      "line": 402,
       "column": 10,
-      "index": 10572
+      "index": 11404
     },
     "end": {
-      "line": 385,
+      "line": 405,
       "column": 3,
-      "index": 10639
+      "index": 11471
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Fingerprint",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 386,
+      "line": 406,
       "column": 15,
-      "index": 10656
+      "index": 11488
     },
     "end": {
-      "line": 389,
+      "line": 409,
       "column": 3,
-      "index": 10733
+      "index": 11565
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Policy id",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 390,
+      "line": 410,
       "column": 12,
-      "index": 10747
+      "index": 11579
     },
     "end": {
-      "line": 393,
+      "line": 413,
       "column": 3,
-      "index": 10819
+      "index": 11651
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Details on",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 394,
+      "line": 414,
       "column": 16,
-      "index": 10837
+      "index": 11669
     },
     "end": {
-      "line": 397,
+      "line": 417,
       "column": 3,
-      "index": 10914
+      "index": 11746
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Copy metadata",
     "file": "src/features/Portfolio/common/MediaDetailsScreen/MediaDetailsScreen.tsx",
     "start": {
-      "line": 398,
+      "line": 418,
       "column": 16,
-      "index": 10932
+      "index": 11764
     },
     "end": {
-      "line": 401,
+      "line": 421,
       "column": 3,
-      "index": 11012
+      "index": 11844
     }
   }
 ]
\ No newline at end of file
diff --git a/packages/portfolio/src/helpers/trait-value-expander.test.ts b/packages/portfolio/src/helpers/trait-value-expander.test.ts
new file mode 100644
index 0000000000..11b810f1b6
--- /dev/null
+++ b/packages/portfolio/src/helpers/trait-value-expander.test.ts
@@ -0,0 +1,158 @@
+import {traitValueExpander} from './trait-value-expander'
+
+describe('traitValueExpander', () => {
+  it('should correctly handle a regular string', () => {
+    const input = 'Hello Cardano'
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'string',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle a valid URL (not IPFS)', () => {
+    const input = 'https://example.com/resource'
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'link',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly transform an IPFS URL', () => {
+    const input = 'ipfs://QmXkzSgR7YK8h'
+    const expected = {
+      originalValue: input,
+      transformedValue: 'https://ipfs.io/ipfs/QmXkzSgR7YK8h',
+      type: 'link',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle a number (integer)', () => {
+    const input = 42
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'number',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle a number (float)', () => {
+    const input = 3.14159
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'number',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle an empty array', () => {
+    const input: unknown[] = []
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'array',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle an array with elements', () => {
+    const input = ['trait1', 'trait2', 'trait3']
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'array',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle null', () => {
+    const input = null
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'unknown',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle undefined', () => {
+    const input = undefined
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'unknown',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle an object', () => {
+    const input = {key: 'value'}
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'record',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle a boolean', () => {
+    const input = true
+
+    const adjustedExpected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'unknown',
+    }
+
+    expect(traitValueExpander(input)).toEqual(adjustedExpected)
+  })
+
+  it('should correctly handle a symbol', () => {
+    const input = Symbol('sym')
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'unknown',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle a function', () => {
+    const input = () => 'I am a function'
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'unknown',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+
+  it('should correctly handle an invalid URL string', () => {
+    const input = 'ht!tp://invalid-url'
+    const expected = {
+      originalValue: input,
+      transformedValue: input,
+      type: 'string',
+    }
+
+    expect(traitValueExpander(input)).toEqual(expected)
+  })
+})
diff --git a/packages/portfolio/src/helpers/trait-value-expander.ts b/packages/portfolio/src/helpers/trait-value-expander.ts
new file mode 100644
index 0000000000..9f6439e254
--- /dev/null
+++ b/packages/portfolio/src/helpers/trait-value-expander.ts
@@ -0,0 +1,108 @@
+import {isNumber, isRecord, isString} from '@yoroi/common'
+import {freeze} from 'immer'
+
+type TraitValueExpanded =
+  | {
+      type: 'link' | 'string'
+      originalValue: string
+      transformedValue: string
+    }
+  | {
+      type: 'number'
+      originalValue: number
+      transformedValue: number
+    }
+  | {
+      type: 'array'
+      originalValue: unknown[]
+      transformedValue: unknown[]
+    }
+  | {
+      type: 'record'
+      originalValue: Record<string, unknown>
+      transformedValue: Record<string, unknown>
+    }
+  | {
+      type: 'unknown'
+      originalValue: unknown
+      transformedValue: unknown
+    }
+
+export function traitValueExpander(value: unknown): TraitValueExpanded {
+  const type = detectType(value)
+
+  switch (type) {
+    case 'link':
+    case 'string': {
+      const transformedValue =
+        type === 'link' ? transformIfIpfs(value as string) : (value as string)
+      return freeze({
+        originalValue: value as string,
+        transformedValue,
+        type,
+      } as const)
+    }
+    case 'number': {
+      return freeze({
+        originalValue: value as number,
+        transformedValue: value as number,
+        type,
+      } as const)
+    }
+    case 'array': {
+      return freeze({
+        originalValue: value as unknown[],
+        transformedValue: value as unknown[],
+        type,
+      } as const)
+    }
+    case 'record': {
+      return freeze({
+        originalValue: value as Record<string, unknown>,
+        transformedValue: value as Record<string, unknown>,
+        type,
+      } as const)
+    }
+    default: {
+      return freeze({
+        originalValue: value,
+        transformedValue: value,
+        type: 'unknown',
+      } as const)
+    }
+  }
+}
+
+function isValidUrl(string: string) {
+  try {
+    // eslint-disable-next-line no-new
+    new URL(string)
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+function transformIfIpfs(value: string) {
+  if (value.startsWith('ipfs://'))
+    return value.replace('ipfs://', 'https://ipfs.io/ipfs/')
+
+  return value
+}
+
+function detectType(value: unknown) {
+  if (isString(value)) {
+    if (isValidUrl(value)) {
+      return 'link'
+    }
+    return 'string'
+  } else if (isNumber(value)) {
+    return 'number'
+  } else if (Array.isArray(value)) {
+    return 'array'
+  } else if (isRecord(value)) {
+    return 'record'
+  } else {
+    return 'unknown'
+  }
+}
diff --git a/packages/portfolio/src/index.ts b/packages/portfolio/src/index.ts
index c6b07dcc37..eaa4057658 100644
--- a/packages/portfolio/src/index.ts
+++ b/packages/portfolio/src/index.ts
@@ -9,6 +9,7 @@ export * from './helpers/is-primary-token'
 export * from './helpers/is-ft'
 export * from './helpers/is-nft'
 export * from './helpers/info-filter-by-name'
+export * from './helpers/trait-value-expander'
 
 export * from './adapters/amount.mocks'
 export * from './adapters/dullahan-api/api-maker.mocks'
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index ecc912b53d..704109ea71 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -207,7 +207,7 @@ import {
 import {AppQueueTask, AppQueueTaskManager} from './app/queue-task-manager'
 import {ExplorersManager} from './explorers/manager'
 import {ExplorersExplorer} from './explorers/explorer'
-import {PortfolioTokenTraits} from './portfolio/traits'
+import {PortfolioTokenTrait, PortfolioTokenTraits} from './portfolio/traits'
 import {HWDeviceInfo, HWDeviceObj, HWFeatures} from './hw/hw'
 import {WalletAddressMode, WalletImplementation} from './wallet/wallet'
 import {WalletMeta} from './wallet/meta'
@@ -547,6 +547,7 @@ export namespace Portfolio {
   }
 
   export namespace Token {
+    export type Trait = PortfolioTokenTrait
     export type Traits = PortfolioTokenTraits
     export type Balances = PortfolioTokenBalances
     export type Amount = PortfolioTokenAmount

From e9f300f4c1421966f0ec02120fb182a6ef0b42c4 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Fri, 4 Oct 2024 22:36:35 +0100
Subject: [PATCH 08/14] chore(wallet-mobile): sharing yoroi link and no longer
 cardano link (#3677)

---
 .../components/ShareQRCodeCard/ShareQRCodeCard.tsx   |  5 ++++-
 .../Receive/useCases/RequestSpecificAmountScreen.tsx | 12 ++++++++----
 .../wallet-mobile/src/kernel/i18n/locales/en-US.json |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
index 55c55c85b4..70728ff47e 100644
--- a/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
+++ b/apps/wallet-mobile/src/components/ShareQRCodeCard/ShareQRCodeCard.tsx
@@ -66,7 +66,7 @@ export const ShareQRCodeCard = ({
 
   if (isSharing)
     return (
-      <ViewShot ref={ref}>
+      <ViewShot style={styles.shot} ref={ref}>
         <CaptureShareQRCodeCard content={qrContent} />
       </ViewShot>
     )
@@ -128,6 +128,9 @@ const useStyles = () => {
     addressContainer: {
       alignItems: 'center',
     },
+    shot: {
+      height: 308,
+    },
     card: {
       ...atoms.gap_lg,
       minHeight: 432,
diff --git a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
index 87cf8f3fc2..73bf9ca721 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
@@ -1,5 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native'
-import {configCardanoLegacyTransfer, linksCardanoModuleMaker} from '@yoroi/links'
+import {configCardanoLegacyTransfer, linksCardanoModuleMaker, linksYoroiModuleMaker} from '@yoroi/links'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {ScrollView as RNScrollView, StyleSheet, Text, useWindowDimensions, View} from 'react-native'
@@ -99,20 +99,24 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
   const {track} = useMetrics()
 
   const cardanoLinks = linksCardanoModuleMaker()
-  const requestData = cardanoLinks.create({
+  const cardanoRequestLink = cardanoLinks.create({
     config: configCardanoLegacyTransfer,
     params: {
       address: address,
       amount: Number(amount),
     },
   })
+  const yoroiLinks = linksYoroiModuleMaker('yoroi')
+  const yoroiPaymentRequestLink = yoroiLinks.transfer.request.adaWithLink({
+    link: cardanoRequestLink.link,
+  })
 
   const {
     wallet: {portfolioPrimaryTokenInfo},
   } = useSelectedWallet()
   const hasAmount = !isEmptyString(amount)
   const hasAddress = !isEmptyString(address)
-  const content = hasAmount ? requestData.link : address
+  const content = hasAmount ? yoroiPaymentRequestLink : address
   const title = hasAmount ? `${amount} ${portfolioPrimaryTokenInfo.ticker.toLocaleUpperCase()}` : ''
 
   const [isCopying, copy] = useCopy()
@@ -124,7 +128,7 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
         {hasAddress ? (
           <ShareQRCodeCard
             title={title}
-            shareContent={`${strings.address} ${content}`}
+            shareContent={content}
             qrContent={content}
             onLongPress={handOnCopy}
             testId="receive:specific-amount"
diff --git a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
index 7809c1f4ff..4742802577 100644
--- a/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/kernel/i18n/locales/en-US.json
@@ -244,7 +244,7 @@
   "components.receive.receivescreen.usedAddresses": "Used",
   "components.receive.receivescreen.verifyAddress": "Verify address",
   "components.receive.addresscard.title": "Wallet address",
-  "components.receive.addresscard.shareLabel": "Share address",
+  "components.receive.addresscard.shareLabel": "Share",
   "components.receive.addresscard.walletAddress": "Wallet address details",
   "components.receive.addresscard.spendingKeyHash": "Spending key hash",
   "components.receive.addresscard.stakingKeyHash": "Staking key hash",

From da2a88f7aa8916623734376798f80149b32a0a51 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:36:00 +0100
Subject: [PATCH 09/14] chore(wallet-mobile): support yoroi links throught qr
 scan (#3678)

---
 .../src/features/Scan/common/mocks.ts         |  2 +
 .../src/features/Scan/common/parsers.test.ts  |  8 +++
 .../src/features/Scan/common/parsers.ts       | 55 ++++++++++++-------
 .../Scan/common/useTriggerScanAction.tsx      |  7 ++-
 packages/types/src/index.ts                   |  2 +
 packages/types/src/scan/actions.ts            |  6 ++
 6 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Scan/common/mocks.ts b/apps/wallet-mobile/src/features/Scan/common/mocks.ts
index e7f3ee6692..d890cd7634 100644
--- a/apps/wallet-mobile/src/features/Scan/common/mocks.ts
+++ b/apps/wallet-mobile/src/features/Scan/common/mocks.ts
@@ -28,6 +28,8 @@ export const codeContent = {
         'web+cardano://claim/v1?code=42&faucet_url=https%3A%2F%2Ffaucet.com&memo=memo-text&message=message1&message=message2&message=message3&extra=extra',
       legacyCip13Transfer:
         'web+cardano:addr_test1qrgpjmyy8zk9nuza24a0f4e7mgp9gd6h3uayp0rqnjnkl54v4dlyj0kwfs0x4e38a7047lymzp37tx0y42glslcdtzhqzp57km?extra=extra&amount=1.23&memo=memo&message=message',
+      yoroiPaymentRequestWithLink:
+        'yoroi://yoroi-wallet.com/w1/transfer/request/ada-with-link?link=web%252Bcardano%253Aaddr1qxvn5nehgdjadqpztxqckh4yz37h0vc7rnl57x9jfaraxxe627hhjyls27xwmke4e4ewn27rv3qcntakvp7wd53dqahqxuhfua%253Famount%253D2',
     },
   },
 } as const
diff --git a/apps/wallet-mobile/src/features/Scan/common/parsers.test.ts b/apps/wallet-mobile/src/features/Scan/common/parsers.test.ts
index 728937d77f..e9fd3f86a1 100644
--- a/apps/wallet-mobile/src/features/Scan/common/parsers.test.ts
+++ b/apps/wallet-mobile/src/features/Scan/common/parsers.test.ts
@@ -40,4 +40,12 @@ describe('parseScanAction', () => {
       params: expect.any(Object),
     })
   })
+
+  it('should correctly parse a Yoroi link', () => {
+    const result = parseScanAction(codeContent.links.success.yoroiPaymentRequestWithLink)
+    expect(result).toEqual({
+      action: 'launch-url',
+      url: codeContent.links.success.yoroiPaymentRequestWithLink,
+    })
+  })
 })
diff --git a/apps/wallet-mobile/src/features/Scan/common/parsers.ts b/apps/wallet-mobile/src/features/Scan/common/parsers.ts
index 0af18bdf37..51a56ea5ef 100644
--- a/apps/wallet-mobile/src/features/Scan/common/parsers.ts
+++ b/apps/wallet-mobile/src/features/Scan/common/parsers.ts
@@ -1,16 +1,24 @@
 import {linksCardanoModuleMaker} from '@yoroi/links'
 import {Links, Scan} from '@yoroi/types'
+import {freeze} from 'immer'
 
 export const parseScanAction = (codeContent: string): Scan.Action => {
-  const isLink = codeContent.includes(':')
+  const isPossibleLink = codeContent.includes(':')
 
   // NOTE: if it is a string < 256 with valid characters, it'd be consider a Yoroi Receiver (wallet address | domain name)
-  if (!isLink) {
+  if (!isPossibleLink) {
     if (codeContent.length > 255 || !nonProtocolRegex.test(codeContent)) throw new Scan.Errors.UnknownContent()
-    return {
+    return freeze({
       action: 'send-only-receiver',
       receiver: codeContent,
-    }
+    } as const)
+  }
+
+  if (isOpenableLink(codeContent)) {
+    return freeze({
+      action: 'launch-url',
+      url: codeContent,
+    } as const)
   }
 
   const cardanoLinks = linksCardanoModuleMaker()
@@ -20,24 +28,33 @@ export const parseScanAction = (codeContent: string): Scan.Action => {
 
   if (parsedCardanoLink.config.authority === 'claim') {
     const {faucet_url: url, code, ...params} = parsedCardanoLink.params
-    return {
-      action: 'claim',
-      url,
-      code,
-      params,
-    } as const
+    return freeze(
+      {
+        action: 'claim',
+        url,
+        code,
+        params,
+      } as const,
+      true,
+    )
   }
 
   const {address: receiver, amount, memo, message} = parsedCardanoLink.params
-  return {
-    action: 'send-single-pt',
-    receiver,
-    params: {
-      amount,
-      memo,
-      message,
-    },
-  } as const
+  return freeze(
+    {
+      action: 'send-single-pt',
+      receiver,
+      params: {
+        amount,
+        memo,
+        message,
+      },
+    } as const,
+    true,
+  )
 }
 
 const nonProtocolRegex = /^[a-zA-Z0-9_\-.$]+$/
+const isOpenableLink = (content: string) => {
+  return content.startsWith('yoroi') || content.startsWith('https')
+}
diff --git a/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx b/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
index 324a494f3b..02250c8596 100644
--- a/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
+++ b/apps/wallet-mobile/src/features/Scan/common/useTriggerScanAction.tsx
@@ -3,7 +3,7 @@ import {toBigInt} from '@yoroi/common'
 import {useTransfer} from '@yoroi/transfer'
 import {Scan} from '@yoroi/types'
 import * as React from 'react'
-import {Alert} from 'react-native'
+import {Alert, Linking} from 'react-native'
 
 import {useModal} from '../../../components/Modal/ModalContext'
 import {useClaimErrorResolver} from '../../../features/Claim/common/useClaimErrorResolver'
@@ -46,6 +46,11 @@ export const useTriggerScanAction = ({insideFeature}: {insideFeature: Scan.Featu
 
   const trigger = (scanAction: Scan.Action) => {
     switch (scanAction.action) {
+      case 'launch-url': {
+        Linking.openURL(scanAction.url)
+        break
+      }
+
       case 'send-single-pt': {
         if (insideFeature !== 'send') resetTransferState()
 
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 704109ea71..e7d72fcf35 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -237,6 +237,7 @@ import {ScanErrorUnknown, ScanErrorUnknownContent} from './scan/errors'
 import {
   ScanAction,
   ScanActionClaim,
+  ScanActionLaunchUrl,
   ScanActionSendOnlyReceiver,
   ScanActionSendSinglePt,
   ScanFeature,
@@ -657,6 +658,7 @@ export namespace Scan {
   export type ActionClaim = ScanActionClaim
   export type ActionSendOnlyReceiver = ScanActionSendOnlyReceiver
   export type ActionSendSinglePt = ScanActionSendSinglePt
+  export type ActionScanLaunchUrl = ScanActionLaunchUrl
 }
 
 export namespace Claim {
diff --git a/packages/types/src/scan/actions.ts b/packages/types/src/scan/actions.ts
index a05a66da28..704265bdfa 100644
--- a/packages/types/src/scan/actions.ts
+++ b/packages/types/src/scan/actions.ts
@@ -22,9 +22,15 @@ export type ScanActionClaim = Readonly<{
   params: Record<string, any> | undefined
 }>
 
+export type ScanActionLaunchUrl = Readonly<{
+  action: 'launch-url'
+  url: string
+}>
+
 export type ScanAction =
   | ScanActionSendOnlyReceiver
   | ScanActionSendSinglePt
   | ScanActionClaim
+  | ScanActionLaunchUrl
 
 export type ScanFeature = 'send' | 'scan'

From 32bcd1a447ab7d49e054e6b546a88b6abd7c01b0 Mon Sep 17 00:00:00 2001
From: Rahul <62512215+rahulnr7@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:51:13 +0530
Subject: [PATCH 10/14] fix(wallet-mobile): add scroll to receive modal (#3679)

---
 .../Receive/useCases/RequestSpecificAmountScreen.tsx         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
index 73bf9ca721..0541ef42bc 100644
--- a/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Receive/useCases/RequestSpecificAmountScreen.tsx
@@ -124,7 +124,7 @@ const Modal = ({amount, address}: {amount: string; address: string}) => {
 
   return (
     <View style={[styles.container, styles.flex]}>
-      <RNScrollView contentContainerStyle={[styles.flex, styles.modalContainer]}>
+      <RNScrollView contentContainerStyle={[styles.flex_grow, styles.modalContainer]}>
         {hasAddress ? (
           <ShareQRCodeCard
             title={title}
@@ -176,6 +176,9 @@ const useStyles = () => {
     flex: {
       ...atoms.flex_1,
     },
+    flex_grow: {
+      ...atoms.flex_grow,
+    },
     textAddressDetails: {
       color: color.text_gray_medium,
       ...atoms.body_1_lg_regular,

From f49627ad6cfb7cdb02f812802671e7cf3bd4080b Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:11:48 +0200
Subject: [PATCH 11/14] fix(wallet-mobile): qr capture colors (#3680)

---
 .../CaptureShareQRCodeCard/CaptureShareQRCodeCard.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-mobile/src/components/ShareQRCodeCard/CaptureShareQRCodeCard/CaptureShareQRCodeCard.tsx b/apps/wallet-mobile/src/components/ShareQRCodeCard/CaptureShareQRCodeCard/CaptureShareQRCodeCard.tsx
index 3557295189..a1ae94c861 100644
--- a/apps/wallet-mobile/src/components/ShareQRCodeCard/CaptureShareQRCodeCard/CaptureShareQRCodeCard.tsx
+++ b/apps/wallet-mobile/src/components/ShareQRCodeCard/CaptureShareQRCodeCard/CaptureShareQRCodeCard.tsx
@@ -82,8 +82,8 @@ const useStyles = () => {
   })
 
   const colors = {
-    white: color.gray_min,
-    black: color.gray_max,
+    white: color.white_static,
+    black: color.black_static,
     transparent: 'transparent',
     backgroundGradientCard: color.bg_gradient_1,
   }

From 9d43847e1f5e7b66ba44abaa1a33af0c17dc1f28 Mon Sep 17 00:00:00 2001
From: Michal S <miso.szorad@gmail.com>
Date: Mon, 7 Oct 2024 12:17:30 +0100
Subject: [PATCH 12/14] chore(wallet-mobile): Update sentry/react-native to fix
 xcode build issues (#3674)

---
 apps/wallet-mobile/ios/Podfile.lock |  17 +-
 apps/wallet-mobile/package.json     |   2 +-
 yarn.lock                           | 259 +++++++++++++++++-----------
 3 files changed, 172 insertions(+), 106 deletions(-)

diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index f094a30104..a8d7b4705c 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -516,9 +516,12 @@ PODS:
   - RNScreens (3.22.1):
     - React-Core
     - React-RCTImage
-  - RNSentry (5.8.0):
+  - RNSentry (5.33.1):
+    - hermes-engine
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
-    - Sentry/HybridSDK (= 8.9.3)
+    - React-hermes
+    - Sentry/HybridSDK (= 8.36.0)
   - RNShare (10.0.2):
     - React-Core
   - RNSVG (13.8.0):
@@ -534,9 +537,7 @@ PODS:
   - SDWebImageWebPCoder (0.11.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.15)
-  - Sentry/HybridSDK (8.9.3):
-    - SentryPrivate (= 8.9.3)
-  - SentryPrivate (8.9.3)
+  - Sentry/HybridSDK (8.36.0)
   - Yoga (1.14.0)
   - ZXingObjC/Core (3.6.9)
   - ZXingObjC/OneD (3.6.9):
@@ -650,7 +651,6 @@ SPEC REPOS:
     - SDWebImageSVGCoder
     - SDWebImageWebPCoder
     - Sentry
-    - SentryPrivate
     - ZXingObjC
 
 EXTERNAL SOURCES:
@@ -919,15 +919,14 @@ SPEC CHECKSUMS:
   RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a
   RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029
   RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3
-  RNSentry: f9e637773502a61c7b455c4ce65bc7008ce22a6e
+  RNSentry: 0744d3c79504bc4778190d047d1b60daf4a378cd
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564
   RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
   SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
   SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
   SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
-  Sentry: 97161cac725da1ecbe77d1445bf8a61c1e5667f1
-  SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 013273d2ca..67db416f1f 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -120,7 +120,7 @@
     "@react-navigation/native": "^6.1.6",
     "@react-navigation/routers": "^6.1.5",
     "@react-navigation/stack": "^6.3.16",
-    "@sentry/react-native": "^5.8.0",
+    "@sentry/react-native": "^5.33.1",
     "@shopify/flash-list": "^1.4.1",
     "@types/bip39": "^3.0.0",
     "@types/pbkdf2": "^3.1.2",
diff --git a/yarn.lock b/yarn.lock
index 812aadb4f9..526e6e0c06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4574,6 +4574,34 @@
     exenv "^1.2.2"
     prop-types "^15.6.2"
 
+"@sentry-internal/feedback@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.119.0.tgz#429b3ea0fd34e928d2e7de5dcbe9377272a3f221"
+  integrity sha512-om8TkAU5CQGO8nkmr7qsSBVkP+/vfeS4JgtW3sjoTK0fhj26+DljR6RlfCGWtYQdPSP6XV7atcPTjbSnsmG9FQ==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry-internal/replay-canvas@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.119.0.tgz#85669d184ba79150e64d05de02f5e2b616e68371"
+  integrity sha512-NL02VQx6ekPxtVRcsdp1bp5Tb5w6vnfBKSIfMKuDRBy5A10Uc3GSoy/c3mPyHjOxB84452A+xZSx6bliEzAnuA==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/replay" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry-internal/tracing@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.119.0.tgz#201561af2a4ad1837333287c26050a5e688537ca"
+  integrity sha512-oKdFJnn+56f0DHUADlL8o9l8jTib3VDLbWQBVkjD9EprxfaCwt2m8L5ACRBdQ8hmpxCEo4I8/6traZ7qAdBUqA==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
 "@sentry-internal/tracing@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.52.0.tgz#c4e0750ad0c3949c5bb4b59cbb708b0fef274080"
@@ -4594,15 +4622,24 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry-internal/tracing@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.60.1.tgz#c20766a7e31589962ffe9ea9dc58b6f475432303"
-  integrity sha512-2vM+3/ddzmoBfi92OOD9FFTHXf0HdQhKtNM26+/RsmkKnTid+/inbvA7nKi+Qa7ExcnlC6eclEHQEg+0X3yDkQ==
-  dependencies:
-    "@sentry/core" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    tslib "^2.4.1 || ^1.9.3"
+"@sentry/babel-plugin-component-annotate@2.20.1":
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.20.1.tgz#204c63ed006a048f48f633876e1b8bacf87a9722"
+  integrity sha512-4mhEwYTK00bIb5Y9UWIELVUfru587Vaeg0DQGswv4aIRHIiMKLyNqCEejaaybQ/fNChIZOKmvyqXk430YVd7Qg==
+
+"@sentry/browser@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.119.0.tgz#65004015c107be5d2f49a852ebcffc5d19d90e0d"
+  integrity sha512-WwmW1Y4D764kVGeKmdsNvQESZiAn9t8LmCWO0ucBksrjL2zw9gBPtOpRcO6l064sCLeSxxzCN+kIxhRm1gDFEA==
+  dependencies:
+    "@sentry-internal/feedback" "7.119.0"
+    "@sentry-internal/replay-canvas" "7.119.0"
+    "@sentry-internal/tracing" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/integrations" "7.119.0"
+    "@sentry/replay" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
 
 "@sentry/browser@7.52.0":
   version "7.52.0"
@@ -4628,17 +4665,40 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry/browser@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.60.1.tgz#d11e86f127f3f1b48a7156a4df63ab2b76e534ee"
-  integrity sha512-opZQee3S0c459LXt8YGpwOM/qiTlzluHEEnfW2q+D2yVCWh8iegsDX3kbRiv4i/mtQu9yPhM9M761KDnc/0eZw==
-  dependencies:
-    "@sentry-internal/tracing" "7.60.1"
-    "@sentry/core" "7.60.1"
-    "@sentry/replay" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    tslib "^2.4.1 || ^1.9.3"
+"@sentry/cli-darwin@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.36.1.tgz#786adf6984dbe3c6fb7dac51b625c314117b807d"
+  integrity sha512-JOHQjVD8Kqxm1jUKioAP5ohLOITf+Dh6+DBz4gQjCNdotsvNW5m63TKROwq2oB811p+Jzv5304ujmN4cAqW1Ww==
+
+"@sentry/cli-linux-arm64@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.36.1.tgz#ff449d7e7e715166257998c02cf635ca02acbadd"
+  integrity sha512-R//3ZEkbzvoStr3IA7nxBZNiBYyxOljOqAhgiTnejXHmnuwDzM3TBA2n5vKPE/kBFxboEBEw0UTzTIRb1T0bgw==
+
+"@sentry/cli-linux-arm@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.36.1.tgz#1ae5d335a1b4cd217a34c2bd6c6f5e0670136eb3"
+  integrity sha512-gvEOKN0fWL2AVqUBKHNXPRZfJNvKTs8kQhS8cQqahZGgZHiPCI4BqW45cKMq+ZTt1UUbLmt6khx5Dz7wi+0i5A==
+
+"@sentry/cli-linux-i686@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.36.1.tgz#112b9e26357e918cbbba918114ec8cdab07cdf60"
+  integrity sha512-R7sW5Vk/HacVy2YgQoQB+PwccvFYf2CZVPSFSFm2z7MEfNe77UYHWUq+sjJ4vxWG6HDWGVmaX0fjxyDkE01JRA==
+
+"@sentry/cli-linux-x64@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.36.1.tgz#c3e5bdb0c9a4bb44c83927c62a3cd7e006709bf7"
+  integrity sha512-UMr3ik8ksA7zQfbzsfwCb+ztenLnaeAbX94Gp+bzANZwPfi/vVHf2bLyqsBs4OyVt9SPlN1bbM/RTGfMjZ3JOw==
+
+"@sentry/cli-win32-i686@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.36.1.tgz#819573320e885e1dbf59b0a01d3bd370c84c1708"
+  integrity sha512-CflvhnvxPEs5GWQuuDtYSLqPrBaPbcSJFlBuUIb+8WNzRxvVfjgw1qzfZmkQqABqiy/YEsEekllOoMFZAvCcVA==
+
+"@sentry/cli-win32-x64@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.36.1.tgz#80779b4bffb4e2e32944eae72c60e6f40151b4dc"
+  integrity sha512-wWqht2xghcK3TGnooHZSzA3WSjdtno/xFjZLvWmw38rblGwgKMxLZnlxV6uDyS+OJ6CbfDTlCRay/0TIqA0N8g==
 
 "@sentry/cli@2.17.5":
   version "2.17.5"
@@ -4651,16 +4711,24 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/cli@2.19.4":
-  version "2.19.4"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.19.4.tgz#d6a07d8224b457a8023b4b2a56b764abb60b53d2"
-  integrity sha512-wsSr2O/GVgr/i+DYtie+DNhODyI+HL7F5/0t1HwWMjHJWm4+5XTEauznYgbh2mewkzfUk9+t0CPecA82lEgspg==
+"@sentry/cli@2.36.1":
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.36.1.tgz#a9146b798cb6d2f782a7a48d74633ddcd88dc8d3"
+  integrity sha512-gzK5uQKDWKhyH5udoB5+oaUNrS//urWyaXgKvHKz4gFfl744HuKY9dpLPP2nMnf0zLGmGM6xJnMXLqILq0mtxw==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
     progress "^2.0.3"
     proxy-from-env "^1.1.0"
     which "^2.0.2"
+  optionalDependencies:
+    "@sentry/cli-darwin" "2.36.1"
+    "@sentry/cli-linux-arm" "2.36.1"
+    "@sentry/cli-linux-arm64" "2.36.1"
+    "@sentry/cli-linux-i686" "2.36.1"
+    "@sentry/cli-linux-x64" "2.36.1"
+    "@sentry/cli-win32-i686" "2.36.1"
+    "@sentry/cli-win32-x64" "2.36.1"
 
 "@sentry/core@6.19.7":
   version "6.19.7"
@@ -4673,6 +4741,14 @@
     "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
+"@sentry/core@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.119.0.tgz#a6e41119bb03ec27689f9ad04e79d1fba5b7fc37"
+  integrity sha512-CS2kUv9rAJJEjiRat6wle3JATHypB0SyD7pt4cpX5y0dN5dZ1JrF57oLHRMnga9fxRivydHz7tMTuBhSSwhzjw==
+  dependencies:
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
 "@sentry/core@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.52.0.tgz#6c820ca48fe2f06bfd6b290044c96de2375f2ad4"
@@ -4691,15 +4767,6 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry/core@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.60.1.tgz#789ebb2ba6808042e8c288f6881b82ff108c9c7c"
-  integrity sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw==
-  dependencies:
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    tslib "^2.4.1 || ^1.9.3"
-
 "@sentry/hub@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11"
@@ -4709,6 +4776,15 @@
     "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
+"@sentry/hub@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.119.0.tgz#a94d657b9d3cfd4cc061c5c238f86faefb55d5d8"
+  integrity sha512-183h5B/rZosLxpB+ZYOvFdHk0rwZbKskxqKFtcyPbDAfpCUgCass41UTqyxF6aH1qLgCRxX8GcLRF7frIa/SOg==
+  dependencies:
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
 "@sentry/hub@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.52.0.tgz#ffc087d58c745d57108862faa0f701b15503dcc2"
@@ -4719,15 +4795,15 @@
     "@sentry/utils" "7.52.0"
     tslib "^1.9.3"
 
-"@sentry/hub@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.60.1.tgz#fd554a1e6148806b2bd3159c4c27a19b1ea3dbfd"
-  integrity sha512-cYDcn1amIn7hu9sa8Oh0wgf+h7aojxjv7ukdR7zfMQgUpSeMsJLjA3YdL3983dPyxbnMhaZkviqtmzInYq9tfg==
+"@sentry/integrations@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.119.0.tgz#5b25c603026dbacfe1ae7bb8d768506a129149fb"
+  integrity sha512-OHShvtsRW0A+ZL/ZbMnMqDEtJddPasndjq+1aQXw40mN+zeP7At/V1yPZyFaURy86iX7Ucxw5BtmzuNy7hLyTA==
   dependencies:
-    "@sentry/core" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    tslib "^2.4.1 || ^1.9.3"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+    localforage "^1.8.1"
 
 "@sentry/integrations@7.52.0":
   version "7.52.0"
@@ -4749,16 +4825,6 @@
     localforage "^1.8.1"
     tslib "^1.9.3"
 
-"@sentry/integrations@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.60.1.tgz#2c0054d57ae337599d3c3a2d412226b4a7a62567"
-  integrity sha512-GkxGGUOGyRZ2aJrHfGPGJ40wh+r03xDHgjeM7SMHwdJdxTgFhv4xUZAl6NlywbxL5t2jhVwCMZNYIvy/vUrcFQ==
-  dependencies:
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    localforage "^1.8.1"
-    tslib "^2.4.1 || ^1.9.3"
-
 "@sentry/minimal@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4"
@@ -4796,19 +4862,31 @@
     "@sentry/types" "7.52.0"
     "@sentry/utils" "7.52.0"
 
-"@sentry/react-native@^5.8.0":
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.8.0.tgz#82dc72d8851c327cea5b60bc0299f2feec529167"
-  integrity sha512-vOTgm/7pXwlIttq58gade7Gm9Zoe5NMFuR4IIaPssJVwTpWTaUTnrvtsTXyjFceaL/EmgAVqK0B0JtOFwfykEA==
-  dependencies:
-    "@sentry/browser" "7.60.1"
-    "@sentry/cli" "2.19.4"
-    "@sentry/core" "7.60.1"
-    "@sentry/hub" "7.60.1"
-    "@sentry/integrations" "7.60.1"
-    "@sentry/react" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
+"@sentry/react-native@^5.33.1":
+  version "5.33.1"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.33.1.tgz#5427bb71205443c7fe0f5ea001bbe2ff724a686e"
+  integrity sha512-k463M0wC+5FNJrKvzsE6uq7cjMKOrzT+hNm79sFjxqbw6vXgMHOjOcYsji7jFr5Nqr0jEOHm2niwsVlYEXGVAg==
+  dependencies:
+    "@sentry/babel-plugin-component-annotate" "2.20.1"
+    "@sentry/browser" "7.119.0"
+    "@sentry/cli" "2.36.1"
+    "@sentry/core" "7.119.0"
+    "@sentry/hub" "7.119.0"
+    "@sentry/integrations" "7.119.0"
+    "@sentry/react" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+
+"@sentry/react@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.119.0.tgz#79f2c9d94322a3afbfa8af9f5b872f7c2e9b0820"
+  integrity sha512-cf8Cei+qdSA26gx+IMAuc/k44PeBImNzIpXi3930SLhUe44ypT5OZ/44L6xTODHZzTIyMSJPduf59vT2+eW9yg==
+  dependencies:
+    "@sentry/browser" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
+    hoist-non-react-statics "^3.3.2"
 
 "@sentry/react@7.52.0":
   version "7.52.0"
@@ -4832,16 +4910,15 @@
     hoist-non-react-statics "^3.3.2"
     tslib "^1.9.3"
 
-"@sentry/react@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.60.1.tgz#ceeb35dadebb41454f488c17d0b9c2e5d59e5ff4"
-  integrity sha512-977wb5gp7SHv9kHPs1HZtL60slt2WBFY9/YJI9Av7BjjJ/A89OhtBwbVhIcKXZ4hwHQVWuOiFCJdMrIfZXpFPA==
+"@sentry/replay@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.119.0.tgz#50881079d013c77f87a994331d8bcad1d49e0960"
+  integrity sha512-BnNsYL+X5I4WCH6wOpY6HQtp4MgVt0NVlhLUsEyrvMUiTs0bPkDBrulsgZQBUKJsbOr3l9nHrFoNVB/0i6WNLA==
   dependencies:
-    "@sentry/browser" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-    hoist-non-react-statics "^3.3.2"
-    tslib "^2.4.1 || ^1.9.3"
+    "@sentry-internal/tracing" "7.119.0"
+    "@sentry/core" "7.119.0"
+    "@sentry/types" "7.119.0"
+    "@sentry/utils" "7.119.0"
 
 "@sentry/replay@7.52.0":
   version "7.52.0"
@@ -4861,20 +4938,16 @@
     "@sentry/types" "7.52.1"
     "@sentry/utils" "7.52.1"
 
-"@sentry/replay@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.60.1.tgz#07ad56f47255706504ee099729bfe476538aa91d"
-  integrity sha512-WHQxEpJbHICs12L17LGgS/ql91yn9wJDH/hgb+1H90HaasjoR54ofWCKul29OvYV0snTWuHd6xauwtzyv9tzvg==
-  dependencies:
-    "@sentry/core" "7.60.1"
-    "@sentry/types" "7.60.1"
-    "@sentry/utils" "7.60.1"
-
 "@sentry/types@6.19.7", "@sentry/types@^6.2.5":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7"
   integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==
 
+"@sentry/types@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.119.0.tgz#8b3d7a1405c362e75cd900d46089df4e70919d2a"
+  integrity sha512-27qQbutDBPKGbuJHROxhIWc1i0HJaGLA90tjMu11wt0E4UNxXRX+UQl4Twu68v4EV3CPvQcEpQfgsViYcXmq+w==
+
 "@sentry/types@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.0.tgz#b7d5372f17355e3991cbe818ad567f3fe277cc6b"
@@ -4885,11 +4958,6 @@
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.1.tgz#bcff6d0462d9b9b7b9ec31c0068fe02d44f25da2"
   integrity sha512-OMbGBPrJsw0iEXwZ2bJUYxewI1IEAU2e1aQGc0O6QW5+6hhCh+8HO8Xl4EymqwejjztuwStkl6G1qhK+Q0/Row==
 
-"@sentry/types@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.60.1.tgz#2f8740db56ae4cae87523ae7a0daf753308496f0"
-  integrity sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==
-
 "@sentry/utils@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79"
@@ -4898,6 +4966,13 @@
     "@sentry/types" "6.19.7"
     tslib "^1.9.3"
 
+"@sentry/utils@7.119.0":
+  version "7.119.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.119.0.tgz#debe29020f6ef3786a5bd855cf1b97116b7be826"
+  integrity sha512-ZwyXexWn2ZIe2bBoYnXJVPc2esCSbKpdc6+0WJa8eutXfHq3FRKg4ohkfCBpfxljQGEfP1+kfin945lA21Ka+A==
+  dependencies:
+    "@sentry/types" "7.119.0"
+
 "@sentry/utils@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.52.0.tgz#cacc36d905036ba7084c14965e964fc44239d7f0"
@@ -4914,14 +4989,6 @@
     "@sentry/types" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry/utils@7.60.1":
-  version "7.60.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.60.1.tgz#27b20bd2926c877011eb39fcb4b2db95dc72243f"
-  integrity sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==
-  dependencies:
-    "@sentry/types" "7.60.1"
-    tslib "^2.4.1 || ^1.9.3"
-
 "@servie/events@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@servie/events/-/events-1.0.0.tgz#8258684b52d418ab7b86533e861186638ecc5dc1"
@@ -22172,7 +22239,7 @@ tslib@^1, tslib@^1.14.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.3.0, "tslib@^2.4.1 || ^1.9.3":
+tslib@^2.3.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
   integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==

From 2ee86b98a51737f440e065e616a1fa10dc8218f5 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Mon, 7 Oct 2024 12:55:36 +0100
Subject: [PATCH 13/14] Revert "chore(wallet-mobile): Update
 sentry/react-native to fix xcode build issues (#3674)"

This reverts commit 9d43847e1f5e7b66ba44abaa1a33af0c17dc1f28.
---
 apps/wallet-mobile/ios/Podfile.lock |  17 +-
 apps/wallet-mobile/package.json     |   2 +-
 yarn.lock                           | 259 +++++++++++-----------------
 3 files changed, 106 insertions(+), 172 deletions(-)

diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index a8d7b4705c..f094a30104 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -516,12 +516,9 @@ PODS:
   - RNScreens (3.22.1):
     - React-Core
     - React-RCTImage
-  - RNSentry (5.33.1):
-    - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
+  - RNSentry (5.8.0):
     - React-Core
-    - React-hermes
-    - Sentry/HybridSDK (= 8.36.0)
+    - Sentry/HybridSDK (= 8.9.3)
   - RNShare (10.0.2):
     - React-Core
   - RNSVG (13.8.0):
@@ -537,7 +534,9 @@ PODS:
   - SDWebImageWebPCoder (0.11.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.15)
-  - Sentry/HybridSDK (8.36.0)
+  - Sentry/HybridSDK (8.9.3):
+    - SentryPrivate (= 8.9.3)
+  - SentryPrivate (8.9.3)
   - Yoga (1.14.0)
   - ZXingObjC/Core (3.6.9)
   - ZXingObjC/OneD (3.6.9):
@@ -651,6 +650,7 @@ SPEC REPOS:
     - SDWebImageSVGCoder
     - SDWebImageWebPCoder
     - Sentry
+    - SentryPrivate
     - ZXingObjC
 
 EXTERNAL SOURCES:
@@ -919,14 +919,15 @@ SPEC CHECKSUMS:
   RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a
   RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029
   RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3
-  RNSentry: 0744d3c79504bc4778190d047d1b60daf4a378cd
+  RNSentry: f9e637773502a61c7b455c4ce65bc7008ce22a6e
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564
   RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
   SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
   SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
   SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
-  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  Sentry: 97161cac725da1ecbe77d1445bf8a61c1e5667f1
+  SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 67db416f1f..013273d2ca 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -120,7 +120,7 @@
     "@react-navigation/native": "^6.1.6",
     "@react-navigation/routers": "^6.1.5",
     "@react-navigation/stack": "^6.3.16",
-    "@sentry/react-native": "^5.33.1",
+    "@sentry/react-native": "^5.8.0",
     "@shopify/flash-list": "^1.4.1",
     "@types/bip39": "^3.0.0",
     "@types/pbkdf2": "^3.1.2",
diff --git a/yarn.lock b/yarn.lock
index 526e6e0c06..812aadb4f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4574,34 +4574,6 @@
     exenv "^1.2.2"
     prop-types "^15.6.2"
 
-"@sentry-internal/feedback@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.119.0.tgz#429b3ea0fd34e928d2e7de5dcbe9377272a3f221"
-  integrity sha512-om8TkAU5CQGO8nkmr7qsSBVkP+/vfeS4JgtW3sjoTK0fhj26+DljR6RlfCGWtYQdPSP6XV7atcPTjbSnsmG9FQ==
-  dependencies:
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
-"@sentry-internal/replay-canvas@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.119.0.tgz#85669d184ba79150e64d05de02f5e2b616e68371"
-  integrity sha512-NL02VQx6ekPxtVRcsdp1bp5Tb5w6vnfBKSIfMKuDRBy5A10Uc3GSoy/c3mPyHjOxB84452A+xZSx6bliEzAnuA==
-  dependencies:
-    "@sentry/core" "7.119.0"
-    "@sentry/replay" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
-"@sentry-internal/tracing@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.119.0.tgz#201561af2a4ad1837333287c26050a5e688537ca"
-  integrity sha512-oKdFJnn+56f0DHUADlL8o9l8jTib3VDLbWQBVkjD9EprxfaCwt2m8L5ACRBdQ8hmpxCEo4I8/6traZ7qAdBUqA==
-  dependencies:
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
 "@sentry-internal/tracing@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.52.0.tgz#c4e0750ad0c3949c5bb4b59cbb708b0fef274080"
@@ -4622,24 +4594,15 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry/babel-plugin-component-annotate@2.20.1":
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.20.1.tgz#204c63ed006a048f48f633876e1b8bacf87a9722"
-  integrity sha512-4mhEwYTK00bIb5Y9UWIELVUfru587Vaeg0DQGswv4aIRHIiMKLyNqCEejaaybQ/fNChIZOKmvyqXk430YVd7Qg==
-
-"@sentry/browser@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.119.0.tgz#65004015c107be5d2f49a852ebcffc5d19d90e0d"
-  integrity sha512-WwmW1Y4D764kVGeKmdsNvQESZiAn9t8LmCWO0ucBksrjL2zw9gBPtOpRcO6l064sCLeSxxzCN+kIxhRm1gDFEA==
-  dependencies:
-    "@sentry-internal/feedback" "7.119.0"
-    "@sentry-internal/replay-canvas" "7.119.0"
-    "@sentry-internal/tracing" "7.119.0"
-    "@sentry/core" "7.119.0"
-    "@sentry/integrations" "7.119.0"
-    "@sentry/replay" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
+"@sentry-internal/tracing@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.60.1.tgz#c20766a7e31589962ffe9ea9dc58b6f475432303"
+  integrity sha512-2vM+3/ddzmoBfi92OOD9FFTHXf0HdQhKtNM26+/RsmkKnTid+/inbvA7nKi+Qa7ExcnlC6eclEHQEg+0X3yDkQ==
+  dependencies:
+    "@sentry/core" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/browser@7.52.0":
   version "7.52.0"
@@ -4665,40 +4628,17 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
-"@sentry/cli-darwin@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.36.1.tgz#786adf6984dbe3c6fb7dac51b625c314117b807d"
-  integrity sha512-JOHQjVD8Kqxm1jUKioAP5ohLOITf+Dh6+DBz4gQjCNdotsvNW5m63TKROwq2oB811p+Jzv5304ujmN4cAqW1Ww==
-
-"@sentry/cli-linux-arm64@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.36.1.tgz#ff449d7e7e715166257998c02cf635ca02acbadd"
-  integrity sha512-R//3ZEkbzvoStr3IA7nxBZNiBYyxOljOqAhgiTnejXHmnuwDzM3TBA2n5vKPE/kBFxboEBEw0UTzTIRb1T0bgw==
-
-"@sentry/cli-linux-arm@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.36.1.tgz#1ae5d335a1b4cd217a34c2bd6c6f5e0670136eb3"
-  integrity sha512-gvEOKN0fWL2AVqUBKHNXPRZfJNvKTs8kQhS8cQqahZGgZHiPCI4BqW45cKMq+ZTt1UUbLmt6khx5Dz7wi+0i5A==
-
-"@sentry/cli-linux-i686@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.36.1.tgz#112b9e26357e918cbbba918114ec8cdab07cdf60"
-  integrity sha512-R7sW5Vk/HacVy2YgQoQB+PwccvFYf2CZVPSFSFm2z7MEfNe77UYHWUq+sjJ4vxWG6HDWGVmaX0fjxyDkE01JRA==
-
-"@sentry/cli-linux-x64@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.36.1.tgz#c3e5bdb0c9a4bb44c83927c62a3cd7e006709bf7"
-  integrity sha512-UMr3ik8ksA7zQfbzsfwCb+ztenLnaeAbX94Gp+bzANZwPfi/vVHf2bLyqsBs4OyVt9SPlN1bbM/RTGfMjZ3JOw==
-
-"@sentry/cli-win32-i686@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.36.1.tgz#819573320e885e1dbf59b0a01d3bd370c84c1708"
-  integrity sha512-CflvhnvxPEs5GWQuuDtYSLqPrBaPbcSJFlBuUIb+8WNzRxvVfjgw1qzfZmkQqABqiy/YEsEekllOoMFZAvCcVA==
-
-"@sentry/cli-win32-x64@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.36.1.tgz#80779b4bffb4e2e32944eae72c60e6f40151b4dc"
-  integrity sha512-wWqht2xghcK3TGnooHZSzA3WSjdtno/xFjZLvWmw38rblGwgKMxLZnlxV6uDyS+OJ6CbfDTlCRay/0TIqA0N8g==
+"@sentry/browser@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.60.1.tgz#d11e86f127f3f1b48a7156a4df63ab2b76e534ee"
+  integrity sha512-opZQee3S0c459LXt8YGpwOM/qiTlzluHEEnfW2q+D2yVCWh8iegsDX3kbRiv4i/mtQu9yPhM9M761KDnc/0eZw==
+  dependencies:
+    "@sentry-internal/tracing" "7.60.1"
+    "@sentry/core" "7.60.1"
+    "@sentry/replay" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/cli@2.17.5":
   version "2.17.5"
@@ -4711,24 +4651,16 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/cli@2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.36.1.tgz#a9146b798cb6d2f782a7a48d74633ddcd88dc8d3"
-  integrity sha512-gzK5uQKDWKhyH5udoB5+oaUNrS//urWyaXgKvHKz4gFfl744HuKY9dpLPP2nMnf0zLGmGM6xJnMXLqILq0mtxw==
+"@sentry/cli@2.19.4":
+  version "2.19.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.19.4.tgz#d6a07d8224b457a8023b4b2a56b764abb60b53d2"
+  integrity sha512-wsSr2O/GVgr/i+DYtie+DNhODyI+HL7F5/0t1HwWMjHJWm4+5XTEauznYgbh2mewkzfUk9+t0CPecA82lEgspg==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
     progress "^2.0.3"
     proxy-from-env "^1.1.0"
     which "^2.0.2"
-  optionalDependencies:
-    "@sentry/cli-darwin" "2.36.1"
-    "@sentry/cli-linux-arm" "2.36.1"
-    "@sentry/cli-linux-arm64" "2.36.1"
-    "@sentry/cli-linux-i686" "2.36.1"
-    "@sentry/cli-linux-x64" "2.36.1"
-    "@sentry/cli-win32-i686" "2.36.1"
-    "@sentry/cli-win32-x64" "2.36.1"
 
 "@sentry/core@6.19.7":
   version "6.19.7"
@@ -4741,14 +4673,6 @@
     "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/core@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.119.0.tgz#a6e41119bb03ec27689f9ad04e79d1fba5b7fc37"
-  integrity sha512-CS2kUv9rAJJEjiRat6wle3JATHypB0SyD7pt4cpX5y0dN5dZ1JrF57oLHRMnga9fxRivydHz7tMTuBhSSwhzjw==
-  dependencies:
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
 "@sentry/core@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.52.0.tgz#6c820ca48fe2f06bfd6b290044c96de2375f2ad4"
@@ -4767,6 +4691,15 @@
     "@sentry/utils" "7.52.1"
     tslib "^1.9.3"
 
+"@sentry/core@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.60.1.tgz#789ebb2ba6808042e8c288f6881b82ff108c9c7c"
+  integrity sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw==
+  dependencies:
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    tslib "^2.4.1 || ^1.9.3"
+
 "@sentry/hub@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11"
@@ -4776,15 +4709,6 @@
     "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/hub@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.119.0.tgz#a94d657b9d3cfd4cc061c5c238f86faefb55d5d8"
-  integrity sha512-183h5B/rZosLxpB+ZYOvFdHk0rwZbKskxqKFtcyPbDAfpCUgCass41UTqyxF6aH1qLgCRxX8GcLRF7frIa/SOg==
-  dependencies:
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
 "@sentry/hub@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.52.0.tgz#ffc087d58c745d57108862faa0f701b15503dcc2"
@@ -4795,15 +4719,15 @@
     "@sentry/utils" "7.52.0"
     tslib "^1.9.3"
 
-"@sentry/integrations@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.119.0.tgz#5b25c603026dbacfe1ae7bb8d768506a129149fb"
-  integrity sha512-OHShvtsRW0A+ZL/ZbMnMqDEtJddPasndjq+1aQXw40mN+zeP7At/V1yPZyFaURy86iX7Ucxw5BtmzuNy7hLyTA==
+"@sentry/hub@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.60.1.tgz#fd554a1e6148806b2bd3159c4c27a19b1ea3dbfd"
+  integrity sha512-cYDcn1amIn7hu9sa8Oh0wgf+h7aojxjv7ukdR7zfMQgUpSeMsJLjA3YdL3983dPyxbnMhaZkviqtmzInYq9tfg==
   dependencies:
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-    localforage "^1.8.1"
+    "@sentry/core" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/integrations@7.52.0":
   version "7.52.0"
@@ -4825,6 +4749,16 @@
     localforage "^1.8.1"
     tslib "^1.9.3"
 
+"@sentry/integrations@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.60.1.tgz#2c0054d57ae337599d3c3a2d412226b4a7a62567"
+  integrity sha512-GkxGGUOGyRZ2aJrHfGPGJ40wh+r03xDHgjeM7SMHwdJdxTgFhv4xUZAl6NlywbxL5t2jhVwCMZNYIvy/vUrcFQ==
+  dependencies:
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    localforage "^1.8.1"
+    tslib "^2.4.1 || ^1.9.3"
+
 "@sentry/minimal@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4"
@@ -4862,31 +4796,19 @@
     "@sentry/types" "7.52.0"
     "@sentry/utils" "7.52.0"
 
-"@sentry/react-native@^5.33.1":
-  version "5.33.1"
-  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.33.1.tgz#5427bb71205443c7fe0f5ea001bbe2ff724a686e"
-  integrity sha512-k463M0wC+5FNJrKvzsE6uq7cjMKOrzT+hNm79sFjxqbw6vXgMHOjOcYsji7jFr5Nqr0jEOHm2niwsVlYEXGVAg==
-  dependencies:
-    "@sentry/babel-plugin-component-annotate" "2.20.1"
-    "@sentry/browser" "7.119.0"
-    "@sentry/cli" "2.36.1"
-    "@sentry/core" "7.119.0"
-    "@sentry/hub" "7.119.0"
-    "@sentry/integrations" "7.119.0"
-    "@sentry/react" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-
-"@sentry/react@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.119.0.tgz#79f2c9d94322a3afbfa8af9f5b872f7c2e9b0820"
-  integrity sha512-cf8Cei+qdSA26gx+IMAuc/k44PeBImNzIpXi3930SLhUe44ypT5OZ/44L6xTODHZzTIyMSJPduf59vT2+eW9yg==
-  dependencies:
-    "@sentry/browser" "7.119.0"
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
-    hoist-non-react-statics "^3.3.2"
+"@sentry/react-native@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.8.0.tgz#82dc72d8851c327cea5b60bc0299f2feec529167"
+  integrity sha512-vOTgm/7pXwlIttq58gade7Gm9Zoe5NMFuR4IIaPssJVwTpWTaUTnrvtsTXyjFceaL/EmgAVqK0B0JtOFwfykEA==
+  dependencies:
+    "@sentry/browser" "7.60.1"
+    "@sentry/cli" "2.19.4"
+    "@sentry/core" "7.60.1"
+    "@sentry/hub" "7.60.1"
+    "@sentry/integrations" "7.60.1"
+    "@sentry/react" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
 
 "@sentry/react@7.52.0":
   version "7.52.0"
@@ -4910,15 +4832,16 @@
     hoist-non-react-statics "^3.3.2"
     tslib "^1.9.3"
 
-"@sentry/replay@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.119.0.tgz#50881079d013c77f87a994331d8bcad1d49e0960"
-  integrity sha512-BnNsYL+X5I4WCH6wOpY6HQtp4MgVt0NVlhLUsEyrvMUiTs0bPkDBrulsgZQBUKJsbOr3l9nHrFoNVB/0i6WNLA==
+"@sentry/react@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.60.1.tgz#ceeb35dadebb41454f488c17d0b9c2e5d59e5ff4"
+  integrity sha512-977wb5gp7SHv9kHPs1HZtL60slt2WBFY9/YJI9Av7BjjJ/A89OhtBwbVhIcKXZ4hwHQVWuOiFCJdMrIfZXpFPA==
   dependencies:
-    "@sentry-internal/tracing" "7.119.0"
-    "@sentry/core" "7.119.0"
-    "@sentry/types" "7.119.0"
-    "@sentry/utils" "7.119.0"
+    "@sentry/browser" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+    hoist-non-react-statics "^3.3.2"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/replay@7.52.0":
   version "7.52.0"
@@ -4938,16 +4861,20 @@
     "@sentry/types" "7.52.1"
     "@sentry/utils" "7.52.1"
 
+"@sentry/replay@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.60.1.tgz#07ad56f47255706504ee099729bfe476538aa91d"
+  integrity sha512-WHQxEpJbHICs12L17LGgS/ql91yn9wJDH/hgb+1H90HaasjoR54ofWCKul29OvYV0snTWuHd6xauwtzyv9tzvg==
+  dependencies:
+    "@sentry/core" "7.60.1"
+    "@sentry/types" "7.60.1"
+    "@sentry/utils" "7.60.1"
+
 "@sentry/types@6.19.7", "@sentry/types@^6.2.5":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7"
   integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==
 
-"@sentry/types@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.119.0.tgz#8b3d7a1405c362e75cd900d46089df4e70919d2a"
-  integrity sha512-27qQbutDBPKGbuJHROxhIWc1i0HJaGLA90tjMu11wt0E4UNxXRX+UQl4Twu68v4EV3CPvQcEpQfgsViYcXmq+w==
-
 "@sentry/types@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.0.tgz#b7d5372f17355e3991cbe818ad567f3fe277cc6b"
@@ -4958,6 +4885,11 @@
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.1.tgz#bcff6d0462d9b9b7b9ec31c0068fe02d44f25da2"
   integrity sha512-OMbGBPrJsw0iEXwZ2bJUYxewI1IEAU2e1aQGc0O6QW5+6hhCh+8HO8Xl4EymqwejjztuwStkl6G1qhK+Q0/Row==
 
+"@sentry/types@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.60.1.tgz#2f8740db56ae4cae87523ae7a0daf753308496f0"
+  integrity sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==
+
 "@sentry/utils@6.19.7":
   version "6.19.7"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79"
@@ -4966,13 +4898,6 @@
     "@sentry/types" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/utils@7.119.0":
-  version "7.119.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.119.0.tgz#debe29020f6ef3786a5bd855cf1b97116b7be826"
-  integrity sha512-ZwyXexWn2ZIe2bBoYnXJVPc2esCSbKpdc6+0WJa8eutXfHq3FRKg4ohkfCBpfxljQGEfP1+kfin945lA21Ka+A==
-  dependencies:
-    "@sentry/types" "7.119.0"
-
 "@sentry/utils@7.52.0":
   version "7.52.0"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.52.0.tgz#cacc36d905036ba7084c14965e964fc44239d7f0"
@@ -4989,6 +4914,14 @@
     "@sentry/types" "7.52.1"
     tslib "^1.9.3"
 
+"@sentry/utils@7.60.1":
+  version "7.60.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.60.1.tgz#27b20bd2926c877011eb39fcb4b2db95dc72243f"
+  integrity sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==
+  dependencies:
+    "@sentry/types" "7.60.1"
+    tslib "^2.4.1 || ^1.9.3"
+
 "@servie/events@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@servie/events/-/events-1.0.0.tgz#8258684b52d418ab7b86533e861186638ecc5dc1"
@@ -22239,7 +22172,7 @@ tslib@^1, tslib@^1.14.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.3.0:
+tslib@^2.3.0, "tslib@^2.4.1 || ^1.9.3":
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
   integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==

From bf707c903ef6b9c84db005a3913de04f07948c54 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:05:05 +0100
Subject: [PATCH 14/14] fix(wallet-mobile): qr link full read within yoroi
 (#3682)

---
 .../.storybook/storybook.requires.js          |   1 +
 apps/wallet-mobile/src/WalletNavigator.tsx    |  73 ++--
 apps/wallet-mobile/src/YoroiApp.tsx           |  25 +-
 .../Settings/SettingsScreenNavigator.tsx      | 335 +++++++++---------
 .../messages/src/WalletNavigator.json         |  96 ++---
 .../Settings/SettingsScreenNavigator.json     | 160 ++++-----
 6 files changed, 341 insertions(+), 349 deletions(-)

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index f593d32e88..7046d09d9b 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -75,6 +75,7 @@ const getStories = () => {
     "./src/components/ExpandableInfoCard/ExpandableInfoCard.stories.tsx": require("../src/components/ExpandableInfoCard/ExpandableInfoCard.stories.tsx"),
     "./src/components/HideableText/HideableText.stories.tsx": require("../src/components/HideableText/HideableText.stories.tsx"),
     "./src/components/Icon/Icon.stories.tsx": require("../src/components/Icon/Icon.stories.tsx"),
+    "./src/components/InfoBanner/InfoBanner.stories.tsx": require("../src/components/InfoBanner/InfoBanner.stories.tsx"),
     "./src/components/LanguagePicker/LanguagePicker.stories.tsx": require("../src/components/LanguagePicker/LanguagePicker.stories.tsx"),
     "./src/components/LanguagePicker/LanguagePickerWarning.stories.tsx": require("../src/components/LanguagePicker/LanguagePickerWarning.stories.tsx"),
     "./src/components/legacy/Modal/Modal.stories.tsx": require("../src/components/legacy/Modal/Modal.stories.tsx"),
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
index 31169b7b74..b67c47d16a 100644
--- a/apps/wallet-mobile/src/WalletNavigator.tsx
+++ b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -10,7 +10,6 @@ import {
   swapStorageMaker,
 } from '@yoroi/swap'
 import {useTheme} from '@yoroi/theme'
-import {TransferProvider} from '@yoroi/transfer'
 import {Swap} from '@yoroi/types'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
@@ -233,51 +232,49 @@ export const WalletNavigator = () => {
   }
 
   return (
-    <TransferProvider>
-      <SearchProvider>
-        <Stack.Navigator
-          screenOptions={{
-            ...navOptions,
-            headerLeft: undefined,
+    <SearchProvider>
+      <Stack.Navigator
+        screenOptions={{
+          ...navOptions,
+          headerLeft: undefined,
+        }}
+      >
+        <Stack.Screen
+          name="wallet-selection"
+          options={{
+            title: strings.walletSelectionScreenHeader,
+            headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
           }}
-        >
-          <Stack.Screen
-            name="wallet-selection"
-            options={{
-              title: strings.walletSelectionScreenHeader,
-              headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
-            }}
-            component={SelectWalletFromList}
-          />
+          component={SelectWalletFromList}
+        />
 
-          <Stack.Screen //
-            name="setup-wallet"
-            options={{headerShown: false}}
-            component={SetupWalletNavigator}
-          />
+        <Stack.Screen //
+          name="setup-wallet"
+          options={{headerShown: false}}
+          component={SetupWalletNavigator}
+        />
 
-          <Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
+        <Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
 
-          <Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
+        <Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
 
-          <Stack.Screen
-            name="voting-registration"
-            options={{headerShown: false}}
-            getComponent={() => CatalystNavigator}
-          />
+        <Stack.Screen
+          name="voting-registration"
+          options={{headerShown: false}}
+          getComponent={() => CatalystNavigator}
+        />
 
-          <Stack.Screen
-            name="toggle-analytics-settings"
-            options={{headerShown: false}}
-            component={ToggleAnalyticsSettingsNavigator}
-          />
+        <Stack.Screen
+          name="toggle-analytics-settings"
+          options={{headerShown: false}}
+          component={ToggleAnalyticsSettingsNavigator}
+        />
 
-          <Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
+        <Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
 
-          <Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
-        </Stack.Navigator>
-      </SearchProvider>
-    </TransferProvider>
+        <Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
+      </Stack.Navigator>
+    </SearchProvider>
   )
 }
 
diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
index 97c06b05aa..fc98586531 100644
--- a/apps/wallet-mobile/src/YoroiApp.tsx
+++ b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -2,6 +2,7 @@ import {AsyncStorageProvider} from '@yoroi/common'
 import {LinksProvider} from '@yoroi/links'
 import {SetupWalletProvider} from '@yoroi/setup-wallet'
 import {ThemeProvider} from '@yoroi/theme'
+import {TransferProvider} from '@yoroi/transfer'
 import React from 'react'
 import {LogBox, StyleSheet} from 'react-native'
 import * as RNP from 'react-native-paper'
@@ -58,17 +59,19 @@ const Yoroi = () => {
                     <LoadingBoundary style={StyleSheet.absoluteFill}>
                       <LanguageProvider>
                         <AuthProvider>
-                          <LinksProvider>
-                            <SetupWalletProvider>
-                              <PoolTransitionProvider>
-                                <BrowserProvider>
-                                  <AutomaticWalletOpenerProvider>
-                                    <InitApp />
-                                  </AutomaticWalletOpenerProvider>
-                                </BrowserProvider>
-                              </PoolTransitionProvider>
-                            </SetupWalletProvider>
-                          </LinksProvider>
+                          <TransferProvider>
+                            <LinksProvider>
+                              <SetupWalletProvider>
+                                <PoolTransitionProvider>
+                                  <BrowserProvider>
+                                    <AutomaticWalletOpenerProvider>
+                                      <InitApp />
+                                    </AutomaticWalletOpenerProvider>
+                                  </BrowserProvider>
+                                </PoolTransitionProvider>
+                              </SetupWalletProvider>
+                            </LinksProvider>
+                          </TransferProvider>
                         </AuthProvider>
                       </LanguageProvider>
                     </LoadingBoundary>
diff --git a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
index fff982f18a..6054fdd899 100644
--- a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx
@@ -2,7 +2,6 @@ import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {createStackNavigator} from '@react-navigation/stack'
 import {useTheme} from '@yoroi/theme'
-import {TransferProvider} from '@yoroi/transfer'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {TouchableOpacity} from 'react-native'
@@ -19,7 +18,6 @@ import {
 } from '../../kernel/navigation'
 import {ChangePinScreen} from '../Auth/ChangePinScreen'
 import {EnableLoginWithPin} from '../Auth/EnableLoginWithPin'
-import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
 import {About} from './About'
 import {ApplicationSettingsScreen} from './ApplicationSettings'
 import {ChangeLanguageScreen} from './ChangeLanguage'
@@ -45,7 +43,6 @@ import {WalletSettingsScreen} from './WalletSettings'
 const Stack = createStackNavigator<SettingsStackRoutes>()
 export const SettingsScreenNavigator = () => {
   const strings = useStrings()
-  const {wallet} = useSelectedWallet()
   const {track} = useMetrics()
   const {atoms, color} = useTheme()
   const {handleOpenModal} = useHandleOpenNetworkNoticeModal()
@@ -57,176 +54,170 @@ export const SettingsScreenNavigator = () => {
   )
 
   return (
-    <TransferProvider key={wallet.id}>
-      <Stack.Navigator
-        screenOptions={{
-          ...defaultStackNavigationOptions(atoms, color),
+    <Stack.Navigator
+      screenOptions={{
+        ...defaultStackNavigationOptions(atoms, color),
+      }}
+    >
+      <Stack.Screen //
+        name="app-settings"
+        component={ApplicationSettingsScreen}
+        options={{
+          title: strings.appSettingsTitle,
+        }}
+      />
+
+      <Stack.Screen name="about" component={About} options={{title: strings.aboutTitle}} />
+
+      <Stack.Screen name="settings-system-log" component={SystemLogScreen} options={{title: strings.systemLogTitle}} />
+
+      <Stack.Screen //
+        name="main-settings"
+        component={SettingsTabNavigator}
+        options={{
+          title: strings.settingsTitle,
+          headerTitle: ({children}) => <NetworkTag>{children}</NetworkTag>,
+        }}
+      />
+
+      <Stack.Screen
+        name="change-wallet-name"
+        component={RenameWalletScreen}
+        options={{title: strings.changeWalletNameTitle}}
+      />
+
+      <Stack.Screen
+        name="terms-of-use"
+        component={TermsOfServiceScreen}
+        options={{title: strings.termsOfServiceTitle}}
+      />
+
+      <Stack.Screen
+        name="privacy-policy"
+        component={PrivacyPolicyScreen}
+        options={{title: strings.privacyPolicyTitle}}
+      />
+
+      <Stack.Screen //
+        name="enable-login-with-os"
+        component={EnableLoginWithOsScreenWrapper}
+        options={{headerShown: false}}
+      />
+
+      <Stack.Screen //
+        name="remove-wallet"
+        component={RemoveWalletScreen}
+        options={{title: strings.removeWalletTitle}}
+      />
+
+      <Stack.Screen //
+        name="change-language"
+        component={ChangeLanguageScreen}
+        options={{title: strings.languageTitle}}
+      />
+
+      <Stack.Screen //
+        name="change-currency"
+        component={ChangeCurrencyScreen}
+        options={{
+          title: strings.currency,
+        }}
+      />
+
+      <Stack.Screen //
+        name="change-theme"
+        component={ChangeThemeScreen}
+        options={{
+          title: strings.themeTitle,
+        }}
+      />
+
+      <Stack.Screen //
+        name="change-network"
+        component={ChangeNetworkScreen}
+        options={{
+          title: strings.networkTitle,
+          headerRight: () => (
+            <TouchableOpacity onPress={handleOpenModal} activeOpacity={0.5}>
+              <Icon.Info size={24} color={color.gray_900} style={{...atoms.px_lg}} />
+            </TouchableOpacity>
+          ),
+        }}
+      />
+
+      <Stack.Screen //
+        name="preparing-network"
+        component={PreparingNetworkScreen}
+        options={{
+          headerShown: false,
+        }}
+      />
+
+      <Stack.Screen //
+        name="enable-easy-confirmation"
+        component={EnableEasyConfirmationScreen}
+        options={{title: strings.enableEasyConfirmationTitle}}
+      />
+
+      <Stack.Screen //
+        name="disable-easy-confirmation"
+        component={DisableEasyConfirmationScreen}
+        options={{title: strings.disableEasyConfirmationTitle}}
+      />
+
+      <Stack.Screen //
+        name="change-password"
+        component={ChangePasswordScreen}
+        options={{title: strings.changePasswordTitle}}
+      />
+
+      <Stack.Screen //
+        name="change-custom-pin"
+        options={{
+          title: strings.changeCustomPinTitle,
+        }}
+        component={ChangePinScreenWrapper}
+      />
+
+      <Stack.Screen //
+        name="manage-collateral"
+        options={{
+          title: strings.collateral,
+        }}
+        component={ManageCollateralScreen}
+      />
+
+      <Stack.Screen //
+        name="collateral-confirm-tx"
+        options={{
+          title: strings.collateral,
+        }}
+        component={ConfirmTxScreen}
+      />
+
+      <Stack.Screen //
+        name="collateral-tx-submitted"
+        options={{
+          title: strings.collateral,
+          headerLeft: () => null,
+        }}
+        component={SubmittedTxScreen}
+      />
+
+      <Stack.Screen //
+        name="collateral-tx-failed"
+        options={{
+          title: strings.collateral,
         }}
-      >
-        <Stack.Screen //
-          name="app-settings"
-          component={ApplicationSettingsScreen}
-          options={{
-            title: strings.appSettingsTitle,
-          }}
-        />
-
-        <Stack.Screen name="about" component={About} options={{title: strings.aboutTitle}} />
-
-        <Stack.Screen
-          name="settings-system-log"
-          component={SystemLogScreen}
-          options={{title: strings.systemLogTitle}}
-        />
-
-        <Stack.Screen //
-          name="main-settings"
-          component={SettingsTabNavigator}
-          options={{
-            title: strings.settingsTitle,
-            headerTitle: ({children}) => <NetworkTag>{children}</NetworkTag>,
-          }}
-        />
-
-        <Stack.Screen
-          name="change-wallet-name"
-          component={RenameWalletScreen}
-          options={{title: strings.changeWalletNameTitle}}
-        />
-
-        <Stack.Screen
-          name="terms-of-use"
-          component={TermsOfServiceScreen}
-          options={{title: strings.termsOfServiceTitle}}
-        />
-
-        <Stack.Screen
-          name="privacy-policy"
-          component={PrivacyPolicyScreen}
-          options={{title: strings.privacyPolicyTitle}}
-        />
-
-        <Stack.Screen //
-          name="enable-login-with-os"
-          component={EnableLoginWithOsScreenWrapper}
-          options={{headerShown: false}}
-        />
-
-        <Stack.Screen //
-          name="remove-wallet"
-          component={RemoveWalletScreen}
-          options={{title: strings.removeWalletTitle}}
-        />
-
-        <Stack.Screen //
-          name="change-language"
-          component={ChangeLanguageScreen}
-          options={{title: strings.languageTitle}}
-        />
-
-        <Stack.Screen //
-          name="change-currency"
-          component={ChangeCurrencyScreen}
-          options={{
-            title: strings.currency,
-          }}
-        />
-
-        <Stack.Screen //
-          name="change-theme"
-          component={ChangeThemeScreen}
-          options={{
-            title: strings.themeTitle,
-          }}
-        />
-
-        <Stack.Screen //
-          name="change-network"
-          component={ChangeNetworkScreen}
-          options={{
-            title: strings.networkTitle,
-            headerRight: () => (
-              <TouchableOpacity onPress={handleOpenModal} activeOpacity={0.5}>
-                <Icon.Info size={24} color={color.gray_900} style={{...atoms.px_lg}} />
-              </TouchableOpacity>
-            ),
-          }}
-        />
-
-        <Stack.Screen //
-          name="preparing-network"
-          component={PreparingNetworkScreen}
-          options={{
-            headerShown: false,
-          }}
-        />
-
-        <Stack.Screen //
-          name="enable-easy-confirmation"
-          component={EnableEasyConfirmationScreen}
-          options={{title: strings.enableEasyConfirmationTitle}}
-        />
-
-        <Stack.Screen //
-          name="disable-easy-confirmation"
-          component={DisableEasyConfirmationScreen}
-          options={{title: strings.disableEasyConfirmationTitle}}
-        />
-
-        <Stack.Screen //
-          name="change-password"
-          component={ChangePasswordScreen}
-          options={{title: strings.changePasswordTitle}}
-        />
-
-        <Stack.Screen //
-          name="change-custom-pin"
-          options={{
-            title: strings.changeCustomPinTitle,
-          }}
-          component={ChangePinScreenWrapper}
-        />
-
-        <Stack.Screen //
-          name="manage-collateral"
-          options={{
-            title: strings.collateral,
-          }}
-          component={ManageCollateralScreen}
-        />
-
-        <Stack.Screen //
-          name="collateral-confirm-tx"
-          options={{
-            title: strings.collateral,
-          }}
-          component={ConfirmTxScreen}
-        />
-
-        <Stack.Screen //
-          name="collateral-tx-submitted"
-          options={{
-            title: strings.collateral,
-            headerLeft: () => null,
-          }}
-          component={SubmittedTxScreen}
-        />
-
-        <Stack.Screen //
-          name="collateral-tx-failed"
-          options={{
-            title: strings.collateral,
-          }}
-          component={FailedTxScreen}
-        />
-
-        <Stack.Screen
-          name="enable-login-with-pin"
-          options={{title: strings.customPinTitle}}
-          component={EnableLoginWithPinWrapper}
-        />
-      </Stack.Navigator>
-    </TransferProvider>
+        component={FailedTxScreen}
+      />
+
+      <Stack.Screen
+        name="enable-login-with-pin"
+        options={{title: strings.customPinTitle}}
+        component={EnableLoginWithPinWrapper}
+      />
+    </Stack.Navigator>
   )
 }
 
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index 0a23067a8f..6e8179e2ac 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": 306,
+      "line": 303,
       "column": 22,
-      "index": 10644
+      "index": 10476
     },
     "end": {
-      "line": 309,
+      "line": 306,
       "column": 3,
-      "index": 10747
+      "index": 10579
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 310,
+      "line": 307,
       "column": 14,
-      "index": 10763
+      "index": 10595
     },
     "end": {
-      "line": 313,
+      "line": 310,
       "column": 3,
-      "index": 10862
+      "index": 10694
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 314,
+      "line": 311,
       "column": 17,
-      "index": 10881
+      "index": 10713
     },
     "end": {
-      "line": 317,
+      "line": 314,
       "column": 3,
-      "index": 10986
+      "index": 10818
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 318,
+      "line": 315,
       "column": 19,
-      "index": 11007
+      "index": 10839
     },
     "end": {
-      "line": 321,
+      "line": 318,
       "column": 3,
-      "index": 11104
+      "index": 10936
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 322,
+      "line": 319,
       "column": 18,
-      "index": 11124
+      "index": 10956
     },
     "end": {
-      "line": 325,
+      "line": 322,
       "column": 3,
-      "index": 11219
+      "index": 11051
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 326,
+      "line": 323,
       "column": 16,
-      "index": 11237
+      "index": 11069
     },
     "end": {
-      "line": 329,
+      "line": 326,
       "column": 3,
-      "index": 11335
+      "index": 11167
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 330,
+      "line": 327,
       "column": 17,
-      "index": 11354
+      "index": 11186
     },
     "end": {
-      "line": 333,
+      "line": 330,
       "column": 3,
-      "index": 11419
+      "index": 11251
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 334,
+      "line": 331,
       "column": 14,
-      "index": 11435
+      "index": 11267
     },
     "end": {
-      "line": 337,
+      "line": 334,
       "column": 3,
-      "index": 11529
+      "index": 11361
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 338,
+      "line": 335,
       "column": 14,
-      "index": 11545
+      "index": 11377
     },
     "end": {
-      "line": 341,
+      "line": 338,
       "column": 3,
-      "index": 11597
+      "index": 11429
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Discover",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 342,
+      "line": 339,
       "column": 18,
-      "index": 11617
+      "index": 11449
     },
     "end": {
-      "line": 345,
+      "line": 342,
       "column": 3,
-      "index": 11706
+      "index": 11538
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 346,
+      "line": 343,
       "column": 31,
-      "index": 11739
+      "index": 11571
     },
     "end": {
-      "line": 349,
+      "line": 346,
       "column": 3,
-      "index": 11848
+      "index": 11680
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Portfolio",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 350,
+      "line": 347,
       "column": 19,
-      "index": 11869
+      "index": 11701
     },
     "end": {
-      "line": 353,
+      "line": 350,
       "column": 3,
-      "index": 11938
+      "index": 11770
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
index 0b85270988..98c2c91766 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 274,
+      "line": 265,
       "column": 18,
-      "index": 8562
+      "index": 8007
     },
     "end": {
-      "line": 277,
+      "line": 268,
       "column": 3,
-      "index": 8660
+      "index": 8105
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Application",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 278,
+      "line": 269,
       "column": 15,
-      "index": 8677
+      "index": 8122
     },
     "end": {
-      "line": 281,
+      "line": 272,
       "column": 3,
-      "index": 8786
+      "index": 8231
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Change PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 282,
+      "line": 273,
       "column": 24,
-      "index": 8812
+      "index": 8257
     },
     "end": {
-      "line": 285,
+      "line": 276,
       "column": 3,
-      "index": 8921
+      "index": 8366
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Change spending password",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 286,
+      "line": 277,
       "column": 23,
-      "index": 8946
+      "index": 8391
     },
     "end": {
-      "line": 289,
+      "line": 280,
       "column": 3,
-      "index": 9060
+      "index": 8505
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 290,
+      "line": 281,
       "column": 21,
-      "index": 9083
+      "index": 8528
     },
     "end": {
-      "line": 293,
+      "line": 284,
       "column": 3,
-      "index": 9184
+      "index": 8629
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Terms of Service Agreement",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 294,
+      "line": 285,
       "column": 23,
-      "index": 9209
+      "index": 8654
     },
     "end": {
-      "line": 297,
+      "line": 288,
       "column": 3,
-      "index": 9325
+      "index": 8770
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change wallet name",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 298,
+      "line": 289,
       "column": 25,
-      "index": 9352
+      "index": 8797
     },
     "end": {
-      "line": 301,
+      "line": 292,
       "column": 3,
-      "index": 9456
+      "index": 8901
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Support",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 302,
+      "line": 293,
       "column": 16,
-      "index": 9474
+      "index": 8919
     },
     "end": {
-      "line": 305,
+      "line": 296,
       "column": 3,
-      "index": 9565
+      "index": 9010
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 306,
+      "line": 297,
       "column": 31,
-      "index": 9598
+      "index": 9043
     },
     "end": {
-      "line": 309,
+      "line": 300,
       "column": 3,
-      "index": 9713
+      "index": 9158
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Easy confirmation",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 310,
+      "line": 301,
       "column": 32,
-      "index": 9747
+      "index": 9192
     },
     "end": {
-      "line": 313,
+      "line": 304,
       "column": 3,
-      "index": 9863
+      "index": 9308
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 314,
+      "line": 305,
       "column": 18,
-      "index": 9883
+      "index": 9328
     },
     "end": {
-      "line": 317,
+      "line": 308,
       "column": 3,
-      "index": 9981
+      "index": 9426
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 318,
+      "line": 309,
       "column": 17,
-      "index": 10000
+      "index": 9445
     },
     "end": {
-      "line": 321,
+      "line": 312,
       "column": 3,
-      "index": 10103
+      "index": 9548
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Language",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 322,
+      "line": 313,
       "column": 17,
-      "index": 10122
+      "index": 9567
     },
     "end": {
-      "line": 325,
+      "line": 316,
       "column": 3,
-      "index": 10220
+      "index": 9665
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Theming",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 326,
+      "line": 317,
       "column": 14,
-      "index": 10236
+      "index": 9681
     },
     "end": {
-      "line": 329,
+      "line": 320,
       "column": 3,
-      "index": 10330
+      "index": 9775
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Network",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 330,
+      "line": 321,
       "column": 16,
-      "index": 10348
+      "index": 9793
     },
     "end": {
-      "line": 333,
+      "line": 324,
       "column": 3,
-      "index": 10444
+      "index": 9889
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!App settings",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 334,
+      "line": 325,
       "column": 20,
-      "index": 10466
+      "index": 9911
     },
     "end": {
-      "line": 337,
+      "line": 328,
       "column": 3,
-      "index": 10584
+      "index": 10029
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 338,
+      "line": 329,
       "column": 14,
-      "index": 10600
+      "index": 10045
     },
     "end": {
-      "line": 341,
+      "line": 332,
       "column": 3,
-      "index": 10700
+      "index": 10145
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!Privacy Policy",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 342,
+      "line": 333,
       "column": 22,
-      "index": 10724
+      "index": 10169
     },
     "end": {
-      "line": 345,
+      "line": 336,
       "column": 3,
-      "index": 10827
+      "index": 10272
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Collateral",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 346,
+      "line": 337,
       "column": 14,
-      "index": 10843
+      "index": 10288
     },
     "end": {
-      "line": 349,
+      "line": 340,
       "column": 3,
-      "index": 10914
+      "index": 10359
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!Log",
     "file": "src/features/Settings/SettingsScreenNavigator.tsx",
     "start": {
-      "line": 350,
+      "line": 341,
       "column": 18,
-      "index": 10934
+      "index": 10379
     },
     "end": {
-      "line": 353,
+      "line": 344,
       "column": 3,
-      "index": 10991
+      "index": 10436
     }
   }
 ]
\ No newline at end of file