Remove MoneyRequestSelectorPage.js and copy any changes since Nov 27 into IOURequestStartPage.js. #35455

Krishna2323 · 2024-01-31T07:32:32Z

Details

Fixed Issues

$ #34613
PROPOSAL: #34613 (comment)

Tests

Press on the + button
Choose Request money
For each tab complete a request and verify everything works correctly
Press on the + button
Choose Send money
Complete the flow & verify everything works correctly
Go to any 1:1 report
Click on + button in the composer
Choose Request money
For each tab complete a request and verify everything works correctly
Go to any 1:1 report
Click on + button in the composer
Choose Send money
Complete the flow & verify everything works correctly

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…into IOURequestStartPage.js. Signed-off-by: Krishna Gupta <[email protected]>

melvin-bot · 2024-01-31T07:32:37Z

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

Krishna2323 · 2024-01-31T07:34:26Z

I'm still working on this to make sure it doesn't cause any regression...

DylanDylann · 2024-02-01T05:39:27Z

@Krishna2323 Please take a look at send money flow

Krishna2323 · 2024-02-01T05:40:27Z

@DylanDylann, what do you mean by it? I know there is issue in the whole flow and I'm already trying to handle it, you can check the changes.

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 · 2024-02-03T13:33:07Z

@hoangzinh, can you pls review this once.

hoangzinh · 2024-02-04T03:09:34Z

I see that the PR is not ready yet, the checklist is not completed and recordings as well.

Krishna2323 · 2024-02-04T10:39:29Z

@hoangzinh, screenshots added and checklist is also complete, you can review now.

hoangzinh · 2024-02-05T15:21:29Z

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

+    const shouldShowDate = (shouldShowSmartScanFields || isDistanceRequest) && !isTypeSend;
+    const shouldShowMerchant = shouldShowSmartScanFields && !isDistanceRequest && !isTypeSend;


could you explain why do we have those changes?

Because we don't show date & merchant option when sending.

could you share any ref link (for example GH issue/discussion) so I can cross-check? Thanks

Current send flow also don't allow merchant and date, I just copied this from old component.

@Krishna2323 nice. Could you share the link to that code from the old component? Thanks

Thanks @Krishna2323 in meanwhile, could you fix the TS error? THanks

@DylanDylann can you pls update here.

could you quickly check if we need to copy any changes from MoneyRequestConfirmPage => IOURequestStepConfirmation

Yes, we need to do that

@hoangzinh bump

@Krishna2323 according to his PR here https://github.com/Expensify/App/pull/35461/files#diff-5e4afd2b33b309cd8b0ddee94902568e7abbcf32a83df362df5555767816ac71 It appears that there is no updates from MoneyRequestConfirmPage. So I think we're good to go. What do you think?

src/libs/Navigation/linkingConfig/config.ts

src/libs/actions/IOU.js

src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js

src/pages/iou/request/step/IOURequestStepConfirmation.js

…a2323/remove/redundant/34613

Signed-off-by: Krishna Gupta <[email protected]>

hoangzinh · 2024-02-06T15:33:52Z

Please merge latest main to solve TS failed

src/pages/iou/request/step/IOURequestStepConfirmation.js

hoangzinh · 2024-02-12T09:55:39Z

Sorry for delay @Krishna2323, I will continue to review today

src/ROUTES.ts

src/libs/Navigation/linkingConfig/config.ts

src/pages/iou/request/step/IOURequestStepParticipants.js

src/pages/iou/request/step/IOURequestStepConfirmation.js

hoangzinh · 2024-02-12T15:48:26Z

Just a few feedbacks, otherwise looks great.

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 · 2024-03-09T08:09:16Z

Tested the flow again, seems to work fine.

cc: @hoangzinh

hoangzinh · 2024-03-11T15:36:44Z

Bug 1: Unable to select another currency

Screen.Recording.2024-03-11.at.22.30.59.mov

Krishna2323 · 2024-03-12T11:42:01Z

@hoangzinh can you pls check once again, I can't reproduce the bug you mentioned.

Monosnap.screencast.2024-03-12.17-10-32.mp4

hoangzinh · 2024-03-12T12:37:05Z

You're right. Relogin seem fix the issue

hoangzinh · 2024-03-12T15:20:33Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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

Screen.Recording.2024-03-12.at.22.20.51.android.mov

Android: mWeb Chrome

Screen.Recording.2024-03-12.at.22.18.50.android.chrome.mov

iOS: Native

Screen.Recording.2024-03-12.at.22.16.46.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-03-12.at.22.15.56.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-12.at.22.09.03.web.mov

MacOS: Desktop

Screen.Recording.2024-03-12.at.22.12.13.desktop.mov

hoangzinh

LGTM

melvin-bot · 2024-03-12T15:27:51Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #34613 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

neil-marcellini · 2024-03-13T15:28:33Z

❗❗ Heads up, I'm going to be OOO working from Spain 🇪🇸 part time until 3/28. Most days I will be working 50%, some days 100%. Please DM me if something needs urgent attention.❗❗

hoangzinh · 2024-03-14T00:05:02Z

@neil-marcellini could you help to review this PR as it's blocking a few other issues? Thanks

neil-marcellini

I looked over all the changes and they look good. I think there should be more tests for split, as well as editing currency and waypoints during creation and after the request has been created. That doesn't need to be a blocker either since QA should catch a lot of this, but it would be wise to test now.

I'm going to request a review from @tgolen since he is familiar with this stuff.

NAB: Remove the mention of MoneyRequestSelectorPage as mentioned in your proposal.

neil-marcellini · 2024-03-14T00:24:23Z

src/pages/iou/request/step/IOURequestStepParticipants.js

@@ -43,7 +43,16 @@ function IOURequestStepParticipants({
    const numberOfParticipants = useRef(participants.length);
    const iouRequestType = TransactionUtils.getRequestType(transaction);
    const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
-    const headerTitle = isSplitRequest ? translate('iou.split') : translate(TransactionUtils.getHeaderTitleTranslationKey(transaction));
+    const headerTitle = useMemo(() => {


NAB: Why do we have useMemo here but not on the confirmation step?

neil-marcellini · 2024-03-14T00:26:04Z

src/pages/iou/request/step/IOURequestStepParticipants.js

+            let nextStepIOUType;
+
+            if (isSplit && iouType !== CONST.IOU.TYPE.REQUEST) {
+                nextStepIOUType = CONST.IOU.TYPE.SPLIT;
+            } else {
+                nextStepIOUType = iouType === CONST.IOU.TYPE.SEND ? CONST.IOU.TYPE.SEND : CONST.IOU.TYPE.REQUEST;
+            }
+


NAB: I'm not familiar with this code. Would you please explain why this logic is needed and why the selectedIouType can not be passed to the navigate function directly?

neil-marcellini · 2024-03-14T01:14:00Z

src/pages/LogInWithShortLivedAuthTokenPage.tsx

@@ -18,6 +18,7 @@ import type {PublicScreensParamList} from '@libs/Navigation/types';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route as Routes} from '@src/ROUTES';


NAB: We prefer type names to be singular. exitTo is a Route, not a Routes. Same for Session/index.ts

hoangzinh · 2024-03-14T14:26:04Z

I think there should be more tests for split, as well as editing currency and waypoints during creation and after the request has been created

@Krishna2323 could you do more tests on this suggestion? This is my recording on it

Screen.Recording.2024-03-14.at.21.21.24.mp4

tgolen

Looks pretty good! I just noticed this one additional thing.

tgolen · 2024-03-14T16:17:36Z

src/pages/iou/request/step/IOURequestStepParticipants.js

@@ -109,7 +118,14 @@ function IOURequestStepParticipants({
    const goToNextStep = useCallback(
        (selectedIouType) => {
            const isSplit = selectedIouType === CONST.IOU.TYPE.SPLIT;
-            const nextStepIOUType = !isSplit && iouType !== CONST.IOU.TYPE.REQUEST ? CONST.IOU.TYPE.REQUEST : iouType;
+            let nextStepIOUType;


NAB: It might be a little better to default this to CONST.IOU.TYPE.REQUEST and then you can remove the ternary below.

neil-marcellini · 2024-03-15T09:10:59Z

@Krishna2323 there are some conflicts now

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 · 2024-03-16T19:54:07Z

@neil-marcellini, I don't see any conflicts. BTW I pushed this commit to handle NAB suggestions.

OSBotify · 2024-03-18T09:23:47Z

✋ 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-03-18T16:30:04Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.4.54-0 🚀

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

pac-guerreiro · 2024-03-18T18:31:02Z

@neil-marcellini Do you know how can I test NewDistanceRequestPage.js and NewRequestAmountPage.js ?

OSBotify · 2024-03-19T23:11:08Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.54-4 🚀

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

Remove MoneyRequestSelectorPage.js and copy any changes since Nov 27 …

dae08c9

…into IOURequestStartPage.js. Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 requested a review from a team as a code owner January 31, 2024 07:32

melvin-bot bot requested review from hoangzinh and removed request for a team January 31, 2024 07:32

Krishna2323 added 3 commits February 3, 2024 16:08

Merge branch 'main' into krishna2323/remove/redundant/34613

ff8b9a3

remove redundant code and old component.

cdaa1aa

Signed-off-by: Krishna Gupta <[email protected]>

remove redundant code and comment

b915c4e

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 mentioned this pull request Feb 5, 2024

[$250] Remove MoneyRequestParticipantsPage.js and copy any changes since Nov 27 into IOURequestStepParticipants.js #34616

Closed

hoangzinh reviewed Feb 6, 2024

View reviewed changes

Krishna2323 added 6 commits February 6, 2024 10:50

Merge branch 'main' of https://github.com/Krishna2323/App into krishn…

2c93aef

…a2323/remove/redundant/34613

Merge branch 'main' of https://github.com/Krishna2323/App into krishn…

8325c22

…a2323/remove/redundant/34613

update startMoneyRequest_temporaryForRefactor to startMoneyRequest.

0824fb9

Signed-off-by: Krishna Gupta <[email protected]>

remove: unused routes from ROUTES.ts

4e69672

Signed-off-by: Krishna Gupta <[email protected]>

minor fix.

013376d

Signed-off-by: Krishna Gupta <[email protected]>

updated sendMoney callback dependencies.

423af4e

Signed-off-by: Krishna Gupta <[email protected]>

hoangzinh reviewed Feb 6, 2024

View reviewed changes

src/pages/iou/request/step/IOURequestStepConfirmation.js Show resolved Hide resolved

src/pages/iou/request/step/IOURequestStepConfirmation.js Outdated Show resolved Hide resolved

Krishna2323 added 2 commits February 7, 2024 09:38

Merge branch 'Expensify:main' into krishna2323/remove/redundant/34613

4bed3d0

Merge branch 'Expensify:main' into krishna2323/remove/redundant/34613

c6b0ffe

hoangzinh reviewed Feb 12, 2024

View reviewed changes

Merge branch 'Expensify:main' into krishna2323/remove/redundant/34613

4c6f886

minor fixes.

24c6f46

Signed-off-by: Krishna Gupta <[email protected]>

Merge branch 'Expensify:main' into krishna2323/remove/redundant/34613

6ba7f40

hoangzinh approved these changes Mar 12, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini March 12, 2024 15:28

neil-marcellini previously approved these changes Mar 14, 2024

View reviewed changes

neil-marcellini requested a review from tgolen March 14, 2024 01:21

tgolen previously approved these changes Mar 14, 2024

View reviewed changes

update according to all NAB suggestions.

6c6ed85

Signed-off-by: Krishna Gupta <[email protected]>

Krishna2323 dismissed stale reviews from tgolen and neil-marcellini via 6c6ed85 March 16, 2024 19:52

neil-marcellini approved these changes Mar 18, 2024

View reviewed changes

neil-marcellini merged commit 28cfc14 into Expensify:main Mar 18, 2024
17 checks passed

github-actions bot mentioned this pull request Mar 18, 2024

Deploy Checklist: New Expensify 2024-03-18 #38489

Closed

65 tasks

ahmedGaber93 mentioned this pull request Mar 22, 2024

[HOLD on ISSUE #34616] Web - App crashes when open /participants link #38816

Closed

6 tasks

		const shouldShowDate = (shouldShowSmartScanFields \|\| isDistanceRequest) && !isTypeSend;
		const shouldShowMerchant = shouldShowSmartScanFields && !isDistanceRequest && !isTypeSend;

Remove MoneyRequestSelectorPage.js and copy any changes since Nov 27 into IOURequestStartPage.js. #35455

Remove MoneyRequestSelectorPage.js and copy any changes since Nov 27 into IOURequestStartPage.js. #35455

Conversation

Krishna2323 commented Jan 31, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 31, 2024

Krishna2323 commented Jan 31, 2024

DylanDylann commented Feb 1, 2024

Krishna2323 commented Feb 1, 2024 • edited Loading

Krishna2323 commented Feb 3, 2024

hoangzinh commented Feb 4, 2024

Krishna2323 commented Feb 4, 2024

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

hoangzinh commented Feb 6, 2024

hoangzinh commented Feb 12, 2024

hoangzinh commented Feb 12, 2024 • edited Loading

Krishna2323 commented Mar 9, 2024 • edited Loading

hoangzinh commented Mar 11, 2024

Krishna2323 commented Mar 12, 2024

hoangzinh commented Mar 12, 2024

hoangzinh commented Mar 12, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

hoangzinh left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Mar 12, 2024

neil-marcellini commented Mar 13, 2024

hoangzinh commented Mar 14, 2024 • edited Loading

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

hoangzinh commented Mar 14, 2024

tgolen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neil-marcellini commented Mar 15, 2024

Krishna2323 commented Mar 16, 2024

OSBotify commented Mar 18, 2024

OSBotify commented Mar 18, 2024

pac-guerreiro commented Mar 18, 2024

OSBotify commented Mar 19, 2024

Krishna2323 commented Jan 31, 2024 •

edited

Loading

Krishna2323 commented Feb 1, 2024 •

edited

Loading

hoangzinh commented Feb 12, 2024 •

edited

Loading

Krishna2323 commented Mar 9, 2024 •

edited

Loading

hoangzinh commented Mar 12, 2024 •

edited

Loading

hoangzinh commented Mar 14, 2024 •

edited

Loading