[Fix]: Optimistic message not set correctly with the `BE` message for approver who is not the admin #42389

allgandalf · 2024-05-20T10:45:25Z

Details

When an approver(Who is not the owner) approves the Expense , he is show wrong optimistic message Waiting for you to pay these expenses, in this PR we fix this by matching the this with the BE message No further Action Needed.

Fixed Issues

$ #41081
PROPOSAL: #41081 (comment)

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Cannot be reproduced offline as we need to submit an expense to another user

QA Steps

Precondition:

Collect Workspace has Workflows option enabled.
In Workflows, Add Approvals option on and another user who is not the admin/owner is set as the approver.

Collect workspace has another user as approver.

This precondition is important for testing so make sure this is set correctly.

Open App
[Admin] Go to workspace chat with another user as the approver.
[Admin] Create an expense and submit the report.
[Approver] Go to transaction thread.
[Approver] Click Approve button.
Verify that the message No further Action required! appears

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2024-05-20.at.4.33.57.PM.mov

MacOS: Desktop

Screen.Recording.2024-05-20.at.5.05.05.PM.mov

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-05-22.at.6.11.05.PM.mov

iOS: Native

Screen.Recording.2024-05-20.at.4.57.52.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-05-20.at.5.00.12.PM.mov

melvin-bot · 2024-05-20T10:45:31Z

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

allgandalf · 2024-05-20T15:07:49Z

Were you able to build android @eh2077 ?, i am getting the following error

eh2077 · 2024-05-21T13:49:57Z

@GandalfGwaihir My client build works well. Can you try npm ci and build it again

allgandalf · 2024-05-21T13:51:12Z

Yeah cool, i will try today, in the meantime you can review this PR, it’s complete technicality 🫡🤝

eh2077 · 2024-05-21T15:38:31Z

Code looks good 👍 I'll update checklist tmr as it's EOD for me

eh2077 · 2024-05-22T17:28:19Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

0-android.mp4

Android: mWeb Chrome

0-mobile-chrome.mp4

iOS: Native

0-ios.mp4

iOS: mWeb Safari

0-mobile-safari.mp4

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

0-web.mp4

yuwenmemon

I guess these don't need translations because they're reflecting copy coming from the back end. It would be nice to have this as a comment somewhere in the file, NAB.

allgandalf · 2024-05-27T17:39:33Z

@yuwenmemon, are you waiting on the comments to be added?

eh2077 · 2024-05-28T15:43:54Z

@GandalfGwaihir There're conflicts need to be resolved.

allgandalf · 2024-05-29T06:06:53Z

this is sad, it seems we had duplicate issues for the same bug @eh2077, #41081 this was our issue and then another issue was opened after it #41614, now the other PR got merged yesterday and hence we have merge conflict, because at the time of this comment, there was not conflict 😢

What are the next steps here? @yuwenmemon, also tagging BZ @muttmuure

eh2077 · 2024-05-29T08:58:10Z

@GandalfGwaihir Can you help to check if the issue is fixed? If yes, I think we'll just close this PR.

allgandalf · 2024-05-29T13:33:28Z

AFK until midnight IST, will update here soon.

…

On Wed, May 29, 2024 at 2:28 PM Eric Han ***@***.***> wrote: @GandalfGwaihir <https://github.com/GandalfGwaihir> Can you help to check if the issue is fixed? If yes, I think we'll just close this PR. — Reply to this email directly, view it on GitHub <#42389 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/A2LMYIH62KWUAM7FFG4F6NTZEWKDRAVCNFSM6AAAAABH7PQ2LWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDCMZWHEYDAMRXGA> . You are receiving this because you were mentioned.Message ID: ***@***.***>

yuwenmemon · 2024-05-29T16:35:07Z

@GandalfGwaihir Can you help to check if the issue is fixed? If yes, I think we'll just close this PR.

Agreed to close if that's the case. We had the merge freeze on so did not merge this last week.

allgandalf · 2024-05-30T23:48:52Z

Sorry this kind of fell through the cracks will test and update today itself!

allgandalf · 2024-05-31T09:47:58Z

From my testing on production, the issue seems to be resolved :)

Screen.Recording.2024-05-31.at.3.16.37.PM.mov

What are the next steps here?

yuwenmemon · 2024-05-31T21:48:37Z

Let's close this out then. We'll still pay for the fix cc @muttmuure (https://stackoverflowteams.com/c/expensify/questions/8719)

Change optimistic message to match BE

cd81ce6

allgandalf requested a review from a team as a code owner May 20, 2024 10:45

melvin-bot bot requested review from eh2077 and removed request for a team May 20, 2024 10:45

Update unit test for another owner

f5622ed

eh2077 approved these changes May 22, 2024

View reviewed changes

melvin-bot bot requested a review from yuwenmemon May 22, 2024 17:31

yuwenmemon approved these changes May 23, 2024

View reviewed changes

allgandalf mentioned this pull request May 29, 2024

[$250] Approve - "Waiting for you to pay" message appears briefly for approver after approving report #41081

Closed

6 tasks

yuwenmemon closed this May 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fix]: Optimistic message not set correctly with the `BE` message for approver who is not the admin #42389

[Fix]: Optimistic message not set correctly with the `BE` message for approver who is not the admin #42389

allgandalf commented May 20, 2024 •

edited

Loading

melvin-bot bot commented May 20, 2024

allgandalf commented May 20, 2024

eh2077 commented May 21, 2024

allgandalf commented May 21, 2024

eh2077 commented May 21, 2024

eh2077 commented May 22, 2024 •

edited

Loading

yuwenmemon left a comment

allgandalf commented May 27, 2024

eh2077 commented May 28, 2024

allgandalf commented May 29, 2024

eh2077 commented May 29, 2024

allgandalf commented May 29, 2024 via email

yuwenmemon commented May 29, 2024

allgandalf commented May 30, 2024

allgandalf commented May 31, 2024

yuwenmemon commented May 31, 2024

[Fix]: Optimistic message not set correctly with the BE message for approver who is not the admin #42389

[Fix]: Optimistic message not set correctly with the BE message for approver who is not the admin #42389

Conversation

allgandalf commented May 20, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 20, 2024

allgandalf commented May 20, 2024

eh2077 commented May 21, 2024

allgandalf commented May 21, 2024

eh2077 commented May 21, 2024

eh2077 commented May 22, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

yuwenmemon left a comment

Choose a reason for hiding this comment

allgandalf commented May 27, 2024

eh2077 commented May 28, 2024

allgandalf commented May 29, 2024

eh2077 commented May 29, 2024

allgandalf commented May 29, 2024 via email

yuwenmemon commented May 29, 2024

allgandalf commented May 30, 2024

allgandalf commented May 31, 2024

yuwenmemon commented May 31, 2024

[Fix]: Optimistic message not set correctly with the `BE` message for approver who is not the admin #42389

[Fix]: Optimistic message not set correctly with the `BE` message for approver who is not the admin #42389

allgandalf commented May 20, 2024 •

edited

Loading

eh2077 commented May 22, 2024 •

edited

Loading