[Home Page] Fix: Your spend section does not update after updating expense offline by adamgrzybowski · Pull Request #93081 · Expensify/App

adamgrzybowski · 2026-06-09T14:47:36Z

Explanation of Change

The Home "Your spend" totals (Awaiting approval and Repaid in the last 30 days) come from cached search snapshots the server only refreshes while online, so most offline money-request actions left them stale until reconnect (only amount edits were patched).
This change optimistically patches the affected total when an action runs offline, and rolls it back on failure. Supported actions:
- Submit / Retract / Unapprove (Awaiting approval): add / remove / re-add the report's reimbursable total.
- Delete / Reject (Awaiting approval, also Repaid for delete): subtract the expense's amount.
- Cancel payment (Repaid): subtract the report's total when a reimbursement is reversed.
- Create is handled via submit (new reports stay Open until submitted); edit amount was already supported.
Patches are scoped to the user's own reimbursable expenses on paid group workspaces, skipped on currency mismatch, and reconciled by the next online refresh.

Fixed Issues

$ #91370
PROPOSAL:

Tests

Offline tests

QA Steps

Prerequisites: a paid group workspace (Team/Corporate) where you are a member, and a few of your own reimbursable expenses. Each suite is run while offline (disable your network connection), starting from Home where you note the current "Your spend" totals.

Suite 1 - Awaiting approval increases

Submit an Open report with your reimbursable expenses, return to Home, and verify "Awaiting approval" increases by that report's total.
Unapprove an approved report you own and verify "Awaiting approval" increases by that report's total.

Suite 2 - Awaiting approval decreases

Retract a submitted report and verify "Awaiting approval" decreases by that report's total.
Reject a single submitted reimbursable expense and verify "Awaiting approval" decreases by that expense's amount.
Delete a single submitted reimbursable expense and verify "Awaiting approval" decreases by that expense's amount.

Suite 3 - Repaid (last 30 days)

Cancel a payment on a report you reimbursed within the last 30 days and verify "Repaid" decreases by that report's total.

Suite 4 - Rollback and reconciliation

Perform any covered action offline and force the request to fail, then verify the "Your spend" total rolls back to its previous value.
Reconnect and verify all totals reconcile with the server (no drift / no double counting).

Suite 5 - Negative checks (totals must not change)

Make a currency-only edit to an expense and verify no "Your spend" total changes.
Perform a covered action on a non-reimbursable expense and verify no total changes.
Perform a covered action on a personal/IOU (non paid-group) expense and verify no total changes.

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

Screen.Recording.2026-06-09.at.16.05.31.mov

Patch awaiting-approval and repaid snapshot search.total aggregates optimistically when money request amounts change, since Home cannot refetch those totals while offline.

Import Your spend query builders directly from @libs/YourSpendQueryUtils instead of a page-local re-export barrel, giving a single source of truth.

melvin-bot · 2026-06-09T14:47:43Z

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

melvin-bot · 2026-06-09T14:47:49Z

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

codecov · 2026-06-09T14:54:42Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...Item/MoneyRequestReportPreview/PayActionButton.tsx	`91.54% <100.00%> (+0.12%)`	⬆️
...c/components/ReportActionItem/MoneyRequestView.tsx	`73.72% <100.00%> (+0.06%)`	⬆️
...earch/SearchList/ListItem/ReportListItemHeader.tsx	`91.78% <100.00%> (+0.11%)`	⬆️
src/components/SettlementButton/index.tsx	`82.19% <100.00%> (+0.06%)`	⬆️
src/hooks/useDeleteTransactions.ts	`55.00% <100.00%> (+0.32%)`	⬆️
src/hooks/useSearchBulkActions.ts	`53.89% <100.00%> (+0.04%)`	⬆️
src/hooks/useSelectionModePayment.ts	`62.50% <100.00%> (+0.36%)`	⬆️
src/hooks/useYourSpendPatchData.ts	`100.00% <100.00%> (ø)`
src/libs/IOUAmountSubmission.ts	`75.16% <ø> (ø)`
src/libs/PaymentUtils.ts	`79.79% <ø> (ø)`
... and 34 more
... and 29 files with indirect coverage changes

grgia · 2026-06-10T10:33:29Z

@adamgrzybowski lint

joekaufmanexpensify

Good for product

Replace unsafe type assertions with a typed createRandomPolicy factory and typed getSnapshotKey/buildSnapshotSearchResults helpers.

adamgrzybowski · 2026-06-11T12:42:22Z

@grgia fixed

ZhenjaHorbach · 2026-06-11T12:49:46Z

Looks like changes don't work if we reject submitted expenses
In this case, we also need to update Your spend section

2026-06-11.14.48.04.mov

adamgrzybowski · 2026-06-11T13:43:57Z

@ZhenjaHorbach Yeah, the question is how big the scope should be for this PR and which actions should be supported.

This issue is also mentioned here #93081 (comment)

ZhenjaHorbach · 2026-06-11T13:47:45Z

@ZhenjaHorbach Yeah, the question is how big the scope should be for this PR and which actions should be supported.

This issue is also mentioned here #93081 (comment)

I believe all actions should be supported, and the amount should be the same as after the response from BE

adamgrzybowski · 2026-06-11T13:55:40Z

@ZhenjaHorbach do you know exactly which actions?

create
delete
edit amount

Something else?

ZhenjaHorbach · 2026-06-11T14:07:13Z

@ZhenjaHorbach do you know exactly which actions?

create

delete

edit amount

Something else?

I suppose in the context of this flow, at least retract, unapprove, reject

github-actions · 2026-07-03T10:56:22Z

This PR adds a new Onyx.connectWithoutView call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @luacmartins) — a review from any one of them is enough. Please add a link in your PR description to the Slack discussion where the @frontend-performance team approved using connectWithoutView here.

- Drop removed transactions from snapshot.data so the Search page stays in sync offline - Mirror only each snapshot's search aggregates to keep memory bounded - Align 30-day boundary checks with the exclusive date> filter semantics

mountiny · 2026-07-05T14:57:04Z

+let allPolicies: OnyxCollection<Policy> = {};
+Onyx.connectWithoutView({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        allPolicies = value ?? {};
+    },
+});


I think that instead of adding this one here again, maybe we could reuse what is already in the ReportUtils - getPolicy and getAllPolicies, so we do not add another subscription to policies collection in another file. Curious what @tgolen @luacmartins thinks

Well, ReportUtils is being refactored to remove those eventually, so even that's not a good pattern to follow. Why can't these just be passed from the view component?

Yeah that is fair, it would just create sort of a singleton pattern that I am not sure if we want.

Why can't these just be passed from the view component?

@adamgrzybowski

These functions run in the IOU action layer (delete/submit/reject/pay/split), not in a component. They are triggered from expense screens when Home isn't always mounted

I am looking for an alternative solution, but so far I don't see a solution without tradeoffs

Is avoiding the connectWithoutView a hard requirement?
cc: @tgolen @mountiny

It's a pretty hard requirement, yes.

These functions run in the IOU action layer (delete/submit/reject/pay/split), not in a component.

But they are called by a component somewhere up the chain, aren't they? Otherwise, what calls these functions?

They are triggered from expense screens when Home isn't always mounted

How can they be triggered from a screen when Home isn't mounted?

Whichever component is triggering the actions, there you can subscribe to the policies and thread them through the functions @adamgrzybowski

How can they be triggered from a screen when Home isn't mounted?

What I meant here is that these actions are triggered by many different components (5 hooks and 8 components), so it's not as straightforward as passing these props from the home component.

However, I understand that we want to get rid of the connectWithoutView.

I will create a commit with the change, so we can judge if this approach is good enough by looking at the diff.

Yeah that is expected, we need to pull the data from the views

tgolen

I have a few general concerns about this PR. It's a massive fix for the issue that was originally reported.

Are we sure this is the best fix?
Are we sure that it needs to be fixed and we can't live with the original problem?

tgolen · 2026-07-05T20:36:43Z

+let allPolicies: OnyxCollection<Policy> = {};
+Onyx.connectWithoutView({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        allPolicies = value ?? {};
+    },
+});


Well, ReportUtils is being refactored to remove those eventually, so even that's not a good pattern to follow. Why can't these just be passed from the view component?

grgia

comments

Split updates now diff reimbursable portions only, and toggling an expense's reimbursable flag offline patches the Your spend totals.

Cover getYourSpendSnapshotReimbursableUpdates in both directions and the getUpdateMoneyRequestParams branch that removes an expense toggled non-reimbursable.

adamgrzybowski · 2026-07-07T12:25:18Z

I fixed problems mentioned by @grgia, and now I am looking for alternative solutions that don't require connectWithoutView

adamgrzybowski · 2026-07-09T15:51:54Z

I removed the connectWithoutView from this PR

mountiny

Overall lets make sure every new or update utils method or action has appropriate test here

grgia · 2026-07-10T10:55:10Z

+/** Supplies the paid-group policies and "Your spend" snapshot aggregates the offline snapshot-patch builders need. */
+function useYourSpendPatchData(): YourSpendPatchData {
+    const {accountID} = useCurrentUserPersonalDetails();
+    const [paidPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: selectPaidGroupPolicies});


Scrolling large Search results and any policy-collection update now do extra per-row Onyx work, which bites on accounts with many workspaces.

could we mount useYourSpendPatchData once at the Search page level and pass it to rows via the existing SearchContext?

or narrow selectPaidGroupPolicies to the fields the builders actually use ({id, type, outputCurrency})

grgia

comments

grgia · 2026-07-10T13:40:30Z

+    const currentTotal = search.total ?? 0;
+    const currentCount = search.count ?? 0;
+
+    if (currentCurrency && currentCurrency !== currency) {
+        return {optimisticData: [], successData: [], failureData: []};
+    }
+
+    const updatedTotal = currentTotal + diff;


Deleting or rejecting several expenses at once while offline leaves the Home Awaiting approval total wrong (only one expense subtracted) until reconnect.

Could we do a snapshot update per batch instead of one per transaction?

grgia

.

…offline-your-spend # Conflicts: # src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx # src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts # src/components/MoneyRequestHeaderSecondaryActions.tsx # src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx # src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx # src/components/ReportActionItem/MoneyRequestReportPreview/SubmitActionButton.tsx # src/components/ReportActionItem/MoneyRequestView.tsx # src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx # src/components/Search/SearchList/ListItem/ReportListItemHeader.tsx # src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx # src/hooks/useDeleteTransactions.ts # src/hooks/useHoldMenuSubmit.ts # src/hooks/useLifecycleActions.tsx # src/hooks/useSearchBulkActions.ts # src/hooks/useSelectionModePayment.ts # src/hooks/useTransactionInlineEdit.ts # src/libs/IOUAmountSubmission.ts # src/libs/PaymentUtils.ts # src/libs/actions/IOU/DeleteMoneyRequest.ts # src/libs/actions/IOU/PayMoneyRequest.ts # src/libs/actions/IOU/RejectMoneyRequest.ts # src/libs/actions/IOU/ReportWorkflow.ts # src/libs/actions/IOU/SplitTransactionUpdate.ts # src/libs/actions/IOU/TrackExpense.ts # src/libs/actions/IOU/UpdateMoneyRequest.ts # src/libs/actions/Search.ts # src/pages/DynamicReportDetailsPage.tsx # src/pages/RejectExpenseReportPage.tsx # src/pages/home/YourSpendSection/useYourSpendData.ts # src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx # src/pages/iou/SplitExpensePage.tsx

adamgrzybowski added 2 commits June 8, 2026 17:34

Fix Your spend totals staying stale after offline expense edits.

ef190b3

Patch awaiting-approval and repaid snapshot search.total aggregates optimistically when money request amounts change, since Home cannot refetch those totals while offline.

Remove redundant YourSpendSection queries barrel

fabd3fd

Import Your spend query builders directly from @libs/YourSpendQueryUtils instead of a page-local re-export barrel, giving a single source of truth.

adamgrzybowski requested review from a team as code owners June 9, 2026 14:47

melvin-bot Bot assigned adamgrzybowski Jun 9, 2026

melvin-bot Bot requested review from ZhenjaHorbach and joekaufmanexpensify and removed request for a team June 9, 2026 14:47

melvin-bot Bot requested review from a team and grgia and removed request for a team June 9, 2026 14:47

Remove unused exports from YourSpendSnapshotUpdate

3545edc

grgia reviewed Jun 10, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/UpdateMoneyRequest.ts Outdated

grgia reviewed Jun 10, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/YourSpendSnapshotUpdate.ts

joekaufmanexpensify previously approved these changes Jun 10, 2026

View reviewed changes

adamgrzybowski added 2 commits June 11, 2026 12:09

Fix ESLint no-unsafe-type-assertion errors in Your spend snapshot test

d767640

Replace unsafe type assertions with a typed createRandomPolicy factory and typed getSnapshotKey/buildSnapshotSearchResults helpers.

Patch Your spend totals only for amount edits, not currency changes

215db73

adamgrzybowski dismissed joekaufmanexpensify’s stale review via 215db73 June 11, 2026 11:12

Merge branch 'main' into @adamgrzybowski/fix-offline-your-spend

009264f

grgia reviewed Jul 2, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/YourSpendSnapshotUpdate.ts Outdated

Merge branch 'main' into @adamgrzybowski/fix-offline-your-spend

f69d9ff

adamgrzybowski dismissed grgia’s stale review via f69d9ff July 3, 2026 10:56

github-actions Bot requested review from luacmartins, mountiny and tgolen July 3, 2026 10:56

adamgrzybowski added 2 commits July 3, 2026 14:49

Trim verbose comments in Your spend snapshot updates

3a835dd

mountiny reviewed Jul 5, 2026

View reviewed changes

tgolen reviewed Jul 5, 2026

View reviewed changes

ZhenjaHorbach reviewed Jul 6, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/DeleteMoneyRequest.ts

grgia reviewed Jul 6, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/YourSpendSnapshotUpdate.ts

grgia reviewed Jul 6, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/SplitTransactionUpdate.ts Outdated

grgia reviewed Jul 6, 2026

View reviewed changes

adamgrzybowski added 2 commits July 7, 2026 13:26

Fix Your spend for reimbursable-only split and reimbursable toggle

274a485

Split updates now diff reimbursable portions only, and toggling an expense's reimbursable flag offline patches the Your spend totals.

Test Your spend snapshot updates for reimbursable toggle

61f248f

Cover getYourSpendSnapshotReimbursableUpdates in both directions and the getUpdateMoneyRequestParams branch that removes an expense toggled non-reimbursable.

adamgrzybowski added 2 commits July 9, 2026 17:12

Supply Your spend patch data via hook scoped to paid-group policies

7a36b36

Merge branch 'main' into @adamgrzybowski/fix-offline-your-spend

3622a9b

Remove unused SnapshotSearch export from YourSpendPatchData

eea3c27

mountiny requested changes Jul 9, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/YourSpendSnapshotUpdate.ts

Comment thread src/libs/YourSpendQueryUtils.ts

Comment thread Mobile-Expensify

Comment thread src/pages/home/YourSpendSection/useYourSpendData.ts

Comment thread src/libs/actions/IOU/ReportWorkflow.ts

grgia reviewed Jul 10, 2026

View reviewed changes

adamgrzybowski added 3 commits July 15, 2026 15:30

Reset Mobile-Expensify submodule pointer to match eorigin/main

6f1a6ec

Merge branch 'main' into @adamgrzybowski/fix-offline-your-spend

cf97be9

Uh oh!

Conversation

adamgrzybowski commented Jun 9, 2026 • edited 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 Jun 9, 2026

Uh oh!

melvin-bot Bot commented Jun 9, 2026

Uh oh!

codecov Bot commented Jun 9, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

grgia commented Jun 10, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

adamgrzybowski commented Jun 11, 2026

Uh oh!

ZhenjaHorbach commented Jun 11, 2026

Uh oh!

adamgrzybowski commented Jun 11, 2026

Uh oh!

ZhenjaHorbach commented Jun 11, 2026

Uh oh!

adamgrzybowski commented Jun 11, 2026

Uh oh!

ZhenjaHorbach commented Jun 11, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgolen left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grgia left a comment • 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!

adamgrzybowski commented Jul 7, 2026

Uh oh!

adamgrzybowski commented Jul 9, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adamgrzybowski commented Jun 9, 2026 •

edited

Loading

codecov Bot commented Jun 9, 2026 •

edited by github-actions Bot

Loading

grgia left a comment •

edited

Loading