[CP Staging] Fix empty workspace detail in money request page #27742

bernhardoj · 2023-09-19T05:17:09Z

Details

Selecting workspace as a split bill participant will show an empty detail.

Fixed Issues

$ #27510
PROPOSAL: #27510 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open request money > manual
Enter any amount and press Next
Select a user and a workspace
Verify the selected participant has their detail (avatar, title, subtitle)
Verify "Add to split" button is hidden
Deselect the user
Press "Add to split"
Verify the selected participant has their detail on the confirm page
Press "Split bill"
Verify the split bill success

Split disabled for scan and distance request

Open request money > scan
Select any file
Verify there is no "Split" button on the participant selection page
Open request money > distance
Enter start and finish waypoints and press Next
Verify there is no "Split" button on the participant selection page

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-09-20.at.15.02.05.mov

Mobile Web - Chrome

Screen.Recording.2023-09-19.at.12.50.38.mov

Mobile Web - Safari

Screen.Recording.2023-09-19.at.12.49.58.mov

Desktop

Screen.Recording.2023-09-19.at.12.49.15.mov

iOS

Screen.Recording.2023-09-19.at.12.51.32.mov

Android

Screen.Recording.2023-09-19.at.12.53.05.mov

melvin-bot · 2023-09-19T05:17:14Z

@situchan 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-09-19T05:32:31Z

Existing issues:

Split bill freeze
Solution: revert Link Request Money not work #26854 locally
Can't split bill with workspace

Is it actually expected to be able to split bill with workspace? If yes, then I can report the above error.

Selected workspaces are still shown in the Recents list

~~I will report this one after this PR is merged.~~ Fixed here.

situchan · 2023-09-19T05:33:55Z

Selected workspaces are still shown in the Recents list

Why can't we fix this here?

bernhardoj · 2023-09-19T05:34:03Z

As the changes touch the SplitBillDetailsPage, I also test opening the split bill details page.

Screen.Recording.2023-09-19.at.12.58.36.mov

I can't test the split bill in workspace as it requires control policy expense chat (idk what that is)

src/libs/OptionsListUtils.js

bernhardoj · 2023-09-19T05:34:54Z

Why can't we fix this here?

I'm still looking for the problem, I will push it if it's simple

bernhardoj · 2023-09-19T05:44:12Z

Fixed the recent list issue.

situchan · 2023-09-19T19:30:29Z

Please pull main. Freeze issue is now fixed.

src/libs/actions/IOU.js

situchan · 2023-09-20T05:34:34Z

Onyx merge error when split bill with a workspace. Not blocker but just for tracking:

situchan · 2023-09-20T05:44:41Z

BUG: Amount input shows when split bill with workspace on distance request. For any distance requests, amount is calculated automatically, right?

Screen.Recording.2023-09-20.at.11.41.43.AM.mov

bernhardoj · 2023-09-20T05:56:43Z

@situchan it happens on the main too.

When we press Add to split, it should go to the confirm page. But in the confirm page, we have a guard to prevent users from accessing it if amount is 0 (which is true for distance requests), but we already add an exception for distance requests.

App/src/pages/iou/steps/MoneyRequestConfirmPage.js

Lines 105 to 107 in 5d71d32

    
           if (_.isEmpty(props.iou.participants) || (props.iou.amount === 0 && !props.iou.receiptPath && !isDistanceRequest) || shouldReset) { 
        
               Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), true); 
        
           }

However, isDistanceRequest is false because. It is true only if the iou type is request.

App/src/libs/MoneyRequestUtils.ts

Lines 70 to 72 in 5d71d32

    
           function isDistanceRequest(iouType: ValueOf<typeof CONST.IOU.MONEY_REQUEST_TYPE>, selectedTab: ValueOf<typeof CONST.TAB>): boolean { 
        
               return iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST && selectedTab === CONST.TAB.DISTANCE; 
        
           }

We should either disable the split option when doing distance requests or allow split bill for distance requests.

bernhardoj · 2023-09-20T06:20:28Z

@situchan updated

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js

situchan · 2023-09-20T06:24:07Z

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js

+    // the app from crashing on native when you try to do this, we'll going to hide the button if you have a workspace and other participants
+    const hasPolicyExpenseChatParticipant = _.some(participants, (participant) => participant.isPolicyExpenseChat);
+    const shouldShowConfirmButton = !(participants.length > 1 && hasPolicyExpenseChatParticipant);
+    const isAllowToSplit = !isDistanceRequest && !isScanRequest;


grammar fix: isAllowedToSplit or shouldAllowSplit. I prefer ~~latter~~former one

Just saw the edit, I think I will keep the latter one

Or maybe not, I updated to use the former one

situchan · 2023-09-20T06:42:47Z

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 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 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-split.mov

web.mov

Mobile Web - Chrome

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

situchan · 2023-09-20T06:48:11Z

@bernhardoj please update QA step based on new expected behavior

situchan · 2023-09-20T06:55:24Z

src/libs/MoneyRequestUtils.ts

+/**
+ * Check if scan request or not
+ */
+function isScanRequest(selectedTab: ValueOf<typeof CONST.TAB>): boolean {


This is inconsistent with isDistanceRequest which also accepts iouType as param but I think that's fine as we'll be supporting split bill on scan request as well.

Yes, I didn't include that because of that reason

bernhardoj · 2023-09-20T07:01:23Z

Updated the test step

thienlnam · 2023-09-20T07:09:30Z

Lovely - thank you both so much for keeping with this!

…tail-money-request (cherry picked from commit 3098119)

OSBotify · 2023-09-20T07:16:33Z

✋ 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-09-20T08:43:30Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.72-0 🚀

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

situchan · 2023-09-20T10:17:44Z

Seems like this didn't hit production yet

OSBotify · 2023-09-22T13:25:25Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.72-11 🚀

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

bernhardoj added 5 commits September 19, 2023 12:52

handle selected state based on reportID

82ee431

return an object instead of an array

c25cd1c

include isPolicyExpenseChat and reportID

2e8b4e3

get option detail of each participant

38502de

fix selected logic to include reportID

9a7e16c

bernhardoj requested a review from a team as a code owner September 19, 2023 05:17

melvin-bot bot requested review from situchan and removed request for a team September 19, 2023 05:17

situchan reviewed Sep 19, 2023

View reviewed changes

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

bernhardoj added 2 commits September 19, 2023 13:35

update returns type

c00c1f4

remove report from recents list if it's selected

e42e511

thienlnam and others added 3 commits September 20, 2023 11:40

Merge branch 'main' into pr/27742

ae8d256

Hide button as a stop gap

5ef21c8

allow to split bill with 1 workspace

9fd8870

bernhardoj commented Sep 20, 2023

View reviewed changes

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

prettier

e15ea99

bernhardoj added 2 commits September 20, 2023 14:17

allow to split with 1 workspace

34f3cff

temp disable split for scan & distance req

74bd857

situchan reviewed Sep 20, 2023

View reviewed changes

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js Outdated Show resolved Hide resolved

situchan reviewed Sep 20, 2023

View reviewed changes

bernhardoj added 3 commits September 20, 2023 14:24

move the logic to util

007d007

rename const

9b92276

rename const

c56e65f

situchan reviewed Sep 20, 2023

View reviewed changes

situchan approved these changes Sep 20, 2023

View reviewed changes

melvin-bot bot requested a review from thienlnam September 20, 2023 06:55

thienlnam approved these changes Sep 20, 2023

View reviewed changes

thienlnam merged commit 3098119 into Expensify:main Sep 20, 2023
16 of 17 checks passed

mountiny changed the title ~~Fix empty workspace detail in money request page~~ [CP Staging] Fix empty workspace detail in money request page Sep 20, 2023

OSBotify pushed a commit that referenced this pull request Sep 20, 2023

Merge pull request #27742 from bernhardoj/fix/27510-empty-wokspace-de…

d2d7227

…tail-money-request (cherry picked from commit 3098119)

OSBotify mentioned this pull request Sep 20, 2023

🍒 Cherry pick PR #27742 to staging 🍒 #27831

Closed

OSBotify mentioned this pull request Sep 20, 2023

Deploy Checklist: New Expensify 2023-09-20 #27837

Closed

melvin-bot bot mentioned this pull request Sep 22, 2023

[HOLD for payment 2023-09-29] [$500] Workspace details don't show up in participants selector #27510

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix empty workspace detail in money request page #27742

[CP Staging] Fix empty workspace detail in money request page #27742

bernhardoj commented Sep 19, 2023 •

edited

Loading

melvin-bot bot commented Sep 19, 2023

bernhardoj commented Sep 19, 2023 •

edited

Loading

situchan commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

situchan commented Sep 19, 2023

situchan commented Sep 20, 2023

situchan commented Sep 20, 2023

bernhardoj commented Sep 20, 2023

bernhardoj commented Sep 20, 2023

situchan Sep 20, 2023 •

edited

Loading

bernhardoj Sep 20, 2023

bernhardoj Sep 20, 2023

bernhardoj Sep 20, 2023

situchan commented Sep 20, 2023 •

edited

Loading

situchan commented Sep 20, 2023

situchan Sep 20, 2023

bernhardoj Sep 20, 2023

bernhardoj commented Sep 20, 2023

thienlnam commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 20, 2023

situchan commented Sep 20, 2023

OSBotify commented Sep 22, 2023

[CP Staging] Fix empty workspace detail in money request page #27742

[CP Staging] Fix empty workspace detail in money request page #27742

Conversation

bernhardoj commented Sep 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 19, 2023

bernhardoj commented Sep 19, 2023 • edited Loading

situchan commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

bernhardoj commented Sep 19, 2023

situchan commented Sep 19, 2023

situchan commented Sep 20, 2023

situchan commented Sep 20, 2023

bernhardoj commented Sep 20, 2023

bernhardoj commented Sep 20, 2023

situchan Sep 20, 2023 • edited Loading

Choose a reason for hiding this comment

bernhardoj Sep 20, 2023

Choose a reason for hiding this comment

bernhardoj Sep 20, 2023

Choose a reason for hiding this comment

bernhardoj Sep 20, 2023

Choose a reason for hiding this comment

situchan commented Sep 20, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

situchan commented Sep 20, 2023

situchan Sep 20, 2023

Choose a reason for hiding this comment

bernhardoj Sep 20, 2023

Choose a reason for hiding this comment

bernhardoj commented Sep 20, 2023

thienlnam commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 20, 2023

situchan commented Sep 20, 2023

OSBotify commented Sep 22, 2023

bernhardoj commented Sep 19, 2023 •

edited

Loading

bernhardoj commented Sep 19, 2023 •

edited

Loading

situchan Sep 20, 2023 •

edited

Loading

situchan commented Sep 20, 2023 •

edited

Loading