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

Create Cancel Payment command (again) #33836

Merged
merged 23 commits into from
Jan 15, 2024
Merged

Create Cancel Payment command (again) #33836

merged 23 commits into from
Jan 15, 2024

Conversation

Gonals
Copy link
Contributor

@Gonals Gonals commented Jan 2, 2024

This unreverts #32674 with a couple of changes to fix the issues found during QA

Details

Fixed Issues

$ #32426
$ #32427
$ #33517
$ #33509
$ #33507
PROPOSAL:

Tests

Pay elsewhere

  1. From an account (account A) create a new workspace and invite account B to it.
  2. Log into account B and request money from the new workspace.
  3. Log back into account A and Pay the money request. Select "Pay elsewhere" It should end up like this:
Screenshot 2023-12-13 at 5 22 55 PM
  1. Confirm you now see the 3dot menu on the top right. Click on it:
Screenshot 2023-12-13 at 5 23 42 PM
  1. Select the cancel payment option. A modl should appear. Confirm the cancellation:
Screenshot 2023-12-13 at 5 23 49 PM
  1. The payment should now be cancelled and you should see a message indicating so. You should now be able to pay again (and you can repeat this process a bunch of times):
Screenshot 2023-12-13 at 5 25 16 PM

Pay with expensify

  • Make sure your admin has a valid withdrawal bank account, and your user a valid deposit one

  • Repeat the previous flow, but using "Pay with Expensify" instead of "Pay elsewhere"

  • Confirm it basically behaves the same way

  • Verify that no errors appear in the JS console

Offline tests

Same as tests, but offline

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 Jan 2, 2024
@Gonals Gonals requested a review from a team as a code owner January 2, 2024 13:53
@melvin-bot melvin-bot bot requested review from Ollyws and removed request for a team January 2, 2024 13:53
Copy link

melvin-bot bot commented Jan 2, 2024

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

@Gonals Gonals changed the title Create Cancel Payment command (again) [HOLD] Create Cancel Payment command (again) Jan 2, 2024
@Gonals Gonals changed the title [HOLD] Create Cancel Payment command (again) Create Cancel Payment command (again) Jan 5, 2024
@Gonals
Copy link
Contributor Author

Gonals commented Jan 5, 2024

OFF HOLD!

@Gonals
Copy link
Contributor Author

Gonals commented Jan 10, 2024

Bump @Ollyws!

@Ollyws
Copy link
Contributor

Ollyws commented Jan 10, 2024

Apologies for the delay, will review this now.

@Ollyws
Copy link
Contributor

Ollyws commented Jan 10, 2024

Cancel payment in the three dots menu isn't translated into Spanish:
Screenshot 2024-01-10 at 15 32 48

@rlinoz
Copy link
Contributor

rlinoz commented Jan 12, 2024

Code looks good!

Just let me confirm how things should behave

Going back and forth with canceling/paying updates previous messages(look at pic2), should that happen?
Screenshot 2024-01-12 at 11 05 47

Cancelling the payment changes the message to look like the admins requested money from the user, which is not what is in your screenshot, I am running latest Web-E and Auth main, maybe something changed?
Screenshot 2024-01-12 at 11 05 56

When I refresh the page the message You marked this report as reimbursed appears and the Canceled tag disappears:
Screenshot 2024-01-12 at 11 06 27

Let me know if I can help!

@Gonals
Copy link
Contributor Author

Gonals commented Jan 12, 2024

Going back and forth with canceling/paying updates previous messages(look at pic2), should that happen?
Yep. Maybe we can discuss some polishing down the line, but, for now, tht's the plan.

Cancelling the payment changes the message to look like the admins requested money from the user, which is not what is in your screenshot, I am running latest Web-E and Auth main, maybe something changed?

Hmm. This does seem to be missing something. I'll take a look

When I refresh the page the message You marked this report as reimbursed appears and the Canceled tag disappears:

This seems wrong too, but it might need a backend fix. Checking it out

@Gonals
Copy link
Contributor Author

Gonals commented Jan 12, 2024

@rlinoz, seems like someone had messed up the money request action messages. Should be fixed now!

@rlinoz
Copy link
Contributor

rlinoz commented Jan 12, 2024

The messages are correct now, but still flip when you change the status, checking the onyx responses it doesn't seem like backend, but I am not 100% sure, can't find what would flip them in your PR either.

Screen.Recording.2024-01-12.at.14.22.28.mov

@Gonals
Copy link
Contributor Author

Gonals commented Jan 15, 2024

The messages are correct now, but still flip when you change the status, checking the onyx responses it doesn't seem like backend, but I am not 100% sure, can't find what would flip them in your PR either.

Screen.Recording.2024-01-12.at.14.22.28.mov

Ah, that message (paid/owes) should flip. We are good 👍

@rlinoz rlinoz merged commit 7bb7bac into main Jan 15, 2024
15 checks passed
@rlinoz rlinoz deleted the alberto-unpay2 branch January 15, 2024 12:31
@OSBotify
Copy link
Contributor

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

Comment on lines +3358 to +3359
stateNum: isFree ? CONST.REPORT.STATE_NUM.PROCESSING : CONST.REPORT.STATE.OPEN,
statusNum: isFree ? CONST.REPORT.STATUS.SUBMITTED : CONST.REPORT.STATE.OPEN,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gonals @rlinoz I'm working on the IOU file TS migration, and after merging the latest main I think I've found an issue in this new part.
I guess it should be

stateNum: isFree ? CONST.REPORT.STATE_NUM.PROCESSING : CONST.REPORT.STATE_NUM.OPEN,
statusNum: isFree ? CONST.REPORT.STATUS.SUBMITTED : CONST.REPORT.STATUS.OPEN,

So using CONST.REPORT.STATE_NUM.OPEN instead of CONST.REPORT.STATE.OPEN for stateNum.
And using CONST.REPORT.STATUS.OPEN instead of CONST.REPORT.STATE.OPEN for statusNum

What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right, yeah. Thanks for catching that! I'll create a PR

@@ -57,7 +57,7 @@ function ReportActionItemMessage({action, displayAsGroup, reportID, style, isHid
const originalMessage = action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? action.originalMessage : null;
const iouReportID = originalMessage?.IOUReportID;
if (iouReportID) {
iouMessage = ReportUtils.getReportPreviewMessage(ReportUtils.getReport(iouReportID), action);
iouMessage = ReportUtils.getIOUReportActionDisplayMessage(action);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gonals Why was this changed? I think it caused this deploy blocker #34685

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because this was changed at some point and I think is wrong. We are not displaying the report preview here (and it causes weird issues with the message)

mountiny added a commit that referenced this pull request Jan 18, 2024
This reverts commit 7bb7bac, reversing
changes made to a1c7f56.
mountiny added a commit that referenced this pull request Jan 18, 2024
[CP Staging] Revert "Merge pull request #33836 from Expensify/alberto-unpay2"
OSBotify pushed a commit that referenced this pull request Jan 18, 2024
[CP Staging] Revert "Merge pull request #33836 from Expensify/alberto-unpay2"

(cherry picked from commit c2eb57e)
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.26-2 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 1.4.27-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.27-1 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

6 participants