Auth2fa theme update by keisyrzk · Pull Request #31691 · Expensify/App

keisyrzk · 2023-11-22T12:17:10Z

Details

Theme Switching Migration

Fixed Issues

Tests

Go to Settings / Security / 2FA
Go through the 2FA setup process

apply this change and test again:

diff --git a/src/styles/themes/ThemeProvider.tsx b/src/styles/themes/ThemeProvider.tsx
index 50bfb3b045..32a40cbdbf 100644
--- a/src/styles/themes/ThemeProvider.tsx
+++ b/src/styles/themes/ThemeProvider.tsx
@@ -15,7 +15,7 @@ const propTypes = {
 function ThemeProvider(props: React.PropsWithChildren) {
     const themePreference = useThemePreference();

-    const theme = useMemo(() => (themePreference === CONST.THEME.LIGHT ? lightTheme : darkTheme), [themePreference]);
+    const theme = useMemo(() => (themePreference === CONST.THEME.LIGHT ? lightTheme : lightTheme), [themePreference]);

     return <ThemeContext.Provider value={theme}>{props.children}</ThemeContext.Provider>;
 }

Verify that no errors appear in the JS console

QA Steps

The same as in Tests section.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

![Simulator Screenshot - iPhone 15 Pro - 2023-11-24 at 12 48 28](https://github.com/Expensify/App/assets/18525360/3f1a5525-18e6-448c-87c8-d3f09c91be7f)

iOS: mWeb Safari

![Simulator Screenshot - iPhone 15 Pro - 2023-11-24 at 12 48 00](https://github.com/Expensify/App/assets/18525360/67b3f100-cf19-4124-8c7f-7b1c2978a7ce)

MacOS: Chrome / Safari

MacOS: Desktop

src/components/AnimatedStep/index.tsx

src/components/OfflineIndicator.js

kubabutkiewicz

one nitpick, LGTM 😄

src/components/AnimatedStep/index.tsx

melvin-bot · 2023-11-24T11:58:23Z

@s77rt Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

src/components/OfflineIndicator.js

src/components/Pressable/GenericPressable/BaseGenericPressable.tsx

src/components/OfflineIndicator.js

keisyrzk · 2023-11-27T06:34:55Z

updates made as requested

src/components/OfflineIndicator.js

s77rt · 2023-11-27T13:24:16Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>

chrispader

LGTM!

OSBotify · 2023-11-29T12:20:32Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.4.5-1 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

kavimuru · 2023-11-29T13:08:53Z

@keisyrzk How do we run this step ?

diff --git a/src/styles/themes/ThemeProvider.tsx b/src/styles/themes/ThemeProvider.tsx
index 50bfb3b045..32a40cbdbf 100644
--- a/src/styles/themes/ThemeProvider.tsx
+++ b/src/styles/themes/ThemeProvider.tsx
@@ -15,7 +15,7 @@ const propTypes = {
 function ThemeProvider(props: React.PropsWithChildren) {
     const themePreference = useThemePreference();

-    const theme = useMemo(() => (themePreference === CONST.THEME.LIGHT ? lightTheme : darkTheme), [themePreference]);
+    const theme = useMemo(() => (themePreference === CONST.THEME.LIGHT ? lightTheme : lightTheme), [themePreference]);

     return <ThemeContext.Provider value={theme}>{props.children}</ThemeContext.Provider>;
 }

OSBotify · 2023-11-30T12:15:39Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.5-7 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

keisyrzk added 8 commits November 22, 2023 11:03

AnimatedStep/index.js

8980727

OfflineIndicator.js

5ae1683

PressableWithDelayToggle.tsx and updated to AnimatedStep/index.js

1191351

GenericPressable/BaseGenericPressable.tsx

d2adfae

OfflineIndicator.js add missing passing

47e473c

prettier

79820a9

PR update

f37a0aa

lint and prettier

ba58958

barttom reviewed Nov 24, 2023

View reviewed changes

src/components/AnimatedStep/index.tsx Outdated Show resolved Hide resolved

barttom reviewed Nov 24, 2023

View reviewed changes

src/components/OfflineIndicator.js Outdated Show resolved Hide resolved

pr adjustments

e9e356a

kubabutkiewicz approved these changes Nov 24, 2023

View reviewed changes

src/components/AnimatedStep/index.tsx Outdated Show resolved Hide resolved

remove style default value

ee119c1

keisyrzk marked this pull request as ready for review November 24, 2023 11:58

keisyrzk requested a review from a team as a code owner November 24, 2023 11:58

melvin-bot bot requested review from s77rt and removed request for a team November 24, 2023 11:58

fabioh8010 reviewed Nov 24, 2023

View reviewed changes

src/components/OfflineIndicator.js Outdated Show resolved Hide resolved

koko57 mentioned this pull request Nov 24, 2023

[HOLD for payment 2023-12-08] [Theme Switching Migration] Master File Tracking #31677

Closed

31 tasks

s77rt suggested changes Nov 25, 2023

View reviewed changes

src/components/Pressable/GenericPressable/BaseGenericPressable.tsx Outdated Show resolved Hide resolved

src/components/OfflineIndicator.js Outdated Show resolved Hide resolved

pr adjustmnets

6b9025c

grgia self-requested a review November 27, 2023 10:35

keisyrzk added 2 commits November 27, 2023 13:01

main merge

6d7a4bf

fix

7d46093

s77rt suggested changes Nov 27, 2023

View reviewed changes

src/components/OfflineIndicator.js Outdated Show resolved Hide resolved

Update src/components/OfflineIndicator.js

4a99688

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>

s77rt approved these changes Nov 28, 2023

View reviewed changes

grgia approved these changes Nov 28, 2023

View reviewed changes

chrispader approved these changes Nov 29, 2023

View reviewed changes

grgia merged commit a8672be into Expensify:main Nov 29, 2023

github-actions bot mentioned this pull request Nov 29, 2023

Deploy Checklist: New Expensify 2023-11-29 #32175

Closed

55 tasks

melvin-bot bot mentioned this pull request Nov 30, 2023

[HOLD for payment 2023-12-07] [Theme Switching Migration] Auth2FA Batch #31680

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Auth2fa theme update#31691

Auth2fa theme update#31691
grgia merged 14 commits intoExpensify:mainfrom
keisyrzk:auth2faThemeUpdate

keisyrzk commented Nov 22, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

kubabutkiewicz left a comment

Uh oh!

Uh oh!

melvin-bot bot commented Nov 24, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

keisyrzk commented Nov 27, 2023

Uh oh!

Uh oh!

s77rt commented Nov 27, 2023 •

edited

Loading

Uh oh!

chrispader left a comment

Uh oh!

OSBotify commented Nov 29, 2023

Uh oh!

kavimuru commented Nov 29, 2023

Uh oh!

OSBotify commented Nov 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

keisyrzk commented Nov 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

kubabutkiewicz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Nov 24, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

keisyrzk commented Nov 27, 2023

Uh oh!

Uh oh!

s77rt commented Nov 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

chrispader left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Nov 29, 2023

Uh oh!

kavimuru commented Nov 29, 2023

Uh oh!

OSBotify commented Nov 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

keisyrzk commented Nov 22, 2023 •

edited

Loading

s77rt commented Nov 27, 2023 •

edited

Loading