[CP Staging] Fix regression #23189 #23240

hannojg · 2023-07-20T06:25:51Z

Details

Fixed Issues

$ #23189
PROPOSAL: #23189 (comment)

Tests

Verify that no errors appear in the JS console
1. Open a new account
1. Click on FAB > new workspace > Rename the workspace
1. Do step 2 again and notice the announce room vs the admin room avatars are changing

Offline tests

QA Steps

n/a

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Screen.Recording.2023-07-20.at.10.35.23.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-07-20T08:36:47Z

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

melvin-bot · 2023-07-20T09:14:04Z

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

fedirjh

Code looks good , let one small comment.

src/libs/SidebarUtils.js

src/libs/ReportUtils.js

Co-authored-by: Fedi Rajhi <[email protected]>

…pensify-app-fork into fix/23189-regression-of-21022

fedirjh · 2023-07-20T11:23:20Z

Screenshots/Videos

Web

Web.mp4

Mobile Web - Chrome

Chrome.mp4

Mobile Web - Safari

Safari.mp4

Desktop

Desktop.mp4

iOS

IOs.mp4

Android

Android.mp4

fedirjh · 2023-07-20T11:28:32Z

@hannojg We have a warning caused by this line when gsd mode is enabled, CONST.OPTION_MODE doesn’t have 'gsd' string,

App/src/pages/home/sidebar/SidebarLinks.js

Line 59 in 82fd2f9

priorityMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),

fedirjh · 2023-07-20T11:29:37Z

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 / Chrome
- iOS / native
- iOS / 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 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.

hannojg · 2023-07-20T11:35:00Z

@fedirjh I am double checking!

hannojg · 2023-07-20T11:36:15Z

Fixed it @fedirjh can you please double check?

fedirjh · 2023-07-20T11:44:54Z

@hannojg We have a lint failure

fedirjh

Code looks good and tests well, should be ready to merge once lint is fixed.

hannojg · 2023-07-20T12:06:36Z

Ehm the lint failure is super weird, no clue, I think something went wrong on the CI system. Will ask @mountiny to restart it!

…sion-of-21022

hannojg · 2023-07-20T12:08:32Z

Oh, it seemed to have been a failure, now fixed on main. I merged main, I think we are good now!

dummy-1111 · 2023-07-20T12:19:43Z

src/libs/ReportUtils.js

 * @returns {Object}
 */
-function getWorkspaceIcon(report) {
-    const workspaceName = getPolicyName(report);
+function getWorkspaceIcon(report, policy = undefined) {


I think policy = undefined has no meaning. We can safely remove the default value because default value is undefined in JS

while its true, we found in other places that its more expressive. It conveys the meaning, that you don't have to set policy.
See similar cases here: https://github.com/Expensify/App/pull/23206/files#r1268753442

App/.github/libs/ActionUtils.js

Line 28 in 450573e

function getStringInput(name, options, defaultValue = undefined) {

mountiny · 2023-07-20T12:20:05Z

src/pages/home/sidebar/SidebarLinks.js

@@ -56,7 +56,7 @@ const propTypes = {

    currentUserPersonalDetails: personalDetailsPropType,

-    priorityMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
+    priorityMode: PropTypes.oneOf(_.values(CONST.PRIORITY_MODE)),


Why is this changed?

It was causing a warning, please check #23240 (comment)

well, the onyx value we read is the priority mode, it has been wrong in the first place to check for OPTION_MODE, which is not what we are working with (we changed it to PRIORITY_MODE)

dummy-1111 · 2023-07-20T12:21:15Z

@mountiny @fedirjh

May I leave my thoughts here?

dummy-1111 · 2023-07-20T12:29:45Z

@hannojg

#23189 (comment)

src/components/LHNOptionsList/OptionRowLHNData.js

mountiny

Lets Thanks!

OSBotify · 2023-07-20T13:13:36Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

[CP Staging] Fix regression #23189 (cherry picked from commit 45c4def)

OSBotify · 2023-07-20T13:35:23Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.43-3 🚀

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

OSBotify · 2023-07-22T00:18:47Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.43-7 🚀

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

OSBotify · 2023-07-25T01:45:12Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.45-0 🚀

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

OSBotify · 2023-07-26T15:54:43Z

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

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

wip: add policy as dependency to function

5521d4b

hannojg mentioned this pull request Jul 20, 2023

[HOLD for payment 2023-08-01] [HOLD for payment 2023-07-28] Web - Workspace avatar is not updating after renaming #23189

Closed

6 tasks

hannojg added 2 commits July 20, 2023 08:40

revert changes on OptionsListUtils

77801b4

pass param correctly

41051a4

mountiny assigned hannojg Jul 20, 2023

mountiny changed the title ~~[WIP] Fix regression #23189~~ [CP Staging] [WIP] Fix regression #23189 Jul 20, 2023

hannojg changed the title ~~[CP Staging] [WIP] Fix regression #23189~~ [CP Staging] Fix regression #23189 Jul 20, 2023

hannojg marked this pull request as ready for review July 20, 2023 08:36

hannojg requested a review from a team as a code owner July 20, 2023 08:36

melvin-bot bot requested review from fedirjh and removed request for a team July 20, 2023 08:36

add comment

66d74ae

mountiny requested a review from a team July 20, 2023 09:14

melvin-bot bot removed the request for review from a team July 20, 2023 09:14

fedirjh suggested changes Jul 20, 2023

View reviewed changes

src/libs/SidebarUtils.js Outdated Show resolved Hide resolved

fedirjh reviewed Jul 20, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

fedirjh reviewed Jul 20, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

hannojg and others added 4 commits July 20, 2023 12:49

Update src/libs/SidebarUtils.js

2b6f5cd

Co-authored-by: Fedi Rajhi <[email protected]>

remove from getReportPreviewMessage

fd7ff20

Merge branch 'fix/23189-regression-of-21022' of github.com:margelo/ex…

2a5d4e2

…pensify-app-fork into fix/23189-regression-of-21022

remove from getRootReportAndWorkspaceName

44ccbd6

fix priority mode warning

9cd441b

fedirjh approved these changes Jul 20, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny July 20, 2023 11:54

Merge branch 'main' of github.com:Expensify/App into fix/23189-regres…

c6f8e6e

…sion-of-21022

dummy-1111 reviewed Jul 20, 2023

View reviewed changes

mountiny reviewed Jul 20, 2023

View reviewed changes

dummy-1111 reviewed Jul 20, 2023

View reviewed changes

src/components/LHNOptionsList/OptionRowLHNData.js Show resolved Hide resolved

mountiny previously approved these changes Jul 20, 2023

View reviewed changes

fixed wrong prop type

ad3ce9b

hannojg dismissed mountiny’s stale review via ad3ce9b July 20, 2023 12:55

mountiny approved these changes Jul 20, 2023

View reviewed changes

mountiny merged commit 45c4def into Expensify:main Jul 20, 2023

OSBotify pushed a commit that referenced this pull request Jul 20, 2023

Merge pull request #23240 from margelo/fix/23189-regression-of-21022

808b271

[CP Staging] Fix regression #23189 (cherry picked from commit 45c4def)

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

OSBotify mentioned this pull request Jul 25, 2023

Deploy Checklist: New Expensify 2023-07-25 #23522

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix regression #23189 #23240

[CP Staging] Fix regression #23189 #23240

hannojg commented Jul 20, 2023 •

edited

Loading

melvin-bot bot commented Jul 20, 2023

melvin-bot bot commented Jul 20, 2023

fedirjh left a comment

fedirjh commented Jul 20, 2023

fedirjh commented Jul 20, 2023

fedirjh commented Jul 20, 2023

hannojg commented Jul 20, 2023

hannojg commented Jul 20, 2023

fedirjh commented Jul 20, 2023

fedirjh left a comment

hannojg commented Jul 20, 2023

hannojg commented Jul 20, 2023

dummy-1111 Jul 20, 2023

hannojg Jul 20, 2023

mountiny Jul 20, 2023

fedirjh Jul 20, 2023

hannojg Jul 20, 2023 •

edited

Loading

mountiny Jul 20, 2023

dummy-1111 commented Jul 20, 2023 •

edited

Loading

dummy-1111 commented Jul 20, 2023

mountiny left a comment

OSBotify commented Jul 20, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

[CP Staging] Fix regression #23189 #23240

[CP Staging] Fix regression #23189 #23240

Conversation

hannojg commented Jul 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 20, 2023

melvin-bot bot commented Jul 20, 2023

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh commented Jul 20, 2023

Screenshots/Videos

fedirjh commented Jul 20, 2023

fedirjh commented Jul 20, 2023

Reviewer Checklist

hannojg commented Jul 20, 2023

hannojg commented Jul 20, 2023

fedirjh commented Jul 20, 2023

fedirjh left a comment

Choose a reason for hiding this comment

hannojg commented Jul 20, 2023

hannojg commented Jul 20, 2023

dummy-1111 Jul 20, 2023

Choose a reason for hiding this comment

hannojg Jul 20, 2023

Choose a reason for hiding this comment

mountiny Jul 20, 2023

Choose a reason for hiding this comment

fedirjh Jul 20, 2023

Choose a reason for hiding this comment

hannojg Jul 20, 2023 • edited Loading

Choose a reason for hiding this comment

mountiny Jul 20, 2023

Choose a reason for hiding this comment

dummy-1111 commented Jul 20, 2023 • edited Loading

dummy-1111 commented Jul 20, 2023

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 20, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

hannojg commented Jul 20, 2023 •

edited

Loading

hannojg Jul 20, 2023 •

edited

Loading

dummy-1111 commented Jul 20, 2023 •

edited

Loading