Fix Your spend offline total sign and empty Search page after submit

adamgrzybowski · adamgrzybowski · commit 4e6f872a4e00 · 2026-06-25T15:38:24.000+02:00
Use signed getAmount instead of Math.abs when patching Your spend snapshot
totals so the section reflects spend as negative (and credit lines reduce the
total) instead of a positive, inflated value.

Also inject a moving report's reimbursable transactions into the snapshot data
when it enters a section so the linked Search page is not empty offline, and
remove them on leave/rollback. Update the related unit tests to the corrected
signed convention and data writes.
diff --git a/src/libs/actions/IOU/YourSpendSnapshotUpdate.ts b/src/libs/actions/IOU/YourSpendSnapshotUpdate.ts
@@ -1,4 +1,4 @@
-import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 // eslint-disable-next-line no-restricted-imports -- Your spend "Awaiting approval"/"Repaid" totals are a billing/paid-only feature (Collect/Control), so paid-group scoping is intentional here.
 import {isPaidGroupPolicy} from '@libs/PolicyUtils';
@@ -9,6 +9,7 @@ import {buildAwaitingApprovalQuery, buildRepaidLast30DaysQuery, get30DaysAgoDate
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, SearchResults, Transaction} from '@src/types/onyx';
+import type {SearchResultDataType} from '@src/types/onyx/SearchResults';
 
 type YourSpendSnapshotOnyxData = {
     optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SNAPSHOT>>;
@@ -172,8 +173,10 @@ function calculateYourSpendTotalDiff(iouReport: OnyxEntry<Report>, updatedTransa
         return null;
     }
 
-    const currentTotal = Math.abs(getAmount(transaction, isExpenseReportLocal));
-    const updatedTotal = Math.abs(getAmount(updatedTransaction, isExpenseReportLocal));
+    // Signed to match the snapshot `total` convention (spend negative, credits positive), so the delta moves the
+    // snapshot total in the correct direction (e.g. raising a spend amount makes the negative total more negative).
+    const currentTotal = getAmount(transaction, isExpenseReportLocal);
+    const updatedTotal = getAmount(updatedTransaction, isExpenseReportLocal);
 
     if (currentTotal === updatedTotal) {
         return 0;
@@ -219,19 +222,23 @@ function getSnapshotSearchResults(snapshotHash: number | undefined) {
     return allSnapshots?.[snapshotKey]?.search;
 }
 
-/** Returns a transaction's reimbursable amount in the snapshot currency, or null when conversion is unavailable offline. */
+/**
+ * Returns a transaction's reimbursable amount in the snapshot currency, or null when conversion is unavailable offline.
+ * The value is signed to match the search `total` convention (spend is negative, credits positive), i.e. it mirrors
+ * `getAmount(transaction, isFromExpenseReport)` rather than its magnitude.
+ */
 function getReimbursableTransactionAmountInCurrency(transaction: Transaction, iouReport: OnyxEntry<Report>, targetCurrency: string): number | null {
     const isExpenseReportLocal = isExpenseReport(iouReport) || isInvoiceReportReportUtils(iouReport);
     const transactionCurrency = getCurrency(transaction);
 
     if (transactionCurrency === targetCurrency) {
-        return Math.abs(getAmount(transaction, isExpenseReportLocal));
+        return getAmount(transaction, isExpenseReportLocal);
     }
     // `convertedAmount` is denominated in the report's policy output currency, not necessarily the snapshot
     // currency. Only trust it when those match; otherwise we'd add a value in the wrong currency to the total.
     const policyOutputCurrency = iouReport?.policyID ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${iouReport.policyID}`]?.outputCurrency : undefined;
     if (transaction.convertedAmount != null && policyOutputCurrency === targetCurrency) {
-        return Math.abs(getConvertedAmount(transaction, isExpenseReportLocal));
+        return getConvertedAmount(transaction, isExpenseReportLocal);
     }
 
     return null;
@@ -242,6 +249,10 @@ type ReportReimbursableAggregate = {
     // Number of reimbursable transactions contributing to `total`. Kept alongside `total` so the snapshot's
     // result `count` can be patched in lockstep when the report enters or leaves a Your spend section.
     count: number;
+    // The reimbursable transactions that contributed to `total`. The Home row reads its amount from
+    // `snapshot.search.total`, but the Search page renders its list from `snapshot.data`. These are injected into
+    // `data` so an offline-submitted report's expenses are visible when the user opens the section offline.
+    transactions: Transaction[];
 };
 
 /** Sums reimbursable transactions (and counts them) in the snapshot currency, optionally restricted to the last 30 days. */
@@ -253,6 +264,7 @@ function getReportReimbursableTotal(
 ): ReportReimbursableAggregate | null {
     let total = 0;
     let count = 0;
+    const transactions: Transaction[] = [];
 
     for (const reportTransaction of reportTransactions) {
         if (!reportTransaction || reportTransaction.reimbursable === false) {
@@ -271,9 +283,46 @@ function getReportReimbursableTotal(
         }
         total += amount;
         count += 1;
+        transactions.push(reportTransaction);
+    }
+
+    return {total, count, transactions};
+}
+
+/**
+ * Builds the snapshot `data` writes that add (or remove) a report's reimbursable transactions when it enters (or
+ * leaves) a Your spend section. The Home row only needs `search.total`/`count`, but the Search page the row links to
+ * renders its list from `snapshot.data`; without these writes an offline-submitted report's section opens empty.
+ */
+function buildSnapshotDataUpdatesForHash(snapshotHash: number | undefined, transactions: Transaction[], enters: boolean, leaves: boolean): YourSpendSnapshotOnyxData {
+    // Only a section crossing (enter XOR leave) changes membership. Staying put, or no transactions, is a no-op.
+    if (!snapshotHash || transactions.length === 0 || enters === leaves) {
+        return {optimisticData: [], successData: [], failureData: []};
     }
 
-    return {total, count};
+    const snapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${snapshotHash}` as const;
+    // Only patch a snapshot that's actually been loaded; writing into a missing one would create a partial entry.
+    if (!allSnapshots?.[snapshotKey]?.search) {
+        return {optimisticData: [], successData: [], failureData: []};
+    }
+
+    const presentData: SearchResultDataType = {};
+    const absentData: NullishDeep<SearchResultDataType> = {};
+    for (const transaction of transactions) {
+        const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}` as const;
+        presentData[transactionKey] = transaction;
+        absentData[transactionKey] = null;
+    }
+
+    // Entering adds the transactions (rollback removes them); leaving removes them (rollback restores them).
+    const optimisticDataValue = enters ? presentData : absentData;
+    const failureDataValue = enters ? absentData : presentData;
+
+    return {
+        optimisticData: [{onyxMethod: Onyx.METHOD.MERGE, key: snapshotKey, value: {data: optimisticDataValue}}],
+        successData: [],
+        failureData: [{onyxMethod: Onyx.METHOD.MERGE, key: snapshotKey, value: {data: failureDataValue}}],
+    };
 }
 
 /**
@@ -311,6 +360,7 @@ function getYourSpendSnapshotReportMoveUpdates({
             const countDiff = (enters ? aggregate.count : 0) - (leaves ? aggregate.count : 0);
             if (diff !== 0 || countDiff !== 0) {
                 mergeYourSpendSnapshotOnyxData(result, buildSnapshotTotalUpdatesForHash(approvalQueryJSON?.hash, diff, approvalTargetCurrency, countDiff));
+                mergeYourSpendSnapshotOnyxData(result, buildSnapshotDataUpdatesForHash(approvalQueryJSON?.hash, aggregate.transactions, enters, leaves));
             }
         }
     }
@@ -328,6 +378,7 @@ function getYourSpendSnapshotReportMoveUpdates({
                 const countDiff = (enters ? aggregate.count : 0) - (leaves ? aggregate.count : 0);
                 if (diff !== 0 || countDiff !== 0) {
                     mergeYourSpendSnapshotOnyxData(result, buildSnapshotTotalUpdatesForHash(paymentQueryJSON?.hash, diff, paymentTargetCurrency, countDiff));
+                    mergeYourSpendSnapshotOnyxData(result, buildSnapshotDataUpdatesForHash(paymentQueryJSON?.hash, aggregate.transactions, enters, leaves));
                 }
             }
         }
diff --git a/tests/actions/IOUTest/GetYourSpendSnapshotReportMoveUpdatesTest.ts b/tests/actions/IOUTest/GetYourSpendSnapshotReportMoveUpdatesTest.ts
@@ -70,11 +70,13 @@ function buildExpenseReport(overrides: Partial<Report> = {}): Report {
     } as Report;
 }
 
+// Expense-report transactions are stored with the opposite sign, so a positive stored `amount` (e.g. 10000) is a
+// spend that `getAmount`/the snapshot total represent as negative (-10000). Mirrors real Onyx data.
 function buildTransaction(overrides: Partial<Transaction> = {}): Transaction {
     return {
         transactionID: 'reportMoveTxn',
         reportID: EXPENSE_REPORT_ID,
-        amount: -10000,
+        amount: 10000,
         currency: CONST.CURRENCY.USD,
         reimbursable: true,
         created: '2026-01-15',
@@ -83,6 +85,8 @@ function buildTransaction(overrides: Partial<Transaction> = {}): Transaction {
     } as Transaction;
 }
 
+const TRANSACTION_KEY = `${ONYXKEYS.COLLECTION.TRANSACTION}reportMoveTxn` as const;
+
 beforeAll(() => {
     Onyx.init({
         keys: ONYXKEYS,
@@ -120,7 +124,7 @@ async function seedRepaidSnapshot(total: number, currency: string = CONST.CURREN
 
 describe('getYourSpendSnapshotReportMoveUpdates', () => {
     it('adds the report total to awaiting approval when a report is submitted (OPEN -> SUBMITTED)', async () => {
-        const snapshotKey = await seedAwaitingApprovalSnapshot(10000);
+        const snapshotKey = await seedAwaitingApprovalSnapshot(-10000);
 
         const {optimisticData, failureData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport(SUBMITTED_STATUS),
@@ -130,22 +134,32 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
             currentUserAccountID: ACCOUNT_ID,
         });
 
+        // Submitting adds the report's (negative) spend to the section total and injects the transaction into
+        // `data` so the linked Search page is not empty offline.
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 20000, count: 2, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -20000, count: 2, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: buildTransaction()}},
             }),
         ]);
         expect(failureData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 10000, count: 1, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -10000, count: 1, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: null}},
             }),
         ]);
     });
 
     it('subtracts the report total from awaiting approval when a report is retracted (SUBMITTED -> OPEN)', async () => {
-        const snapshotKey = await seedAwaitingApprovalSnapshot(30000);
+        const snapshotKey = await seedAwaitingApprovalSnapshot(-30000);
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport(OPEN_STATUS),
@@ -155,16 +169,21 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
             currentUserAccountID: ACCOUNT_ID,
         });
 
+        // Leaving the section removes the (negative) spend from the total and removes the transaction from `data`.
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 20000, count: 0, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -20000, count: 0, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: null}},
             }),
         ]);
     });
 
     it('subtracts the report total from awaiting approval when a report is rejected (SUBMITTED -> OPEN)', async () => {
-        const snapshotKey = await seedAwaitingApprovalSnapshot(30000);
+        const snapshotKey = await seedAwaitingApprovalSnapshot(-30000);
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport(OPEN_STATUS),
@@ -177,13 +196,17 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 20000, count: 0, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -20000, count: 0, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: null}},
             }),
         ]);
     });
 
     it('adds the report total back to awaiting approval when a report is unapproved (APPROVED -> SUBMITTED)', async () => {
-        const snapshotKey = await seedAwaitingApprovalSnapshot(10000);
+        const snapshotKey = await seedAwaitingApprovalSnapshot(-10000);
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport(SUBMITTED_STATUS),
@@ -196,17 +219,22 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 20000, count: 2, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -20000, count: 2, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: buildTransaction()}},
             }),
         ]);
     });
 
     it('subtracts the report total from repaid when a payment is cancelled (REIMBURSED -> APPROVED)', async () => {
-        const snapshotKey = await seedRepaidSnapshot(30000);
+        const snapshotKey = await seedRepaidSnapshot(-30000);
+        const recentTransaction = buildTransaction({created: getRecentCreatedDate()});
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport(APPROVED_STATUS),
-            reportTransactions: [buildTransaction({created: getRecentCreatedDate()})],
+            reportTransactions: [recentTransaction],
             fromStatus: REIMBURSED_STATUS,
             toStatus: APPROVED_STATUS,
             currentUserAccountID: ACCOUNT_ID,
@@ -215,7 +243,11 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 20000, count: 0, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -20000, count: 0, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: null}},
             }),
         ]);
     });
@@ -280,11 +312,12 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
     });
 
     it('patches using convertedAmount when the snapshot currency differs from the transaction currency', async () => {
-        const snapshotKey = await seedAwaitingApprovalSnapshot(10000);
+        const snapshotKey = await seedAwaitingApprovalSnapshot(-10000);
+        const convertedTransaction = buildTransaction({currency: CONST.CURRENCY.EUR, amount: 10000, convertedAmount: 5000});
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport({...SUBMITTED_STATUS, currency: CONST.CURRENCY.EUR}),
-            reportTransactions: [buildTransaction({currency: CONST.CURRENCY.EUR, amount: -10000, convertedAmount: -5000})],
+            reportTransactions: [convertedTransaction],
             fromStatus: OPEN_STATUS,
             toStatus: SUBMITTED_STATUS,
             currentUserAccountID: ACCOUNT_ID,
@@ -293,7 +326,11 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 15000, count: 2, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -15000, count: 2, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: convertedTransaction}},
             }),
         ]);
     });
@@ -307,7 +344,7 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
 
         const {optimisticData} = getYourSpendSnapshotReportMoveUpdates({
             iouReport: buildExpenseReport({...SUBMITTED_STATUS, currency: CONST.CURRENCY.GBP}),
-            reportTransactions: [buildTransaction({currency: CONST.CURRENCY.GBP, amount: -10000, convertedAmount: -5000})],
+            reportTransactions: [buildTransaction({currency: CONST.CURRENCY.GBP, amount: 10000, convertedAmount: 5000})],
             fromStatus: OPEN_STATUS,
             toStatus: SUBMITTED_STATUS,
             currentUserAccountID: ACCOUNT_ID,
@@ -334,7 +371,11 @@ describe('getYourSpendSnapshotReportMoveUpdates', () => {
         expect(optimisticData).toEqual([
             expect.objectContaining({
                 key: snapshotKey,
-                value: {search: {total: 10000, count: 1, currency: CONST.CURRENCY.USD}},
+                value: {search: {total: -10000, count: 1, currency: CONST.CURRENCY.USD}},
+            }),
+            expect.objectContaining({
+                key: snapshotKey,
+                value: {data: {[TRANSACTION_KEY]: buildTransaction()}},
             }),
         ]);
     });
diff --git a/tests/actions/IOUTest/GetYourSpendSnapshotTotalUpdatesTest.ts b/tests/actions/IOUTest/GetYourSpendSnapshotTotalUpdatesTest.ts
