Adds 'Required' label for merchant on workspaces & updates P2P requirements for worskpaces #36252

cdanwards · 2024-02-09T15:46:44Z

Details

Fixed Issues

In this PR we are adding the Required label to the Merchant category whenever making money requests within Workspaces. We're also updating the way in which it's determined if a request belongs to a workspace in some instances.

Tests

Testing for creating a money request in a workspace (Required should appear)

Verify that no errors appear in the JS console
Navigate to a workspace
Within the creation menu, select "Request Money"
Enter in an amount
Select "Next"
Verify that the Merchant Menu Item has a "Required" as a right label

Testing for creating a p2p money request (Required should not appear)

Verify that no errors appear in the JS console
Within the global creation menu, select "Request Money"
Enter in an amount
Select "Next"
Select a peer for a money request
Select "Next"
Expand to see all menu items
Verify that the Merchant Menu Item does not have a "Required" as a right label

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…:infinitered/ExpensifyApp into violations/cdanwards/merchant-required

…questConfirmationList*** ***Update IOU.ts to handle policy requirements

…:infinitered/ExpensifyApp into violations/cdanwards/merchant-required

…ards/merchant-required

…st.js

…ards/merchant-required

src/components/MoneyRequestConfirmationList.js

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

cdanwards · 2024-02-12T18:01:21Z

@cead22 this is now ready for review!

melvin-bot · 2024-02-12T18:01:23Z

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

cead22

Please add manual tests for the case of p2p money requests (where the policy isn't set)

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

src/components/MoneyRequestConfirmationList.js

src/libs/actions/IOU.ts

…dates

cdanwards · 2024-02-12T21:32:15Z

@cead22 updated with a p2p test case. Also updated that check like you described. The optional chaining was only necessary with the check the way I had it, so I removed those as well.

cead22 · 2024-02-13T03:16:27Z

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

@@ -729,6 +729,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                    interactive={!isReadOnly}
                    brickRoadIndicator={merchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
                    error={merchantError ? translate('common.error.fieldRequired') : ''}
+                    rightLabel={translate('common.required')}


Don't we need the PolicyUtils.isPaidGroupPolicy check here?

src/components/MoneyRequestConfirmationList.js

src/libs/actions/IOU.ts

Co-authored-by: Carlos Alvarez <cead22@gmail.com>

…ards/merchant-required

cdanwards · 2024-02-14T00:52:31Z

MoneyTemporaryForRefactorRequestConfirmationList was refactored so I now needed to use the PolicyUtils.isPaidGroupPolicy util.

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

src/libs/actions/IOU.ts

aimane-chnaif · 2024-02-14T09:53:01Z

Please update Tests Steps:

- Testing for creating a money request in a policy (Required should appear)
+ Testing for creating a money request in a collect/control policy (Required should appear)

- Testing for creating a p2p money request (Required should not appear)
+ Testing for creating a p2p money request or in free policy (Required should not appear)

aimane-chnaif · 2024-02-14T09:59:36Z

I am curious why Request should not show on free policy.
As you see, without setting Merchant, cannot proceed erroring "Please enter a merchant"

Screen.Recording.2024-02-14.at.10.58.02.AM.mov

(In this video, dark mode is free policy, light mode is control policy)

…t.js Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

cdanwards · 2024-02-14T14:24:22Z

@aimane-chnaif I went back and looked at the issue and you are correct that it should be for all workspaces. I'll change which check is made.

…st.js

…ards/merchant-required

src/libs/actions/IOU.ts

src/components/MoneyRequestConfirmationList.js

aimane-chnaif · 2024-02-15T16:17:25Z

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

@@ -720,6 +720,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                    interactive={!isReadOnly}
                    brickRoadIndicator={merchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
                    error={merchantError ? translate('common.error.fieldRequired') : ''}
+                    rightLabel={isMerchantRequired ? translate('common.required') : ''}


It doesn't make sense to show "Required" when merchant is already filled so this can be updated to
isMerchantEmpty && isMerchantRequired ? translate('common.required') : ''

But this is already existing logic in category, tag so out of scope

Yeah, this is just following the design precedent set by the other required items.

There was a bug created to remove the Required label from the category and tag fields if they have a values set. I can include the merchant field in the scope of that bug

…ards/merchant-required

aimane-chnaif · 2024-02-15T16:37:21Z

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

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-02-15T16:37:43Z

🎯 @aimane-chnaif, thanks for reviewing and testing this PR! 🎉

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

OSBotify · 2024-02-15T17:38:13Z

✋ 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 · 2024-02-19T23:47:58Z

🚀 Deployed to staging by https://github.com/cead22 in version: 1.4.43-0 🚀

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

OSBotify · 2024-02-26T20:54:02Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.43-20 🚀

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

cdanwards added 7 commits February 8, 2024 16:41

Update MoneyRequestConfirmationList component

0eca9e9

Merge branch 'lindboe/violations/money-request-updates' of github.com…

014dd14

…:infinitered/ExpensifyApp into violations/cdanwards/merchant-required

Refactor MoneyRequestConfirmationList and MoneyTemporaryForRefactorRe…

b49e86e

…questConfirmationList*** ***Update IOU.ts to handle policy requirements

Merge branch 'lindboe/violations/money-request-updates' of github.com…

9927c0a

…:infinitered/ExpensifyApp into violations/cdanwards/merchant-required

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

7491f67

…ards/merchant-required

Refactor rightLabel in MoneyTemporaryForRefactorRequestConfirmationLi…

28be879

…st.js

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

5c00980

…ards/merchant-required

cdanwards commented Feb 12, 2024

View reviewed changes

src/components/MoneyRequestConfirmationList.js Outdated Show resolved Hide resolved

cdanwards commented Feb 12, 2024

View reviewed changes

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js Outdated Show resolved Hide resolved

cdanwards marked this pull request as ready for review February 12, 2024 18:00

cdanwards requested a review from a team as a code owner February 12, 2024 18:00

melvin-bot bot requested review from lakchote and removed request for a team February 12, 2024 18:01

cead22 requested review from cead22 and removed request for lakchote February 12, 2024 20:25

cead22 requested changes Feb 12, 2024

View reviewed changes

cdanwards added 2 commits February 12, 2024 16:01

Fix condition in buildOnyxDataForMoneyRequest function

49a9f14

Refactor code to use translated label for required field and other up…

9f833cd

…dates

cead22 requested changes Feb 13, 2024

View reviewed changes

cdanwards and others added 2 commits February 13, 2024 11:12

Update src/libs/actions/IOU.ts

d1011f3

Co-authored-by: Carlos Alvarez <cead22@gmail.com>

Update src/libs/actions/IOU.ts

7c54b7f

Co-authored-by: Carlos Alvarez <cead22@gmail.com>

cdanwards requested a review from cead22 February 13, 2024 16:49

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

c6277c6

…ards/merchant-required

cead22 requested a review from aimane-chnaif February 13, 2024 17:16

cdanwards added 2 commits February 13, 2024 19:37

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

bc887e3

…ards/merchant-required

Add right label for paid group policy

ed3d556

cead22 previously approved these changes Feb 14, 2024

View reviewed changes

aimane-chnaif suggested changes Feb 14, 2024

View reviewed changes

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js Outdated Show resolved Hide resolved

src/libs/actions/IOU.ts Show resolved Hide resolved

cdanwards dismissed cead22’s stale review via b6ac532 February 14, 2024 14:13

Update src/components/MoneyTemporaryForRefactorRequestConfirmationLis…

b6ac532

…t.js Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

cdanwards added 2 commits February 14, 2024 09:41

Refactor rightLabel in MoneyTemporaryForRefactorRequestConfirmationLi…

e97594a

…st.js

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

c62c0f6

…ards/merchant-required

cdanwards requested a review from aimane-chnaif February 14, 2024 15:32

cead22 reviewed Feb 14, 2024

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

Fix policy check in getUpdateMoneyRequestParams function

f3dedad

cead22 requested changes Feb 14, 2024

View reviewed changes

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

Fix conditional statement in editRegularMoneyRequest function

0b2971e

aimane-chnaif reviewed Feb 15, 2024

View reviewed changes

src/components/MoneyRequestConfirmationList.js Outdated Show resolved Hide resolved

Removed prop from MoneyRequestConfirmationList

107939a

aimane-chnaif reviewed Feb 15, 2024

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into violations/cdanw…

fda1f51

…ards/merchant-required

aimane-chnaif approved these changes Feb 15, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Feb 15, 2024

[HOLD for payment 3/4] Payment issue for E/App PR#36252 #36607

Closed

aimane-chnaif mentioned this pull request Feb 15, 2024

[HOLD for payment 2024-03-11] [$500] Required label in push row should be removed if value is present #36608

Closed

6 tasks

cead22 approved these changes Feb 15, 2024

View reviewed changes

cead22 merged commit f4d1b5a into Expensify:main Feb 15, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Feb 19, 2024

Deploy Checklist: New Expensify 2024-02-19 #36820

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds 'Required' label for merchant on workspaces & updates P2P requirements for worskpaces #36252

Adds 'Required' label for merchant on workspaces & updates P2P requirements for worskpaces #36252

cdanwards commented Feb 9, 2024 •

edited

Loading

cdanwards commented Feb 12, 2024

melvin-bot bot commented Feb 12, 2024

cead22 left a comment

cdanwards commented Feb 12, 2024

cead22 Feb 13, 2024

cdanwards commented Feb 14, 2024

aimane-chnaif commented Feb 14, 2024

aimane-chnaif commented Feb 14, 2024 •

edited

Loading

cdanwards commented Feb 14, 2024

aimane-chnaif Feb 15, 2024

cdanwards Feb 15, 2024 •

edited

Loading

cead22 Feb 15, 2024

aimane-chnaif commented Feb 15, 2024

melvin-bot bot commented Feb 15, 2024

OSBotify commented Feb 15, 2024

OSBotify commented Feb 19, 2024

OSBotify commented Feb 26, 2024

Adds 'Required' label for merchant on workspaces & updates P2P requirements for worskpaces #36252

Adds 'Required' label for merchant on workspaces & updates P2P requirements for worskpaces #36252

Conversation

cdanwards commented Feb 9, 2024 • edited Loading

Details

Fixed Issues

Tests

Testing for creating a money request in a workspace (Required should appear)

Testing for creating a p2p money request (Required should not appear)

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

cdanwards commented Feb 12, 2024

melvin-bot bot commented Feb 12, 2024

cead22 left a comment

Choose a reason for hiding this comment

cdanwards commented Feb 12, 2024

cead22 Feb 13, 2024

Choose a reason for hiding this comment

cdanwards commented Feb 14, 2024

aimane-chnaif commented Feb 14, 2024

aimane-chnaif commented Feb 14, 2024 • edited Loading

cdanwards commented Feb 14, 2024

aimane-chnaif Feb 15, 2024

Choose a reason for hiding this comment

cdanwards Feb 15, 2024 • edited Loading

Choose a reason for hiding this comment

cead22 Feb 15, 2024

Choose a reason for hiding this comment

aimane-chnaif commented Feb 15, 2024

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Feb 15, 2024

OSBotify commented Feb 15, 2024

OSBotify commented Feb 19, 2024

OSBotify commented Feb 26, 2024

cdanwards commented Feb 9, 2024 •

edited

Loading

aimane-chnaif commented Feb 14, 2024 •

edited

Loading

cdanwards Feb 15, 2024 •

edited

Loading