[CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account #30112

mountiny · 2023-10-20T23:36:37Z

Details

Follow up to #30079 coming from https://expensify.slack.com/archives/C07J32337/p1697844844307529?thread_ts=1697843073.603539&cid=C07J32337

For money request flow we create two IOU actions on the iou report. One is of type create and the other of type pay. So let's see how these actions are rendered on the frontend if the payee is on silver wallet(aka we add the isWaitingOnBankAccount status to the iou report).

IOU create action -> We use this to render a preview.
ReimbursementQueued action -> To show a system message that the payee needs to enable the wallet and show the enable wallet button.
IOU pay action -> This doesn't fall in any if block under the ReportActionItem component as a result else block gets executed for this and we render another system message asking user to add their bank account as that is the default message if the report has isWaitingOnBankAccount property set.

So we now have two system messages so I have updated the code to prevent rendering any content if the IOU action type is pay and it is not a send money flow and if the user needs to add their wallet or bank account.

Fixed Issues

$ #30075
PROPOSAL:

Tests

Create userA and by default they will be on silver wallet.
Create another userB and add them to gold wallet by completing the kyc.
As userA request money from userB.
As userB, pay the money request.
As userA and userB, confirm we only see a single system message stating user needs to enable their wallet. And a button to enable the wallet.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test steps.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Desktop

melvin-bot · 2023-10-20T23:37:08Z

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

techievivek · 2023-10-21T07:21:15Z

Fixing the conflicts and testing the changes.

techievivek · 2023-10-21T08:00:48Z

I am seeing something weird. For some reason props.IOUReportID is an empty object.

We seem to be loading the iouReport here:

App/src/pages/home/report/ReportActionItem.js

Lines 728 to 732 in fcee207

    
           iouReport: { 
        
               key: ({action}) => { 
        
                   const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action); 
        
                   return iouReportID ? `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}` : undefined; 
        
               },

but we are using the property originalMessage.linkedReportID but it looks like the iouReportID info is actually on originalMessage.IOUReportID key.

techievivek · 2023-10-21T09:15:54Z

This is ready for a review. @situchan @mountiny

src/pages/home/report/ReportActionItem.js

situchan · 2023-10-23T07:54:49Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

payer.mov

payee.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

situchan

Confirmed system message shows when payee added bank and got paid

melvin-bot · 2023-10-23T07:56:58Z

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

techievivek · 2023-10-23T07:58:06Z

@mountiny Can you do the final review for this? We will need to CP this.

OSBotify · 2023-10-23T12:07:05Z

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

Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account (cherry picked from commit f42a195)

OSBotify · 2023-10-23T12:53:33Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.89-3 🚀

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

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

kavimuru · 2023-10-23T13:34:43Z

@mountiny we have silver wallet only. Is this internal QA?

mountiny · 2023-10-23T13:56:20Z

Yes

OSBotify · 2023-10-24T01:27:16Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.89-6 🚀

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

OSBotify · 2023-10-25T17:02:32Z

🚀 Deployed to staging by https://github.com/techievivek in version: 1.3.91-0 🚀

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

OSBotify · 2023-10-26T22:44:34Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.91-8 🚀

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

Check for isWaitingOnBankAccount

722a815

mountiny requested a review from a team as a code owner October 20, 2023 23:36

melvin-bot bot removed the request for review from a team October 20, 2023 23:37

melvin-bot bot requested a review from jasperhuangg October 20, 2023 23:37

mountiny changed the title ~~Check for isWaitingOnBankAccount~~ [HOLD] Check for isWaitingOnBankAccount Oct 21, 2023

techievivek added 2 commits October 21, 2023 12:55

resolve conflicts and update comments

cf4ff36

update comments

b6f4bd1

techievivek changed the title ~~[HOLD] Check for isWaitingOnBankAccount~~ Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account Oct 21, 2023

fix the eslint

ba0660e

techievivek requested a review from situchan October 21, 2023 09:06

fix styling

d182a4f

techievivek mentioned this pull request Oct 21, 2023

[HOLD for payment 2023-11-01] [HOLD for payment 2023-10-31] Fix the double message on the iou report when we pay a money request using wallet #30075

Closed

situchan reviewed Oct 21, 2023

View reviewed changes

src/pages/home/report/ReportActionItem.js Show resolved Hide resolved

techievivek requested a review from mananjadhav October 23, 2023 05:27

situchan approved these changes Oct 23, 2023

View reviewed changes

melvin-bot bot requested a review from danieldoglas October 23, 2023 07:56

danieldoglas approved these changes Oct 23, 2023

View reviewed changes

techievivek assigned mountiny Oct 23, 2023

techievivek merged commit f42a195 into main Oct 23, 2023
12 of 14 checks passed

techievivek deleted the vit-30079followup branch October 23, 2023 12:00

techievivek changed the title ~~Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account~~ [CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account Oct 23, 2023

OSBotify pushed a commit that referenced this pull request Oct 23, 2023

Merge pull request #30112 from Expensify/vit-30079followup

8632d0e

Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account (cherry picked from commit f42a195)

OSBotify mentioned this pull request Oct 23, 2023

Deploy Checklist: New Expensify 2023-10-23 #30157

Closed

17 tasks

OSBotify mentioned this pull request Oct 25, 2023

Deploy Checklist: New Expensify 2023-10-25 #30365

Closed

99 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account #30112

[CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account #30112

mountiny commented Oct 20, 2023 •

edited by techievivek

Loading

melvin-bot bot commented Oct 20, 2023

techievivek commented Oct 21, 2023

techievivek commented Oct 21, 2023 •

edited

Loading

techievivek commented Oct 21, 2023

situchan commented Oct 23, 2023

situchan left a comment

melvin-bot bot commented Oct 23, 2023

techievivek commented Oct 23, 2023

OSBotify commented Oct 23, 2023

OSBotify commented Oct 23, 2023

kavimuru commented Oct 23, 2023

mountiny commented Oct 23, 2023

OSBotify commented Oct 24, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 26, 2023

[CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account #30112

[CP stag]Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account #30112

Conversation

mountiny commented Oct 20, 2023 • edited by techievivek Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 20, 2023

techievivek commented Oct 21, 2023

techievivek commented Oct 21, 2023 • edited Loading

techievivek commented Oct 21, 2023

situchan commented Oct 23, 2023

Reviewer Checklist

Screenshots/Videos

situchan left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 23, 2023

techievivek commented Oct 23, 2023

OSBotify commented Oct 23, 2023

OSBotify commented Oct 23, 2023

kavimuru commented Oct 23, 2023

mountiny commented Oct 23, 2023

OSBotify commented Oct 24, 2023

OSBotify commented Oct 25, 2023

OSBotify commented Oct 26, 2023

mountiny commented Oct 20, 2023 •

edited by techievivek

Loading

techievivek commented Oct 21, 2023 •

edited

Loading