Create report simplified actions follow ups #61760

SzymczakJ · 2025-05-09T07:57:14Z

Explanation of Change

This PR adds:

"Add unreported expense" option to "Add expense" report simplified action(for MoneyReportHeader)

Tests for "Add expense: simplified action
Adds "Add unreported expense" option to "Add expense" simplified action for empty report preview.

Adds navigation logic, so that creating expense from empty report preview simplified action doesn't redirect to the inside of the report, but stays on the chat where the report preview is.

Screen.Recording.2025-05-12.at.10.30.02.mov

Refactors portion of FloatingActionButtonAndPopover putting functions connected to quick actions to a seperate utils file and changes the Create report FAB action so that, if there's only one paid gropu workspace and it's past grace period it automatically redirects "pay for workspace" page

Fixed Issues

$ #57656
$ #61087
$ #61513
$ #60887 (comment)
PROPOSAL:

Tests

Create empty report and go to "Add unreported expense" page, make sure that you are able to add unreported expenses with it.
Create empty report and go to workpace chat to see it's report preview:

make sure that you are able to create expense in it and the navigation stays on the workspace chat on which you've seen the report preview,
make sure that you are able to add unreported expense to it and the navigation stays on the workspace chat on which you've seen the report preview,

Try submitting expense in any way that you can think of and make sure that the navigation is not broken(like creating expense with FAB, inside a workspace chat, creating an expense with scan, etc.)
Test quick actions(create expense, create report, etc.).

Offline tests

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

-1a917cafcafc" />

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…plified action

…ty report preview

mountiny · 2025-05-12T12:55:41Z

src/ROUTES.ts

+        route: ':action/:iouType/start/:transactionID/:reportID/distance/:backToReport?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) =>
+            `create/${iouType as string}/start/${transactionID}/${reportID}/${backToReport}/distance` as const,


arent these the other way around? /${backToReport}/distance

melvin-bot · 2025-05-12T13:49:02Z

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

luacmartins

LGTM

tests/actions/ReportPreviewActionUtilsTest.ts

mountiny

Tested with the backend fix and its looking good, left couple NAB comments but would be good to address them since conflicts need to be resolved
https://github.com/user-attachments/assets/7e443f19-db1a-4e2f-9505-f6f0ed7594b5

mountiny · 2025-05-12T18:25:51Z

src/ROUTES.ts

+        route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?/:backToReport?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, pageIndex: string, backToReport?: string, backTo = '') => {


No need to add it to the getUrlWithBackToParam?

src/ROUTES.ts

src/libs/QuickActionUtils.ts

mountiny · 2025-05-12T18:30:12Z

src/pages/iou/request/step/IOURequestStepAmount.tsx

+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false});
+    const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
+    const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
+    const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`, {canBeMissing: true});


can this be missing?

Personal details list: probably not, I think we are sending it on app startup and that's why I added false,

draftTransaction: I believe this is only local onyx value, we don't have a full confidence it will be always there,

splitDraftTransaction: can be missing in case we are creating a normal expense,

skipConfirmation: this is some custom setting and if the user doesn't set it explicitly, then it's missing,

draftTransaction: I believe this is only local onyx value, we don't have a full confidence it will be always there,

I mainly meant this one so I thought since its local we should probably be able to control its set

It makes sense, I'll change it to false. From what I've checked it's always there.

src/pages/iou/request/step/IOURequestStepAmount.tsx

src/pages/iou/request/step/IOURequestStepScan/index.tsx

DylanDylann · 2025-05-13T12:07:26Z

BUG: Not Found Page display when creating expense via the quick action button

Screen.Recording.2025-05-13.at.19.05.00.mov

SzymczakJ · 2025-05-13T12:19:48Z

BUG: Not Found Page display when creating expense via the quick action button

Cannot reproduce it on my end, can you give more tests steps/custom config of your workspace, etc.?

DylanDylann · 2025-05-13T12:36:46Z

So weird, can't reproduce anymore

DylanDylann · 2025-05-13T12:37:34Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Screen.Recording.2025-05-13.at.19.51.51.mov

Android: mWeb Chrome

Screen.Recording.2025-05-13.at.19.43.17.mov

iOS: HybridApp

Screen.Recording.2025-05-13.at.19.49.04.mov

iOS: mWeb Safari

Screen.Recording.2025-05-13.at.19.42.41.mov

MacOS: Chrome / Safari

Screen.Recording.2025-05-13.at.19.40.21.mov

MacOS: Desktop

Screen.Recording.2025-05-13.at.19.46.08.mov

luacmartins

LGTM and tests well. @mountiny all yours

mountiny

Thanks!

OSBotify · 2025-05-13T17:06:44Z

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

github-actions · 2025-05-13T18:24:05Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.45-0 🚀

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

github-actions · 2025-05-13T19:34:30Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.45-0 🚀

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

nlemma · 2025-05-13T20:37:29Z

@SzymczakJ This PR is failing because of issue #61953
The issue is reproducible in all platforms.

Bug6830140_1747165724773.20250514_034343.mp4

github-actions · 2025-05-15T19:02:16Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.45-21 🚀

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

SzymczakJ added 5 commits May 6, 2025 15:11

add tests to ADD_EXPENSE simplified action

b7cc2ab

add dropdown options to add expense simplified header action

40840a2

refactor createReport and quick actions in FAB

10de585

Merge branch 'main' into @szymczak/simplified-report-actions-follow-ups

b2b2596

add 'add unreported expense action' to empty money report preview sim…

f49ab87

…plified action

mountiny assigned SzymczakJ May 9, 2025

mountiny self-requested a review May 9, 2025 16:25

SzymczakJ added 5 commits May 12, 2025 10:01

different navigation for startMoneyRequest when it's started from emp…

7bcfd90

…ty report preview

Merge branch 'main' into @szymczak/simplified-report-actions-follow-ups

46a57de

fix tests

b2ba611

fix money request navigation edge cases

12eb120

fix linet and typescript checks

b49431a

mountiny reviewed May 12, 2025

View reviewed changes

fix wrong getRoute for distnace expense creation

847df49

SzymczakJ marked this pull request as ready for review May 12, 2025 13:48

SzymczakJ requested a review from a team as a code owner May 12, 2025 13:48

melvin-bot bot requested review from DylanDylann and removed request for a team May 12, 2025 13:49

fix wrong navigation Routes

e1c7ba1

luacmartins previously approved these changes May 12, 2025

View reviewed changes

tests/actions/ReportPreviewActionUtilsTest.ts Outdated Show resolved Hide resolved

rename test

b61a2ee

SzymczakJ dismissed luacmartins’s stale review via b61a2ee May 12, 2025 14:58

luacmartins previously approved these changes May 12, 2025

View reviewed changes

mountiny previously approved these changes May 12, 2025

View reviewed changes

Merge branch 'main' into @szymczak/simplified-report-actions-follow-ups

6ceb8c4

SzymczakJ dismissed stale reviews from mountiny and luacmartins via 6ceb8c4 May 13, 2025 10:50

SzymczakJ added 2 commits May 13, 2025 13:41

fix PR comments

700b1bb

fix canBeMissing value in draftTransaction

0c216e4

DylanDylann approved these changes May 13, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny May 13, 2025 12:54

luacmartins approved these changes May 13, 2025

View reviewed changes

mountiny approved these changes May 13, 2025

View reviewed changes

mountiny merged commit bf49d9f into Expensify:main May 13, 2025
18 checks passed

github-actions bot mentioned this pull request May 13, 2025

Deploy Checklist: New Expensify 2025-05-13 #61917

Closed

jaydamani mentioned this pull request May 13, 2025

[Due for payment 2025-05-27] [$125] [Report Creation UI] Not here page opens after clicking Amount in expense thread RHP #61942

Closed

8 tasks

nlemma mentioned this pull request May 13, 2025

[Report Creation UI] App opens expense report after creating unreported expense from main workspace chat #61953

Open

8 tasks

trjExpensify mentioned this pull request May 19, 2025

[Report Creation UI] Integrate the primary action logic to the empty money report preview #61513

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create report simplified actions follow ups #61760

Create report simplified actions follow ups #61760

SzymczakJ commented May 9, 2025 •

edited

Loading

mountiny May 12, 2025

melvin-bot bot commented May 12, 2025

luacmartins left a comment

mountiny left a comment

mountiny May 12, 2025

mountiny May 12, 2025

SzymczakJ May 13, 2025

mountiny May 13, 2025

SzymczakJ May 13, 2025

DylanDylann commented May 13, 2025

SzymczakJ commented May 13, 2025

DylanDylann commented May 13, 2025

DylanDylann commented May 13, 2025 •

edited

Loading

luacmartins left a comment

mountiny left a comment

OSBotify commented May 13, 2025

github-actions bot commented May 13, 2025

github-actions bot commented May 13, 2025

nlemma commented May 13, 2025

github-actions bot commented May 15, 2025

		route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?/:backToReport?',
		getRoute: (action: IOUAction, iouType: IOUType, transactionID: string \| undefined, reportID: string \| undefined, pageIndex: string, backToReport?: string, backTo = '') => {

Create report simplified actions follow ups #61760

Create report simplified actions follow ups #61760

Conversation

SzymczakJ commented May 9, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

mountiny May 12, 2025

Choose a reason for hiding this comment

melvin-bot bot commented May 12, 2025

luacmartins left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny May 12, 2025

Choose a reason for hiding this comment

mountiny May 12, 2025

Choose a reason for hiding this comment

SzymczakJ May 13, 2025

Choose a reason for hiding this comment

mountiny May 13, 2025

Choose a reason for hiding this comment

SzymczakJ May 13, 2025

Choose a reason for hiding this comment

DylanDylann commented May 13, 2025

SzymczakJ commented May 13, 2025

DylanDylann commented May 13, 2025

DylanDylann commented May 13, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

luacmartins left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented May 13, 2025

github-actions bot commented May 13, 2025

github-actions bot commented May 13, 2025

nlemma commented May 13, 2025

github-actions bot commented May 15, 2025

SzymczakJ commented May 9, 2025 •

edited

Loading

DylanDylann commented May 13, 2025 •

edited

Loading