Feat/31678 theme switching migration selectionlist batch by koko57 · Pull Request #31774 · Expensify/App

koko57 · 2023-11-23T08:43:48Z

Details

Fixed Issues

Tests

These changes affect Selection List and Option Rows:

Verify if the multiple avatars in LHN are displayed correctly
Click FAB -> New Chat -> select a few people from the list.
Verify that the circle with checkbox, options and the whole list are displayed correctly.
Verify that the app does not crash while going through LHN or Selection List.

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

Offline tests

QA Steps

These changes affect Selection List and Option Rows:

Verify if the multiple avatars in LHN are displayed correctly
Click FAB -> New Chat -> select a few people from the list.
Verify that the circle with checkbox, options and the whole list are displayed correctly.
Verify that the app does not crash while going through LHN or Selection List.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…onlist-batch

koko57 · 2023-11-24T08:46:27Z

I see there's some problem with loading images on iOS Safari. I will try to find why, but I don't think this PR introduced the issue

EDIT: it's occurring for me on main as well

src/components/OfflineWithFeedback.js

src/components/OptionsSelector/BaseOptionsSelector.js

rezkiy37

Left a comment.

src/components/MultipleAvatars.tsx

kubabutkiewicz

One small comment, but LGTM 😄

src/components/OptionsSelector/BaseOptionsSelector.js

rezkiy37

Left a comment, after LGTM.

melvin-bot · 2023-11-24T15:30:26Z

@alitoshmatov 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]

alitoshmatov · 2023-11-27T16:14:46Z

@grgia Can you remove my assignment, since it does not require a review from C+

grgia · 2023-11-28T11:10:08Z

@koko57 will review today, could you resolve conflicts?

grgia

tests well locally!

grgia

double checking all files from issue addressed ✅

chrispader

LGTM, just a few small comments

chrispader · 2023-11-28T22:27:34Z

src/components/MultipleAvatars.tsx

+        [styles],
+    );
+
+    const secondAvatarDefaultStyles = secondAvatarStyle ?? [StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)];


I think we should rename this variable to secondAvatarStyle and rename the prop secondAvatarStyle to secondAvatarStyleProp.

Especially i think this should be singular instead of plural, since the prop is also singular. (sorry for nitpicking 😃)

But it would break the convention we have in the app - all the styles passed as props doesn't have 'props' in the name. badgeStyles, textStyles, containerStyles or even listContainerStyles in BaseOptionsSelector below - these are just some of examples.

which convention do you mean?

Naming the props. I just gave some examples how the style props are named. We don't have containerStylesProp only containerStyles. If I changed secondAvatarStyle to secondAvatarStyleProp that would be the only style prop in the app which name includes 'Prop'

I don't think we need to add Prop to the variable name, but if secondAvatarStyle can be an array of styles, maybe we rename to secondAvatarStyles?

I think it would be safer to work on the names refactor in a separate PR 🙂

oh sorry, i might not have explained this well... @koko57 @grgia

i meant to create an alias for the prop just in this component. Like this:

function MultipleAvatars({ ... secondAvatarStyle: secondAvatarStyleProp, ... }) { ...

Yes I agree, no need for name refactor here

ah, ok then 😃 thanks for clarification

@chrispader changes applied 🙂

chrispader · 2023-11-28T22:42:48Z

src/components/OptionsSelector/BaseOptionsSelector.js

I think we'll have to add the withThemeStylesPropTypes to optionSelectorPropTypes as well as in other components

grgia · 2023-11-29T11:45:08Z

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

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

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

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

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

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

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

koko57 added 10 commits November 22, 2023 12:46

feat: migrate MultipleAvatars

499a416

fix: migrate SelectCircle

dbe88eb

feat: migrate OfflineWithFeedback

d38b9e3

feat: migrate BaseOptionsSelector

c3fa464

feat: migrate optionRowStyles

c8a9777

fix: minor fix for MultipleAvatars, prettier

e610716

feat: migrate Icon

9c09583

Merge branch 'main' into feat/31678-theme-switching-migration-selecti…

b0e476c

…onlist-batch

fix: lint

a5ab9ef

fix: add missing dep

ccf1c26

lukemorawski reviewed Nov 24, 2023

View reviewed changes

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

rezkiy37 reviewed Nov 24, 2023

View reviewed changes

src/components/OptionsSelector/BaseOptionsSelector.js Outdated Show resolved Hide resolved

rezkiy37 reviewed Nov 24, 2023

View reviewed changes

kubabutkiewicz reviewed Nov 24, 2023

View reviewed changes

src/components/MultipleAvatars.tsx Outdated Show resolved Hide resolved

kubabutkiewicz approved these changes Nov 24, 2023

View reviewed changes

rezkiy37 mentioned this pull request Nov 24, 2023

[Theme Switching Migration] Report #31728

Merged

47 tasks

fix: apply requested changes

2ff63d1

rezkiy37 reviewed Nov 24, 2023

View reviewed changes

src/components/OptionsSelector/BaseOptionsSelector.js Outdated Show resolved Hide resolved

rezkiy37 reviewed Nov 24, 2023

View reviewed changes

koko57 added 2 commits November 24, 2023 15:46

fix: apply requested changes

422fb8e

fix: lint

b6ab866

koko57 marked this pull request as ready for review November 24, 2023 15:30

koko57 requested a review from a team as a code owner November 24, 2023 15:30

melvin-bot bot requested review from alitoshmatov and removed request for a team November 24, 2023 15:30

This was referenced Nov 24, 2023

[HOLD for payment 2023-12-07] [Theme Switching Migration] SelectionList Batch #31678

Closed

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

Closed

feat: migrate BaseOnfidoWeb

b6c2a4e

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

fix: revert last commit

744c881

grgia removed the request for review from alitoshmatov November 28, 2023 11:09

fix: resolve conflicts

49c4940

grgia previously approved these changes Nov 28, 2023

View reviewed changes

grgia reviewed Nov 28, 2023

View reviewed changes

chrispader suggested changes Nov 28, 2023

View reviewed changes

chrispader reviewed Nov 28, 2023

View reviewed changes

fix: add missing proptypes

3a3879c

koko57 dismissed grgia’s stale review via 3a3879c November 29, 2023 08:55

koko57 added 2 commits November 29, 2023 11:03

fix: rename a const, add an alias for a style prop

ad2b3b5

fix: run prettier

bd315c8

chrispader approved these changes Nov 29, 2023

View reviewed changes

grgia approved these changes Nov 29, 2023

View reviewed changes

grgia merged commit daceac6 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

koko57 deleted the feat/31678-theme-switching-migration-selectionlist-batch branch January 17, 2024 18:39

Conversation

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

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rezkiy37 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kubabutkiewicz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rezkiy37 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Nov 24, 2023

Uh oh!

alitoshmatov commented Nov 27, 2023

Uh oh!

grgia commented Nov 28, 2023

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

chrispader left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Nov 29, 2023

Uh oh!

OSBotify commented Nov 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

koko57 commented Nov 23, 2023 •

edited

Loading

koko57 commented Nov 24, 2023 •

edited

Loading

chrispader Nov 29, 2023 •

edited

Loading

grgia commented Nov 29, 2023 •

edited

Loading