Update request money header title #29936

DylanDylann · 2023-10-19T04:18:23Z

Details

App displays 'Split' in title on back from scan request money
App displays 'Split' in title on back from manual request money

Fixed Issues

$ #28751
PROPOSAL: #28751 (comment)

Tests

Part 1:

Open the app
Click on plus and click request money->scan
Select any file
Observe now it displays 'Scan' in header, select any user
Click on back and verify that now it displays 'Scan' in header

Part 2:

Click manual tap
Enter amount and select any user
Click back button and verify that header message is 'Manual'
Click split button and verify that header message is changed to 'Split'

Verify that no errors appear in the JS console

Offline tests

QA Steps

Part 1:

Open the app
Click on plus and click request money->scan
Select any file
Observe now it displays 'Scan' in header, select any user
Click on back and verify that now it displays 'Scan' in header

Part 2:

Click manual tap
Enter amount and select any user
Click back button and verify that header message is 'Manual'
Click split button and verify that header message is changed to 'Split'

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-resize.mov

Android: mWeb Chrome

cr-resize.mov

iOS: Native

ios-resize.mov

iOS: mWeb Safari

sf-resize.mov

MacOS: Chrome / Safari

web-resize.mov

MacOS: Desktop

dk-resize.mov

melvin-bot · 2023-10-19T05:04:22Z

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

DylanDylann · 2023-10-20T03:47:15Z

@fedirjh Could you help to take a look at this PR? Thanks

fedirjh · 2023-10-20T21:07:30Z

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

@@ -54,6 +54,7 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
    const isScanRequest = MoneyRequestUtils.isScanRequest(selectedTab);
    const isSplitRequest = iou.id === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT;
    const [headerTitle, setHeaderTitle] = useState();
+    const [selectedParticipants, setSelectedParticipants] = useState([]);


I think we have a bug with this approach. The bug is that when you refresh the page on the confirmation page, the data is lost for this state check the video.

CleanShot.2023-10-20.at.21.37.45.mp4

@fedirjh I think this bug occurs because I have not set the default value for state selectedParticipants. I just updated the code, please check again

@DylanDylann I think passing the default value for the state selectedParticipants will bring back the original bug.

Screen.Recording.2023-10-25.at.11.47.29.AM-converted.mov

fedirjh · 2023-10-20T21:16:05Z

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

@@ -198,9 +202,11 @@ function MoneyRequestParticipantsSelector({
                ];
            }

+            setSelectedParticipants(newSelectedOptions);
+
            onAddParticipants(newSelectedOptions);


I think the best option is to use a new optimistic prop inside the IOU to store the type of the request, something like iou.isSplitRequest and then update it when we select multiple participants, what do you think?

fedirjh · 2023-10-22T18:47:52Z

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

Web

CleanShot.2023-10-27.at.13.45.46.mp4

Mobile Web - Chrome

CleanShot.2023-10-27.at.13.54.44.mp4

Mobile Web - Safari

CleanShot.2023-10-27.at.13.52.44.mp4

Desktop

CleanShot.2023-10-27.at.14.10.57.mp4

iOS

CleanShot.2023-10-27.at.14.25.42.mp4

Android

CleanShot.2023-10-27.at.16.13.03.mp4

fedirjh · 2023-10-22T18:50:34Z

@DylanDylann Let's split test on 2 separate tests.

fedirjh · 2023-10-24T22:34:42Z

@DylanDylann Can we push this forward?

DylanDylann · 2023-10-25T02:26:47Z

@fedirjh Could you help to check this comment? #29936 (comment)

fedirjh · 2023-10-25T14:25:51Z

@DylanDylann setting the default value will bring back the original bug , #29936 (comment)

DylanDylann · 2023-10-25T14:27:26Z

@fedirjh I am trying your suggestion, i will give some response asap

DylanDylann · 2023-10-25T16:58:24Z

@fedirjh I just updated code according to your suggestion, please check again

fedirjh

Let's simplify the code a bit.

fedirjh · 2023-10-25T17:01:52Z

src/libs/actions/IOU.js

+function setMoneyRequestIsSplitRequest(isSplitRequest) {
+    Onyx.merge(ONYXKEYS.IOU, {isSplitRequest});
+}


I think it would be better to update the existing code of setMoneyRequestParticipants instead of creating a new one.

Let's add new parameter to the setMoneyRequestParticipants function.

@fedirjh Thank you for your comment, please check again

fedirjh · 2023-10-25T17:04:05Z

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

+            if (newSelectedOptions.length === 0) {
+                IOU.setMoneyRequestIsSplitRequest(false);
+            } else {
+                IOU.setMoneyRequestIsSplitRequest(true);
+            }


Let's avoid these extra steps, let's update onAddParticipants to accept new parameter instead.

fedirjh · 2023-10-25T17:37:33Z

src/libs/actions/IOU.js

    Onyx.merge(ONYXKEYS.IOU, {participants});
+    Onyx.merge(ONYXKEYS.IOU, {isSplitRequest});


Suggested change

Onyx.merge(ONYXKEYS.IOU, {isSplitRequest});

Let's use one merge :

Onyx.merge(ONYXKEYS.IOU, {participants, isSplitRequest});

@fedirjh Quickly updated

cc @DylanDylann I think there is one more change needed, let's pass an empty array when iou.isSplitRequest is false.

I think we have a little bug: when closing the modal without splitting the request, the default type is set to 'split'

bugDesktop.mov

cc @DylanDylann I think there is one more change needed, let's pass an empty array when iou.isSplitRequest is false.

@fedirjh I think it is unnecessary, currently as code change we have 2 cases iou.isSplitRequest = false

In function addSingleParticipant (manual case) we must pass participants param

In function addParticipantToSelection, isSplitRequest = false when newSelectedOptions.length === 0 which means newSelectedOptions is empty

I think it is unnecessary

@DylanDylann We have this bug, from a manual request, navigating back to the participant's page will display selected user + 'add to split button' in the bottom

CleanShot.2023-10-26.at.12.20.13.mp4

fedirjh · 2023-10-25T21:53:09Z

@DylanDylann We should reset the isSplitRequest to false inside IOU.resetMoneyRequestInfo to fix this issue.

DylanDylann · 2023-10-26T02:55:18Z

@DylanDylann We should reset the isSplitRequest to false inside IOU.resetMoneyRequestInfo to fix this issue.

Thanks for your suggestion, I updated

fedirjh

@DylanDylann Please address this bug, #29936 (comment)

fedirjh · 2023-10-26T19:53:21Z

let's pass an empty array when iou.isSplitRequest is false.

@DylanDylann This change should be applied to this line :

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

Line 125 in 9df120e

participants={iou.participants}

This will fix the issue in #29936 (comment)

participants={iou.isSplitRequest ? iou.participants : []}

DylanDylann · 2023-10-27T02:54:26Z

@fedirjh Thanks for your suggestion, I updated. Please check again

fedirjh

Looks good to me.

OSBotify · 2023-10-27T15:47:38Z

✋ 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-10-30T08:02:05Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.93-0 🚀

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

OSBotify · 2023-10-31T21:35:15Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.93-1 🚀

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

OSBotify · 2023-10-31T22:02:04Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.94-0 🚀

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

OSBotify · 2023-11-01T08:54:03Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.94-0 🚀

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

OSBotify · 2023-11-02T10:17:24Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.94-2 🚀

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

DylanDylann added 2 commits October 19, 2023 10:58

Update request money header title

ae942cf

fix lint

c34e284

DylanDylann marked this pull request as ready for review October 19, 2023 05:04

DylanDylann requested a review from a team as a code owner October 19, 2023 05:04

melvin-bot bot requested review from fedirjh and removed request for a team October 19, 2023 05:04

fedirjh reviewed Oct 20, 2023

View reviewed changes

Add default value to selected participants

52919fa

DylanDylann added 2 commits October 25, 2023 23:31

Add isSplitRequest to IOU onyx

6514698

fix lint

8ee843a

fedirjh reviewed Oct 25, 2023

View reviewed changes

fix logic update isSplitRequest

2e2b5c8

fedirjh reviewed Oct 25, 2023

View reviewed changes

fix chore

3fd048d

Reset isSplitRequest when reset IOU

64780a1

fix lint

9df120e

fedirjh suggested changes Oct 26, 2023

View reviewed changes

fix money request participants selector in manual

d4bce78

fedirjh approved these changes Oct 27, 2023

View reviewed changes

melvin-bot bot requested a review from amyevans October 27, 2023 15:23

amyevans approved these changes Oct 27, 2023

View reviewed changes

amyevans merged commit b529f96 into Expensify:main Oct 27, 2023
12 checks passed

OSBotify mentioned this pull request Oct 30, 2023

Deploy Checklist: New Expensify 2023-10-30 #30560

Closed

melvin-bot bot mentioned this pull request Oct 31, 2023

[HOLD for payment 2023-11-07] [$500] Scan - App displays 'Split' in title on back from scan request money request #28751

Closed

6 tasks

OSBotify mentioned this pull request Oct 31, 2023

Deploy Checklist: New Expensify 2023-10-31 #30662

Closed

97 tasks

marktoman mentioned this pull request Oct 31, 2023

[$500] IOU - Show more dropdown option not displayed and manual displayed for scan option #30309

Closed

6 tasks

		Onyx.merge(ONYXKEYS.IOU, {participants});
		Onyx.merge(ONYXKEYS.IOU, {isSplitRequest});

Update request money header title #29936

Update request money header title #29936

Conversation

DylanDylann commented Oct 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 19, 2023

DylanDylann commented Oct 20, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fedirjh commented Oct 22, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh commented Oct 22, 2023

fedirjh commented Oct 24, 2023

DylanDylann commented Oct 25, 2023

fedirjh commented Oct 25, 2023

DylanDylann commented Oct 25, 2023

DylanDylann commented Oct 25, 2023 • edited Loading

fedirjh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fedirjh commented Oct 25, 2023

DylanDylann commented Oct 26, 2023

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh commented Oct 26, 2023

DylanDylann commented Oct 27, 2023

fedirjh left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 27, 2023

OSBotify commented Oct 30, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Nov 1, 2023

OSBotify commented Nov 2, 2023

DylanDylann commented Oct 19, 2023 •

edited

Loading

fedirjh commented Oct 22, 2023 •

edited

Loading

DylanDylann commented Oct 25, 2023 •

edited

Loading