Workspaces in money request modal #17132

cristipaval · 2023-04-07T12:47:21Z

Details

Fixed Issues

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

Tests

Login with an admin account and create a new workspace
Invite an employee to the workspace
Login with the employee account
Verify that you can initiate a money request to the workspace using the global create --note that tapping the Request $X button in the final step won't do anything for now since we are still implementing this feature
Verify that you can initiate a money request to the workspace using the plus button from the workspace chat -- note that tapping the Request $X button in the final step won't do anything for now since we are still implementing this feature
Verify that you can complete a money request from any person using the global create -- tapping the Request $X button should work in this case
Verify that you can complete a money request from any person using the plus button from the direct chat -- tapping the Request $X button should work in this case

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

chrome.mobile.mov

Mobile Web - Safari

safari.mobile.mov

Desktop

desktop.mov

iOS

ios.native.mov

Android

android.native.mov

…MoneyRequestModal

src/pages/iou/MoneyRequestModal.js

MelvinBot · 2023-04-10T20:12:58Z

@fedirjh @techievivek 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]

src/libs/OptionsListUtils.js

src/pages/iou/MoneyRequestModal.js

fedirjh · 2023-04-11T06:34:35Z

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 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 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 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

Screen.Recording.2023-04-11.at.6.32.21.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-04-12.at.5.29.30.PM.mov

Mobile Web - Safari

Simulator.Screen.Recording.-.iPhone.14.-.2023-04-11.at.06.48.23.mp4

Desktop

Screen.Recording.2023-04-11.at.6.38.59.AM.mov

iOS

Simulator.Screen.Recording.-.iPhone.14.-.2023-04-11.at.06.44.42.mp4

Android

Screen.Recording.2023-04-11.at.6.58.07.AM.mov

fedirjh

I have addressed this minor bug . Over All code LGTM.

src/libs/OptionsListUtils.js

src/pages/iou/MoneyRequestModal.js

luacmartins

Looking great! Let's just address @fedirjh's comments and we should be good here.

I think that we should update testing steps so that it's clear to QA and they don't fail this PR:

Verify that you can initiate a money request to the workspace using the global create --note that tapping the Request $X button in the final step won't do anything for now since we are still implementing this feature
Verify that you can initiate a money request to the workspace using the plus button from the workspace chat -- note that tapping the Request $X button in the final step won't do anything for now since we are still implementing this feature
Verify that you can complete a money request from any person using the global create -- tapping the Request $X button should work in this case
Verify that you can complete a money request from any person using the plus button from the direct chat -- tapping the Request $X button should work in this case

Co-authored-by: Fedi Rajhi <[email protected]>

cristipaval · 2023-04-13T20:58:46Z

@Julesssss @fedirjh @luacmartins @mountiny Love all your feedback!
ready for review again.

luacmartins

LGTM!

fedirjh

LGTM and tests well 🚀

MelvinBot · 2023-04-14T03:45:30Z

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

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

OSBotify · 2023-04-14T09:37:24Z

✋ 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-04-18T04:40:03Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.1-0 🚀

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

OSBotify · 2023-04-18T06:09:39Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.1-0 🚀

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

OSBotify · 2023-04-19T17:22:48Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.1-3 🚀

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

s77rt · 2023-05-17T11:58:51Z

This PR caused a bug #18708. The filtered reports here

App/src/libs/OptionsListUtils.js

Line 101 in 9754a32

    
           const filteredPolicyExpenseReports = _.filter(policyExpenseReports, policyExpenseReport => policyExpenseReport.policyID === report.policyID);

should have been based on isOwnPolicyExpenseChat to only get the workspace report and drop the other 1:1 policy expense reports.

Beamanator · 2023-06-20T14:22:09Z

src/libs/OptionsListUtils.js

+        }],
+        payPalMeAddress: lodashGet(details, 'payPalMeAddress', ''),
+        phoneNumber: lodashGet(details, 'phoneNumber', ''),
+    }));


Just wondering: Any reason we didn't add isMoneyRequestReport: true here? Since I believe this is only used in money request reports

Maybe because of the split case, since those don't create an IOU/Expense report for the group chat?

innnnnnnnnnnnnnnnnnnnnnnteresting that would make sense :D

s77rt · 2023-10-16T23:54:43Z

src/libs/OptionsListUtils.js

+        return {
+            ...expenseReport,
+            keyForList: expenseReport.policyID,
+            text: expenseReport.displayName,


Not exactly a regression but we shouldn't have used expenseReport.displayName here because the display name is not necessary the policy name. The display name is the policy name only if you are the policy expense chat owner.

This worked fine with money request because you are the only one who can see the participants list (and that's only at the creation phase). But that's not the case with split action.

allroundexperts · 2023-10-18T00:28:43Z

src/libs/OptionsListUtils.js

+            icons: [{
+                source: policyExpenseChatAvatarSource,
+                name: expenseReport.displayName,
+                type: CONST.ICON_TYPE_WORKSPACE,
+            }],


We should have used the already existing createOption to generate these options. Using the icons object like this caused #28731

cristipaval added 8 commits April 6, 2023 16:59

Rename participants to selectedOptions in MoneyRequestModal.js

1d602e4

set optiotPropTypes as the prop type for participants

bddf4b0

Rename steps in MoneyRequestModal

80efa65

Rename IOUAmountPage to MoneyRequestAmountPage

22f6234

Rename IOUConfirmPage to MoneyRequestConfirmPage

964c5ce

Rename IOUParticipantsPage to MoneyRequestParticipantsPage

b31fb44

WIP.

1d9f7be

Merge remote-tracking branch 'origin/main' into cristi_workspaces-in-…

bb95eae

…MoneyRequestModal

cristipaval self-assigned this Apr 7, 2023

cristipaval added 6 commits April 8, 2023 01:25

MoneyRequestModal now supports workspaces.

dd7da6a

Rename personalDetails to option

ca7d9c7

handle option icons and alternateText

13ff8e3

Make Lint happy

b1654c5

Merge remote-tracking branch 'origin/main' into cristi_workspaces-in-…

54e5be9

…MoneyRequestModal

Do not request money if the participant is a workspace.

c59279a

cristipaval commented Apr 10, 2023

View reviewed changes

src/pages/iou/MoneyRequestModal.js Show resolved Hide resolved

cristipaval commented Apr 10, 2023

View reviewed changes

src/pages/iou/MoneyRequestModal.js Show resolved Hide resolved

cristipaval marked this pull request as ready for review April 10, 2023 20:12

cristipaval requested a review from a team as a code owner April 10, 2023 20:12

cristipaval requested review from Julesssss, luacmartins and mountiny April 10, 2023 20:12

melvin-bot bot requested review from fedirjh and techievivek and removed request for a team April 10, 2023 20:12

fedirjh reviewed Apr 11, 2023

View reviewed changes

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

src/pages/iou/MoneyRequestModal.js Outdated Show resolved Hide resolved

fedirjh suggested changes Apr 11, 2023

View reviewed changes

src/libs/OptionsListUtils.js Show resolved Hide resolved

src/pages/iou/MoneyRequestModal.js Outdated Show resolved Hide resolved

Julesssss reviewed Apr 11, 2023

View reviewed changes

src/pages/iou/MoneyRequestModal.js Outdated Show resolved Hide resolved

luacmartins reviewed Apr 13, 2023

View reviewed changes

cristipaval and others added 4 commits April 13, 2023 23:48

Update src/libs/OptionsListUtils.js

41b9d74

Co-authored-by: Fedi Rajhi <[email protected]>

Update src/libs/OptionsListUtils.js

ffd15bf

Co-authored-by: Fedi Rajhi <[email protected]>

Remove useless comments.

4f995a9

Avoid repeating logic at every component render.

9754a32

cristipaval requested review from Julesssss, luacmartins, fedirjh and mountiny April 13, 2023 20:58

luacmartins approved these changes Apr 13, 2023

View reviewed changes

fedirjh approved these changes Apr 14, 2023

View reviewed changes

melvin-bot bot mentioned this pull request Apr 14, 2023

Payment issue for E/App PR#17132 #17442

Closed

Julesssss approved these changes Apr 14, 2023

View reviewed changes

Julesssss merged commit 32b1e01 into main Apr 14, 2023

Julesssss deleted the cristi_workspaces-in-MoneyRequestModal branch April 14, 2023 09:31

OSBotify mentioned this pull request Apr 17, 2023

Deploy Checklist: New Expensify 2023-04-17 #17546

Closed

53 tasks

kbecciv mentioned this pull request Apr 19, 2023

[$2000] IOS -Workspace - Workspaces name displayed twice when using the plus button from the workspace chat #17653

Closed

6 tasks

s77rt mentioned this pull request May 10, 2023

[$1000] [HOLD for payment 2023-05-23] [Manual Requests] Fix participants on the IOUConfirmation page in the case when an admin requests money from the workspace #18708

Closed

Beamanator reviewed Jun 20, 2023

View reviewed changes

s77rt reviewed Oct 16, 2023

View reviewed changes

s77rt mentioned this pull request Oct 16, 2023

[HOLD awaiting refund from overpayment] [$500] Details - Workspace split bill displays user name instead of workspace name to admin #29219

Closed

6 tasks

allroundexperts reviewed Oct 18, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Workspaces in money request modal #17132

Workspaces in money request modal #17132

cristipaval commented Apr 7, 2023 •

edited

Loading

MelvinBot commented Apr 10, 2023

fedirjh commented Apr 11, 2023 •

edited

Loading

fedirjh left a comment

luacmartins left a comment •

edited

Loading

cristipaval commented Apr 13, 2023

luacmartins left a comment

fedirjh left a comment

MelvinBot commented Apr 14, 2023

OSBotify commented Apr 14, 2023

OSBotify commented Apr 18, 2023

OSBotify commented Apr 18, 2023

OSBotify commented Apr 19, 2023

s77rt commented May 17, 2023

Beamanator Jun 20, 2023

luacmartins Jun 20, 2023

Beamanator Jun 20, 2023

s77rt Oct 16, 2023

allroundexperts Oct 18, 2023

Workspaces in money request modal #17132

Workspaces in money request modal #17132

Conversation

cristipaval commented Apr 7, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 10, 2023

fedirjh commented Apr 11, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh left a comment

Choose a reason for hiding this comment

luacmartins left a comment • edited Loading

Choose a reason for hiding this comment

cristipaval commented Apr 13, 2023

luacmartins left a comment

Choose a reason for hiding this comment

fedirjh left a comment

Choose a reason for hiding this comment

MelvinBot commented Apr 14, 2023

OSBotify commented Apr 14, 2023

OSBotify commented Apr 18, 2023

OSBotify commented Apr 18, 2023

OSBotify commented Apr 19, 2023

s77rt commented May 17, 2023

Beamanator Jun 20, 2023

Choose a reason for hiding this comment

luacmartins Jun 20, 2023

Choose a reason for hiding this comment

Beamanator Jun 20, 2023

Choose a reason for hiding this comment

s77rt Oct 16, 2023

Choose a reason for hiding this comment

allroundexperts Oct 18, 2023

Choose a reason for hiding this comment

cristipaval commented Apr 7, 2023 •

edited

Loading

fedirjh commented Apr 11, 2023 •

edited

Loading

luacmartins left a comment •

edited

Loading