fixed negative values as Total

Author: mukhrr

src/components/TransactionItemRow/index.tsx

@@ -33,6 +33,7 @@ import StringUtils from '@libs/StringUtils';
 import {
     getAmount,
     getAttendees,
+    getConvertedAmount,
     getCurrency,
     getDescription,
     getExchangeRate,
@@ -585,15 +586,20 @@ function TransactionItemRow({
                     </View>
                 );
             case CONST.SEARCH.TABLE_COLUMNS.TOTAL: {
-                const convertedAmount = transactionItem.convertedAmount ?? 0;
+                // getConvertedAmount flips the stored opposite-sign value to the display convention, so an expense
+                // with a negative Amount renders Total as negative too (matching Classic).
+                const convertedAmount = getConvertedAmount(transactionItem, isExpenseReport(transactionItem.report ?? report), false, true);
+                // convertedAmount is expressed in the report's output currency. Prefer the report currency, then the
+                // policy output currency. Fall back to the transaction's own currency only when neither is available
+                // (e.g. self-DM or unreported contexts) — in that case no conversion happened so the currencies match.
                 const convertedCurrency = report?.currency ?? policy?.outputCurrency ?? getCurrency(transactionItem);
                 return (
                     <View
                         key={column}
                         style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, {isAmountColumnWide})]}
                     >
                         <AmountCell
-                            total={Math.abs(convertedAmount)}
+                            total={convertedAmount}
                             currency={convertedCurrency}
                         />
                     </View>

src/libs/TransactionUtils/index.ts

@@ -1318,8 +1318,11 @@ function getExchangeRate(transaction: TransactionWithOptionalSearchFields, repor
     }
 
     // currencyConversionRate: report-layout rate (fromCurrency → reportCurrency).
-    const conversionToCurrency = reportCurrency ?? (transaction.currency !== fromCurrency ? transaction.currency : (transaction.groupCurrency ?? fromCurrency));
-    if (transaction.currencyConversionRate != null && fromCurrency !== conversionToCurrency) {
+    // When no reportCurrency is provided (e.g. search sort), fall back to groupCurrency so we can still
+    // surface a meaningful rate. We intentionally do not use transaction.currency here, since it reflects
+    // the pre-modification currency and is almost never the correct conversion target.
+    const conversionToCurrency = reportCurrency ?? transaction.groupCurrency;
+    if (conversionToCurrency && transaction.currencyConversionRate != null && fromCurrency !== conversionToCurrency) {
         const conversionRate = Number(transaction.currencyConversionRate);
         if (conversionRate !== 1) {
             return `${transaction.currencyConversionRate} ${fromCurrency}/${conversionToCurrency}`;

src/pages/settings/Report/ReportDetailsColumnsPage.tsx

@@ -1,5 +1,6 @@
 import {useRoute} from '@react-navigation/native';
-import React, {useMemo} from 'react';
+import React, {useCallback, useMemo} from 'react';
+import type {OnyxCollection} from 'react-native-onyx';
 import ColumnsSettingsList from '@components/ColumnsSettingsList';
 import type {SearchCustomColumnIds} from '@components/Search/types';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -14,6 +15,7 @@ import type {ReportSettingsNavigatorParamList} from '@navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
+import type {Transaction} from '@src/types/onyx';
 import arraysEqual from '@src/utils/arraysEqual';
 
 /**
@@ -36,16 +38,26 @@ function ReportDetailsColumnsPage() {
     const [reportDetailsColumns] = useOnyx(ONYXKEYS.NVP_REPORT_DETAILS_COLUMNS);
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`);
-    const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
-    const reportTransactions = Object.values(allTransactions ?? {}).filter((t): t is NonNullable<typeof t> => t != null && t.reportID === reportID);
+    // Selector keeps re-renders scoped to this report's transactions. We intentionally return undefined
+    // while the collection is loading so the caller can distinguish "loading" from "no transactions".
+    const reportTransactionsSelector = useCallback(
+        (transactions: OnyxCollection<Transaction>): Transaction[] | undefined => {
+            if (!transactions) {
+                return undefined;
+            }
+            return Object.values(transactions).filter((transaction): transaction is Transaction => !!transaction && transaction.reportID === reportID);
+        },
+        [reportID],
+    );
+    const [reportTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {selector: reportTransactionsSelector}, [reportTransactionsSelector]);
     const currentUserDetails = useCurrentUserPersonalDetails();
 
     const allTypeCustomColumns = Object.values(CONST.SEARCH.REPORT_DETAILS_CUSTOM_COLUMNS) as SearchCustomColumnIds[];
 
     // Wait for transactions to load before rendering. ColumnsSettingsList snapshots
     // currentColumns in useState on mount and does not sync prop updates, so we must
     // pass the final value on first render.
-    const isLoading = !allTransactions;
+    const isLoading = !reportTransactions;
 
     // When no custom columns are saved, compute which columns getColumnsToShow would
     // return for this report so data-driven columns (e.g. Exchange rate, Original amount,
@@ -56,7 +68,7 @@ function ReportDetailsColumnsPage() {
             return savedColumns;
         }
 
-        if (!reportTransactions.length) {
+        if (!reportTransactions?.length) {
             return REPORT_DETAILS_DEFAULT_COLUMNS;
         }