Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add page theme for onboard engagement screen root #36144

Merged
merged 5 commits into from
Feb 8, 2024
Merged

fix: add page theme for onboard engagement screen root #36144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ec1e9a
fix bad merge
teneeto Feb 8, 2024
ddca62f
add page theme for onboard engagement screen root - light theme
teneeto Feb 8, 2024
0aed3b3
add page theme for onboard engagement screen root - dark theme
teneeto Feb 8, 2024
1e549c1
use onboard engagement root page theme background color
teneeto Feb 8, 2024
9d0b69f
fix weird transition when closing modal
teneeto Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/Icon/Expensicons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was removed in #35019 (comment)

import Scan from '@assets/images/scan.svg';
import Send from '@assets/images/send.svg';
import Shield from '@assets/images/shield.svg';
Expand Down Expand Up @@ -252,6 +253,7 @@ export {
Receipt,
ReceiptSearch,
Rotate,
RotateLeft,
Scan,
Send,
Shield,
Expand Down
4 changes: 2 additions & 2 deletions src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ 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(() => {
teneeto marked this conversation as resolved.
Show resolved Hide resolved
Report.dismissEngagementModal();
Navigation.goBack(ROUTES.HOME);
Navigation.goBack();
}, []);

const completeEngagement = useCallback((message: string, choice: ValueOf<typeof CONST.INTRO_CHOICES>) => {
Expand Down
4 changes: 4 additions & 0 deletions src/styles/theme/themes/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions src/styles/theme/themes/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading