From 2ec1e9ae7514fa866792e104d41a5505b9e9f08f Mon Sep 17 00:00:00 2001 From: Etotaziba Olei Date: Thu, 8 Feb 2024 13:55:38 +0100 Subject: [PATCH 1/5] fix bad merge --- src/components/Icon/Expensicons.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 139b6789e8d..252d13259ae 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -110,6 +110,7 @@ import QuestionMark from '@assets/images/question-mark-circle.svg'; import ReceiptSearch from '@assets/images/receipt-search.svg'; import Receipt from '@assets/images/receipt.svg'; import Rotate from '@assets/images/rotate-image.svg'; +import RotateLeft from '@assets/images/rotate-left.svg'; import Scan from '@assets/images/scan.svg'; import Send from '@assets/images/send.svg'; import Shield from '@assets/images/shield.svg'; @@ -252,6 +253,7 @@ export { Receipt, ReceiptSearch, Rotate, + RotateLeft, Scan, Send, Shield, From ddca62f09456729c64814797a99af8a42175af54 Mon Sep 17 00:00:00 2001 From: Etotaziba Olei Date: Thu, 8 Feb 2024 13:57:32 +0100 Subject: [PATCH 2/5] add page theme for onboard engagement screen root - light theme --- src/styles/theme/themes/light.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts index 7317dc836b2..62c788abbfb 100644 --- a/src/styles/theme/themes/light.ts +++ b/src/styles/theme/themes/light.ts @@ -144,6 +144,10 @@ const lightTheme = { backgroundColor: colors.productDark200, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, }, + [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: { + backgroundColor: colors.pink800, + statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, + }, [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: { backgroundColor: colors.green600, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, From 0aed3b30ae385e9e5bc372cdc951e401b07b2be1 Mon Sep 17 00:00:00 2001 From: Etotaziba Olei Date: Thu, 8 Feb 2024 13:57:47 +0100 Subject: [PATCH 3/5] add page theme for onboard engagement screen root - dark theme --- src/styles/theme/themes/dark.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts index ea61a1b98dd..8cb1566ec27 100644 --- a/src/styles/theme/themes/dark.ts +++ b/src/styles/theme/themes/dark.ts @@ -144,6 +144,10 @@ const darkTheme = { backgroundColor: colors.productDark200, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, }, + [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: { + backgroundColor: colors.pink800, + statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, + }, [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: { backgroundColor: colors.green600, statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT, From 1e549c1600c53f736e5f23373510732744d7a7e4 Mon Sep 17 00:00:00 2001 From: Etotaziba Olei Date: Thu, 8 Feb 2024 13:59:04 +0100 Subject: [PATCH 4/5] use onboard engagement root page theme background color --- src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx index acbc272c5ab..a237d1f38b1 100644 --- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx +++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx @@ -76,7 +76,7 @@ function PurposeForUsingExpensifyModal() { const styles = useThemeStyles(); const {windowHeight} = useWindowDimensions(); const theme = useTheme(); - const backgroundColorStyle = StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.SETTINGS.WORKSPACES].backgroundColor); + const backgroundColorStyle = StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.ONBOARD_ENGAGEMENT.ROOT].backgroundColor); const appBGColor = StyleUtils.getBackgroundColorStyle(theme.appBG); const navigateBack = useCallback(() => { From 9d0b69f76a7a1dd7a0933845484ff462bc2fd9f6 Mon Sep 17 00:00:00 2001 From: Etotaziba Olei Date: Thu, 8 Feb 2024 15:29:19 +0100 Subject: [PATCH 5/5] fix weird transition when closing modal --- src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx index a237d1f38b1..66d25da28f9 100644 --- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx +++ b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx @@ -81,7 +81,7 @@ function PurposeForUsingExpensifyModal() { const navigateBack = useCallback(() => { Report.dismissEngagementModal(); - Navigation.goBack(ROUTES.HOME); + Navigation.goBack(); }, []); const completeEngagement = useCallback((message: string, choice: ValueOf) => {