Fix GBR and RBR show up at the same time in the LHN by hungvu193 · Pull Request #18137 · Expensify/App

hungvu193 · 2023-04-28T09:40:21Z

Details

This PR fixes problem with GBR and RBR show up at the same time in the OptionRowLHN

Fixed Issues

$ #17912
PROPOSAL: #17912 (comment)

Tests

Request money from userA to userB
As userB notice the GBR indicator in the LHN
Perform an action that will result in an error
Verify that only RBR show up

Verify that no errors appear in the JS console

Offline tests

QA Steps

Request money from userA to userB
As userB notice the GBR indicator in the LHN
Perform an action that will result in an error
Verify that only RBR show up

Verify that no errors appear in the JS console

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
- 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-04-28.at.16.21.19.mov

Mobile Web - Chrome

Screen.Recording.2023-04-28.at.16.18.21.mov

Mobile Web - Safari

Screen.Recording.2023-04-28.at.16.25.27.mov

Desktop

Screen.Recording.2023-04-28.at.16.30.11.mov

iOS

Screen.Recording.2023-04-28.at.16.36.23.mov

Android

Screen.Recording.2023-04-28.at.16.39.27.mov

MelvinBot · 2023-04-28T09:40:28Z

@luacmartins @mananjadhav One of you needs to 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]

luacmartins

@hungvu193 can we also address this comment? We also have conflicts now.

hungvu193 · 2023-05-01T12:02:06Z

@luacmartins sure, I updated the PR.

mananjadhav · 2023-05-01T18:25:41Z

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.

Screenshots/Videos

Web

web-one-dot-indicator.mov

Mobile Web - Chrome

mweb-chrome-one-dot-indicator.mov

Mobile Web - Safari

mweb-safari-one-dot-indicator.mov

mweb-safari-lhs-indicator.mov

Desktop

desktop-one-dot-indicator.mov

iOS

ios-one-dot-indicator.mov

ios-lhs-indicator.mov

Android

android-one-dot-indicator.mov

android-lhs-indicator.mov

luacmartins · 2023-05-01T19:01:34Z

@hungvu193 Thanks for addressing my previous comment. As I mentioned before, we are still displaying the pinned icon and according to our new design, the green/red indicator should replace the pinned icon. Could you please address that?

mananjadhav · 2023-05-01T19:16:39Z

@luacmartins Sorry I didn't understand the change. Can you elaborate what we mean by should replace the pinned icon?

The comment mentioned here talks about removing the indicator from between the pin and pencil, but not about replacing?

luacmartins · 2023-05-02T07:26:57Z

My comment comes from the new design doc and the section that introduced this behavior:

When an admin needs to pay a request, a green dot will appear on the expense/IOU report row for them. The report will also remain auto-pinned in the LHN until the report is settled, because they have an action they need to take.
Note: We replace the pin icon with the green dot icon in this case to minimize clutter in the LHN chat row.

luacmartins · 2023-05-02T07:27:18Z

I thought that's what Shawn had mentioned in his comment, but I can see how that was confusing.

hungvu193 · 2023-05-02T07:36:14Z

When an admin needs to pay a request, a green dot will appear on the expense/IOU report row for them. The report will also remain auto-pinned in the LHN until the report is settled, because they have an action they need to take.
Note: We replace the pin icon with the green dot icon in this case to minimize clutter in the LHN chat row.

@luacmartins if we replace the pin icon in LHN when green dot is visible, should we need to replace the pin icon in the header inside LHN? I think it's confused for user when they didn't see the pin icon outside but still saw it inside of LHN.
Also the purpose of this PR was fixing the logic between RBR and GBR, do you think it's out of scope of this PR?

luacmartins · 2023-05-02T08:24:57Z

@hungvu193 I don't think we should change the logic in the header, this should affect the LHN only. I think it's an easy enough change to incorporate in this PR.

hungvu193 · 2023-05-02T08:26:20Z

@luacmartins just to confirm, when the green dot is visible, we also need to hide the pin icon right?

luacmartins · 2023-05-02T08:29:49Z

Yes

hungvu193 · 2023-05-02T08:35:40Z

@luacmartins Cool, I've updated the PR again.

luacmartins · 2023-05-02T09:24:28Z

LGTM!

luacmartins · 2023-05-02T09:24:46Z

@mananjadhav do you wanna review again since we changed some of the logic?

mananjadhav · 2023-05-02T09:32:05Z

@luacmartins I was just reviewing and testing it. I just want to confirm, if we have a RBR, we can always have Pin and Pencil icon right?

I tried accessing the design doc google link, but it says Access denied.

luacmartins · 2023-05-02T09:45:32Z

@mananjadhav yes, that seems to be the expected behavior for RBR.

mananjadhav · 2023-05-02T11:03:31Z

@luacmartins I've updated the new screenshots on the same checklist here. Does that work?

luacmartins · 2023-05-02T11:21:52Z

Yea, that's good. Thank you!

OSBotify · 2023-05-02T11:29:09Z

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

aimane-chnaif · 2023-05-02T12:48:17Z

+                                    height={variables.iconSizeNormal}
+                                    width={variables.iconSizeNormal}
+                                    src={Expensicons.DotIndicator}
+                                    fill={colors.green}


I think themeColors.success is better here.
@hungvu193 is there any reason for replacing with colors.green?

I think that's from previous commit, cc @puneetlath, since I think that's diff from you

Nice catch @aimane-chnaif! We should not import colors directly 😬

I see that we are doing that in multiple places though. I think we should put up a PR to fix that.

Nice catch @aimane-chnaif! We should not import colors directly 😬

Agree, this is important for dark/light theme switch which will be implemented very soon

I think we should create a separate issue for this.

Agree that we should be using success here

Ah weird. I thought I had changed this to success in a previous PR.

OSBotify · 2023-05-03T00:07:35Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.9-12 🚀

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

mountiny · 2023-05-04T07:07:23Z

@mananjadhav @hungvu193 @aimane-chnaif could you please test this in staging just to make sure, I think QA has tested it but forgot to check off the checklist.

aimane-chnaif · 2023-05-04T07:18:28Z

Tests pass on staging

Screen.Recording.2023-05-04.at.8.13.51.AM.mov

One thing I noticed unusual - #18384 but it seems it's new expected behavior

OSBotify · 2023-05-09T04:07:31Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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

hungvu193 requested a review from a team as a code owner April 28, 2023 09:40

melvin-bot Bot requested review from luacmartins and mananjadhav and removed request for a team April 28, 2023 09:40

hungvu193 mentioned this pull request Apr 28, 2023

[PAID] [$1000] GBR and RBR show up at the same time in the LHN #17912

Closed

6 tasks

fix GBR and RBR show up at the same time in the LHN

2660cbe

hungvu193 force-pushed the fix-17912 branch from 5691064 to 2660cbe Compare April 28, 2023 09:46

luacmartins requested changes May 1, 2023

View reviewed changes

sync with main

4d0b22b

mananjadhav previously approved these changes May 1, 2023

View reviewed changes

hide pinned button while LHN has green dot

688ba8e

hungvu193 dismissed mananjadhav’s stale review via 688ba8e May 2, 2023 08:35

luacmartins approved these changes May 2, 2023

View reviewed changes

luacmartins merged commit c9f6606 into Expensify:main May 2, 2023

Prince-Mendiratta mentioned this pull request May 2, 2023

[Icon Size] GBR, RBR & related icon size 20x20 #18242

Merged

57 tasks

aimane-chnaif reviewed May 2, 2023

View reviewed changes

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

marcaaron mentioned this pull request May 3, 2023

Deploy Checklist: New Expensify 2023-05-02 #18322

Closed

59 tasks

hungvu193 mentioned this pull request May 4, 2023

LHN - Pin icon is not displayed in LHN together with Green Dot #18384

Closed

6 tasks

hungvu193 mentioned this pull request Jul 1, 2023

Task - Pin icon is not displayed on LHN for a task #22028

Closed

6 tasks

Pujan92 mentioned this pull request Aug 9, 2023

Chat - Pin icon not showing in IOU chat in LHN #24329

Closed

6 tasks

Uh oh!

Conversation

hungvu193 commented Apr 28, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Apr 28, 2023

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented May 1, 2023

Uh oh!

mananjadhav commented May 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins commented May 1, 2023

Uh oh!

mananjadhav commented May 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

hungvu193 commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

hungvu193 commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

hungvu193 commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

mananjadhav commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023

Uh oh!

mananjadhav commented May 2, 2023

Uh oh!

luacmartins commented May 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OSBotify commented May 2, 2023

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 3, 2023

Uh oh!

mountiny commented May 4, 2023

Uh oh!

aimane-chnaif commented May 4, 2023

Uh oh!

OSBotify commented May 9, 2023

mananjadhav commented May 1, 2023 •

edited

Loading

mananjadhav commented May 1, 2023 •

edited

Loading

luacmartins commented May 2, 2023 •

edited

Loading