Fix the optimistic GBR for chats with money requests #38675

paultsimura · 2024-03-20T13:47:25Z

Details

This PR fixes the optimistic GBR calculation for the chats that have a money request that requires attention.

Fixed Issues

$ #38425
PROPOSAL: #38425 (comment)

Tests

Same as QA

Offline tests

Same as QA

QA Steps

Test 1:

Request money from your own workspace;
Verify the workspace chat has a green dot in LHN;
Open the money request;
Go offline;
Modify the request amount;
Verify the workspace chat still has a green dot in LHN;
Go online;
Verify the workspace chat still has a green dot in LHN;

Test 2:

Pre-requisites:

Be an employee of a Collect workspace with the Scheduled Submit: disabled;
Have no pending money request with the said workspace;

Go offline;
Request money from the said workspace;
Verify the workspace chat has a green dot in LHN;
Go online;
Verify the workspace chat still has a green dot in LHN;

Test 3:

Pre-requisites:

Be an employee of a Collect workspace with the Scheduled Submit: enabled;
Have no pending money request with the said workspace;

Go offline;
Request money from the said workspace;
Verify the workspace chat has no green dot in LHN;
Go online;
Verify the workspace chat still has no green dot in LHN;

Test 4:

Log in as a user A and B on different devices;
Request money from each other so that there is a Money Report with 2 requests, e.g.:
- User A: request $20
- User B: request $10
Do the following operations as the User A:
Verify the chat with B has no green dot in LHN;
Go offline;
Edit your money request amount to $5
Verify the chat with B now has the GBR as you own the money;
Go online and verify the GBR remains
Go offline;
Request money from user B again, so that the total amount requested by you is bigger than that requested from you (e.g. request another $10).
Verify the chat with B now has no GBR as you don't own the money;
Go online and verify the GBR doesn't appear
Go offline;
Remove your last money request so that the total amount requested by you is now smaller than that requested from you.
Verify the chat with B now has the GBR as you own the money again;
Go online and verify the GBR remains

PR Author Checklist

Screenshots/Videos

Android: Native

Android16.27.mp4

Android: mWeb Chrome

chrome16.30.mp4

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-03-16.at.16.25.5416.26.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-03-16.at.16.33.1916.33.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-03-20.at.15.40.0015.42.mp4

Screen.Recording.2024-03-20.at.16.01.2516.02.mp4

Screen.Recording.2024-03-16.at.16.15.3616.16.mp4

MacOS: Desktop

Screen.Recording.2024-03-16.at.16.17.4516.18.mp4

# Conflicts: # src/libs/ReportUtils.ts

melvin-bot · 2024-03-20T15:10:43Z

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

paultsimura · 2024-03-20T15:11:42Z

@mountiny I'm trying to fix the optimistic GBR calculation for different flows as it's been broken recently. Could you please check the Test section and maybe add some flows that I missed?

mountiny · 2024-03-21T12:14:24Z

In general this looks good to me, you could have more tests for once the Draft report is submitted, then approved and paid for example. Then when bank account is missing and needs to be added in order for the employee to be reimbursed. There has been some unit tests for parts of it I believe

mountiny · 2024-03-21T14:40:06Z

@paultsimura one comment for the test2

Are you disabling the delayed submission from newDot or oldDot?

We are in middle of migrating to Instant submit so in Newdot, actually having the Delayed submission off should mean new report is created in Submitted/ Processing state in which case there would be no GBR.

Can you confirm if the autoReportingFrequency is set to Instant for you when you toggle the delayed submission off?

paultsimura · 2024-03-21T22:15:30Z

Are you disabling the delayed submission from newDot or oldDot?

It's from OD:

The autoReportingFrequency is still weekly for the employee. Maybe we should delegate this case of GBR to the authors of the migration as it's a new feature?

mountiny · 2024-03-27T17:01:12Z

Cool ok I think we can handle that edge case later as we are in better spot with the scheduled submit instant

situchan · 2024-03-30T05:01:48Z

Please reassign as I am going on vacation

akinwale · 2024-03-30T06:37:06Z

I am available to review this as C+.

mountiny · 2024-03-31T20:08:24Z

@paultsimura can you please resolve the conflicts? Thank you!

# Conflicts: # src/libs/ReportUtils.ts

paultsimura · 2024-04-01T07:40:11Z

Done, all yours @akinwale ✔️

akinwale · 2024-04-03T05:17:47Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web-38675-1.mp4

web-38675-2.mp4

web-38675-3.mp4

38675-desktop-web.mp4

MacOS: Desktop

38675-desktop-web.mp4

akinwale · 2024-04-03T06:37:45Z

@paultsimura There's an issue with steps 5 through 7 in Test 4. The GBR does not display for user A when offline (starts from around the 0:59 mark in the video).

Screen.Recording.2024-04-03.at.07.33.12.mp4

paultsimura · 2024-04-03T07:16:55Z

@paultsimura There's an issue with steps 5 through 7 in Test 4. The GBR does not display for user A when offline

This is because your requests are in USD while the IOU Report is in NGN. Unfortunately, we do not do the currency conversion and calculation offline.

Please try performing the same test in NGN only:

Screen.Recording.2024-04-03.at.09.15.4309.16.mp4

akinwale

LGTM.

src/libs/ReportUtils.ts

This reverts commit 365429d.

# Conflicts: # src/libs/actions/IOU.ts

hayata-suenaga

🟢 @paultsimura thank you so much for your work

OSBotify · 2024-04-08T11:08:20Z

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.4.61-0 🚀

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

OSBotify · 2024-04-08T13:04:58Z

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.4.61-0 🚀

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

shubham1206agra · 2024-04-09T11:51:24Z

src/libs/ReportUtils.ts

+
+    const policy = getPolicy(iouReport.policyID);
+    const shouldBeManuallySubmitted = PolicyUtils.isPaidGroupPolicy(policy) && !policy?.harvesting?.enabled;
+    if (shouldBeManuallySubmitted || PolicyUtils.isPolicyAdmin(policy)) {


This line is causing problems whenever I am trying to edit anything from Admin side. The collect policy has scheduled submit on.

OSBotify · 2024-04-10T17:22:35Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.61-8 🚀

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

paultsimura added 3 commits March 20, 2024 14:29

Fix the optimistic GBR for chats with money requests

d25a16a

Merge branch 'main' into fix/38425-gbr

cccfbf5

# Conflicts: # src/libs/ReportUtils.ts

Fix the optimistic GBR for chats with money requests

2d3f930

paultsimura marked this pull request as ready for review March 20, 2024 15:10

paultsimura requested a review from a team as a code owner March 20, 2024 15:10

melvin-bot bot requested review from situchan and removed request for a team March 20, 2024 15:10

Merge branch 'main' into fix/38425-gbr

94986b0

mountiny assigned paultsimura Mar 27, 2024

Merge branch 'main' into fix/38425-gbr

f97464a

mountiny requested review from akinwale and removed request for situchan March 31, 2024 19:52

Merge branch 'main' into fix/38425-gbr

7ab913f

# Conflicts: # src/libs/ReportUtils.ts

Merge branch 'main' into fix/38425-gbr

cfda769

akinwale approved these changes Apr 3, 2024

View reviewed changes

melvin-bot bot requested a review from hayata-suenaga April 3, 2024 07:28

hayata-suenaga reviewed Apr 3, 2024

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

Simplify getOptimisticOutstandingChildRequest

365429d

paultsimura requested a review from hayata-suenaga April 3, 2024 17:16

paultsimura added 2 commits April 3, 2024 21:50

Revert "Simplify getOptimisticOutstandingChildRequest"

6d8bb69

This reverts commit 365429d.

Merge branch 'main' into fix/38425-gbr

687c2e0

# Conflicts: # src/libs/actions/IOU.ts

hayata-suenaga approved these changes Apr 4, 2024

View reviewed changes

hayata-suenaga merged commit 8614ce4 into Expensify:main Apr 4, 2024
16 checks passed

github-actions bot mentioned this pull request Apr 8, 2024

Deploy Checklist: New Expensify 2024-04-08 #39807

Closed

kbecciv mentioned this pull request Apr 8, 2024

Web - IOU -GBR stays on LHN of wrong user until user navigates to expense report #39858

Closed

6 tasks

shubham1206agra reviewed Apr 9, 2024

View reviewed changes

izarutskaya mentioned this pull request Apr 9, 2024

[HOLD for payment 2024-04-25] Expense - GBR appears briefly in LHN when Schedule submit is enabled and admin requests money #39923

Closed

6 tasks

paultsimura mentioned this pull request Apr 11, 2024

Web - Workspace - IOU moves in the LHN every time the merchant is changed #38425

Closed

6 tasks

This was referenced Apr 12, 2024

Deploy Checklist: New Expensify 2024-04-08 #39807 Derevyaa/Expensify-App#1

Closed

Deploy Checklist: New Expensify 2024-04-09 #39808 Derevyaa/Expensify-App#2

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the optimistic GBR for chats with money requests #38675

Fix the optimistic GBR for chats with money requests #38675

paultsimura commented Mar 20, 2024 •

edited

Loading

melvin-bot bot commented Mar 20, 2024

paultsimura commented Mar 20, 2024

mountiny commented Mar 21, 2024

mountiny commented Mar 21, 2024

paultsimura commented Mar 21, 2024

mountiny commented Mar 27, 2024

situchan commented Mar 30, 2024

akinwale commented Mar 30, 2024

mountiny commented Mar 31, 2024

paultsimura commented Apr 1, 2024

akinwale commented Apr 3, 2024 •

edited

Loading

akinwale commented Apr 3, 2024 •

edited

Loading

paultsimura commented Apr 3, 2024

akinwale left a comment

hayata-suenaga left a comment

OSBotify commented Apr 8, 2024

OSBotify commented Apr 8, 2024

shubham1206agra Apr 9, 2024

OSBotify commented Apr 10, 2024

Fix the optimistic GBR for chats with money requests #38675

Fix the optimistic GBR for chats with money requests #38675

Conversation

paultsimura commented Mar 20, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

Test 1:

Test 2:

Test 3:

Test 4:

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 20, 2024

paultsimura commented Mar 20, 2024

mountiny commented Mar 21, 2024

mountiny commented Mar 21, 2024

paultsimura commented Mar 21, 2024

mountiny commented Mar 27, 2024

situchan commented Mar 30, 2024

akinwale commented Mar 30, 2024

mountiny commented Mar 31, 2024

paultsimura commented Apr 1, 2024

akinwale commented Apr 3, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

akinwale commented Apr 3, 2024 • edited Loading

paultsimura commented Apr 3, 2024

akinwale left a comment

Choose a reason for hiding this comment

hayata-suenaga left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 8, 2024

OSBotify commented Apr 8, 2024

shubham1206agra Apr 9, 2024

Choose a reason for hiding this comment

OSBotify commented Apr 10, 2024

paultsimura commented Mar 20, 2024 •

edited

Loading

akinwale commented Apr 3, 2024 •

edited

Loading

akinwale commented Apr 3, 2024 •

edited

Loading