From 8f038162f1335ce0b9abeafc32793da58a463b9a Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Tue, 16 Apr 2024 13:15:48 +0100 Subject: [PATCH 01/12] rename Chats to Inbox --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- .../AppNavigator/createCustomBottomTabNavigator/TopBar.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 9451407c822f..39e9044525e9 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -144,7 +144,7 @@ export default { magicCode: 'Magic code', twoFactorCode: 'Two-factor code', workspaces: 'Workspaces', - chats: 'Chats', + inbox: 'Inbox', group: 'Group', profile: 'Profile', referral: 'Referral', diff --git a/src/languages/es.ts b/src/languages/es.ts index a56c8ac2739d..21ba1be2abb0 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -134,7 +134,7 @@ export default { magicCode: 'Código mágico', twoFactorCode: 'Autenticación de dos factores', workspaces: 'Espacios de trabajo', - chats: 'Chats', + inbox: 'Bandeja de entrada', group: 'Grupo', profile: 'Perfil', referral: 'Remisión', diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx index fd5282a8cfcd..aa2217ea914a 100644 --- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx +++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx @@ -53,7 +53,7 @@ function TopBar({policy, session}: TopBarProps) { breadcrumbs={[ headerBreadcrumb, { - text: translate('common.chats'), + text: translate('common.inbox'), }, ]} /> From db8dd658ed2b3b568836c2e328f85a319c6f1e2b Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Tue, 16 Apr 2024 14:53:44 +0100 Subject: [PATCH 02/12] Add and rearrange bottom tab buttons --- .../BottomTabBar.tsx | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx index 391468578fab..6c06650fd4eb 100644 --- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx +++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx @@ -72,13 +72,13 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps return ( - + { Navigation.navigate(ROUTES.HOME); }} role={CONST.ROLE.BUTTON} - accessibilityLabel={translate('common.chats')} + accessibilityLabel={translate('common.inbox')} wrapperStyle={styles.flex1} style={styles.bottomTabBarItem} > @@ -95,9 +95,28 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps - - + + { + Navigation.navigate(ROUTES.SEARCH); + }} + role={CONST.ROLE.BUTTON} + accessibilityLabel={translate('common.search')} + wrapperStyle={styles.flex1} + style={styles.bottomTabBarItem} + > + + + + + + ); } From 2af4fc0f6b3da3a6656e8fe73d57fa9f64e4e11b Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Tue, 16 Apr 2024 15:03:49 +0100 Subject: [PATCH 03/12] Use home icon, add comments --- .../createCustomBottomTabNavigator/BottomTabBar.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx index 6c06650fd4eb..79999d639dcd 100644 --- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx +++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx @@ -84,7 +84,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps > { - Navigation.navigate(ROUTES.SEARCH); + Navigation.navigate(ROUTES.SEARCH); // replace with final route implemented in #App#40245 }} role={CONST.ROLE.BUTTON} accessibilityLabel={translate('common.search')} @@ -108,7 +108,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps From 584e3fcbc76680a05bbdafe91183803b2d4e5f91 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 25 Apr 2024 20:10:07 +0100 Subject: [PATCH 04/12] Add new assets, automatically go to search/all --- assets/images/inbox.svg | 12 ++++++++++++ assets/images/money-search.svg | 16 ++++++++++++++++ src/components/Icon/Expensicons.ts | 4 ++++ .../BottomTabBar.tsx | 8 ++++---- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 assets/images/inbox.svg create mode 100644 assets/images/money-search.svg diff --git a/assets/images/inbox.svg b/assets/images/inbox.svg new file mode 100644 index 000000000000..f9059e78ec5a --- /dev/null +++ b/assets/images/inbox.svg @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/assets/images/money-search.svg b/assets/images/money-search.svg new file mode 100644 index 000000000000..90dedae0a2fb --- /dev/null +++ b/assets/images/money-search.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 2f0d8a05a572..c2a3449f4190 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -82,6 +82,7 @@ import Heart from '@assets/images/heart.svg'; import History from '@assets/images/history.svg'; import Home from '@assets/images/home.svg'; import Hourglass from '@assets/images/hourglass.svg'; +import Inbox from '@assets/images/inbox.svg'; import ImageCropCircleMask from '@assets/images/image-crop-circle-mask.svg'; import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg'; import Info from '@assets/images/info.svg'; @@ -103,6 +104,7 @@ import Menu from '@assets/images/menu.svg'; import Meter from '@assets/images/meter.svg'; import MoneyBag from '@assets/images/money-bag.svg'; import MoneyCircle from '@assets/images/money-circle.svg'; +import MoneySearch from '@assets/images/money-search.svg'; import MoneyWaving from '@assets/images/money-waving.svg'; import Monitor from '@assets/images/monitor.svg'; import Mute from '@assets/images/mute.svg'; @@ -245,6 +247,7 @@ export { History, Home, Hourglass, + Inbox, ImageCropCircleMask, ImageCropSquareMask, Info, @@ -264,6 +267,7 @@ export { Megaphone, MoneyBag, MoneyCircle, + MoneySearch, MoneyWaving, Monitor, Mute, diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx index e351e4cde2aa..4ae1fd5c441f 100644 --- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx +++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx @@ -81,7 +81,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps > { - Navigation.navigate(ROUTES.SEARCH); // replace with final route implemented in #App#40245 + Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL)); // replace with final route implemented in #App#40245 }} role={CONST.ROLE.BUTTON} accessibilityLabel={translate('common.search')} @@ -104,8 +104,8 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps > From f72a1c9654fb00491543fb80d3d7fa3aaf10f523 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 25 Apr 2024 20:19:29 +0100 Subject: [PATCH 05/12] prettier --- src/components/Icon/Expensicons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index c2a3449f4190..8a5bc3ee531a 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -82,9 +82,9 @@ import Heart from '@assets/images/heart.svg'; import History from '@assets/images/history.svg'; import Home from '@assets/images/home.svg'; import Hourglass from '@assets/images/hourglass.svg'; -import Inbox from '@assets/images/inbox.svg'; import ImageCropCircleMask from '@assets/images/image-crop-circle-mask.svg'; import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg'; +import Inbox from '@assets/images/inbox.svg'; import Info from '@assets/images/info.svg'; import QBOSquare from '@assets/images/integrationicons/qbo-icon-square.svg'; import XeroSquare from '@assets/images/integrationicons/xero-icon-square.svg'; From 56c6d57d2b87a9ffcc7490b6b616d320fc80e844 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 25 Apr 2024 20:21:31 +0100 Subject: [PATCH 06/12] remove comments --- .../createCustomBottomTabNavigator/BottomTabBar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx index 4ae1fd5c441f..70f1af5fb28b 100644 --- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx +++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx @@ -95,7 +95,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps { - Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL)); // replace with final route implemented in #App#40245 + Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL)); }} role={CONST.ROLE.BUTTON} accessibilityLabel={translate('common.search')} @@ -105,7 +105,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps From 44901ed75ba7cac44fe76a90a0b07a2ede46fc36 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 25 Apr 2024 20:45:53 +0100 Subject: [PATCH 07/12] fix equal spacing between buttons --- src/components/TestToolMenu.tsx | 11 ----------- .../createCustomBottomTabNavigator/BottomTabBar.tsx | 4 +++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/components/TestToolMenu.tsx b/src/components/TestToolMenu.tsx index e4d33957f7f1..165205ee2c64 100644 --- a/src/components/TestToolMenu.tsx +++ b/src/components/TestToolMenu.tsx @@ -92,17 +92,6 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) { onPress={() => Session.invalidateCredentials()} /> - - {/* Navigate to the new Search Page. This button is temporary and should be removed after passing QA tests. */} - -