fix: reverting the amount and currency after error clearance. #55102

Tony-MK · 2025-01-10T22:46:33Z

Explanation of Change

After the error message is cleared, change the transaction amount and currency to the values used to pay.

Fixed Issues

$ #54471
PROPOSAL: #54471 (comment)

Tests

Create an expense from user A to user B.
Edit the amount of the expense.
Pay the expense from user B.
Click to save.
Check that an error has appeared.
Close the error.
Confirm that the amount has changed back to the paid amount.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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 is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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.ts or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

Android.-.Native.webm

Android: mWeb Chrome

Android.-.mWeb.webm

iOS: Native

iOS.-.Native.mp4

iOS: mWeb Safari

iOS.-.Safari.mp4

MacOS: Chrome / Safari

macOS.-.Chrome.mov

MacOS: Desktop

macOS.-.Desktop.mov

…dimissed

melvin-bot · 2025-01-10T22:46:38Z

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

hungvu193 · 2025-01-12T15:35:13Z

Can you address the linting? @Tony-MK

hungvu193 · 2025-01-13T07:15:32Z

Do you think we also should to revert the amount when we clicked the above error?

Screen.Recording.2025-01-13.at.14.14.30.mov

Tony-MK · 2025-01-13T12:04:10Z

Can you address the linting? @Tony-MK

@hungvu193, Seems like the linting issue is not due to my changes but because of rulesdir/no-default-id-values.

You can read this slack thread for more info.

hungvu193 · 2025-01-13T12:11:44Z

Can you address the linting? @Tony-MK

@hungvu193, Seems like the linting issue is not due to my changes but because of rulesdir/no-default-id-values.

You can read this slack thread for more info.

I know that. But I think you mentioned wrong slack thread. Anyway, we still need to address the linting

hungvu193 · 2025-01-13T12:12:03Z

Do you think we also should to revert the amount when we clicked the above error?

Screen.Recording.2025-01-13.at.14.14.30.mov

How about this one?

Tony-MK · 2025-01-13T12:44:34Z

Can you address the linting? @Tony-MK

@hungvu193, Seems like the linting issue is not due to my changes but because of rulesdir/no-default-id-values.
You can read this slack thread for more info.

I know that. But I think you mentioned wrong slack thread. Anyway, we still need to address the lining

I just wanted to point out the two first lines.

Note

Hey team, please read this section thoroughly and ensure you follow it in the PRs you write/review.
The main purpose of this eslint change was to ensure we gradually start handling missing IDs properly.

Yeah, we can address the lining, but won't it cause merge conflicts with other PRs trying to fix the same lint issue?

Do you think we also should to revert the amount when we clicked the above error?

How about this one?

Frankly, I also don't know about this one.

I have considered it and would like your opinion because I originally thought it was only the last error.

What do you think?

hungvu193 · 2025-01-14T08:35:02Z

Yeah, we can address the lining, but won't it cause merge conflicts with other PRs trying to fix the same lint issue?

No worries, I think that's simple change so it won't be a problem.

Frankly, I also don't know about this one.

I have considered it and would like your opinion because I originally thought it was only the last error.

Yep. Agree.

hungvu193 · 2025-01-14T09:39:31Z

Regarding this comment from mkzie2 I don't think I can reproduce the bug that he mentioned. Can you confirm? @Tony-MK. ty

src/pages/home/report/PureReportActionItem.tsx

Tony-MK · 2025-01-15T12:49:03Z

Regarding this comment from mkzie2 I don't think I can reproduce the bug that he mentioned. Can you confirm? @Tony-MK. ty

I also could not reproduce it after attempting a couple of times.

hungvu193 · 2025-01-15T13:20:37Z

Cool. Ty

hungvu193 · 2025-01-16T07:39:15Z

Can you fix lint again 😄 ?

hungvu193 · 2025-01-18T17:18:42Z

lint is still failing..

Tony-MK · 2025-01-18T19:35:36Z

Hey @hungvu193, I have edited MoneyRequestView to pass the lint, but PureReportActionItem is the only file left. I think we should allow it since it's long, hence it has a lot of functions to change. Considering some variables are named exactly as the function name, it becomes tiresome. Also, the last commit on PureReportActionItem didn't pass the lint because of one specific rule. If it's a must, can we do it in a separate PR?

hungvu193 · 2025-01-20T02:10:22Z

Considering some variables are named exactly as the function name, it

with the function/variable that have the same name, you can change its alias like this:

import {functionName as functionNameUtil} from '..'

you can reference here:
https://expensify.slack.com/archives/C01GTK53T8Q/p1736838528732529

hungvu193 · 2025-01-20T02:15:40Z

Please keep in mind that we can't merge the PR without all the check passing, we will always need to address the lint anyway.

Tony-MK · 2025-01-20T04:19:02Z

Okay, on it. It should be done by the end of the day.

hungvu193 · 2025-01-22T08:25:48Z

Thanks for the updates @Tony-MK and your effort on the lint fixes. I appreciate it 🙇

hungvu193 · 2025-01-22T08:26:07Z

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.mov

Android: mWeb Chrome

mChrome.mov

iOS: Native

IOS.mov

iOS: mWeb Safari

mSafari.mov

MacOS: Chrome / Safari

Chrome.mov

MacOS: Desktop

DEsk.mov

OSBotify · 2025-01-22T20:29:24Z

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

github-actions · 2025-01-23T18:27:47Z

🚀 Deployed to staging by https://github.com/tylerkaraszewski in version: 9.0.89-0 🚀

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

github-actions · 2025-01-28T01:51:11Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.89-8 🚀

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

fix: changing the transaction amount and currency after the error is …

bdf6e35

…dimissed

Tony-MK requested a review from a team as a code owner January 10, 2025 22:46

melvin-bot bot requested review from hungvu193 and removed request for a team January 10, 2025 22:46

Tony-MK mentioned this pull request Jan 10, 2025

[HOLD for payment 2025-02-04] [$250] Expense - Edited amount for a paid request does not revert to paid amount when dismiss the error #54471

Closed

8 tasks

Tony-MK added 2 commits January 10, 2025 23:55

prettier

1d71117

typecheck...

04d54df

Merge branch 'Expensify:main' into fix/54471

ca37da6

hungvu193 reviewed Jan 14, 2025

View reviewed changes

src/pages/home/report/PureReportActionItem.tsx Outdated Show resolved Hide resolved

Merge branch 'Expensify:main' into fix/54471

35bacea

Tony-MK mentioned this pull request Jan 15, 2025

[No QA] Applying changes to searchParser.peggy #55284

Merged

50 tasks

Tony-MK added 2 commits January 15, 2025 19:04

PureReportActionItem.tsx ...

acbd01e

Update Transaction.ts

aeff354

Tony-MK force-pushed the fix/54471 branch from a00a9cc to aeff354 Compare January 15, 2025 16:20

Tony-MK added 4 commits January 15, 2025 19:22

handling errors in MoneyRequestView.ts...

21bda1e

prettier...

4f6aa62

lint..

462e71f

Merge branch 'main' into fix/54471

a7d8b3f

Tony-MK added 2 commits January 18, 2025 20:58

Merge branch 'main' into fix/54471

8b645c1

lint: MoneyRequestView..

c28c08a

Tony-MK added 7 commits January 20, 2025 19:13

Merge branch 'Expensify:main' into fix/54471

9488811

lint: ReportActionUtils - PureReportActionItem.tsx

f86baaa

lint: ReportUtils - PureReportActionItem.tsx

72cf04e

lint: Rest of the other modules in PureReportActionItem.tsx

a9b9d32

fixing Permissions lint error

211524c

lint: EmojiPickerAction module on PureReportActionItem.tsx

1b5c26a

Merge branch 'Expensify:main' into fix/54471

85693a0

hungvu193 approved these changes Jan 22, 2025

View reviewed changes

melvin-bot bot requested a review from tylerkaraszewski January 22, 2025 08:26

tylerkaraszewski approved these changes Jan 22, 2025

View reviewed changes

tylerkaraszewski merged commit e60725e into Expensify:main Jan 22, 2025
17 checks passed

github-actions bot mentioned this pull request Jan 23, 2025

Deploy Checklist: New Expensify 2025-01-23 #55657

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: reverting the amount and currency after error clearance. #55102

fix: reverting the amount and currency after error clearance. #55102

Tony-MK commented Jan 10, 2025

melvin-bot bot commented Jan 10, 2025

hungvu193 commented Jan 12, 2025

hungvu193 commented Jan 13, 2025

Tony-MK commented Jan 13, 2025

hungvu193 commented Jan 13, 2025

hungvu193 commented Jan 13, 2025

Tony-MK commented Jan 13, 2025

hungvu193 commented Jan 14, 2025

hungvu193 commented Jan 14, 2025

Tony-MK commented Jan 15, 2025

hungvu193 commented Jan 15, 2025

hungvu193 commented Jan 16, 2025

hungvu193 commented Jan 18, 2025

Tony-MK commented Jan 18, 2025

hungvu193 commented Jan 20, 2025 •

edited

Loading

hungvu193 commented Jan 20, 2025

Tony-MK commented Jan 20, 2025

hungvu193 commented Jan 22, 2025

hungvu193 commented Jan 22, 2025

OSBotify commented Jan 22, 2025

github-actions bot commented Jan 23, 2025

github-actions bot commented Jan 28, 2025

fix: reverting the amount and currency after error clearance. #55102

fix: reverting the amount and currency after error clearance. #55102

Conversation

Tony-MK commented Jan 10, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 10, 2025

hungvu193 commented Jan 12, 2025

hungvu193 commented Jan 13, 2025

Tony-MK commented Jan 13, 2025

hungvu193 commented Jan 13, 2025

hungvu193 commented Jan 13, 2025

Tony-MK commented Jan 13, 2025

hungvu193 commented Jan 14, 2025

hungvu193 commented Jan 14, 2025

Tony-MK commented Jan 15, 2025

hungvu193 commented Jan 15, 2025

hungvu193 commented Jan 16, 2025

hungvu193 commented Jan 18, 2025

Tony-MK commented Jan 18, 2025

hungvu193 commented Jan 20, 2025 • edited Loading

hungvu193 commented Jan 20, 2025

Tony-MK commented Jan 20, 2025

hungvu193 commented Jan 22, 2025

hungvu193 commented Jan 22, 2025

Reviewer Checklist

Screenshots/Videos

OSBotify commented Jan 22, 2025

github-actions bot commented Jan 23, 2025

github-actions bot commented Jan 28, 2025

hungvu193 commented Jan 20, 2025 •

edited

Loading