Add active-workspace-specific fields to the Unreported Expenses by koko57 · Pull Request #70821 · Expensify/App

koko57 · 2025-09-18T16:53:17Z

Explanation of Change

This PR adds the fields specific to the active workspace to the unreported expenses from selfDM.
If the user has no active workspace, we show Report and Category fields by default and redirect the user to Upgrade when they try editing them.

Fixed Issues

$ #70660
PROPOSAL: -

Tests

Violations problem

Create a workspace (if you don't have one), enable taxes
Go to self DM
Track a manual expense
Open the transaction thread
Click Category
Select a category
Verify that no violation is shown

Wrong max tax amount

Create a workspace (if you don't have one), enable taxes
Go to self DM
Track a manual expense
Open the transaction thread
Click Tax
Select 5% tax rate
Click Tax amount
Change amount or just click save/hit enter
Verify that "Maximum tax amount is " is not shown
Verify that the amount is saved an no error appears

System message problem

Create a workspace (if you don't have one), enable taxes
Go to self DM
Track a manual expense
Open the transaction thread.
Click Category.
Select a category.
Verify that the system message is: "set the category to [category]"
Click Tag.
Select a tag.
Verify that the system message is: "set the tag to [tag]"
Click Tax.
Select a tax rate.
Verify that the system message is: "set the tax rate to [taxRate]"

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

#68988

Create a new account
Create a workspace
Go to the workspace, More Features, and enable Categories, Taxes, and Tags
Go to Categories and modify the category list
Go to Taxes and modify the Tax rate lists
Go to Tags and modify the Tags list
Verify that the workspace is the default one for the account
Go to selfDM and create a new expense
Verify that an actionable whisper from Concierge is created with the options: “Send to someone” and “Do nothing”
Click on the newly created expense
Verify that the expense has Category, Tag, Tax Rate, Tax Amount, and Report fields
Verify that when you click on Category, you are asked to select from the custom list of the workspace categories created at step 4
Verify that when you click on Tag, you are asked to select from the custom list of the workspace tags created at step 6
Verify that when you click on the Tax Rate, you are asked to select from the custom list of the tax rates created at the step 5
Verify that updating Category, Tag, Tax Rate, and Tax Amount fields work as expected
Click on the Report field and verify that you can either create a new report or select from existing reports linked to the expense chat
Create some more unreported expenses in the selfDM chat
Go to Reports, select the unreported expenses and verify that you can move them to a report

#68993

Create a new account
Open the self-DM chat and create a new expense linked to it
Verify that an actionable whisper from Concierge is created with the options: “Send to someone” and “Do nothing”
Click on the newly created expense
Verify that the new expense has the Category field
Click on Category and verify that you see the screen with the Upgrade button
Click on Upgrade, add workspace name and currency and confirm
Verify that you get the screen showing that the workspace was successfully created
Click on the Got it button and verify that you have to select a Category from the default Category list

#68994

Have an account with an active workspace
Go to selfDM and create a new expense
Verify that an actionable whisper from Concierge is created with the options: “Send to someone” and “Do nothing”
Click on the newly created expense
Click on the Report field
Verify that you have the option to create a new report
Click on that option and verify that the expense is now moved to a new report linked to the active workspace

#68989

Create a new account
Open the self-DM chat and create a new expense linked to it
Verify that an actionable whisper from Concierge is created with the options: “Send to someone” and “Do nothing”
Click on the newly created expense
Verify that the new expense has the Report field
Click on Report and verify that you see the screen with the Upgrade button
Click on Upgrade, add workspace name and currency, and confirm
Verify that you get the screen showing that the workspace was successfully created
Click on the Got it button and verify that you land on a screen with the option to create a new Report
Click on the Create new report option and verify that the expense is successfully added to that report

#68995

PREREQUISITES: having an active workspace

Have a few unreported expenses
Go to Reports and select those with the status: unreported
Select all of them and then click on the dropdown with the options for the selected expenses
Click on Move expenses option
Verify you have the option to create a new report
Click on that option and verify that a new report is created on the active workspace and the expenses are successfully moved to that report

#71109

Go to workspace chat
Create an empty report
Go to self DM
Track a manual expense
Open the transaction thread
Click Report field
Verify thet Report field is clickable as there is an open report

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-09-18T16:53:23Z

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

parasharrajat · 2025-09-20T12:17:31Z

Let's solve #70663 (comment) here.

koko57 · 2025-09-22T11:22:34Z

@parasharrajat @cristipaval @dylanexpensify I fixed the problem with navigation, but after confirming the flow I get this error:

I tried to add the change to get the policy data from activePolicy if the expense was unreported but still somehow it doesn't work and the policyID param is sent as FAKE. It's a whole lot more digging.

As trackFlow is still in beta, should we fix it here or can it be done later?

@parasharrajat could you please review the PR in the meantime?

cristipaval · 2025-09-22T11:33:53Z

@koko57, what API command is returning that?

koko57 · 2025-09-22T12:04:21Z

@cristipaval CategorizeTrackedExpense

koko57 · 2025-09-22T14:47:26Z

@parasharrajat friendly bump, could you please review in the meantime, when you have some time?

parasharrajat · 2025-09-23T07:16:06Z

Checking...

parasharrajat · 2025-09-23T16:39:09Z

Screenshots

🔲 iOS / native

23.09.2025_23.30.23_REC.mp4

🔲 iOS / Safari

23.09.2025_23.04.02_REC.mp4

🔲 MacOS / Desktop

23.09.2025_22.35.34_REC.mp4

🔲 MacOS / Chrome

23.09.2025_22.30.09_REC.mp4

🔲 Android / Chrome

23.09.2025_23.02.01_REC.mp4

🔲 Android / native

23.09.2025_23.14.37_REC.mp4

parasharrajat · 2025-09-23T16:54:11Z

@koko57 Are you going to handle in new PR #69878 (comment)?

parasharrajat · 2025-09-23T16:54:34Z

@koko57 We didn't remove the permission flag.

parasharrajat

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.

🎀 👀 🎀 C+ reviewed

koko57 · 2025-09-24T07:07:39Z

@parasharrajat ok I waited for your review

parasharrajat · 2025-09-24T11:45:07Z

@koko57 Please let me know when this is ready. Thanks.

parasharrajat

LGTM.

cristipaval

Thank you @koko57 and @parasharrajat for the work you put here! 🙌

melvin-bot · 2025-09-24T18:55:23Z

@cristipaval looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2025-09-24T19:07:28Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

cristipaval · 2025-09-24T19:38:00Z

@cristipaval looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

unrelated to this PR.

OSBotify · 2025-09-24T23:19:03Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.18-0 🚀

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

…nable-unreported-expenses" This reverts commit cd6b82b, reversing changes made to 5223cd6.

[CP Staging] Revert #70821 "Add active-workspace-specific fields to the Unreported Expenses"

[CP Staging] Revert #70821 "Add active-workspace-specific fields to the Unreported Expenses" (cherry picked from commit 3ea5946) (cherry-picked to staging by roryabraham)

OSBotify · 2025-09-26T22:44:08Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.18-7 🚀

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

OSBotify · 2025-09-26T23:07:06Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.19-0 🚀

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

OSBotify · 2025-09-29T20:16:18Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.19-3 🚀

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

koko57 added 4 commits September 18, 2025 15:00

fix: tax amount error

7f63228

fix: minor fix

0dac2f7

fix: report action modified expense message

186701e

fix: show proper message on tax change

b6eec48

koko57 requested a review from a team as a code owner September 18, 2025 16:53

melvin-bot bot assigned koko57 Sep 18, 2025

melvin-bot bot requested review from parasharrajat and removed request for a team September 18, 2025 16:53

koko57 mentioned this pull request Sep 19, 2025

[NoQA] Report upgrade path + Bulk move expenses #70663

Merged

50 tasks

koko57 added 2 commits September 22, 2025 09:52

Merge branch 'main' into fix/70660-enable-unreported-expenses

67745b9

fix: navigation issue

f4048ff

rlinoz mentioned this pull request Sep 22, 2025

Expense - Category page loads infinitely after creating workspace when categorizing expense #70930

Closed

8 tasks

parasharrajat approved these changes Sep 23, 2025

View reviewed changes

melvin-bot bot requested a review from cristipaval September 23, 2025 18:02

koko57 added 4 commits September 24, 2025 09:12

fix: remove the flag

626e2d0

fix: resolve conflicts

374d8b6

fix: prettier

3c2700f

Merge branch 'main' into fix/70660-enable-unreported-expenses

66b12e4

koko57 added 2 commits September 24, 2025 16:07

fix: prettier

51b5314

fix: eslint

efaa1c8

parasharrajat approved these changes Sep 24, 2025

View reviewed changes

cristipaval changed the title ~~Unreported Expenses system message fixes~~ Add active-workspace-specific fields to the Unreported Expenses Sep 24, 2025

cristipaval approved these changes Sep 24, 2025

View reviewed changes

cristipaval merged commit cd6b82b into Expensify:main Sep 24, 2025
23 of 24 checks passed

melvin-bot bot added the Emergency label Sep 24, 2025

cristipaval removed the Emergency label Sep 24, 2025

OSBotify mentioned this pull request Sep 24, 2025

Deploy Checklist: New Expensify 2025-09-24 #71247

Closed

83 tasks

lanitochka17 mentioned this pull request Sep 25, 2025

[Due for payment 2025-10-06] [Due for payment 2025-10-03] IOU - "Rate not valid for this workspace" is shown on expense preview but missing in expense thread #71256

Closed

16 tasks

francoisl added a commit that referenced this pull request Sep 25, 2025

Revert "Merge pull request #70821 from callstack-internal/fix/70660-e…

3d2353c

…nable-unreported-expenses" This reverts commit cd6b82b, reversing changes made to 5223cd6.

francoisl mentioned this pull request Sep 25, 2025

[CP Staging] Revert #70821 "Add active-workspace-specific fields to the Unreported Expenses" #71257

Merged

51 tasks

melvin-bot bot added Reviewing Has a PR in review Weekly KSv2 labels Sep 25, 2025

mitarachim mentioned this pull request Sep 25, 2025

Expense- "You haven't created any categories" is shown when member has no access to categories #71259

Closed

8 tasks

lanitochka17 mentioned this pull request Sep 25, 2025

Expense - After importing categories, RHP back button reopens category settings #71261

Closed

16 tasks

roryabraham added a commit that referenced this pull request Sep 25, 2025

Merge pull request #71257 from Expensify/francois-revert-70821

3ea5946

[CP Staging] Revert #70821 "Add active-workspace-specific fields to the Unreported Expenses"

mitarachim mentioned this pull request Sep 25, 2025

Expense -"Submit 0,00" shown and category field missing on track expense moved to new report #71265

Closed

8 tasks

melvin-bot bot mentioned this pull request Sep 26, 2025

[Unreported] [$250] Enable fields specific to the active workspace to the unreported expenses #70660

Closed

Conversation

koko57 commented Sep 18, 2025 • edited by cristipaval Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Sep 18, 2025

Uh oh!

parasharrajat commented Sep 20, 2025

Uh oh!

koko57 commented Sep 22, 2025

Uh oh!

cristipaval commented Sep 22, 2025

Uh oh!

koko57 commented Sep 22, 2025

Uh oh!

koko57 commented Sep 22, 2025

Uh oh!

parasharrajat commented Sep 23, 2025

Uh oh!

parasharrajat commented Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

Uh oh!

parasharrajat commented Sep 23, 2025

Uh oh!

parasharrajat commented Sep 23, 2025

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

koko57 commented Sep 24, 2025

Uh oh!

parasharrajat commented Sep 24, 2025

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Uh oh!

cristipaval left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Sep 24, 2025

Uh oh!

OSBotify commented Sep 24, 2025

Uh oh!

cristipaval commented Sep 24, 2025

Uh oh!

OSBotify commented Sep 24, 2025

Uh oh!

OSBotify commented Sep 26, 2025

Uh oh!

OSBotify commented Sep 26, 2025

Uh oh!

OSBotify commented Sep 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

koko57 commented Sep 18, 2025 •

edited by cristipaval

Loading

parasharrajat commented Sep 23, 2025 •

edited

Loading