[Hold on Auth#18965] Fix expense amount not displaying $0 when edited to zero

__mocks__/reportData/transactions.ts

@@ -30,7 +30,7 @@ const transactionR14932: Transaction = {
     reimbursable: true,
     hasEReceipt: true,
     cardID: 0,
-    modifiedAmount: 0,
+    modifiedAmount: undefined,
     originalAmount: 0,
     comment: {},
     bank: '',
@@ -59,7 +59,7 @@ const transactionR98765: Transaction = {
     hasEReceipt: true,
     managedCard: false,
     billable: false,
-    modifiedAmount: 0,
+    modifiedAmount: undefined,
     cardID: 0,
     originalAmount: 0,
     comment: {},

src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx

@@ -1,3 +1,4 @@
+import isNumber from 'lodash/isNumber';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import type {LayoutChangeEvent, ListRenderItem} from 'react-native';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
@@ -97,8 +98,7 @@ function MoneyRequestReportPreview({
             return false;
         }
 
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        return transactions.some((transaction) => (transaction?.modifiedAmount || transaction?.amount) < 0);
+        return transactions.some((transaction) => (isNumber(transaction?.modifiedAmount) ? transaction.modifiedAmount : transaction?.amount) < 0);
     }, [transactions, action.childType, iouReport]);
 
     const openReportFromPreview = useCallback(() => {

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -1,4 +1,5 @@
 import {Str} from 'expensify-common';
+import isNumber from 'lodash/isNumber';
 import React, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
@@ -270,9 +271,9 @@ function MoneyRequestView({
     // Use the updated transaction amount in merge flow to have correct positive/negative sign
     const actualAmount = isFromMergeTransaction && updatedTransaction ? updatedTransaction.amount : transactionAmount;
     const actualCurrency = updatedTransaction ? getCurrency(updatedTransaction) : transactionCurrency;
-    const shouldDisplayTransactionAmount = ((isDistanceRequest && hasRoute) || !!actualAmount) && actualAmount !== undefined;
+    const shouldDisplayTransactionAmount = (isDistanceRequest && hasRoute) || isNumber(actualAmount);
     const formattedTransactionAmount = shouldDisplayTransactionAmount ? convertToDisplayString(actualAmount, actualCurrency) : '';
-    const formattedPerAttendeeAmount = shouldDisplayTransactionAmount ? convertToDisplayString(actualAmount / (actualAttendees?.length ?? 1), actualCurrency) : '';
+    const formattedPerAttendeeAmount = shouldDisplayTransactionAmount && isNumber(actualAmount) ? convertToDisplayString(actualAmount / (actualAttendees?.length ?? 1), actualCurrency) : '';
 
     const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
     const isCardTransaction = isCardTransactionTransactionUtils(transaction);

src/components/ReportActionItem/TransactionPreview/index.tsx

@@ -1,4 +1,5 @@
 import {useRoute} from '@react-navigation/native';
+import isNumber from 'lodash/isNumber';
 import React, {useCallback, useMemo} from 'react';
 import type {GestureResponderEvent} from 'react-native';
 import {usePersonalDetails, useSession} from '@components/OnyxListItemProvider';
@@ -93,8 +94,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
     const iouAction = action;
 
     // See description of `transactionRawAmount` prop for more context
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const transactionRawAmount = (transaction?.modifiedAmount || transaction?.amount) ?? 0;
+    const transactionRawAmount = (isNumber(transaction?.modifiedAmount) ? transaction.modifiedAmount : transaction?.amount) ?? 0;
 
     const shouldDisableOnPress = isBillSplit && isEmptyObject(transaction);
     const isTransactionMadeWithCard = isManagedCardTransaction(transaction);

src/components/Search/index.tsx

@@ -1,5 +1,6 @@
 import {findFocusedRoute, useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
 import * as Sentry from '@sentry/react-native';
+import isNumber from 'lodash/isNumber';
 import React, {useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
@@ -219,7 +220,7 @@ function prepareTransactionsList(
             action: item.action,
             reportID: item.reportID,
             policyID: item.policyID,
-            amount: Math.abs(item.modifiedAmount || item.amount),
+            amount: Math.abs(isNumber(item.modifiedAmount) ? item.modifiedAmount : item.amount),
             groupAmount: item.groupAmount,
             groupCurrency: item.groupCurrency,
             groupExchangeRate: item.groupExchangeRate,

src/libs/ReportUtils.ts

@@ -12468,8 +12468,7 @@ function hasExportError(reportActions: OnyxEntry<ReportActions> | ReportAction[]
 
 function doesReportContainRequestsFromMultipleUsers(iouReport: OnyxEntry<Report>): boolean {
     const transactions = getReportTransactions(iouReport?.reportID);
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    return isIOUReport(iouReport) && transactions.some((transaction) => (transaction?.modifiedAmount || transaction?.amount) < 0);
+    return isIOUReport(iouReport) && transactions.some((transaction) => (isNumber(transaction?.modifiedAmount) ? transaction.modifiedAmount : transaction?.amount) < 0);
 }
 
 /**

src/libs/SearchUIUtils.ts

@@ -1,3 +1,4 @@
+import isNumber from 'lodash/isNumber';
 import type {TextStyle, ViewStyle} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -845,8 +846,7 @@ function isAmountTooLong(amount: number, maxLength = 8): boolean {
 
 // eslint-disable-next-line @typescript-eslint/no-deprecated
 function isTransactionAmountTooLong(transactionItem: TransactionListItemType | SearchTransaction | OnyxTypes.Transaction) {
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const amount = Math.abs(transactionItem.modifiedAmount || transactionItem.amount);
+    const amount = Math.abs(isNumber(transactionItem.modifiedAmount) ? transactionItem.modifiedAmount : transactionItem.amount);
     return isAmountTooLong(amount);
 }
 

src/libs/TransactionUtils/index.ts

@@ -2,6 +2,7 @@
 import {deepEqual} from 'fast-equals';
 import lodashDeepClone from 'lodash/cloneDeep';
 import lodashHas from 'lodash/has';
+import isNumber from 'lodash/isNumber';
 import lodashSet from 'lodash/set';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
@@ -126,7 +127,7 @@
 };
 
 let deprecatedAllReports: OnyxCollection<Report> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -135,7 +136,7 @@
 });
 
 let deprecatedAllTransactionViolations: OnyxCollection<TransactionViolations> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
     waitForCollectionCallback: true,
     callback: (value) => (deprecatedAllTransactionViolations = value),
@@ -752,9 +753,8 @@
 function getAmount(transaction: OnyxInputOrEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false, allowNegative = false, disableOppositeConversion = false): number {
     // IOU requests cannot have negative values, but they can be stored as negative values, let's return absolute value
     if (!isFromExpenseReport && !isFromTrackedExpense && !allowNegative) {
-        const amount = transaction?.modifiedAmount ?? 0;
-        if (amount) {
-            return Math.abs(amount);
+        if (isNumber(transaction?.modifiedAmount)) {
+            return Math.abs(transaction.modifiedAmount);
         }
         return Math.abs(transaction?.amount ?? 0);
     }
@@ -766,12 +766,11 @@
     // Expense report case:
     // The amounts are stored using an opposite sign and negative values can be set,
     // we need to return an opposite sign than is saved in the transaction object
-    let amount = transaction?.modifiedAmount ?? 0;
-    if (amount) {
-        return -amount;
+    if (isNumber(transaction?.modifiedAmount)) {
+        return -transaction.modifiedAmount;
     }
 
-    amount = transaction?.amount ?? 0;
+    const amount = transaction?.amount ?? 0;
 
     // To avoid -0 being shown, lets only change the sign if the value is other than 0.
     return amount ? -amount : 0;

src/libs/Violations/ViolationsUtils.ts

@@ -1,4 +1,5 @@
 import isEmpty from 'lodash/isEmpty';
+import isNumber from 'lodash/isNumber';
 import keyBy from 'lodash/keyBy';
 import reject from 'lodash/reject';
 import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
@@ -341,8 +342,7 @@ const ViolationsUtils = {
         const isPolicyTrackTaxEnabled = isTaxTrackingEnabled(true, policy, isDistanceRequest, isPerDiemRequest);
         const isTaxInPolicy = Object.keys(policy.taxRates?.taxes ?? {}).some((key) => key === updatedTransaction.taxCode);
 
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        const amount = updatedTransaction.modifiedAmount || updatedTransaction.amount;
+        const amount = isNumber(updatedTransaction.modifiedAmount) ? updatedTransaction.modifiedAmount : updatedTransaction.amount;
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         const currency = updatedTransaction.modifiedCurrency || updatedTransaction.currency;
         const canCalculateAmountViolations = policy.outputCurrency === currency;

src/stories/objects/Transaction.ts

@@ -20,7 +20,7 @@ const transaction: Transaction & {mcc: string; modifiedMCC: string} = {
     managedCard: false,
     mcc: '',
     merchant: "Mario's",
-    modifiedAmount: 0,
+    modifiedAmount: undefined,
     modifiedCreated: '',
     modifiedCurrency: '',
     modifiedMCC: '',

src/types/onyx/SearchResults.ts

@@ -90,7 +90,7 @@ type SearchTransaction = {
     canDelete: boolean;
 
     /** The edited transaction amount */
-    modifiedAmount: number;
+    modifiedAmount?: number;
 
     /** The transaction currency */
     currency: string;

tests/actions/IOUTest.ts

@@ -6874,7 +6874,7 @@ describe('actions/IOU', () => {
                 ...createRandomTransaction(0),
                 reportID,
                 amount: 0,
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 receipt: {
                     source: 'test',
                     state: CONST.IOU.RECEIPT_STATE.SCANNING,
@@ -6886,7 +6886,7 @@ describe('actions/IOU', () => {
                 ...createRandomTransaction(1),
                 reportID,
                 amount: 0,
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 receipt: {
                     source: 'test',
                     state: CONST.IOU.RECEIPT_STATE.SCANNING,
@@ -6936,7 +6936,7 @@ describe('actions/IOU', () => {
                 ...createRandomTransaction(1),
                 reportID,
                 amount: 0,
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 receipt: {
                     source: 'test',
                     state: CONST.IOU.RECEIPT_STATE.SCANNING,
@@ -7386,6 +7386,7 @@ describe('actions/IOU', () => {
                 ...createRandomTransaction(1),
                 reportID: fakeReport.reportID,
                 amount: 100,
+                modifiedAmount: 0,
                 currency: 'USD',
             };
 

tests/unit/DebugUtilsTest.ts

@@ -1234,7 +1234,7 @@ describe('DebugUtils', () => {
                     },
                     [`${ONYXKEYS.COLLECTION.TRANSACTION}1` as const]: {
                         amount: 0,
-                        modifiedAmount: 0,
+                        modifiedAmount: undefined,
                     },
                 });
                 const {reportAction} =
@@ -1294,7 +1294,7 @@ describe('DebugUtils', () => {
                     await Onyx.multiSet({
                         [`${ONYXKEYS.COLLECTION.TRANSACTION}1` as const]: {
                             amount: 0,
-                            modifiedAmount: 0,
+                            modifiedAmount: undefined,
                         },
                         [`${ONYXKEYS.COLLECTION.REPORT}1` as const]: MOCK_CHAT_REPORT,
                         [`${ONYXKEYS.COLLECTION.REPORT}2` as const]: MOCK_IOU_REPORT,
@@ -1359,7 +1359,7 @@ describe('DebugUtils', () => {
                     await Onyx.multiSet({
                         [`${ONYXKEYS.COLLECTION.TRANSACTION}1` as const]: {
                             amount: 0,
-                            modifiedAmount: 0,
+                            modifiedAmount: undefined,
                         },
                         [`${ONYXKEYS.COLLECTION.REPORT}1` as const]: MOCK_CHAT_REPORT,
                         [`${ONYXKEYS.COLLECTION.REPORT}2` as const]: MOCK_IOU_REPORT,

tests/unit/MoneyRequestReportUtilsTest.ts

@@ -82,7 +82,7 @@ const transactionItemBaseMock: TransactionListItemType = {
     hasEReceipt: false,
     keyForList: '1',
     merchant: 'Expense',
-    modifiedAmount: 0,
+    modifiedAmount: undefined,
     modifiedCreated: '',
     modifiedCurrency: '',
     modifiedMerchant: 'Expense',

tests/unit/Search/SearchUIUtilsTest.ts

@@ -399,7 +399,7 @@ const searchResults: OnyxTypes.SearchResults = {
             currency: 'USD',
             hasEReceipt: false,
             merchant: 'Expense',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: 'Expense',
@@ -429,7 +429,7 @@ const searchResults: OnyxTypes.SearchResults = {
             currency: 'USD',
             hasEReceipt: false,
             merchant: 'Expense',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: 'Expense',
@@ -460,7 +460,7 @@ const searchResults: OnyxTypes.SearchResults = {
             currency: 'VND',
             hasEReceipt: false,
             merchant: '(none)',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: '',
@@ -490,7 +490,7 @@ const searchResults: OnyxTypes.SearchResults = {
             currency: 'VND',
             hasEReceipt: false,
             merchant: '(none)',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: '',
@@ -790,7 +790,7 @@ const transactionsListItems = [
         hasEReceipt: false,
         keyForList: '1',
         merchant: 'Expense',
-        modifiedAmount: 0,
+        modifiedAmount: undefined,
         modifiedCreated: '',
         modifiedCurrency: '',
         modifiedMerchant: 'Expense',
@@ -850,7 +850,7 @@ const transactionsListItems = [
         hasEReceipt: false,
         keyForList: '2',
         merchant: 'Expense',
-        modifiedAmount: 0,
+        modifiedAmount: undefined,
         modifiedCreated: '',
         modifiedCurrency: '',
         modifiedMerchant: 'Expense',
@@ -908,7 +908,7 @@ const transactionsListItems = [
         currency: 'VND',
         hasEReceipt: false,
         merchant: '(none)',
-        modifiedAmount: 0,
+        modifiedAmount: undefined,
         modifiedCreated: '',
         modifiedCurrency: '',
         modifiedMerchant: '',
@@ -973,7 +973,7 @@ const transactionsListItems = [
         currency: 'VND',
         hasEReceipt: false,
         merchant: '(none)',
-        modifiedAmount: 0,
+        modifiedAmount: undefined,
         modifiedCreated: '',
         modifiedCurrency: '',
         modifiedMerchant: '',
@@ -1088,7 +1088,7 @@ const transactionReportGroupListItems = [
                 hasEReceipt: false,
                 keyForList: '1',
                 merchant: 'Expense',
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 modifiedCreated: '',
                 modifiedCurrency: '',
                 modifiedMerchant: 'Expense',
@@ -1200,7 +1200,7 @@ const transactionReportGroupListItems = [
                 ],
                 keyForList: '2',
                 merchant: 'Expense',
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 modifiedCreated: '',
                 modifiedCurrency: '',
                 modifiedMerchant: 'Expense',
@@ -1304,7 +1304,7 @@ const transactionReportGroupListItems = [
                 currency: 'VND',
                 hasEReceipt: false,
                 merchant: '(none)',
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 modifiedCreated: '',
                 modifiedCurrency: '',
                 modifiedMerchant: '',
@@ -1366,7 +1366,7 @@ const transactionReportGroupListItems = [
                 currency: 'VND',
                 hasEReceipt: false,
                 merchant: '(none)',
-                modifiedAmount: 0,
+                modifiedAmount: undefined,
                 modifiedCreated: '',
                 modifiedCurrency: '',
                 modifiedMerchant: '',

tests/unit/Search/handleActionButtonPressTest.ts

@@ -111,7 +111,7 @@ const mockReportItemWithHold = {
             hasEReceipt: false,
             managerID: 1206,
             merchant: 'Qatar',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: '',
@@ -210,7 +210,7 @@ const mockReportItemWithHold = {
             currency: 'USD',
             hasEReceipt: false,
             merchant: 'Forbes',
-            modifiedAmount: 0,
+            modifiedAmount: undefined,
             modifiedCreated: '',
             modifiedCurrency: '',
             modifiedMerchant: '',

tests/unit/useTodosTest.ts

@@ -44,7 +44,7 @@ const createMockTransaction = (transactionID: string, reportID: string, override
         transactionID,
         reportID,
         amount: 100,
-        modifiedAmount: 0,
+        modifiedAmount: undefined,
         reimbursable: true,
         ...overrides,
     }) as Transaction;

tests/utils/collections/transaction.ts

@@ -41,7 +41,6 @@ export default function createRandomTransaction(index: number): Transaction {
         receipt: {filename: randWord()},
         reimbursable: randBoolean(),
         hasEReceipt: randBoolean(),
-        modifiedAmount: 0,
     };
 }