Update logic for categorising expenses #40840

allroundexperts · 2024-04-23T22:39:07Z

Details

Fixed Issues

$ #40668
PROPOSAL: N/A

Tests

Create a new account and login
Click on the Fab, then track expense and create a track expense request
Actionable whispers should appear in personal chat
Click on the Categorize option.
Verify that an option to select a category appears and selecting it creates a request successfully.
Repeat steps 1-3, and click on the Share with accountant whisper
Verify that you are redirected to the request confirmation page and upon confirmation, you're able to see an invite members page.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create a new account and login
Click on the Fab, then track expense and create a track expense request
Actionable whispers should appear in personal chat
Click on the Categorize option.
Verify that an option to select a category appears and selecting it creates a request successfully.
Repeat steps 1-3, and click on the Share with accountant whisper
Verify that you are redirected to the request confirmation page and upon confirmation, you're able to see an invite members page.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Having issues with my Android build.

Android: mWeb Chrome

Screen.Recording.2024-04-25.at.1.05.45.AM.mov

iOS: Native

Screen.Recording.2024-04-25.at.1.07.41.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-04-25.at.12.56.53.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-25.at.12.40.11.AM.mov

MacOS: Desktop

Screen.Recording.2024-04-25.at.12.46.27.AM.mov

src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js

This reverts commit 238d7d7.

…antsSelector.js Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

melvin-bot · 2024-04-24T20:19:37Z

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

github-actions · 2024-04-24T20:30:32Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/40840/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/40840/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/40840/NewExpensify.dmg	https://40840.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

src/libs/ReportUtils.ts

ishpaul777 · 2024-04-24T22:00:41Z

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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Android: mWeb Chrome

WhatsApp.Video.2024-04-25.at.7.01.30.AM.mp4

iOS: Native

Screen.Recording.2024-04-25.at.6.33.49.AM-1.mov

iOS: mWeb Safari

Screen.Recording.2024-04-25.at.6.20.29.AM-1.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-25.at.6.41.46.AM.mov

MacOS: Desktop

Screen.Recording.2024-04-25.at.6.29.48.AM.mov

shubham1206agra · 2024-04-25T01:05:03Z

src/libs/ReportUtils.ts

+            isPolicyExpenseChat: true,
+            reportID: expenseChatReportID,
+            policyID,
+            searchText: policyName,


NAB - Why searchText is required here?

It was being set when a participant is selected in the IOUParticipantSelector page. I just replicated that functionality.

ishpaul777

There's a minor issue, that can be follow up. sometimes on categories page not-found page appears for a second, it would be greate if we can fix before deploy otherwise it not blocker IMO

shubham1206agra · 2024-04-25T01:21:57Z

src/libs/ReportUtils.ts

@@ -6116,7 +6117,34 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
        mccGroup,
    } as Transaction);

-    Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(CONST.IOU.TYPE.SUBMIT, transactionID, reportID, undefined, actionName));


@allroundexperts You forgot to keep this route for the Submit it to someone flow. And this is a blocker for this PR.

shubham1206agra · 2024-04-25T01:24:10Z

@thienlnam Do not merge until #40840 (comment) has been addressed, as it will create a workspace for Submit it to someone flow, which is not desired at all.

src/libs/ReportUtils.ts

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

shubham1206agra · 2024-04-25T08:25:59Z

@thienlnam You are clear to merge now.

thienlnam

Thanks for the urgency!

OSBotify · 2024-04-25T15:31:25Z

✋ 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-04-26T23:21:44Z

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

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

OSBotify · 2024-04-29T23:13:31Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

OSBotify · 2024-04-30T00:41:00Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

update logic for categorizing expenses

70a6330

allroundexperts mentioned this pull request Apr 23, 2024

CRITICAL: [Actionable Whisper] [$1500] Create workspace automatically if none already exists for Categorize and Share #40668

Closed

Update Permissions.ts

3284333

allroundexperts changed the title ~~update logic for categorising expenses~~ Update logic for categorising expenses Apr 23, 2024

typecheck fix

2f9e0fd

shubham1206agra reviewed Apr 24, 2024

View reviewed changes

src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js Outdated Show resolved Hide resolved

allroundexperts and others added 5 commits April 24, 2024 18:37

Merge branch 'main' into feat-40668

594d8f2

feat: do not create workspace api call

238d7d7

Revert "feat: do not create workspace api call"

072f62d

This reverts commit 238d7d7.

Update src/pages/iou/request/MoneyTemporaryForRefactorRequestParticip…

946f165

…antsSelector.js Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

show optimistic reports in the search

062c8d3

thienlnam added the Ready To Build label Apr 24, 2024

allroundexperts marked this pull request as ready for review April 24, 2024 20:19

allroundexperts requested a review from a team as a code owner April 24, 2024 20:19

melvin-bot bot removed the request for review from a team April 24, 2024 20:19

melvin-bot bot requested a review from shubham1206agra April 24, 2024 20:19

thienlnam assigned allroundexperts Apr 24, 2024

allroundexperts added 3 commits April 25, 2024 01:56

optimise the draft workspace creation logic further

7b76548

merge with main

12b930c

fix: multiple workspace getting created

e45bee0

ishpaul777 reviewed Apr 24, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

allroundexperts added 2 commits April 25, 2024 02:47

fix: submit expense button disabled

ffdaec1

fix: submit expense button disabled

fa96051

allroundexperts added 2 commits April 25, 2024 03:35

exclude pending delete workspaces

d9187ec

typecheck fix

34dc692

shubham1206agra reviewed Apr 25, 2024

View reviewed changes

ishpaul777 approved these changes Apr 25, 2024

View reviewed changes

melvin-bot bot requested a review from thienlnam April 25, 2024 01:19

shubham1206agra reviewed Apr 25, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

Update ReportUtils.ts

9fce2e8

Co-authored-by: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>

thienlnam approved these changes Apr 25, 2024

View reviewed changes

thienlnam merged commit 1abbf42 into Expensify:main Apr 25, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-04-26 #41122

Closed

63 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update logic for categorising expenses #40840

Update logic for categorising expenses #40840

allroundexperts commented Apr 23, 2024 •

edited

Loading

melvin-bot bot commented Apr 24, 2024

github-actions bot commented Apr 24, 2024

ishpaul777 commented Apr 24, 2024 •

edited

Loading

shubham1206agra Apr 25, 2024

allroundexperts Apr 25, 2024

ishpaul777 left a comment •

edited

Loading

shubham1206agra Apr 25, 2024

shubham1206agra commented Apr 25, 2024

shubham1206agra commented Apr 25, 2024

thienlnam left a comment

OSBotify commented Apr 25, 2024

OSBotify commented Apr 26, 2024

OSBotify commented Apr 29, 2024

OSBotify commented Apr 30, 2024

Update logic for categorising expenses #40840

Update logic for categorising expenses #40840

Conversation

allroundexperts commented Apr 23, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 24, 2024

github-actions bot commented Apr 24, 2024

ishpaul777 commented Apr 24, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

shubham1206agra Apr 25, 2024

Choose a reason for hiding this comment

allroundexperts Apr 25, 2024

Choose a reason for hiding this comment

ishpaul777 left a comment • edited Loading

Choose a reason for hiding this comment

shubham1206agra Apr 25, 2024

Choose a reason for hiding this comment

shubham1206agra commented Apr 25, 2024

shubham1206agra commented Apr 25, 2024

thienlnam left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 25, 2024

OSBotify commented Apr 26, 2024

OSBotify commented Apr 29, 2024

OSBotify commented Apr 30, 2024

allroundexperts commented Apr 23, 2024 •

edited

Loading

ishpaul777 commented Apr 24, 2024 •

edited

Loading

ishpaul777 left a comment •

edited

Loading