Merge branch 'feature/tx-review' into feature/tx-review-token-details

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>

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}

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()

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,

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

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>
 }
@@ -282,7 +282,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}
@@ -348,11 +348,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

apps/wallet-mobile/translations/messages/src/AppNavigator.json

@@ -4,59 +4,59 @@
     "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
     }
   },
   {
     "id": "components.initialization.custompinscreen.title",
     "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
     }
   },
   {
     "id": "global.actions.dialogs.walletKeysInvalidated.title",
     "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
     }
   },
   {
     "id": "global.actions.dialogs.biometricsChange.message",
     "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
     }
   }
 ]