Prevent additional requests on settled request reports #19033

Julesssss · 2023-05-16T16:28:23Z

@mountiny @luacmartins

Details

Blocks users from:

requesting money from within a settled IOUReport or expense report
or sending money from an iouReport in any state
sending money from expense report in any state
requesting or sending money from transaction thread

Fix showing the description and amount in the send money transaction detail view

Fixed Issues

$ #19028
$ #19122

Tests

Got to DM
Verify you can Request and Send money
Go to Group message
Verify you can split the bill
Got to Workspace chat
Verify you can request money
Request money in the workspace
Go to the expense report
Verify you cannot request or send money
Click on the IOU Preview to go to the transaction thread
Verify you cannot request or send money here

Send money flow

Send money to some account
Click on the IOU report
Click Plus in the composer and verify you dont see Request or Send money option
Verify the header looks correct
Click on the iou Preview
Verify you are in the transaction view
Verify the amount and description is correctly showing

Offline tests

N/A

QA Steps

Run above test

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Cant sign in, not related to this PR

Mobile Web - Safari

iou report

Workspace

Desktop

transaction report

iOS

iou report

transaction

Android

iou report

DM

src/libs/ReportUtils.js

luacmartins · 2023-05-17T01:59:37Z

Tests are still failing, but I think it's legit -- we are displaying options that we shouldn't.

addressed

melvin-bot · 2023-05-17T17:15:22Z

@mountiny @rushatgabhane 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]

rushatgabhane · 2023-05-17T18:39:33Z

@mountiny the tests are still failing

ios/Podfile.lock

mountiny · 2023-05-17T21:30:47Z

ios/Podfile.lock

@@ -1135,4 +1135,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 4ed1c7b099741c82e2b0411b95f6468e72be6c76

-COCOAPODS: 1.12.0
+COCOAPODS: 1.11.3


I keep getting this on main, anyone else?

Yes.

[!] The version of CocoaPods used to generate the lockfile (1.12.0) is higher than the version of the current executable (1.11.3). Incompatibility issues may arise.

I think we need to update cocoapods installed on our system

yea an update of cocoapods fixed it

brew install cocoapods cd ios && pod install

oh nice, thank you!

github-actions · 2023-05-17T21:54:06Z

⚠️ ⚠️ 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.

mountiny · 2023-05-17T21:55:18Z

src/components/ReportWelcomeText.js

-                        {/* Need to confirm copy for the below with marketing, and then add to translations. */}
-                        {props.translate('reportActionsView.usePlusButton')}
-                    </Text>
+                    <Text>{props.translate('reportActionsView.usePlusButton')}</Text>


I just confirmed in slack the comment is not needed anymore

src/libs/ReportActionsUtils.js

rushatgabhane · 2023-05-17T21:58:04Z

src/libs/ReportActionsUtils.js

@@ -99,10 +99,10 @@ function getFormattedAmount(reportAction) {
 */
 function isTransactionThread(parentReportAction) {
    const originalMessage = lodashGet(parentReportAction, 'originalMessage', {});
-    return (
+    return Boolean(


NAB: @mountiny why is this change needed?

The logical operators should return a boolean anyway, right?

oh nvm, just saw your comment after a page refresh https://github.com/Expensify/App/pull/19033/files#r1197091432

rushatgabhane · 2023-05-17T23:00:30Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Group

iOS

Android

rushatgabhane · 2023-05-17T23:01:02Z

wasn't able to edit checklist for some reason

rushatgabhane

@jasperhuangg @mountiny LGTM!

some relevant discussion in case we look at this again in future - https://expensify.slack.com/archives/C02NK2DQWUX/p1684360467651169

…edReports Prevent additional requests on settled request reports (cherry picked from commit 55885ab)

…-19033 🍒 Cherry pick PR #19033 to staging 🍒

OSBotify · 2023-05-18T00:34:04Z

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

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 · 2023-05-18T06:49:56Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.15-12 🚀

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

OSBotify · 2023-06-15T01:28:39Z

🚀 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 · 2023-06-16T18:46:28Z

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

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

prevent additional requests on settled request reports

d1faf96

Julesssss self-assigned this May 16, 2023

Julesssss changed the base branch from cmartins-createRequestsInExpenseReports to main May 16, 2023 16:28

Julesssss changed the title ~~Prevent additional requests on settled request reports~~ [HOLD - App/18604] Prevent additional requests on settled request reports May 16, 2023

block send money option in all non-chat reports

aa43c09

Julesssss commented May 16, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

luacmartins self-requested a review May 16, 2023 17:00

mountiny previously requested changes May 16, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

mountiny reviewed May 16, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

luacmartins mentioned this pull request May 16, 2023

Use IOU/Expense reportID for IOU actions #18604

Merged

56 tasks

luacmartins changed the title ~~[HOLD - App/18604] Prevent additional requests on settled request reports~~ Prevent additional requests on settled request reports May 17, 2023

resolve conflicts

82a6ddb

Merge branch 'main' into jules-preventRequestsOnSettledReports

7b4ffdf

mountiny self-requested a review May 17, 2023 14:31

Show the correct options for money requests

5d8e419

mountiny self-assigned this May 17, 2023

mountiny marked this pull request as ready for review May 17, 2023 17:15

mountiny requested a review from a team as a code owner May 17, 2023 17:15

melvin-bot bot requested review from rushatgabhane and removed request for a team May 17, 2023 17:15

mountiny added 4 commits May 17, 2023 21:21

Merge branch 'main' into jules-preventRequestsOnSettledReports

2783f0a

Fix tests

e6f4e8b

Make sure the Money request header works for the sent money requests too

872ca23

Cast to Boolean to get rid of console warning

0f218a7

rushatgabhane reviewed May 17, 2023

View reviewed changes

ios/Podfile.lock Outdated Show resolved Hide resolved

mountiny reviewed May 17, 2023

View reviewed changes

Revert podfile lock change

8f8e58f

mountiny added the CP Staging label May 17, 2023

mountiny reviewed May 17, 2023

View reviewed changes

src/libs/ReportActionsUtils.js Outdated Show resolved Hide resolved

rushatgabhane reviewed May 17, 2023

View reviewed changes

Use has to find if a IOUDetails field exists

f2631e0

jasperhuangg approved these changes May 17, 2023

View reviewed changes

rushatgabhane approved these changes May 17, 2023

View reviewed changes

mountiny merged commit 55885ab into main May 17, 2023

mountiny deleted the jules-preventRequestsOnSettledReports branch May 17, 2023 23:11

OSBotify pushed a commit that referenced this pull request May 17, 2023

Merge pull request #19033 from Expensify/jules-preventRequestsOnSettl…

958fd9f

…edReports Prevent additional requests on settled request reports (cherry picked from commit 55885ab)

OSBotify mentioned this pull request May 17, 2023

🍒 Cherry pick PR #19033 to staging 🍒 #19159

Merged

OSBotify added a commit that referenced this pull request May 17, 2023

Merge pull request #19159 from Expensify/OSBotify-cherry-pick-staging…

a931c8e

…-19033 🍒 Cherry pick PR #19033 to staging 🍒

OSBotify mentioned this pull request May 17, 2023

Deploy Checklist: New Expensify 2023-05-16 #19088

Closed

71 tasks

OSBotify mentioned this pull request May 18, 2023

Deploy Checklist: New Expensify 2023-05-18 #19175

Closed

39 tasks

OSBotify mentioned this pull request Jun 15, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent additional requests on settled request reports #19033

Prevent additional requests on settled request reports #19033

Julesssss commented May 16, 2023 •

edited by mountiny

Loading

luacmartins commented May 17, 2023

melvin-bot bot commented May 17, 2023

rushatgabhane commented May 17, 2023

mountiny May 17, 2023

rushatgabhane May 17, 2023

rushatgabhane May 17, 2023 •

edited

Loading

rushatgabhane May 17, 2023 •

edited

Loading

mountiny May 17, 2023

github-actions bot commented May 17, 2023

mountiny May 17, 2023

rushatgabhane May 17, 2023

rushatgabhane May 17, 2023 •

edited

Loading

mountiny May 17, 2023

rushatgabhane commented May 17, 2023 •

edited

Loading

rushatgabhane commented May 17, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

OSBotify commented May 18, 2023

OSBotify commented May 18, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

Prevent additional requests on settled request reports #19033

Prevent additional requests on settled request reports #19033

Conversation

Julesssss commented May 16, 2023 • edited by mountiny Loading

Details

Fixed Issues

Tests

Send money flow

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

luacmartins commented May 17, 2023

melvin-bot bot commented May 17, 2023

rushatgabhane commented May 17, 2023

mountiny May 17, 2023

Choose a reason for hiding this comment

rushatgabhane May 17, 2023

Choose a reason for hiding this comment

rushatgabhane May 17, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane May 17, 2023 • edited Loading

Choose a reason for hiding this comment

mountiny May 17, 2023

Choose a reason for hiding this comment

github-actions bot commented May 17, 2023

mountiny May 17, 2023

Choose a reason for hiding this comment

rushatgabhane May 17, 2023

Choose a reason for hiding this comment

rushatgabhane May 17, 2023 • edited Loading

Choose a reason for hiding this comment

mountiny May 17, 2023

Choose a reason for hiding this comment

rushatgabhane commented May 17, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane commented May 17, 2023 • edited Loading

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

OSBotify commented May 18, 2023

OSBotify commented May 18, 2023

OSBotify commented Jun 15, 2023

OSBotify commented Jun 16, 2023

Julesssss commented May 16, 2023 •

edited by mountiny

Loading

rushatgabhane May 17, 2023 •

edited

Loading

rushatgabhane May 17, 2023 •

edited

Loading

rushatgabhane May 17, 2023 •

edited

Loading

rushatgabhane commented May 17, 2023 •

edited

Loading

rushatgabhane commented May 17, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading