FIX: Implement pattern C for money reports with various currencies #35062

BartoszGrajdek · 2024-01-24T14:46:35Z

Details

While working on #31345 I have noticed that when money report contains money requests with currencies different than default currency of the money report itself the app cannot handle calculations like getting a total amount while the user is offline. Because of that after a discussion on Slack with Expensify team it was decided that for now we want to implement pattern C whenever there's a money request sent with a different currency.

Fixed Issues

N/A (Details above)

Tests

Send a couple of money requests with different currencies to a workspace, or just normal IOU
Make sure that the total amount on the money report is displayed & calculated properly
Check if you can pay for the money report from parent chat window (the settlement button in top right corner should be enabled)
Check if you can pay for the money report from the money report chat itself (the settlement button in top right corner should be enabled)

Offline tests

Send a money request (you can do this part offline as well as online) if you're sending it to a workspace try sending it using the default currency set for that workspace
Go offline
Open up the newly created money report
Check if you can still pay for that money report & the total amount is displayed with full opacity - the button should be enabled, you don't need to go through the process of payment, if you do then afterwards please go back online and repeat steps 1. & 2.
Now send a request using a different currency
Check if the total amount in the money report summary is set to opacity = 0.5
Check if the button in top right corner has been disabled (it should be)
Make sure to go back into the parent chat, where the money report preview can be seen, the settlement button should be disabled as well
Go back online and after all API requests has been sent check if you can now pay the money report

QA Steps

Online

Send a couple of money requests with different currencies to a workspace, or just normal IOU
Make sure that the total amount on the money report is displayed & calculated properly
Check if you can pay for the money report from parent chat window (the settlement button in top right corner should be enabled)
Check if you can pay for the money report from the money report chat itself (the settlement button in top right corner should be enabled)

Offline

Send a money request (you can do this part offline as well as online) if you're sending it to a workspace try sending it using the default currency set for that workspace
Go offline
Open up the newly created money report
Check if you can still pay for that money report & the total amount is displayed with full opacity - the button should be enabled, you don't need to go through the process of payment, if you do then afterwards please go back online and repeat steps 1. & 2.
Now send a request using a different currency
Check if the total amount in the money report summary is set to opacity = 0.5
Check if the button in top right corner has been disabled (it should be)
Make sure to go back into the parent chat, where the money report preview can be seen, the settlement button should be disabled as well
Go back online and after all API requests has been sent check if you can now pay the money report

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

chrome.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

safari.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

…-fix

melvin-bot · 2024-01-29T20:45:53Z

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

johnmlee101 · 2024-01-30T20:45:56Z

Adding @allroundexperts to help review this and do the checklist

allroundexperts · 2024-01-30T20:47:11Z

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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

Screen.Recording.2024-01-31.at.3.12.06.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-01-31.at.3.00.57.AM.mov

iOS: Native

Screen.Recording.2024-01-31.at.2.58.37.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-01-31.at.2.51.03.AM.mov

MacOS: Chrome / Safari

https://github.com/Expensify/App/assets/30054992/595fa564-2f9a-4d91-9a84-1018a1ad49de
https://github.com/Expensify/App/assets/30054992/b61aa5e0-5983-4d39-b086-179170c7a6f0

MacOS: Desktop

Screen.Recording.2024-01-31.at.2.46.34.AM.mov

allroundexperts

Works good!

melvin-bot · 2024-01-30T22:36:39Z

🎯 @allroundexperts, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #35441.

allroundexperts · 2024-01-31T12:54:36Z

Forgot to post this previously, but I think the following is not related to this PR. @BartoszGrajdek Can you please confirm before merging?

pecanoro · 2024-01-31T15:05:55Z

src/libs/ReportUtils.ts

+    }
+
+    const transactions = TransactionUtils.getAllReportTransactions(report.reportID);
+


Suggested change

johnmlee101 · 2024-01-31T18:30:17Z

Forgot to post this previously, but I think the following is not related to this PR. @BartoszGrajdek Can you please confirm before merging?

Let's confirm this before I approve 😄

BartoszGrajdek · 2024-02-01T12:53:33Z

I think that's not something related to this PR, but I'll check it today to make sure 🫡

johnmlee101 · 2024-02-02T21:55:38Z

Any update @BartoszGrajdek ?

BartoszGrajdek · 2024-02-04T14:02:02Z

I don't get an error like the one you've sent, so maybe it got fixed after merging the main? @allroundexperts let me know if you can still see it. I would like to wait for the main to get fixed first though, because it seems like there are some problems there

…-fix

BartoszGrajdek · 2024-02-05T11:22:11Z

Alright, I've checked to make sure and all the errors I'm getting are the same as on the main branch. The one you've sent @allroundexperts seems to have disappeared to it most likely got fixed. cc @johnmlee101

OSBotify · 2024-02-05T17:18:53Z

✋ 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 · 2024-02-05T23:09:22Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 1.4.36-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-02-05T23:31:07Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 1.4.36-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-02-07T09:51:31Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.37-7 🚀

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

BartoszGrajdek added 4 commits January 24, 2024 12:08

feat: add offline handling for money reports with various currencies

61d6fcf

fix: change the way settlement button on ReportPreview is handled

aa34234

fix: remove console logs

8705023

Merge remote-tracking branch 'origin/main' into money-report-currency…

5e0340d

…-fix

BartoszGrajdek marked this pull request as ready for review January 29, 2024 20:45

BartoszGrajdek requested a review from a team as a code owner January 29, 2024 20:45

melvin-bot bot requested review from johnmlee101 and removed request for a team January 29, 2024 20:45

chore: resolve merge conflicts

0b72325

johnmlee101 requested a review from allroundexperts January 30, 2024 20:45

allroundexperts approved these changes Jan 30, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Jan 30, 2024

Payment issue for E/App PR#35062 #35441

Closed

pecanoro reviewed Jan 31, 2024

View reviewed changes

BartoszGrajdek added 2 commits February 3, 2024 21:21

chore: resolve merge conflicts

ba4dbb4

fix: remove empty line

53dcfc1

Merge remote-tracking branch 'origin/main' into money-report-currency…

7121f1f

…-fix

johnmlee101 approved these changes Feb 5, 2024

View reviewed changes

johnmlee101 merged commit 43d1576 into Expensify:main Feb 5, 2024
15 checks passed

github-actions bot mentioned this pull request Feb 5, 2024

Deploy Checklist: New Expensify 2024-02-05 #35857

Closed

66 tasks

tienifr mentioned this pull request Feb 6, 2024

[$500] Expense - "Pay with Expensify" button is grayed out briefly after requesting money #35894

Closed

6 tasks

bernhardoj mentioned this pull request Mar 19, 2024

[HOLD for payment 2024-04-25] [LOW] [Splits] [$500] Android - IOU - Error returning online after paying request in different currency created offline #38578

Closed

6 tasks

rayane-djouah mentioned this pull request May 8, 2024

[$250] Android - Scan - Pay elsewhere greyed on submitting expense with currency other than local #41445

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIX: Implement pattern C for money reports with various currencies #35062

FIX: Implement pattern C for money reports with various currencies #35062

BartoszGrajdek commented Jan 24, 2024 •

edited

melvin-bot bot commented Jan 29, 2024

johnmlee101 commented Jan 30, 2024

allroundexperts commented Jan 30, 2024 •

edited

allroundexperts left a comment

melvin-bot bot commented Jan 30, 2024

allroundexperts commented Jan 31, 2024

pecanoro Jan 31, 2024

johnmlee101 Jan 31, 2024

johnmlee101 commented Jan 31, 2024

BartoszGrajdek commented Feb 1, 2024

johnmlee101 commented Feb 2, 2024

BartoszGrajdek commented Feb 4, 2024 •

edited

BartoszGrajdek commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 7, 2024

		}

		const transactions = TransactionUtils.getAllReportTransactions(report.reportID);

FIX: Implement pattern C for money reports with various currencies #35062

FIX: Implement pattern C for money reports with various currencies #35062

Conversation

BartoszGrajdek commented Jan 24, 2024 • edited

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 29, 2024

johnmlee101 commented Jan 30, 2024

allroundexperts commented Jan 30, 2024 • edited

Reviewer Checklist

Screenshots/Videos

allroundexperts left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jan 30, 2024

allroundexperts commented Jan 31, 2024

pecanoro Jan 31, 2024

Choose a reason for hiding this comment

johnmlee101 Jan 31, 2024

Choose a reason for hiding this comment

johnmlee101 commented Jan 31, 2024

BartoszGrajdek commented Feb 1, 2024

johnmlee101 commented Feb 2, 2024

BartoszGrajdek commented Feb 4, 2024 • edited

BartoszGrajdek commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 5, 2024

OSBotify commented Feb 7, 2024

BartoszGrajdek commented Jan 24, 2024 •

edited

allroundexperts commented Jan 30, 2024 •

edited

BartoszGrajdek commented Feb 4, 2024 •

edited