remove MoneyRequestCategoryPage and refactor route #35458

dukenv0307 · 2024-01-31T09:09:52Z

Details

Remove all use of MoneyRequestCategoryPage
Use IOURequestStepCategory for both create and edit case
Add action param for the route of IOURequestStepCategory
EditRequestCategoryPage will be removed after removing all use of EditRequestPage

Fixed Issues

$ #34606
PROPOSAL: #34606 (comment)

Tests

create and edit request money

Verify that MoneyRequestCategoryPage is removed with the route, screen, and all use of this page in the app
Create a request money and select a category
Go to transaction thread report
Verify that selected category is displayed as well
Click on category to edit
Verify that the route has this format :action/:iouType/category/:transactionID/:reportID and action param in URL is edit
Select onther category and verify that category is edited successfully

Create and edit scan split bill

Go to workspace chat
Create a scan split bill request and select a category
Click on split bill detail
Verify that selected category is displayed as well
Click on category to edit
Verify that the route has this format :action/:iouType/category/:transactionID/:reportID and action param in URL is edit
Select another category and verify that category is edited successfully

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

create and edit request money

Verify that MoneyRequestCategoryPage is removed with the route, screen, and all use of this page in the app
Create a request money and select a category
Go to transaction thread report
Verify that selected category is displayed as well
Click on category to edit
Verify that the route has this format :action/:iouType/category/:transactionID/:reportID and action param in URL is edit
Select another category and verify that category is edited successfully

Create and edit scan split bill

Go to workspace chat
Create a scan split bill request and select a category
Click on split bill detail
Verify that selected category is displayed as well
Click on category to edit
Verify that the route has this format :action/:iouType/category/:transactionID/:reportID?backTo= and action param in URL is edit
Select another category and verify that category is edited successfully

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

create and edit request money

Screen.Recording.2024-01-31.at.16.03.51.mov

Create and edit scan split bill

Screen.Recording.2024-01-31.at.16.04.25.mov

Android: mWeb Chrome

create and edit request money

Screen.Recording.2024-01-31.at.15.59.23.mov

Create and edit scan split bill

Screen.Recording.2024-01-31.at.15.59.47.mov

iOS: Native

iOS: mWeb Safari

create and edit request money

Screen.Recording.2024-01-31.at.15.55.35.mov

Create and edit scan split bill

Screen.Recording.2024-01-31.at.15.56.00.mov

MacOS: Chrome / Safari

create and edit request money

Screen.Recording.2024-01-31.at.15.40.47.mov

Create and edit scan split bill

Screen.Recording.2024-01-31.at.15.43.30.mov

MacOS: Desktop

create and edit request money

Screen.Recording.2024-01-31.at.16.08.55.mov

Create and edit scan split bill

Screen.Recording.2024-01-31.at.16.09.15.mov

melvin-bot · 2024-01-31T09:10:07Z

@DylanDylann 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 · 2024-02-02T07:06:39Z

@dukenv0307 Please resolve conflict

dukenv0307 · 2024-02-02T07:12:21Z

@DylanDylann I updated.

src/libs/Navigation/linkingConfig/config.ts

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

DylanDylann · 2024-02-05T16:18:21Z

Also resolve conflict, please

dukenv0307 · 2024-02-05T17:27:06Z

@DylanDylann I updated.

dukenv0307 · 2024-02-05T17:27:37Z

My IOS simulator doesn't work now, please help me to test this.

DylanDylann · 2024-02-06T04:06:21Z

@dukenv0307 Please fix lint error and resolve conflict

dukenv0307 · 2024-02-06T04:16:10Z

@DylanDylann I updated.

src/libs/Navigation/types.ts

src/libs/actions/IOU.ts

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

DylanDylann · 2024-02-06T15:23:50Z

@dukenv0307 Please also use IOURequestStepCategory for editing requests and editing split bill

dukenv0307 · 2024-02-06T15:24:34Z

@dukenv0307 Please also use IOURequestStepCategory for editing requests and editing split bill

I already used it for the edit case.

DylanDylann · 2024-02-06T15:29:37Z

Also should remove EditRequestCategoryPage

DylanDylann · 2024-02-20T08:42:18Z

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

@@ -101,6 +107,10 @@ function IOURequestStepCategory({
        navigateBack();
    };

+    if (!shouldShowCategories) {
+        return <FullPageNotFoundView shouldShow />;


What do you think about moving FullPageNotFoundView into StepScreenWrapper

I think that's good.

@DylanDylann moved not found to into StepScreenWrapper .

DylanDylann · 2024-02-20T14:56:48Z

The changes look good. Testing

DylanDylann · 2024-02-20T14:56:56Z

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(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-02-21.at.15.24.09-compressed.mov

Android: mWeb Chrome

category-chro.mp4

iOS: Native

Screen.Recording.2024-02-21.at.15.22.35-compressed.mov

iOS: mWeb Safari

category-saf.mp4

MacOS: Chrome / Safari

category-web.mp4

MacOS: Desktop

category-desk.mp4

DylanDylann

LGTM

amyevans

Bug: Can't edit a category in request money. Error: Malformed currency code

I'm experiencing this as well

On main, I'm getting a different error:

Uncaught TypeError: Cannot read properties of undefined (reading 'scrollTop')

so that's fun.

I don't feel comfortable approving/merging until the editing flow can be tested again, so let's wait until it's fixed in main (Slack convo), then merge main and retest.

amyevans · 2024-02-21T23:03:47Z

src/components/MoneyRequestConfirmationList.js

-                                Navigation.navigate(ROUTES.MONEY_REQUEST_CATEGORY.getRoute(props.iouType, props.reportID));
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID));


What's up with this change?

Thanks for your catch. @dukenv0307 It seems you update this in this commit

That's my mistake.

amyevans · 2024-02-21T23:11:20Z

src/libs/actions/IOU.ts

    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {category});
 }

-// eslint-disable-next-line @typescript-eslint/naming-convention
-function resetMoneyRequestCategory_temporaryForRefactor(transactionID: string) {


I'm still seeing an instance of this on your branch locally - perhaps from a merge with main?

I updated this to use setMoneyRequestCategory function.

amyevans · 2024-02-21T23:13:07Z

src/libs/actions/IOU.ts

@@ -299,16 +299,10 @@ function setMoneyRequestPendingFields(transactionID: string, pendingFields: Pend
    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {pendingFields});
 }

-// eslint-disable-next-line @typescript-eslint/naming-convention
-function setMoneyRequestCategory_temporaryForRefactor(transactionID: string, category: string) {


Still seeing one usage of this too on your branch

Same as above.

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

Co-authored-by: Amy Evans <[email protected]>

DylanDylann · 2024-02-22T09:53:36Z

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

+    const {category: transactionCategory} = ReportUtils.getTransactionDetails(isEditingSplitBill ? splitDraftTransaction : transaction);
+
+    const isPolicyExpenseChat = ReportUtils.isGroupPolicy(report);
+    const shouldShowCategories = isPolicyExpenseChat && (transactionCategory || OptionsListUtils.hasEnabledOptions(_.values(policyCategories)));


@dukenv0307 Should update to shouldShowNotFoundPage

@DylanDylann Updated.

dukenv0307 · 2024-02-22T16:15:55Z

I don't feel comfortable approving/merging until the editing flow can be tested again, so let's wait until it's fixed in main (Slack convo), then merge main and retest.

@amyevans We can test this now. I tested and It worked well

amyevans · 2024-02-22T17:19:04Z

Okay great. Was able to test fully, looks good on that front! Let me just give the code another once over quick

OSBotify · 2024-02-22T17:30:45Z

✋ 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-02-26T21:05:38Z

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

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

OSBotify · 2024-02-28T23:54:14Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

remove MoneyRequestCategoryPage and refactor route

0d3a9f4

dukenv0307 marked this pull request as ready for review January 31, 2024 09:10

dukenv0307 requested a review from a team as a code owner January 31, 2024 09:10

melvin-bot bot removed the request for review from a team January 31, 2024 09:10

melvin-bot bot requested a review from DylanDylann January 31, 2024 09:10

delete old page and route type

7b3c742

resolve conflict

104f065

DylanDylann reviewed Feb 2, 2024

View reviewed changes

src/libs/Navigation/linkingConfig/config.ts Outdated Show resolved Hide resolved

DylanDylann reviewed Feb 2, 2024

View reviewed changes

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

dukenv0307 added 2 commits February 6, 2024 00:12

resolve conflict

826748b

merge main and remove un-use functiion

27a668e

dukenv0307 added 2 commits February 6, 2024 00:32

fix ts error

7104c7f

fix lint

388615a

dukenv0307 added 3 commits February 6, 2024 11:09

merge main

9437006

resolve conflict

c19b5ff

fix conflict

339c584

dukenv0307 added 2 commits February 6, 2024 11:19

fix lint

2c9117f

Merge branch 'main' into fix/34606

fadfb4c

DylanDylann reviewed Feb 6, 2024

View reviewed changes

src/libs/Navigation/types.ts Show resolved Hide resolved

src/libs/actions/IOU.ts Show resolved Hide resolved

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

DylanDylann reviewed Feb 20, 2024

View reviewed changes

dukenv0307 added 2 commits February 20, 2024 16:16

move not found page into step screen wrapper

d9ce687

Merge branch 'main' into fix/34606

58a4e27

DylanDylann approved these changes Feb 21, 2024

View reviewed changes

melvin-bot bot requested a review from amyevans February 21, 2024 08:36

amyevans requested changes Feb 21, 2024

View reviewed changes

dukenv0307 and others added 5 commits February 22, 2024 14:47

Update src/pages/iou/request/step/StepScreenWrapper.js

b5c4658

Co-authored-by: Amy Evans <[email protected]>

Merge branch 'main' into fix/34606

ce19475

replace old function after merging main

248ebc0

revert incorrect change

fb86af9

remove the use of old route

f93dda6

DylanDylann reviewed Feb 22, 2024

View reviewed changes

dukenv0307 added 4 commits February 22, 2024 17:11

rename variable

60c559d

fix lint

c79efb5

Merge branch 'main' into fix/34606

ea47735

merge main

4b4a005

amyevans approved these changes Feb 22, 2024

View reviewed changes

amyevans merged commit 586ddff into Expensify:main Feb 22, 2024
15 checks passed

DylanDylann mentioned this pull request Feb 24, 2024

[HOLD for payment 2024-03-25] [$500] Can't unselect category when editing a split bill #37146

Closed

6 tasks

github-actions bot mentioned this pull request Feb 26, 2024

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

brandonhenry mentioned this pull request Feb 28, 2024

[HOLD for payment 2024-03-07] [$500] Category - Selected category does not appear as selected in split request Category list #37346

Closed

6 tasks

DylanDylann mentioned this pull request Feb 28, 2024

Get correct default category for split scan request #37392

Merged

50 tasks

mkhutornyi mentioned this pull request Feb 28, 2024

[HOLD for payment 2024-03-18] [$500] Still can access to Tag page when request money to DM 1:1 chat #37207

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove MoneyRequestCategoryPage and refactor route #35458

remove MoneyRequestCategoryPage and refactor route #35458

dukenv0307 commented Jan 31, 2024

melvin-bot bot commented Jan 31, 2024

DylanDylann commented Feb 2, 2024

dukenv0307 commented Feb 2, 2024

DylanDylann commented Feb 5, 2024

dukenv0307 commented Feb 5, 2024

dukenv0307 commented Feb 5, 2024

DylanDylann commented Feb 6, 2024

dukenv0307 commented Feb 6, 2024

DylanDylann commented Feb 6, 2024

dukenv0307 commented Feb 6, 2024

DylanDylann commented Feb 6, 2024

DylanDylann Feb 20, 2024

dukenv0307 Feb 20, 2024

dukenv0307 Feb 20, 2024

DylanDylann commented Feb 20, 2024

DylanDylann commented Feb 20, 2024 •

edited

Loading

DylanDylann left a comment

amyevans left a comment

amyevans Feb 21, 2024

DylanDylann Feb 22, 2024

dukenv0307 Feb 22, 2024

amyevans Feb 21, 2024

dukenv0307 Feb 22, 2024

amyevans Feb 21, 2024

dukenv0307 Feb 22, 2024

DylanDylann Feb 22, 2024

dukenv0307 Feb 22, 2024

dukenv0307 commented Feb 22, 2024 •

edited

Loading

amyevans commented Feb 22, 2024

OSBotify commented Feb 22, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024

		Navigation.navigate(ROUTES.MONEY_REQUEST_CATEGORY.getRoute(props.iouType, props.reportID));
		Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID));

remove MoneyRequestCategoryPage and refactor route #35458

remove MoneyRequestCategoryPage and refactor route #35458

Conversation

dukenv0307 commented Jan 31, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 31, 2024

DylanDylann commented Feb 2, 2024

dukenv0307 commented Feb 2, 2024

DylanDylann commented Feb 5, 2024

dukenv0307 commented Feb 5, 2024

dukenv0307 commented Feb 5, 2024

DylanDylann commented Feb 6, 2024

dukenv0307 commented Feb 6, 2024

DylanDylann commented Feb 6, 2024

dukenv0307 commented Feb 6, 2024

DylanDylann commented Feb 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann commented Feb 20, 2024

DylanDylann commented Feb 20, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann left a comment

Choose a reason for hiding this comment

amyevans 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

dukenv0307 commented Feb 22, 2024 • edited Loading

amyevans commented Feb 22, 2024

OSBotify commented Feb 22, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024

DylanDylann commented Feb 20, 2024 •

edited

Loading

dukenv0307 commented Feb 22, 2024 •

edited

Loading