Track Expense flow by shubham1206agra · Pull Request #37282 · Expensify/App

shubham1206agra · 2024-02-27T13:02:30Z

Details

Fixed Issues

$ #36362

Tests

Test 1

Go to Self DM report.
Click on + Button.
Select Track Expense.
Enter the amount (Test using different currencies too).
Click on Next (Confirm the amount shown in the confirmation page matches).
[Optional] Click on 3 dots > Add receipt to add a receipt.
Click on Track Expense at the confirmation step.

Test 2

Go to Self DM report.
Click on + Button.
Select Track Expense.
Go to Scan tab.
Upload a receipt.
Click on Track Expense at the confirmation step.

Test 3

Click on FAB.
Select Track Expense.
Enter the amount (Test using different currencies too).
Click on Next (Confirm the amount shown in the confirmation page matches).
[Optional] Click on 3 dots > Add receipt to add a receipt.
Click on Track Expense at the confirmation step.

Test 4

Click on FAB Button.
Select Track Expense.
Go to Scan tab.
Upload a receipt.
Click on Track Expense at the confirmation step.

Test 5 (Delete Track Expense)

Go to the Track Expense you created.
Press on 3 dot menu.
Click on Delete expense.
Confirm the delete.
Verify that the track expense is deleted and you are navigated to self DM.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests.

PR Author Checklist

Screenshots/Videos

Screenshots for Design Reference

Android: Native

Screen.Recording.2024-03-20.at.7.35.56.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-03-20.at.6.31.25.PM.mov

iOS: Native

Screen.Recording.2024-03-20.at.7.19.00.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-03-20.at.6.18.28.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-20.at.5.44.15.PM.mp4

Screen.Recording.2024-03-20.at.5.46.49.PM.mp4

MacOS: Desktop

Screen.Recording.2024-03-20.at.7.11.40.PM.mov

shubham1206agra · 2024-02-27T16:51:02Z

@thienlnam I have completed preliminary flow. I want to HOLD this on #37165 as I want to pick some common components from there.Mainly for To section in Confirmation Step.

thienlnam

Thanks, just a couple notes for far - it looks the track flow doesn't yet auto-select the self-DM as destination?

src/CONST.ts

src/pages/iou/request/IOURequestStartPage.js

shubham1206agra · 2024-02-28T01:43:44Z

Thanks, just a couple notes for far - it looks the track flow doesn't yet auto-select the self-DM as destination?

It does select. You need to set selfDMReportID in Account Onyx key.

thienlnam

Couple comments so far, also looks like we are failing some ts typechecks

src/libs/ReportUtils.ts

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

shubham1206agra · 2024-03-11T12:20:26Z

src/libs/ReportUtils.ts

+    if (canUseTrackExpense && isPolicyExpenseChat(report) && report?.isOwnPolicyExpenseChat) {
+        options = [...options, CONST.IOU.TYPE.TRACK_EXPENSE];
+    }


@thienlnam I am thinking of disabling the track expense in workspace temporarily. Will re-enable it in a follow up PR. This is basically for reason that the logic for deleting the request / updating the amount gets complicated, and this feature details in workspace is not flushed through completely. Since the plan was enable this feature to all users in near future, I think, delivering the workspace track expense incomplete may not have best outcome for users.

Sure that works, we can create another issue for this to get added into the workspace

shubham1206agra · 2024-03-14T13:55:55Z

@ishpaul777 Can you start doing preliminary tests here? We want to ship this PR by friday.

ishpaul777 · 2024-03-14T13:57:18Z

Sure! Will start in 1-2 hours

ishpaul777 · 2024-03-14T16:57:25Z

Just so you know i have already started testing, will spend some time testing for the flow before looking deep in code.

thienlnam · 2024-03-20T18:45:50Z

Ah yeah that is currently known
#37282 (review)
Editing and deleting need some additional changes in the BE

thienlnam · 2024-03-20T19:07:15Z

Merging so we can get this project back on track for the may release - please let us know if there are other design items that look off. We're keeping the beta on until we get these BE issues fixed

melvin-bot · 2024-03-20T19:07:24Z

@thienlnam 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.

thienlnam · 2024-03-20T19:07:43Z

Tests were passing 😵

OSBotify · 2024-03-22T16:19:30Z

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

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

OSBotify · 2024-03-27T04:48:39Z

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

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

ikevin127 · 2024-04-25T22:21:17Z

Because optimisticData related to the ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE onyx key was missing from the buildOnyxDataForTrackExpense, this caused the quick action to not update while offline (optimistically):

[HOLD for payment 2024-05-02] [$250] Track expense - Track expense shortcut doesn't update to the correct one in offline mode #40097

Ollyws · 2024-06-20T13:02:02Z

src/components/MoneyRequestHeader.tsx

            const iouTransactionID = parentReportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction.originalMessage?.IOUTransactionID ?? '' : '';
+            if (ReportActionsUtils.isTrackExpenseAction(parentReportAction)) {
+                IOU.deleteTrackExpense(parentReport?.reportID ?? '', iouTransactionID, parentReportAction, true);
+                return;


The early return here was preventing the modal from closing immediately (#39862) we fixed this in #43020

alitoshmatov · 2024-10-23T10:06:33Z

src/libs/ReportUtils.ts

+
+            const transactionDetails = getTransactionDetails(linkedTransaction);
+            const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
+            return Localize.translateLocal('iou.trackedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});


If merchant present comment should be merchant rather than transaction description #49993

suneox · 2024-11-18T16:28:14Z

src/libs/ReportUtils.ts

+function isTrackExpenseReport(report: OnyxEntry<Report>): boolean {
+    if (isThread(report)) {
+        const parentReportAction = ReportActionsUtils.getParentReportAction(report);
+        return !isEmptyObject(parentReportAction) && ReportActionsUtils.isTrackExpenseAction(parentReportAction);


Coming from #52240 BZ checklist:

After update track expense to transaction, the type of parent action still is track so we have to check parentReportID with selfDMReportID to detect it's a track expense

hungvu193 · 2025-02-25T08:25:05Z

src/libs/actions/IOU.ts

+                ...chatReport,
+                lastMessageText: iouAction.message?.[0].text,
+                lastMessageHtml: iouAction.message?.[0].html,
+                lastReadTime: DateUtils.getDBTime(),


We should also include lastVisibleActionCreated here to avoid: #56176

More details: #56176 (comment)

shubham1206agra added 4 commits February 27, 2024 18:31

Initial implementation of button

9054944

Fixed svg

c532bab

Trying to start track expense flow

2feddbf

Minor fixes

f274174

thienlnam reviewed Feb 27, 2024

View reviewed changes

src/CONST.ts Show resolved Hide resolved

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

shubham1206agra and others added 5 commits February 28, 2024 09:25

Temporary disable track expense distance

d519b8c

Merge branch 'main' into track-expense

2cf09d1

Removed duplicate function

d6d6c89

fixed bad merge commit

7517fbf

fixed bad merge commit

6c6690c

thienlnam suggested changes Mar 6, 2024

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js Outdated Show resolved Hide resolved

shubham1206agra and others added 8 commits March 6, 2024 19:33

Merge branch 'Expensify:main' into track-expense

5937bf5

Completing UI changes in Request for Track Expense

82e1fe5

Merge branch 'main' into track-expense

15a5e0f

Completed BE endpoint connection

c2ef07b

Added gpsPoints in endpoint

2a425ad

merge main

173d44b

Merge branch 'main' into track-expense

c7f6a50

Fixing on which room we should allow track expense

92f803a

shubham1206agra commented Mar 11, 2024

View reviewed changes

shubham1206agra and others added 5 commits March 12, 2024 00:23

Merge branch 'main' into track-expense

3a6661a

merge main

42d0ea5

Fix types

c47d0e0

Fixed bunch of bugs

88e0bf3

Disabled track expense in policy expense chats

cccfbf9

This was referenced Mar 20, 2024

Track Expense - First Tracked Expense Fails #38697

Closed

Track Expense - Unable to delete request #38698

Closed

[HOLD for payment 2024-05-02] CRITICAL: [Track Expense] [$500] Unable to edit request #38699

Closed

thienlnam merged commit 2571c8d into Expensify:main Mar 20, 2024

melvin-bot bot added the Emergency label Mar 20, 2024

thienlnam removed the Emergency label Mar 20, 2024

shubham1206agra mentioned this pull request Mar 21, 2024

Fixed wrong subtitle for some reports #38754

Merged

49 tasks

github-actions bot mentioned this pull request Mar 22, 2024

Deploy Checklist: New Expensify 2024-03-22 #38811

Closed

srikarparsi mentioned this pull request Mar 24, 2024

Track expense-Scan track expense shows no option to enter details manually #38868

Closed

6 tasks

thienlnam mentioned this pull request Mar 26, 2024

[HOLD for payment 2024-04-25] [$500] [Track Expense] Adding Track Expense to Workspace Chats #38971

Closed

melvin-bot bot mentioned this pull request Mar 27, 2024

[$1250] [HOLD for payment 2024-04-03] CRITICAL: [Track Expense] - FE - Add Track Expense Flow #36362

Closed

paultsimura mentioned this pull request Apr 4, 2024

[HOLD for payment 2024-04-05] [$500] Refreshing the page on request confirmation step leads to workspace to disappear #38550

Closed

6 tasks

VickyStash mentioned this pull request Apr 5, 2024

[TS migration] Migrate StepScreenWrapper, StepScreenDragAndDropWrapper, IOURequestStepConfirmation and IOURequestStepCategory pages to TypeScript #39175

Merged

50 tasks

suneox mentioned this pull request Apr 22, 2024

Submit Expense - Header Remains as "Submit Expense" Instead of "Manual" #40717

Closed

6 tasks

ikevin127 mentioned this pull request Apr 25, 2024

[HOLD for payment 2024-05-02] [$250] Track expense - Track expense shortcut doesn't update to the correct one in offline mode #40097

Closed

6 tasks

Ollyws reviewed Jun 20, 2024

View reviewed changes

Ollyws mentioned this pull request Jun 20, 2024

[HOLD for payment 2024-06-20] [$250] Android - Track expense - Confirmation modal when deleting a tracked expense shows in the wrong place for a few seconds #39862

Closed

6 tasks

alitoshmatov reviewed Oct 23, 2024

View reviewed changes

alitoshmatov mentioned this pull request Oct 23, 2024

[WAITING ON CHECKLIST] [$250] Expense Details - The header of the expense details displays "[amount] for [Description]" #49993

Closed

6 tasks

suneox reviewed Nov 18, 2024

View reviewed changes

shubham1206agra deleted the track-expense branch February 3, 2025 17:47

hungvu193 reviewed Feb 25, 2025

View reviewed changes

sobitneupane mentioned this pull request Jun 3, 2025

[Due for payment 2025-05-28] [$250] Expense-On deleting expense, header displays "expense" #61288

Closed

8 tasks

Conversation

shubham1206agra commented Feb 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Test 1

Test 2

Test 3

Test 4

Test 5 (Delete Track Expense)

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

shubham1206agra commented Feb 27, 2024

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

shubham1206agra commented Feb 28, 2024

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

shubham1206agra Mar 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thienlnam Mar 11, 2024

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Mar 14, 2024

Uh oh!

ishpaul777 commented Mar 14, 2024

Uh oh!

ishpaul777 commented Mar 14, 2024

Uh oh!

thienlnam commented Mar 20, 2024

Uh oh!

thienlnam commented Mar 20, 2024

Uh oh!

melvin-bot bot commented Mar 20, 2024

Uh oh!

thienlnam commented Mar 20, 2024

Uh oh!

OSBotify commented Mar 22, 2024

Uh oh!

OSBotify commented Mar 27, 2024

Uh oh!

ikevin127 commented Apr 25, 2024

Uh oh!

Ollyws Jun 20, 2024

Choose a reason for hiding this comment

Uh oh!

alitoshmatov Oct 23, 2024

Choose a reason for hiding this comment

Uh oh!

suneox Nov 18, 2024

Choose a reason for hiding this comment

Uh oh!

hungvu193 Feb 25, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

shubham1206agra commented Feb 27, 2024 •

edited

Loading

shubham1206agra Mar 11, 2024 •

edited

Loading