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

Use IOU/Expense reportID for IOU actions #18604

Merged
merged 26 commits into from
May 16, 2023

Conversation

luacmartins
Copy link
Contributor

@luacmartins luacmartins commented May 8, 2023

Add the IOU reportAction to the IOU/Expense report instead of the parent chatReport.

We are gonna start creating IOU reportActions directly in the IOU/Expense report and as part of the switch, we are temporarily skipping test so that Auth integration tests pass. The plan to make the switch is:

  1. Merge https://github.com/Expensify/Web-Expensify/pull/37375 and CP to prod
  2. Web-E Integrations tests in this https://github.com/Expensify/Auth/pull/7863 should pass
  3. Merge the https://github.com/Expensify/Auth/pull/7863
  4. Deploy the Auth PR
  5. Merge https://github.com/Expensify/Web-Expensify/pull/37337 that re-enables tests using the correct reportID
  6. CP the https://github.com/Expensify/Web-Expensify/pull/37337 PR to prod
  7. Merge Use IOU/Expense reportID for IOU actions #18604, CPing it to staging to minimize the amount of time IOUs are broken
  8. Run the bulkCQ from https://github.com/Expensify/Expensify/issues/282420 to change the reportID of all previous IOU actions

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/281893

Tests

In dev, pull these Auth and Web-E branches

Pre-requisites: 2 accounts you have access to

Request money

  1. In accountA, go offline
  2. Request money from a user you haven't chatted with before, + > Request money
  3. Verify:
  • A new chat report is created between you and accountB. The chat should be greyed out (pending state)
  • A new iou report is created between you and accountB and is displayed in the LHN (this report has a different header showing the request total). The report should be greyed out (pending state)
  • In the iou report, you see the IOU request preview. The preview should be greyed out (pending state).
  1. Go online and verify that all pending states are resolved, i.e. the reports and preview are no longer greyed out
  2. From the chat report, request money again to the same user.
  3. Verify that a new preview is added to the IOU report.

Delete request
8. Tap on the request preview and delete the request
9. Verify that a deleted the $X request message is added to the IOU report

Pay money request
10. In accountB, navigate to the IOU report with accountA
11. Tap on the pay button and settle elsewhere
12. Verify that a settled up $X message is added to the IOU report

Workspace case

  1. In account A, create a new Workspace + > New workspace
  2. Navigate to the Workspace chat
  3. Repeat the steps for Request money, Delete request and Pay money request above.
  • Verify that no errors appear in the JS console

Offline tests

Covered above

QA Steps

Same as above.

  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 correct English and 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
web.mov
Mobile Web - Chrome
Mobile Web - Safari
Desktop
desktop.mov
iOS
Android

@luacmartins luacmartins self-assigned this May 8, 2023
@aldo-expensify
Copy link
Contributor

What is the progress on this?

@luacmartins luacmartins changed the title Use IOU/Expense reportID for IOU actions Refactor MoneyRequest May 12, 2023
@luacmartins luacmartins changed the title Refactor MoneyRequest Use IOU/Expense reportID for IOU actions May 13, 2023
@github-actions
Copy link
Contributor

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

@luacmartins luacmartins marked this pull request as ready for review May 13, 2023 13:32
@luacmartins luacmartins requested a review from a team as a code owner May 13, 2023 13:32
@melvin-bot melvin-bot bot requested review from amyevans and eVoloshchak and removed request for a team May 13, 2023 13:33
@melvin-bot
Copy link

melvin-bot bot commented May 13, 2023

@eVoloshchak @amyevans One of you needs to 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]

@luacmartins
Copy link
Contributor Author

I'm not able to reproduce the delete error. What error are you getting back from the API?

As for the IOUPReview, it should still be shown.

@s77rt
Copy link
Contributor

s77rt commented May 16, 2023

Error 401

{
    "jsonCode": 401,
    "message": "401 Unauthorized report NVP.",
    "onyxData": [
        {
            "onyxMethod": "merge",
            "key": "reportActions_6792924156649370",
            "value": {
                "errors": {
                    "1684260166419151": "Auth DeleteMoneyRequest returned an error"
                }
            }
        },
        {
            "onyxMethod": "merge",
            "key": "reportActions_6792924156649370",
            "value": {
                "errors": {
                    "1684260166419151": "Auth DeleteMoneyRequest returned an error"
                }
            }
        }
    ],
    "requestID": "7c8588974f9c9a17-SJC"
}

@luacmartins
Copy link
Contributor Author

@s77rt that seems unrelated to the changes in this PR. We already have another internal issue to track that error.

@s77rt
Copy link
Contributor

s77rt commented May 16, 2023

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 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
web.mp4
Mobile Web - Chrome

mweb-chrome

Mobile Web - Safari

mweb-safari

Desktop
desktop.mp4
iOS
ios.mp4
Android

android

@s77rt
Copy link
Contributor

s77rt commented May 16, 2023

@luacmartins Checklist is ready. Just waiting for a confirmation for the reported bug if it's something we should fix in this PR.

Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

@melvin-bot
Copy link

melvin-bot bot commented May 16, 2023

🎯 @s77rt, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #19057.

@luacmartins luacmartins merged commit d20142b into main May 16, 2023
@luacmartins luacmartins deleted the cmartins-createRequestsInExpenseReports branch May 16, 2023 18:45
@luacmartins
Copy link
Contributor Author

Thanks for the thorough review @s77rt

OSBotify pushed a commit that referenced this pull request May 16, 2023
…enseReports

Use IOU/Expense reportID for IOU actions

(cherry picked from commit d20142b)
OSBotify added a commit that referenced this pull request May 16, 2023
@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.3.14-13 🚀

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.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.14-14 🚀

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

props.chatReportID, // Needs to be changed to iouReportID
props.requestReportID,
Copy link
Contributor

@s77rt s77rt May 25, 2023

Choose a reason for hiding this comment

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

@luacmartins Can you please explain why was this needed? We think this is causing this bug #19487

In case of a SPLIT action, the requestReportID is '0'. Building optimistic thread will not work as expected as the parentReportID will be '0'.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should not be building a thread when clicking the preview on a Split action. We instead show a split details page that is being worked on here

Copy link
Contributor

Choose a reason for hiding this comment

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

it has to be for other cases, we should probably consider treating this a bit differntly for the split case, need to explore more there.

@parasharrajat
Copy link
Member

There might be many PRs during the IOU actions to report transactions. I am not sure which one should be tagged but when these IOU reports were added, we should have also updated the LHN rendering logic to allow these reports to behave like normal chats causing this #19570 whose explanation is in #19570 (comment).

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

createdReportActionID: isNewChat ? optimisticCreatedAction.reportActionID : 0,
reportActionID: optimisticIOUAction.reportActionID,
createdChatReportActionID: isNewChatReport ? optimisticCreatedActionForChat.reportActionID : 0,
createdIOUReportActionID: isNewIOUReport ? optimisticCreatedActionForIOU.reportActionID : 0,
Copy link
Contributor

Choose a reason for hiding this comment

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

We should have added a similar logic for createdIOUReportActionID to the getSendMoneyParams function.
#38141

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.

8 participants