Tweaks to the expense flow #55016

JKobrynski · 2025-01-09T16:19:15Z

This is followup to the reverted #53760.

On top on fixing #52981 it also fixes #54836, #54844 and #54861 which caused the revert

Explanation of Change

Fixed Issues

$ #52981
PROPOSAL: N/A

Tests

Log into the app
Click on the + button
Select the Create expense option
Choose the Manual expense
Provide an expense value
Navigate to the next step
Make sure the Just track it (don't submit it) option row is not visible
Verify if there is a Workspace and Personal section
Test if you can submit an expenses to workspaces, recents, contacts and to yourself
Verify the button on the Confirm details screen says "Create amount expense"

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests section above

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message: https://expensify.slack.com/archives/C01GTK53T8Q/p1734011675583879
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

android-compressed.webm

Android: mWeb Chrome

chrome-compressed.webm

iOS: Native

ios-compressed.mp4

iOS: mWeb Safari

safari-compressed.mp4

MacOS: Chrome / Safari

MacOS: Desktop

JKobrynski · 2025-01-10T08:25:51Z

Bug #54836 fixed:

web-compressed.mov

melvin-bot · 2025-01-10T08:26:08Z

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

grgia · 2025-01-10T11:38:11Z

@abdulrahuman5196 I'm going to assign @mananjadhav this one since it needs to be merged with #54201

github-actions · 2025-01-10T11:48:04Z

🚧 @grgia has triggered a test build. You can view the workflow run here.

mananjadhav · 2025-01-10T17:53:22Z

Reviewing.

mananjadhav · 2025-01-10T17:54:05Z

src/components/MoneyRequestConfirmationList.tsx

@@ -429,16 +429,19 @@ function MoneyRequestConfirmationList({
                text = translate('common.next');
            }
        } else if (isTypeTrackExpense) {
-            text = translate('iou.trackExpense');
+            text = translate('iou.createExpense');


This code is being duplicated along with the other PR right? We'll have to take care of the conflicts.

mananjadhav · 2025-01-10T17:59:49Z

src/libs/OptionsListUtils.ts

@@ -1009,6 +1013,23 @@ function orderReportOptionsWithSearch(
    );
 }

+function orderWorkspaceOptions(options: ReportUtils.OptionData[]): ReportUtils.OptionData[] {
+    return lodashOrderBy(


I can't remember the exact docs link, but isn't our preference to use built-in methods wherever possible? Can we use options.sort ?

mananjadhav · 2025-01-13T04:38:00Z

Reviewed partially, will review the rest today.

grgia · 2025-01-14T14:49:08Z

Can we get this wrapped today?

mananjadhav · 2025-01-14T15:00:33Z

src/libs/OptionsListUtils.ts

@@ -1700,6 +1744,23 @@ function filterReports(reports: ReportUtils.OptionData[], searchTerms: string[])
    return filteredReports;
 }

+function filterWorkspaceChats(reports: ReportUtils.OptionData[], searchTerms: string[]): ReportUtils.OptionData[] {


I was wondering if any of these methods can have supporting unit tests?

mananjadhav

Just finished with the reviewer, left minor comments. But I think it's best if we add a few unit tests to make it more reliable?

mananjadhav · 2025-01-14T18:14:07Z

@JKobrynski I was testing this but I had some issues.

On a new account, I didn't find the option for the self-DM. I am not sure if the issue related to the PR.
When the number of workspaces is high (I don't know if it's valid for the production users), the Personal and other users have to be scrolled down.
I can see justTrackIt: 'Just track it (don’t submit it)', keys are not removed from translation.
We also need to get rid of 4. Click "Just track it (don\'t submit it)".\n in the CONST or we're fixing it in the other PR.

web-expense-flow.mov

trjExpensify · 2025-01-15T01:13:19Z

On a new account, I didn't find the option for the self-DM. I am not sure if the issue related to the PR.

Nope, not related to this PR. We stopped creating the selfDM on account creation unless you choose the track option in the onboarding modal. @MonilBhavsar I believe you were going to be looking into this, per here.

fabioh8010 · 2025-01-15T09:11:54Z

Just a heads up that @JKobrynski has been on OOO since Monday and will return tomorrow.

trjExpensify · 2025-01-15T14:32:24Z

Thanks for the heads up! What can we do to keep this moving to being merged today?

When the number of workspaces is high (I don't know if it's valid for the production users), the Personal and other users have to be scrolled down.

Is this just saying that the list of workspaces take up the scroll view when you have a ton of them? If so, I think that's fine and expected. That's clearly your primary use-case if you have that many and, after all, you can use the search bar if you want.

I can see justTrackIt: 'Just track it (don’t submit it)', keys are not removed from translation.

We also need to get rid of 4. Click "Just track it (don\'t submit it)".\n in the CONST or we're fixing it in the other PR.

Is there any harm or noticeable impact for the customer if we proceed to merge this, and take care of those in this PR which comes after it?

fabioh8010 · 2025-01-15T17:42:12Z

@trjExpensify I can handle the remaining review comments if you want urgency here.

trjExpensify · 2025-01-15T18:52:50Z

Seems like we're okay to wait for tomorrow, because Georgia wants to merge this PR along with this one.

github-actions · 2025-01-17T18:06:03Z

🧪🧪 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/55016/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/55016/index.html

Desktop 💻	Web 🕸️
❌ FAILED ❌	https://55016.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed

👀 View the workflow run that generated this build 👀

mananjadhav · 2025-01-17T18:11:05Z

Looks like the build is working fine. Seems like an issue on my end and I still couldn't get it working. I am completing the testing with adhoc builds.

trjExpensify · 2025-01-20T14:33:52Z

@JKobrynski before we merge this, can you quickly make trackScan read "Scan receipt" instead of what it was changed to in this PR. Thanks!

JKobrynski · 2025-01-20T15:13:51Z

@trjExpensify done!

mananjadhav · 2025-01-21T08:35:06Z

@JKobrynski We've got some conflicts.

…aks-to-create-expense-flow-2

JKobrynski · 2025-01-21T12:54:27Z

@mananjadhav conflicts fixed!

CC: @grgia @trjExpensify

trjExpensify · 2025-01-21T14:06:30Z

Niceee!

grgia

🎸

grgia · 2025-01-21T15:42:46Z

Follow up issue here- #55538

cc @JKobrynski @mananjadhav

Gonna merge this!

OSBotify · 2025-01-21T15:51:43Z

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

hannojg · 2025-01-22T10:12:26Z

I have performance considerations with this. We shouldn't add new loops in getValidOptions, but instead move those checks to getValidReports and do it all on one loop.
I am working on it over here:

wip: don't do calculations in getValidOptions, do them only once in getValidReports #55599

(currently a bit limited in bandwidth feel free to pick it up or explore other approaches. Otherwise I can also complete it)

mananjadhav · 2025-01-22T11:01:36Z

@JKobrynski How about we take care of this in the follow up PR?

JKobrynski · 2025-01-22T12:47:13Z

@mananjadhav should we create an issue for that?

mananjadhav · 2025-01-22T15:15:15Z

Yeah let's create a separate issue for the improvement and we can assign ourselves. Wdyt @grgia ?

grgia · 2025-01-22T17:18:19Z

Sounds good. Issue created here #55621

@JKobrynski @mananjadhav

github-actions · 2025-01-23T18:27:38Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.0.89-0 🚀

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

github-actions · 2025-01-28T01:51:02Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.89-8 🚀

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

…ate-expense-performance-improvements [Create Expense - Clean up] #55016 Follow up - Performance improvements

JKobrynski added 2 commits January 9, 2025 17:15

adjust create expense flow

96037d4

prevent users from sending invoices to themselves

8b79ccc

JKobrynski marked this pull request as ready for review January 10, 2025 08:26

JKobrynski requested a review from a team as a code owner January 10, 2025 08:26

melvin-bot bot requested a review from abdulrahuman5196 January 10, 2025 08:26

melvin-bot bot removed the request for review from a team January 10, 2025 08:26

grgia requested review from mananjadhav and removed request for abdulrahuman5196 January 10, 2025 11:37

grgia self-requested a review January 10, 2025 11:38

grgia added the Ready To Build label Jan 10, 2025

This comment has been minimized.

Sign in to view

mananjadhav reviewed Jan 10, 2025

View reviewed changes

trjExpensify mentioned this pull request Jan 14, 2025

[Due for payment 2025-02-18] [HOLD for payment 2025-02-04] Tweaks to the Create Expense Flow #52981

Open

grgia mentioned this pull request Jan 14, 2025

Create Expense Part 2 - Clean up #54201

Merged

50 tasks

mananjadhav reviewed Jan 14, 2025

View reviewed changes

mananjadhav approved these changes Jan 17, 2025

View reviewed changes

trjExpensify mentioned this pull request Jan 20, 2025

[$250] QAB - Quick action shows the old title "Track distance" for distance expense in self DM #55456

Open

8 tasks

modify trackScan translation

4fd9f58

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

6e8eb7e

…aks-to-create-expense-flow-2

grgia approved these changes Jan 21, 2025

View reviewed changes

grgia mentioned this pull request Jan 21, 2025

[HOLD for payment 2025-02-04] [Create Expense - Clean Up] Add unit tests #55538

Closed

grgia merged commit ab3a7ee into Expensify:main Jan 21, 2025
16 checks passed

grgia mentioned this pull request Jan 21, 2025

Create expense - "Just track it (Don't submit it)" row is still shown in Create expense flow #54953

Closed

8 tasks

JKobrynski mentioned this pull request Jan 22, 2025

[No QA] Create Expense Clean Up (follow up) - Add unit tests #55600

Merged

50 tasks

grgia mentioned this pull request Jan 22, 2025

[Due for payment 2025-02-18] [Create Expense - Clean up] #55016 Follow up - Performance improvements #55621

Open

github-actions bot mentioned this pull request Jan 23, 2025

Deploy Checklist: New Expensify 2025-01-23 #55657

Closed

trjExpensify mentioned this pull request Jan 24, 2025

[HOLD for payment 2025-02-05] [HOLD for payment 2025-02-04] Self DM - User can submit track expense to self (You) again and send invoice to self #55661

Closed

8 tasks

lanitochka17 mentioned this pull request Jan 28, 2025

[adhoc testing] bottom tabs build found issues #55511

Open

grgia added a commit that referenced this pull request Feb 6, 2025

Merge pull request #55769 from callstack-internal/JKobrynski/perf/cre…

25d54a1

…ate-expense-performance-improvements [Create Expense - Clean up] #55016 Follow up - Performance improvements

Tweaks to the expense flow #55016

Tweaks to the expense flow #55016

Conversation

JKobrynski commented Jan 9, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

JKobrynski commented Jan 10, 2025

melvin-bot bot commented Jan 10, 2025

grgia commented Jan 10, 2025

github-actions bot commented Jan 10, 2025

This comment has been minimized.

mananjadhav commented Jan 10, 2025

mananjadhav Jan 10, 2025

Choose a reason for hiding this comment

mananjadhav Jan 10, 2025

Choose a reason for hiding this comment

JKobrynski Jan 16, 2025

Choose a reason for hiding this comment

mananjadhav commented Jan 13, 2025

grgia commented Jan 14, 2025

mananjadhav Jan 14, 2025

Choose a reason for hiding this comment

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav commented Jan 14, 2025

trjExpensify commented Jan 15, 2025

fabioh8010 commented Jan 15, 2025

trjExpensify commented Jan 15, 2025

fabioh8010 commented Jan 15, 2025

trjExpensify commented Jan 15, 2025

github-actions bot commented Jan 17, 2025

mananjadhav commented Jan 17, 2025

trjExpensify commented Jan 20, 2025

JKobrynski commented Jan 20, 2025

mananjadhav commented Jan 21, 2025

JKobrynski commented Jan 21, 2025

trjExpensify commented Jan 21, 2025

grgia left a comment

Choose a reason for hiding this comment

grgia commented Jan 21, 2025

OSBotify commented Jan 21, 2025

hannojg commented Jan 22, 2025

mananjadhav commented Jan 22, 2025

JKobrynski commented Jan 22, 2025

mananjadhav commented Jan 22, 2025

grgia commented Jan 22, 2025

github-actions bot commented Jan 23, 2025

github-actions bot commented Jan 28, 2025