Disable request money on a paid policy submitted expense by bernhardoj · Pull Request #33182 · Expensify/App

bernhardoj · 2023-12-15T18:08:24Z

Details

When a paid policy expense report is submitted, we want to hide the option to request money.

Fixed Issues

$ #32796
PROPOSAL: #32796 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open a paid policy expense chat
Request money in USD currency
Press the request preview to open the IOU report
Press the add action (+) button and verify there is a Request money option
Submit the request
Press the add action (+) button and verify there is no Request money option

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-12-16.at.01.54.41.mov

Android: mWeb Chrome

Screen.Recording.2023-12-16.at.01.57.34.mov

iOS: Native

Screen.Recording.2023-12-16.at.01.51.40.mov

iOS: mWeb Safari

Screen.Recording.2023-12-18.at.19.08.43.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-16.at.01.47.17.mov

MacOS: Desktop

Screen.Recording.2023-12-16.at.01.49.27.mov

melvin-bot · 2023-12-15T18:08:29Z

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

bernhardoj · 2023-12-15T18:11:36Z

mWeb safari is infinitely loading on my simulator.

I see this error on the console.

src/libs/ReportUtils.ts

hoangzinh · 2023-12-18T10:54:07Z

mWeb safari is infinitely loading on my simulator.

I see this error on the console.

have you found a way to fix it or tried to merge the latest main?

bernhardoj · 2023-12-18T11:12:35Z

have you found a way to fix it or tried to merge the latest main?

There is a discussion here and reverting this locally fix the issue.

I have added the iOS Safari recording

src/libs/ReportUtils.ts

hoangzinh · 2023-12-18T16:26:32Z

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

Screen.Recording.2023-12-19.at.23.15.35.-.android.mov

Android: mWeb Chrome

Screen.Recording.2023-12-19.at.22.37.58.android.chrome.mov

iOS: Native

Screen.Recording.2023-12-19.at.22.54.51.-.ios.mov

iOS: mWeb Safari

Screen.Recording.2023-12-19.at.22.59.49.-.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-19.at.22.33.38.-.web.mov

MacOS: Desktop

Screen.Recording.2023-12-19.at.22.35.29.-.desktop.mov

hoangzinh · 2023-12-26T02:25:19Z

cc @mountiny just in case you missed this PR

mountiny

Sorry for the delay, been travelling, requesting mainly some safety changes

mountiny · 2023-12-26T11:11:14Z

src/libs/ReportUtils.ts

    if (isMoneyRequestReport(report)) {
-        return ((isExpenseReport(report) && isOwnPolicyExpenseChat) || isIOUReport(report)) && !isReportApproved(report) && !isSettled(report?.reportID);
+        const isOwnExpenseReport = isExpenseReport(report) && isOwnPolicyExpenseChat;
+        if (isOwnExpenseReport && PolicyUtils.isPaidGroupPolicy(policy)) {


cc @Beamanator We will need to update this with instant submit for paid policies

mountiny · 2023-12-26T11:17:29Z

src/pages/iou/MoneyRequestSelectorPage.js

            key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
        },
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${lodashGet(report, 'policyID')}`,


I think just to be safe we should add 0 here, thats because that in case no policyID is found then we are not loading the entire collection

Suggested change

key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${lodashGet(report, 'policyID')}`,

key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${lodashGet(report, 'policyID', '0')}`,

I intentionally didn't put any default value to it, so it would return undefined and the key will be policy_undefined, so it won't load the whole collection.

Ah ok, I thought the default would be an empty string

src/pages/iou/request/IOURequestStartPage.js

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.js

mountiny · 2023-12-26T11:23:32Z

@bernhardoj Also seems like there is a conflict

bernhardoj · 2023-12-26T12:04:32Z

@mountiny conflicts solved.

mountiny

Thanks for the changes!

OSBotify · 2023-12-26T14:57:17Z

✋ 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 · 2023-12-28T21:19:12Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.18-8 🚀

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

disable request money on a submitted expense (paid policy)

2953cb7

bernhardoj requested a review from a team as a code owner December 15, 2023 18:08

melvin-bot bot requested review from hoangzinh and removed request for a team December 15, 2023 18:08

bernhardoj added 6 commits December 16, 2023 02:13

add policy

eac52c2

fix test by passing an empty policy object

5e6c1d1

add prop types

fd66555

add new test

22cd7f5

rename duplicated var

fde44dc

prettier

479b018

hoangzinh reviewed Dec 18, 2023

View reviewed changes

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

Merge branch 'main' into fix/32796-disable-request-on-submitted-expense

34cd933

create a new util func

bbcdf6b

hoangzinh reviewed Dec 18, 2023

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

pass policy prop

486abe8

hoangzinh approved these changes Dec 19, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny December 19, 2023 16:23

mountiny assigned bernhardoj Dec 26, 2023

mountiny requested changes Dec 26, 2023

View reviewed changes

bernhardoj added 2 commits December 26, 2023 19:58

Merge branch 'main' into fix/32796-disable-request-on-submitted-expense

8c845fb

safely access policy id

d0e8f34

mountiny approved these changes Dec 26, 2023

View reviewed changes

mountiny merged commit e21cbb5 into Expensify:main Dec 26, 2023

github-actions bot mentioned this pull request Dec 27, 2023

Deploy Checklist: New Expensify 2023-12-27 #33644

Closed

41 tasks

melvin-bot bot mentioned this pull request Dec 28, 2023

[HOLD for payment 2024-01-04] [$500] [Wave 6: Workspace Chats] IOU-The request created is not displayed in the manual expense created page. #32796

Closed

6 tasks

	key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${lodashGet(report, 'policyID')}`,
	key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${lodashGet(report, 'policyID', '0')}`,

Conversation

bernhardoj commented Dec 15, 2023 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 15, 2023

Uh oh!

bernhardoj commented Dec 15, 2023

Uh oh!

Uh oh!

hoangzinh commented Dec 18, 2023

Uh oh!

bernhardoj commented Dec 18, 2023

Uh oh!

Uh oh!

hoangzinh commented Dec 18, 2023 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh commented Dec 26, 2023

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 26, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 26, 2023

Choose a reason for hiding this comment

Uh oh!

bernhardoj Dec 26, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 26, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mountiny commented Dec 26, 2023

Uh oh!

bernhardoj commented Dec 26, 2023

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 26, 2023

Uh oh!

OSBotify commented Dec 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernhardoj commented Dec 15, 2023 •

edited by mountiny

Loading

hoangzinh commented Dec 18, 2023 •

edited by mountiny

Loading