Update error flow for prevent splitting bill with workspace and additional participants #30302

hoangzinh · 2023-10-24T22:55:38Z

Details

Fixed Issues

$ #27508
PROPOSAL: #27508 (comment)

Tests

Test case 1:

Press FAB -> Request money
Select the "Manual" tab, then fill in any amount
Select split bill with 2 workspaces
Verify that it shows a form error and "Add to split" button is disabled
Select split bill with a workspace and an individual user
Verify that it shows a form error and "Add to split" button is disabled
Select split bill with a single workspace
Verify that it does not show any error and "Add to split" button is enabled
Select split bill with individual users
Verify that it does not show any error and "Add to split" button is enabled

Test case 2:
On Web/Desktop

Press FAB -> Request money
Select the "Manual" tab, then fill in any amount
Select split bill with 2 workspaces
Press the shortcut CMD+Enter
Verify the form error is displayed and the form still stays at the participants selection screen

Verify that no errors appear in the JS console

Offline tests

PR changes are not affected by network status

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-11-01.at.00.25.45.-.android.mov

Android: mWeb Chrome

Screen.Recording.2023-10-31.at.23.57.30.-.android.chrome.mov

iOS: Native

Screen.Recording.2023-11-01.at.00.01.04.-.ios.mov

iOS: mWeb Safari

Screen.Recording.2023-10-31.at.23.59.31.-.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2023-10-31.at.23.43.10.-.web.mov

Screen.Recording.2023-11-02.at.16.10.12.-.web.cmd.+.enter.mov

MacOS: Desktop

Screen.Recording.2023-10-31.at.23.47.19.-.desktop.mov

Screen.Recording.2023-11-02.at.16.11.01.-.desktop.cmd.+.enter.mov

…cluding a workspace

melvin-bot · 2023-10-31T17:28:37Z

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

situchan · 2023-10-31T17:32:09Z

src/languages/en.ts

@@ -594,6 +594,7 @@ export default {
            genericSmartscanFailureMessage: 'Transaction is missing fields',
            duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
            emptyWaypointsErrorMessage: 'Please enter at least two waypoints',
+            splitBillMultipleParticipantsIncludingWorkspace: 'Split bill is only allowed between a single workspace or individual users. Please update your selection.',


splitBillMultipleParticipantsErrorMessage is better name

Updated in 06879a6

situchan · 2023-10-31T17:33:25Z

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

                onConfirmSelection={navigateToSplit}
                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                textInputAlert={isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''}
                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                shouldShowOptions={isOptionsDataReady}
                shouldPreventDefaultFocusOnSelectRow={!Browser.isMobile()}
                shouldDelayFocus
+                footerContent={isAllowedToSplit && footerContent}


Won't this cause console error?

Suggested change

footerContent={isAllowedToSplit && footerContent}

footerContent={isAllowedToSplit ? footerContent : undefined}

I think it won't cause console error.

footerContent props accept a PropTypes.node

App/src/components/OptionsSelector/optionsSelectorPropTypes.js

Lines 106 to 107 in 342a2c4

/** Custom content to display in the footer instead of the default button. */

footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),

And boolean is one of ReactNodeLike type

situchan · 2023-11-01T17:58:05Z

@hoangzinh let's not allow going to next page on Cmd+Enter key press, which is your issue - #29628 haha

Screen.Recording.2023-11-02.at.12.01.13.AM.mov

situchan · 2023-11-01T18:06:35Z

@thienlnam Hmm, actually do you want #30302 (comment) to be fixed here or separately in #29628?

thienlnam · 2023-11-01T18:17:02Z

Hmm yeah that bug looks to be the same issue we're trying to prevent here - so if we can handle it here as well that would be great

hoangzinh · 2023-11-02T09:14:25Z

@situchan Fixed that bug in commit 8da24d8

situchan · 2023-11-02T17:18:27Z

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

Android: Native

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

situchan

thienlnam

Great, thank you!

OSBotify · 2023-11-02T20:11:07Z

✋ 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-11-06T22:33:19Z

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

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

OSBotify · 2023-11-09T22:50:52Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.96-15 🚀

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

OSBotify · 2023-11-10T15:47:48Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.97-7 🚀

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

hoangzinh added 8 commits October 25, 2023 05:54

Always show confirmation button

62e087b

Display warning message when split bill with multiple participants in…

40b36e0

…cluding a workspace

Change variable name

f665bda

Update comment

9e0578e

Update translation

b5c4c95

Merge branch 'main' into df/27508

22cfb1d

Fix lint

41c05ae

Fix lint

274f686

hoangzinh marked this pull request as ready for review October 31, 2023 17:28

hoangzinh requested a review from a team as a code owner October 31, 2023 17:28

melvin-bot bot requested review from situchan and removed request for a team October 31, 2023 17:28

situchan reviewed Oct 31, 2023

View reviewed changes

Update translation key

06879a6

hoangzinh added 2 commits November 2, 2023 16:04

Prevent user go to next step when press CMD+ENTER

8da24d8

Fix linter

ec1e215

situchan approved these changes Nov 2, 2023

View reviewed changes

melvin-bot bot requested a review from thienlnam November 2, 2023 17:21

thienlnam approved these changes Nov 2, 2023

View reviewed changes

thienlnam merged commit 35c3b8a into Expensify:main Nov 2, 2023
15 checks passed

OSBotify mentioned this pull request Nov 6, 2023

Deploy Checklist: New Expensify 2023-11-06 #30929

Closed

OSBotify mentioned this pull request Nov 8, 2023

Deploy Checklist: New Expensify 2023-11-08 #31077

Closed

hoangzinh mentioned this pull request Nov 19, 2023

[Issue Payment] [$500] Update error flow for prevent splitting bill with workspace and additional participants #27508

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update error flow for prevent splitting bill with workspace and additional participants #30302

Update error flow for prevent splitting bill with workspace and additional participants #30302

hoangzinh commented Oct 24, 2023 •

edited

Loading

melvin-bot bot commented Oct 31, 2023

situchan Oct 31, 2023

hoangzinh Oct 31, 2023

situchan Oct 31, 2023

hoangzinh Oct 31, 2023

situchan commented Nov 1, 2023 •

edited

Loading

situchan commented Nov 1, 2023 •

edited

Loading

thienlnam commented Nov 1, 2023

hoangzinh commented Nov 2, 2023

situchan commented Nov 2, 2023

situchan left a comment

thienlnam left a comment

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023

	footerContent={isAllowedToSplit && footerContent}
	footerContent={isAllowedToSplit ? footerContent : undefined}

	/** Custom content to display in the footer instead of the default button. */
	footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),

Update error flow for prevent splitting bill with workspace and additional participants #30302

Update error flow for prevent splitting bill with workspace and additional participants #30302

Conversation

hoangzinh commented Oct 24, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 31, 2023

situchan Oct 31, 2023

Choose a reason for hiding this comment

hoangzinh Oct 31, 2023

Choose a reason for hiding this comment

situchan Oct 31, 2023

Choose a reason for hiding this comment

hoangzinh Oct 31, 2023

Choose a reason for hiding this comment

situchan commented Nov 1, 2023 • edited Loading

situchan commented Nov 1, 2023 • edited Loading

thienlnam commented Nov 1, 2023

hoangzinh commented Nov 2, 2023

situchan commented Nov 2, 2023

Reviewer Checklist

Screenshots/Videos

situchan left a comment

Choose a reason for hiding this comment

thienlnam left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023

hoangzinh commented Oct 24, 2023 •

edited

Loading

situchan commented Nov 1, 2023 •

edited

Loading

situchan commented Nov 1, 2023 •

edited

Loading