Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass displayed amount to the backend when paying a money request #36904

Merged
merged 5 commits into from
Mar 6, 2024

Conversation

Gonals
Copy link
Contributor

@Gonals Gonals commented Feb 20, 2024

Details

Fixed Issues

$ #36440
PROPOSAL:

Tests

  1. User A invites User B to Free workspace
  2. User B submits an expense
  3. User A goes offline
  4. User A taps ‘Pay’ on the original expense
  5. User B edits the expense amount OR adds an additional expense while User A is offline
  6. User A comes back online
  7. Confirm the money request is not paid and User A sees an error message:
Screenshot 2024-02-20 at 4 33 38 PM
  • Verify that no errors appear in the JS console

Offline tests

Included above

QA Steps

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 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed 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 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 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.js 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 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@Gonals Gonals self-assigned this Feb 20, 2024
@Gonals Gonals requested a review from a team as a code owner February 20, 2024 15:10
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team February 20, 2024 15:10
Copy link

melvin-bot bot commented Feb 20, 2024

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

@mananjadhav
Copy link
Collaborator

Code change looks good, I'll have it tested today.

@Gonals
Copy link
Contributor Author

Gonals commented Feb 23, 2024

@mananjadhav bump! 😁

@mananjadhav
Copy link
Collaborator

Will check this in an hour.

@hungvu193
Copy link
Contributor

if this is urgent then I can take it, otherwise I leave it to you @mananjadhav

@mananjadhav
Copy link
Collaborator

mananjadhav commented Feb 26, 2024

Thanks @hungvu193. I am on this right now, it'll be done in 1-2 hours.

@hungvu193
Copy link
Contributor

I am on this right now, it'll be done in 1-2 hours.

all yours 😄

@mananjadhav
Copy link
Collaborator

@Gonals I tried a few times, but I didn't get expected behavior that shows the error. Here are two of my tests . Can you confirm if I am missing out something?

  1. with the same steps - in this the updated amount shows up and the payout request is pending.
same-steps.mp4
  1. slightly altered test steps (interchange step 4 and 5) - In this scenario the edited amount went through.
altered-steps.mp4

@Gonals
Copy link
Contributor Author

Gonals commented Feb 26, 2024

@Gonals I tried a few times, but I didn't get expected behavior that shows the error. Here are two of my tests . Can you confirm if I am missing out something?

  1. with the same steps - in this the updated amount shows up and the payout request is pending.

same-steps.mp4
2. slightly altered test steps (interchange step 4 and 5) - In this scenario the edited amount went through.

altered-steps.mp4

Hmmm. The only thing I can think of is that the "Going offline" might not fully mimic being offline. Try:

User A invites User B to Free workspace
User B submits an expense
User A goes offline - Fully disconnect from your wifi
User A taps ‘Pay’ on the original expense
Close the navigator for User A
Go back online
User B adds an additional expense while User A is offline
User A comes back online
Confirm the money request is not paid and User A sees an error message:

@mananjadhav
Copy link
Collaborator

Okay and swapping the steps 4 and 5 also shouldn’t have any impact right ?

@mananjadhav
Copy link
Collaborator

@Gonals I tried with full offline too.

offline-test_UfrPkZqA.mp4

@Gonals
Copy link
Contributor Author

Gonals commented Feb 28, 2024

@Gonals I tried with full offline too.

offline-test_UfrPkZqA.mp4

Weird. I'll take another look tomorrow

@Gonals
Copy link
Contributor Author

Gonals commented Mar 4, 2024

Finally got to this. It seems it broke when merging conflicts. It should work now:
Screenshot 2024-03-04 at 4 21 29 PM

@mananjadhav
Copy link
Collaborator

Thanks for resolving. I'll take a look at this again.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Mar 4, 2024

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-offline-amount-change
Android: mWeb Chrome mweb-chrome-offline-amount-change
iOS: Native ios-offline-amount-change
iOS: mWeb Safari mweb-safari-offline-amount-change
MacOS: Chrome / Safari web-offline-amount-change
MacOS: Desktop desktop-offline-amount-change

@Gonals I am assuming because this error is from the backend, we won't have any translation for this one now?

@melvin-bot melvin-bot bot requested a review from blimpich March 4, 2024 19:18
Copy link

melvin-bot bot commented Mar 4, 2024

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

@mananjadhav
Copy link
Collaborator

@Gonals I am assuming because this error is from the backend, we won't have any translation for this one now?

@Gonals @blimpich Making sure you check this before we merge the PR.

@blimpich
Copy link
Contributor

blimpich commented Mar 4, 2024

@mananjadhav can you update your checklist? The check is failing with this error:

You completed 50 out of 57 checklist items with 7 unfinished items
Make sure you are using the most up to date checklist found here: https://raw.githubusercontent.com/Expensify/App/main/contributingGuides/REVIEWER_CHECKLIST.md

@blimpich
Copy link
Contributor

blimpich commented Mar 4, 2024

@Gonals can you address @mananjadhav's question about whether we need a translation for the error message? Otherwise I think we're good to merge ✅

@mananjadhav
Copy link
Collaborator

@blimpich I've completed the whole checklist. Can you please retrigger the action?

@Gonals
Copy link
Contributor Author

Gonals commented Mar 6, 2024

@Gonals I am assuming because this error is from the backend, we won't have any translation for this one now?

@Gonals @blimpich Making sure you check this before we merge the PR.

Correct

@blimpich blimpich merged commit 50a1fd3 into main Mar 6, 2024
16 checks passed
@blimpich blimpich deleted the alberto-passAmount branch March 6, 2024 17:32
@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 2024

✋ 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
Copy link
Contributor

OSBotify commented Mar 6, 2024

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.48-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 7, 2024

🚀 Deployed to production by https://github.com/roryabraham in version: 1.4.48-0 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants