Only update IOU total when network is online and the request currency matches the IOUReport's #12488

youssef-lr · 2022-11-04T23:17:23Z

Details

This PR prevents any updates to be made to the IOU total when the user requests money while offline and the IOU request currency is different from the IOU report currency. Once connection is restored the IOU gets updated correctly.

Fixed Issues

$ #12433

Tests

While being online, request money in USD from another user.
Turn off your connection, request money using a different currency.
Make sure the amount total in USD remains the same.
Turn on your connection, make sure the amount is updated properly (e.g. the amount you requested offline was converted to USD and added to the total.)

QA Steps

Test requesting money

While being online, request money in USD from another user.
Turn off your connection, request money using a different currency.
Make sure the amount total in USD remains the same.
Turn on your connection, make sure the amount is updated properly (e.g. the amount you requested offline was converted to USD and added to the total.)

Test cancelling money request

Send a money request in USD while being online, e.g. $100.
Send a second money request in a different currency, e.g. 100 AED. The total should now be converted to USD.
Go offline, cancel the request in AED: the total amount should not change here.
Go online. Make sure the total is updated correctly: cancelled amount in AED is converted to USD and subtracted from the report total.

PR Author Checklist

PR Reviewer Checklist

The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed

Screenshots

Web

offline_iou_web.mov

Mobile Web - Chrome

sr.-.android.-.chrome.mov

Mobile Web - Safari

RPReplay_Final1668386838.mov

Desktop

sr.desktop.mov

iOS

RPReplay_Final1668361307.MP4

Android

sr.-.android.-.native.mov

rushatgabhane · 2022-11-07T09:58:27Z

Additionally, if the iouReport has requests in different currencies and the user is offline, we should disable the Pay button cc @youssef-lr since you are working on the Pay IOU flow refactors.

The second point of expected result in #12433 says that the pay IOU should be disabled.

@youssef-lr Is that gonna be done in a seperate PR?

youssef-lr · 2022-11-07T10:11:47Z

@rushatgabhane I will implement it in this PR.

rushatgabhane · 2022-11-07T10:12:24Z

sweet!

Justicea83 · 2022-11-07T10:40: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:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

2022-11-07_10-30-34.mp4

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

Justicea83

Tested well and code LGTM!

src/libs/IOUUtils.js

luacmartins · 2022-11-07T16:33:36Z

src/libs/actions/IOU.js

@@ -65,6 +65,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com
            iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${chatReport.iouReportID}`],
            recipientEmail,
            amount,
+            currency,


There are more usages of IOUUtils.updateIOUOwnerAndTotal. We'll need to update those too, e.g.

App/src/libs/actions/IOU.js

Lines 340 to 344 in 2820c72

oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(

existingIOUReport,

currentUserEmail,

splitAmount,

);

and

App/src/libs/actions/IOU.js

Line 572 in 2820c72

const updatedIOUReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, currentUserEmail, amount, type);

This is in createSplitsAndOnyxData, do you think it should have the same behavior?

Yes, we still add the money request to the individual IOU report with each user.

src/libs/IOUUtils.js

rushatgabhane · 2022-11-08T20:22:13Z

@youssef-lr please ping me whenever you've pushed changes to disable the pay button. Thanks! 🙇‍♂️

youssef-lr · 2022-11-08T21:36:42Z

@rushatgabhane disabling the Pay button will be implemented in an upcoming refactor I'm working on, so it won't be included in this PR.

youssef-lr · 2022-11-08T21:51:58Z

Updated! Working on screen recordings and updating test steps.

luacmartins

I won't be able to test this since I'm going ooo today until Nov 22, but changes LGTM! Thanks for fixing this!

rushatgabhane · 2022-11-08T22:32:29Z

code looks good, testing after the shiny new test steps arrive ✨

Justicea83

LGTM!

rushatgabhane · 2022-11-11T10:54:30Z

Updated! Working on screen recordings and updating test steps

@youssef-lr please ping me when you've updated the tests, thanks!

youssef-lr · 2022-11-13T16:42:34Z

@rushatgabhane updated! Sorry for the delay I had some issues in my dev environment.

rushatgabhane

@youssef-lr thank you, we're good to merge :)

Web

Screen.Recording.2022-11-15.at.9.10.50.PM.mov

Screen.Recording.2022-11-15.at.9.15.45.PM.mov

mWeb

Screen.Recording.2022-11-15.at.9.18.40.PM.mov

Screen.Recording.2022-11-15.at.9.25.53.PM.mov

iOS

Screen.Recording.2022-11-15.at.9.39.49.PM.mov

Android

WhatsApp.Video.2022-11-15.at.22.40.52.mp4

Desktop

Screen.Recording.2022-11-15.at.9.45.18.PM.mov

PR Reviewer Checklist

youssef-lr · 2022-11-15T18:39:30Z

Thanks @rushatgabhane!

melvin-bot · 2022-11-15T18:39:56Z

@youssef-lr looks like this was merged without the checklist test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

youssef-lr · 2022-11-15T18:40:11Z

PR Author checklist is complete Melvin.

OSBotify · 2022-11-15T18:45:12Z

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

OSBotify · 2022-11-15T21:58:08Z

🚀 Deployed to staging by @youssef-lr in version: 1.2.28-0 🚀

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

OSBotify · 2022-11-15T23:40:08Z

🚀 Deployed to staging by @youssef-lr in version: 1.2.28-0 🚀

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

OSBotify · 2022-11-17T07:37:10Z

🚀 Deployed to production by @roryabraham in version: 1.2.28-2 🚀

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

mountiny · 2022-11-17T19:28:55Z

src/libs/IOUUtils.js

 * @param {String} type
 * @returns {Object}
 */
-function updateIOUOwnerAndTotal(iouReport, actorEmail, amount, type = CONST.IOU.REPORT_ACTION_TYPE.CREATE) {
+function updateIOUOwnerAndTotal(iouReport, actorEmail, amount, currency, type = CONST.IOU.REPORT_ACTION_TYPE.CREATE) {
+    if (currency !== iouReport.currency && isNetworkOffline) {


I don't think this should be only if the user is offline. If I request money in different currency even when being online, I will create optimistic report which will change the total locally to wrong number before this will be fetched from the server to the correct amount.

@mountiny that makes sense to me

Yeah i think this could end up with the flickering issues.

cc @youssef-lr maybe something we should address in the related issues

mountiny · 2023-01-05T13:37:51Z

heads-up: I think from this PR we have noticed an issue which we havent spotted here #12792 where the IOU preview was flashing if we cancelled a request with different currency.

Only update IOU total when network is online

dd1e9a8

youssef-lr requested a review from a team as a code owner November 4, 2022 23:17

youssef-lr self-assigned this Nov 4, 2022

melvin-bot bot requested review from Justicea83 and rushatgabhane and removed request for a team November 4, 2022 23:17

luacmartins self-requested a review November 5, 2022 00:15

youssef-lr changed the title ~~Only update IOU total when network is online~~ [WIP] Only update IOU total when network is online Nov 7, 2022

Justicea83 previously approved these changes Nov 7, 2022

View reviewed changes

luacmartins changed the title ~~[WIP] Only update IOU total when network is online~~ Only update IOU total when network is online Nov 7, 2022

luacmartins requested changes Nov 7, 2022

View reviewed changes

Apply requested changes

37529ff

youssef-lr dismissed Justicea83’s stale review via 37529ff November 8, 2022 21:36

youssef-lr added 2 commits November 8, 2022 22:39

Merge branch 'main' into youssef_offline_iou_total

b864a7d

Only update IOU if cancelled request has same currency as the report

f735cdc

luacmartins approved these changes Nov 8, 2022

View reviewed changes

youssef-lr changed the title ~~Only update IOU total when network is online~~ Only update IOU total when network is online and the request currency matches the IOUReport's Nov 8, 2022

Justicea83 approved these changes Nov 9, 2022

View reviewed changes

rushatgabhane approved these changes Nov 15, 2022

View reviewed changes

youssef-lr merged commit 7658abd into main Nov 15, 2022

youssef-lr deleted the youssef_offline_iou_total branch November 15, 2022 18:39

melvin-bot bot added the Emergency label Nov 15, 2022

youssef-lr removed the Emergency label Nov 15, 2022

OSBotify mentioned this pull request Nov 15, 2022

Deploy Checklist: New Expensify 2022-11-15 #12753

Closed

31 tasks

mountiny reviewed Nov 17, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only update IOU total when network is online and the request currency matches the IOUReport's #12488

Only update IOU total when network is online and the request currency matches the IOUReport's #12488

youssef-lr commented Nov 4, 2022 •

edited

Loading

rushatgabhane commented Nov 7, 2022 •

edited

Loading

youssef-lr commented Nov 7, 2022

rushatgabhane commented Nov 7, 2022

Justicea83 commented Nov 7, 2022 •

edited

Loading

Justicea83 left a comment

luacmartins Nov 7, 2022

youssef-lr Nov 8, 2022

luacmartins Nov 8, 2022

rushatgabhane commented Nov 8, 2022

youssef-lr commented Nov 8, 2022

youssef-lr commented Nov 8, 2022

luacmartins left a comment

rushatgabhane commented Nov 8, 2022 •

edited

Loading

Justicea83 left a comment

rushatgabhane commented Nov 11, 2022

youssef-lr commented Nov 13, 2022

rushatgabhane left a comment •

edited

Loading

youssef-lr commented Nov 15, 2022

melvin-bot bot commented Nov 15, 2022

youssef-lr commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 17, 2022

mountiny Nov 17, 2022

rushatgabhane Nov 18, 2022

mountiny Nov 18, 2022

mountiny commented Jan 5, 2023

	oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(
	existingIOUReport,
	currentUserEmail,
	splitAmount,
	);

Only update IOU total when network is online and the request currency matches the IOUReport's #12488

Only update IOU total when network is online and the request currency matches the IOUReport's #12488

Conversation

youssef-lr commented Nov 4, 2022 • edited Loading

Details

Fixed Issues

Tests

QA Steps

Test requesting money

Test cancelling money request

PR Author Checklist

PR Reviewer Checklist

Screenshots

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

rushatgabhane commented Nov 7, 2022 • edited Loading

youssef-lr commented Nov 7, 2022

rushatgabhane commented Nov 7, 2022

Justicea83 commented Nov 7, 2022 • edited Loading

Reviewer Checklist

Screenshots/Videos

Justicea83 left a comment

Choose a reason for hiding this comment

luacmartins Nov 7, 2022

Choose a reason for hiding this comment

youssef-lr Nov 8, 2022

Choose a reason for hiding this comment

luacmartins Nov 8, 2022

Choose a reason for hiding this comment

rushatgabhane commented Nov 8, 2022

youssef-lr commented Nov 8, 2022

youssef-lr commented Nov 8, 2022

luacmartins left a comment

Choose a reason for hiding this comment

rushatgabhane commented Nov 8, 2022 • edited Loading

Justicea83 left a comment

Choose a reason for hiding this comment

rushatgabhane commented Nov 11, 2022

youssef-lr commented Nov 13, 2022

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

PR Reviewer Checklist

youssef-lr commented Nov 15, 2022

melvin-bot bot commented Nov 15, 2022

youssef-lr commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 15, 2022

OSBotify commented Nov 17, 2022

mountiny Nov 17, 2022

Choose a reason for hiding this comment

rushatgabhane Nov 18, 2022

Choose a reason for hiding this comment

mountiny Nov 18, 2022

Choose a reason for hiding this comment

mountiny commented Jan 5, 2023

youssef-lr commented Nov 4, 2022 •

edited

Loading

rushatgabhane commented Nov 7, 2022 •

edited

Loading

Justicea83 commented Nov 7, 2022 •

edited

Loading

rushatgabhane commented Nov 8, 2022 •

edited

Loading

rushatgabhane left a comment •

edited

Loading