Display the message for last requests with foreign currency that are created in offline mode #34011

dukenv0307 · 2024-01-05T09:18:52Z

Details

Fixed Issues

$ #33073
PROPOSAL: #33073 (comment)

Tests

Go to staging.new.expensify.com.
Go offline
3.Click FAB > Request money > Manual.
Request money from a user that has no existing chat.
In 1:1 DM, click + > Request money.
Create another manual request in a different currency.
Click on the IOU preview.
Verify that: "Total will update when you're back online" will appear on the last IOU request with foreign currency.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to staging.new.expensify.com.
Go offline
3.Click FAB > Request money > Manual.
Request money from a user that has no existing chat.
In 1:1 DM, click + > Request money.
Create another manual request in a different currency.
Click on the IOU preview.
Verify that: "Total will update when you're back online" will appear on the last IOU request with foreign currency.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-01-05T09:22:43Z

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

cubuspl42 · 2024-01-05T12:11:41Z

I started a discussion on Slack, as this is a slight change of a user-observable behavior. I think it's a minor one, so we should be good, but it's better to confirm it.

cubuspl42 · 2024-01-10T13:56:24Z

No replies; let's just move forward. This is an edge case.

cubuspl42 · 2024-01-10T13:56:50Z

Please merge main, while I'll proceed with the testing

dukenv0307 · 2024-01-10T14:11:15Z

Updated.

cubuspl42 · 2024-01-11T11:37:08Z

Hey, I'm sorry, but I think we'll have to pivot. The solution works different form what I understood earlier.

I thought that we'll display the "Total will update..." under each entry which isn't included in the total. That made sense to me.

In practice, we also display the mentioned message under entires which are included in the total.

Screen.Recording.2024-01-11.at.12.31.09.mov

I might've misunderstood "to display the message for all requests with foreign currency that are created in offline mode". I thought that it means all non-PLN requests (in my example).

dukenv0307 · 2024-01-15T07:02:37Z

@cubuspl42 Updated.

cubuspl42 · 2024-01-15T09:41:56Z

@cubuspl42 Updated.

Thank you for your update. Please note that very short responses make me unsure whether we're on the same page. The vast majority of the questions I ask on PRs are not rhetorical, i.e., I actually expect an answer. I'd prefer to know whether I misunderstood a detail in the proposal, or if I got it right, but the implementation had a bug that made the code not equivalent to the original idea.

cubuspl42 · 2024-01-15T09:46:51Z

src/components/ReportActionItem/MoneyRequestAction.js

-    ) {
-        shouldShowPendingConversionMessage = IOUUtils.isIOUReportPendingCurrencyConversion(iouReport);
+    if (!_.isEmpty(iouReport) && !_.isEmpty(reportActions) && chatReport.iouReportID && action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && network.isOffline) {
+        shouldShowPendingConversionMessage = IOUUtils.isTransactionPendingCurrencyConversion(iouReport, (action && action.originalMessage && action.originalMessage.IOUTransactionID) || 0);


Commenting on || 0...

The relevant function argument is typed: transactionID: string

So I think that either the argument type or the passed value is not correct

dukenv0307 · 2024-01-15T16:02:45Z

I might've misunderstood "to display the message for all requests with foreign currency that are created in offline mode". I thought that it means all non-PLN requests (in my example).

I think that is good to only display the pending message for the transaction with foreign currency. Actually, isIOUReportPendingCurrencyConversion function will return true if at least one request in offline has foreign currency. So I will updated it to check for each transaction.

cubuspl42 · 2024-01-16T13:12:57Z

I'm sorry about the back-and-forth, but I'd like to confirm one thing.

I never had strong opinions about this issue. I just want a simple fix with reasonable behavior.

In your proposal, you sketched two options:

Pass the correct chatReportID here [...]
Use useMemo here [...]

...or...

we can remove this check here to display the message for all requests with foreign currency that are created in offline mode

Option 2 sounded like a cool idea that is very easy to implement and has resonable behavior.

I suggested "cool, let's go with option 2 then", as I thought that we're gonna remove one check and fix the issue this way.

At this point, it doesn't seem like it was removing one expression.

What is your perspective on pivoting back to Option 1? Do I understand correctly, that it would be less invasive, both in the user-perceived behavior and the amount of modified code?

This reverts commit ea5c3a2.

This reverts commit 43c38ba.

This reverts commit 9647635.

This reverts commit ad03aca.

cubuspl42 · 2024-01-19T08:12:36Z

What is your perspective on pivoting back to Option 1? Do I understand correctly, that it would be less invasive, both in the user-perceived behavior and the amount of modified code?

Again, this wasn't a rhetorical question! 🙂 I always want to know the Contributor's perspective on my suggestions. If they disagree, it can go both ways: either I accept their perspective or insist if I believe that it's necessary.

cubuspl42 · 2024-01-19T08:17:40Z

@dukenv0307

About the commit message: I'm 90% sure that this one won't do any harm (as it's missing the #), but I would just recommend against any PR/commit descriptions involving "Fix {issue_id}". In this case, it could be whatever else, even "Fix issue with foreign currencies".

For now, you can leave it as is, but let's have this in mind.

dukenv0307 · 2024-01-19T09:41:20Z

About the commit message: I'm 90% sure that this one won't do any harm (as it's missing the #), but I would just recommend against any PR/commit descriptions involving "Fix {issue_id}". In this case, it could be whatever else, even "Fix issue with foreign currencies".

Sorry about this problem, I will pay attention in the next commit

dukenv0307 · 2024-01-19T09:48:04Z

Again, this wasn't a rhetorical question! 🙂 I always want to know the Contributor's perspective on my suggestions. If they disagree, it can go both ways: either I accept their perspective or insist if I believe that it's necessary.

@cubuspl42 I agree with the decision to return to option 1. It would be less invasive and less amount of modified code.

I changed the code according to option 1, please check again.

cubuspl42 · 2024-01-19T10:06:55Z

Please change the PR title

cubuspl42 · 2024-01-19T10:28:21Z

In the Tests let's specify that the message should appear on the last entry. We pivoted our approach, it's not good that the tests still "pass".

cubuspl42 · 2024-01-19T10:45:43Z

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

Android: mWeb Chrome

total-update-2-android-web-compressed.mp4

iOS: Native

total-update-2-ios-compressed.mp4

iOS: mWeb Safari

total-update-2-ios-web-compressed.mp4

MacOS: Chrome / Safari

total-update-2-web-converted.mp4

MacOS: Desktop

arosiclair · 2024-01-19T15:24:22Z

src/pages/home/report/ReportActionItem.js

@@ -346,7 +346,7 @@ function ReportActionItem(props) {
            const iouReportID = originalMessage.IOUReportID ? originalMessage.IOUReportID.toString() : '0';
            children = (
                <MoneyRequestAction
-                    chatReportID={props.report.reportID}
+                    chatReportID={originalMessage.IOUReportID ? props.report.chatReportID : props.report.reportID}


Can you just add a comment explaining this check so the next person knows why we needed to do this?

Added a comment.

Please ensure that this is in proper English. You can use freely available tools like ChatGPT 3.

Try this

If originalMessage.iouReportID is set, this is a 1:1 money request in a DM chat whose reportID is props.report.chatReportID

I updated the comment.

arosiclair · 2024-01-23T15:37:37Z

Unrelated error in the performance test. I re-ran it hopefully it passes now.

cubuspl42 · 2024-01-24T09:16:08Z

@arosiclair Checks passing 👍

OSBotify · 2024-01-24T17:00:01Z

✋ 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-01-25T09:06:40Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 1.4.32-0 🚀

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

OSBotify · 2024-01-29T19:06:25Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.32-5 🚀

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

dukenv0307 added 2 commits January 5, 2024 15:39

fix: 33073

ad03aca

remove most recent iou report action id

9647635

dukenv0307 marked this pull request as ready for review January 5, 2024 09:22

dukenv0307 requested a review from a team as a code owner January 5, 2024 09:22

melvin-bot bot requested review from cubuspl42 and removed request for a team January 5, 2024 09:22

Merge branch 'main' into fix/33073

ca811b3

dukenv0307 added 2 commits January 15, 2024 13:40

Merge branch 'main' into fix/33073

3b548b4

only display pending message for foreign currency transaction

43c38ba

cubuspl42 reviewed Jan 15, 2024

View reviewed changes

fallback string instead of number

ea5c3a2

dukenv0307 added 5 commits January 19, 2024 14:41

Merge branch 'main' into fix/33073

6f3693e

Revert "fallback string instead of number"

bd4d978

This reverts commit ea5c3a2.

Revert "only display pending message for foreign currency transaction"

4cfb299

This reverts commit 43c38ba.

Revert "remove most recent iou report action id"

db3e96c

This reverts commit 9647635.

Revert "fix: 33073"

86a4108

This reverts commit ad03aca.

fix 33073

7fcdc58

cubuspl42 approved these changes Jan 19, 2024

View reviewed changes

melvin-bot bot requested a review from arosiclair January 19, 2024 10:45

dukenv0307 changed the title ~~Display the message for all requests with foreign currency that are created in offline mode~~ Display the message for last requests with foreign currency that are created in offline mode Jan 19, 2024

arosiclair requested changes Jan 19, 2024

View reviewed changes

dukenv0307 added 2 commits January 19, 2024 22:43

add comment

3bd5950

edit comment

e16d282

arosiclair approved these changes Jan 23, 2024

View reviewed changes

aimane-chnaif mentioned this pull request Jan 23, 2024

Extract gesture logic from MultiGestureCanvas to hooks and improve code #33756

Merged

50 tasks

arosiclair merged commit 60e72d0 into Expensify:main Jan 24, 2024
16 checks passed

github-actions bot mentioned this pull request Jan 25, 2024

Deploy Checklist: New Expensify 2024-01-25 #35138

Closed

48 tasks

This was referenced Jan 25, 2024

[$500] IOU - Total amount is not updated when change the different currency IOU in offline #35209

Closed

[$500] IOU - New green line appears when delete second IOU #35211

Closed

bernhardoj mentioned this pull request Jan 26, 2024

[HOLD for payment 2024-02-07] [$500] IOU - Options missing from context menu when long tap IOU report #35244

Closed

6 tasks

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

[HOLD for payment 2024-02-05] [$500] IOU - "Total will update when you're back online" is missing on IOU request with foreign currency #33073

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display the message for last requests with foreign currency that are created in offline mode #34011

Display the message for last requests with foreign currency that are created in offline mode #34011

dukenv0307 commented Jan 5, 2024 •

edited

Loading

melvin-bot bot commented Jan 5, 2024

cubuspl42 commented Jan 5, 2024

cubuspl42 commented Jan 10, 2024

cubuspl42 commented Jan 10, 2024

dukenv0307 commented Jan 10, 2024

cubuspl42 commented Jan 11, 2024

dukenv0307 commented Jan 15, 2024

cubuspl42 commented Jan 15, 2024

cubuspl42 Jan 15, 2024

dukenv0307 commented Jan 15, 2024

cubuspl42 commented Jan 16, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

dukenv0307 commented Jan 19, 2024

dukenv0307 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

arosiclair Jan 19, 2024

dukenv0307 Jan 19, 2024

cubuspl42 Jan 22, 2024

arosiclair Jan 22, 2024

dukenv0307 Jan 23, 2024

arosiclair commented Jan 23, 2024

cubuspl42 commented Jan 24, 2024

OSBotify commented Jan 24, 2024

OSBotify commented Jan 25, 2024

OSBotify commented Jan 29, 2024

Display the message for last requests with foreign currency that are created in offline mode #34011

Display the message for last requests with foreign currency that are created in offline mode #34011

Conversation

dukenv0307 commented Jan 5, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 5, 2024

cubuspl42 commented Jan 5, 2024

cubuspl42 commented Jan 10, 2024

cubuspl42 commented Jan 10, 2024

dukenv0307 commented Jan 10, 2024

cubuspl42 commented Jan 11, 2024

dukenv0307 commented Jan 15, 2024

cubuspl42 commented Jan 15, 2024

cubuspl42 Jan 15, 2024

Choose a reason for hiding this comment

dukenv0307 commented Jan 15, 2024

cubuspl42 commented Jan 16, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

dukenv0307 commented Jan 19, 2024

dukenv0307 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

cubuspl42 commented Jan 19, 2024

Reviewer Checklist

Screenshots/Videos

arosiclair Jan 19, 2024

Choose a reason for hiding this comment

dukenv0307 Jan 19, 2024

Choose a reason for hiding this comment

cubuspl42 Jan 22, 2024

Choose a reason for hiding this comment

arosiclair Jan 22, 2024

Choose a reason for hiding this comment

dukenv0307 Jan 23, 2024

Choose a reason for hiding this comment

arosiclair commented Jan 23, 2024

cubuspl42 commented Jan 24, 2024

OSBotify commented Jan 24, 2024

OSBotify commented Jan 25, 2024

OSBotify commented Jan 29, 2024

dukenv0307 commented Jan 5, 2024 •

edited

Loading