feat(suite-native): tweak receive flow and navigation

trezor · Jan 6, 2025 · 413e5ba · 413e5ba
1 parent e8ab5a0
commit 413e5ba
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 168 deletions.
diff --git a/suite-native/app/package.json b/suite-native/app/package.json
@@ -65,7 +65,6 @@
         "@suite-native/module-device-settings": "workspace:*",
         "@suite-native/module-home": "workspace:*",
         "@suite-native/module-onboarding": "workspace:*",
-        "@suite-native/module-receive": "workspace:*",
         "@suite-native/module-send": "workspace:*",
         "@suite-native/module-settings": "workspace:*",
         "@suite-native/module-staking-management": "workspace:*",

diff --git a/suite-native/app/src/navigation/AppTabNavigator.tsx b/suite-native/app/src/navigation/AppTabNavigator.tsx
@@ -1,6 +1,5 @@
 import { BottomTabBarProps, createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 
-import { ReceiveStackNavigator } from '@suite-native/module-receive';
 import { HomeStackNavigator } from '@suite-native/module-home';
 import { AccountsStackNavigator } from '@suite-native/module-accounts-management';
 import { SettingsScreen } from '@suite-native/module-settings';
@@ -27,7 +26,6 @@ export const AppTabNavigator = () => {
         >
             <Tab.Screen name={AppTabsRoutes.HomeStack} component={HomeStackNavigator} />
             <Tab.Screen name={AppTabsRoutes.AccountsStack} component={AccountsStackNavigator} />
-            <Tab.Screen name={AppTabsRoutes.ReceiveStack} component={ReceiveStackNavigator} />
             <Tab.Screen name={AppTabsRoutes.Settings} component={SettingsScreen} />
         </Tab.Navigator>
     );

diff --git a/suite-native/app/src/navigation/routes.ts b/suite-native/app/src/navigation/routes.ts
@@ -19,13 +19,6 @@ const accountsStack = enhanceTabOption({
     },
 });
 
-const receiveStack = enhanceTabOption({
-    routeName: AppTabsRoutes.ReceiveStack,
-    label: 'Receive',
-    iconName: 'arrowLineDown',
-    focusedIconName: 'arrowLineDown',
-});
-
 const settings = enhanceTabOption({
     routeName: AppTabsRoutes.Settings,
     iconName: 'gear',
@@ -36,6 +29,5 @@ const settings = enhanceTabOption({
 export const rootTabsOptions = {
     ...homeStack,
     ...accountsStack,
-    ...receiveStack,
     ...settings,
 };
diff --git a/suite-native/app/tsconfig.json b/suite-native/app/tsconfig.json
@@ -54,7 +54,6 @@
         { "path": "../module-device-settings" },
         { "path": "../module-home" },
         { "path": "../module-onboarding" },
-        { "path": "../module-receive" },
         { "path": "../module-send" },
         { "path": "../module-settings" },
         {

diff --git a/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx b/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
@@ -135,11 +135,10 @@ export const TransactionListHeader = memo(
                         tokenContract={tokenContract}
                     />
                     {accountHasTransactions && (
-                        <HStack paddingHorizontal="sp16" flex={1} spacing="sp12">
+                        <HStack paddingTop="sp8" paddingHorizontal="sp16" flex={1} spacing="sp12">
                             <Box flex={1}>
                                 <Button
                                     viewLeft="arrowLineDown"
-                                    size="large"
                                     onPress={handleReceive}
                                     testID="@account-detail/receive-button"
                                 >
@@ -150,7 +149,6 @@ export const TransactionListHeader = memo(
                                 <Box flex={1}>
                                     <Button
                                         viewLeft="arrowLineUp"
-                                        size="large"
                                         onPress={handleSend}
                                         testID="@account-detail/send-button"
                                     >

diff --git a/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts b/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts
@@ -272,8 +272,6 @@ export const useAddCoinAccount = () => {
             let screen = AppTabsRoutes.HomeStack;
             if (flowType === 'accounts') {
                 screen = AppTabsRoutes.AccountsStack;
-            } else if (flowType === 'receive') {
-                screen = AppTabsRoutes.ReceiveStack;
             }
 
             if (newAccountResult.payload === 'Passphrase is incorrect') {

diff --git a/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx b/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx
@@ -1,46 +1,37 @@
-import { useSelector } from 'react-redux';
 import { forwardRef } from 'react';
 
 import { useNavigation } from '@react-navigation/native';
 
-import { Box, Button, VStack } from '@suite-native/atoms';
+import { Button, VStack } from '@suite-native/atoms';
 import { Assets } from '@suite-native/assets';
 import {
     RootStackParamList,
     RootStackRoutes,
     StackNavigationProps,
 } from '@suite-native/navigation';
-import { selectIsPortfolioTrackerDevice } from '@suite-common/wallet-core';
 import { Translation } from '@suite-native/intl';
 
 import { PortfolioGraph, PortfolioGraphRef } from './PortfolioGraph';
 
 export const PortfolioContent = forwardRef<PortfolioGraphRef>((_props, ref) => {
     const navigation = useNavigation<StackNavigationProps<RootStackParamList, RootStackRoutes>>();
 
-    const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
-
     const handleReceive = () => {
         navigation.navigate(RootStackRoutes.ReceiveModal, { closeActionType: 'back' });
     };
 
     return (
-        <VStack spacing="sp24" marginTop="sp8">
+        <VStack spacing="sp32" marginTop="sp8">
             <PortfolioGraph ref={ref} />
             <VStack spacing="sp24" marginHorizontal="sp16">
-                <Box>
-                    <Assets />
-                </Box>
-                {isPortfolioTrackerDevice && (
-                    <Button
-                        data-testID="@home/portolio/recieve-button"
-                        size="large"
-                        onPress={handleReceive}
-                        viewLeft="arrowLineDown"
-                    >
-                        <Translation id="moduleHome.buttons.receive" />
-                    </Button>
-                )}
+                <Button
+                    data-testID="@home/portolio/recieve-button"
+                    onPress={handleReceive}
+                    viewLeft="arrowLineDown"
+                >
+                    <Translation id="moduleHome.buttons.receive" />
+                </Button>
+                <Assets />
             </VStack>
         </VStack>
     );

diff --git a/suite-native/module-receive/package.json b/suite-native/module-receive/package.json
diff --git a/suite-native/module-receive/src/index.ts b/suite-native/module-receive/src/index.ts
diff --git a/suite-native/module-receive/src/navigation/ReceiveStackNavigator.tsx b/suite-native/module-receive/src/navigation/ReceiveStackNavigator.tsx
diff --git a/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx b/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx
diff --git a/suite-native/module-receive/tsconfig.json b/suite-native/module-receive/tsconfig.json
diff --git a/suite-native/navigation/src/navigators.ts b/suite-native/navigation/src/navigators.ts
@@ -100,7 +100,6 @@ export type SendStackParamList = {
 export type AppTabsParamList = {
     [AppTabsRoutes.HomeStack]: NavigatorScreenParams<HomeStackParamList>;
     [AppTabsRoutes.AccountsStack]: NavigatorScreenParams<AccountsStackParamList>;
-    [AppTabsRoutes.ReceiveStack]: NavigatorScreenParams<ReceiveStackParamList>;
     [AppTabsRoutes.Settings]: undefined;
 };
 
@@ -128,7 +127,7 @@ export type AccountsImportStackParamList = {
     };
 };
 
-export type AddCoinFlowType = 'home' | 'receive' | 'accounts';
+export type AddCoinFlowType = 'home' | 'accounts';
 
 export type AddCoinAccountStackParamList = {
     [AddCoinAccountStackRoutes.AddCoinAccount]: {

diff --git a/suite-native/navigation/src/routes.ts b/suite-native/navigation/src/routes.ts
@@ -20,7 +20,6 @@ export enum RootStackRoutes {
 export enum AppTabsRoutes {
     HomeStack = 'HomeStack',
     AccountsStack = 'AccountsStack',
-    ReceiveStack = 'ReceiveStack',
     Settings = 'Settings',
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -9737,7 +9737,6 @@ __metadata:
     "@suite-native/module-device-settings": "workspace:*"
     "@suite-native/module-home": "workspace:*"
     "@suite-native/module-onboarding": "workspace:*"
-    "@suite-native/module-receive": "workspace:*"
     "@suite-native/module-send": "workspace:*"
     "@suite-native/module-settings": "workspace:*"
     "@suite-native/module-staking-management": "workspace:*"
@@ -10551,20 +10550,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@suite-native/module-receive@workspace:*, @suite-native/module-receive@workspace:suite-native/module-receive":
-  version: 0.0.0-use.local
-  resolution: "@suite-native/module-receive@workspace:suite-native/module-receive"
-  dependencies:
-    "@react-navigation/native": "npm:6.1.18"
-    "@react-navigation/native-stack": "npm:6.11.0"
-    "@suite-native/accounts": "workspace:*"
-    "@suite-native/device-manager": "workspace:*"
-    "@suite-native/navigation": "workspace:*"
-    react: "npm:18.2.0"
-    react-native: "npm:0.76.1"
-  languageName: unknown
-  linkType: soft
-
 "@suite-native/module-send@workspace:*, @suite-native/module-send@workspace:suite-native/module-send":
   version: 0.0.0-use.local
   resolution: "@suite-native/module-send@workspace:suite-native/module-send"