Updates

Author: ShridharGoel

src/components/MoneyReportHeader.tsx

@@ -10,6 +10,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import {useCurrencyListState} from '@hooks/useCurrencyList';
 import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
 import useDeleteTransactions from '@hooks/useDeleteTransactions';
 import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
@@ -351,6 +352,7 @@ function MoneyReportHeader({
     const [originalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transaction?.comment?.originalTransactionID)}`);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
+    const {currencyList} = useCurrencyListState();
     const {isBetaEnabled} = usePermissions();
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const isDEWBetaEnabled = isBetaEnabled(CONST.BETAS.NEW_DOT_DEW);
@@ -919,7 +921,7 @@ function MoneyReportHeader({
     }, [connectedIntegration, exportModalStatus, moneyRequestReport?.reportID]);
 
     const getAmount = (actionType: ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>) => ({
-        formattedAmount: getTotalAmountForIOUReportPreviewButton(moneyRequestReport, policy, actionType),
+        formattedAmount: getTotalAmountForIOUReportPreviewButton(moneyRequestReport, policy, actionType, currencyList),
     });
 
     const {formattedAmount: totalAmount} = getAmount(CONST.REPORT.PRIMARY_ACTIONS.PAY);
@@ -1776,7 +1778,7 @@ function MoneyReportHeader({
             }
             return option;
         });
-    }, [originalSelectedTransactionsOptions, showDeleteModal, dismissedRejectUseExplanation]);
+    }, [originalSelectedTransactionsOptions, showDeleteModal, dismissedRejectUseExplanation, isDelegateAccessRestricted, showDelegateNoAccessModal]);
 
     const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length && !transactionThreadReportID;
 

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx

@@ -27,6 +27,7 @@ import {showContextMenuForReport} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import {useCurrencyListState} from '@hooks/useCurrencyList';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -182,6 +183,7 @@ function MoneyRequestReportPreviewContent({
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const {isBetaEnabled} = usePermissions();
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const {currencyList} = useCurrencyListState();
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
@@ -649,7 +651,7 @@ function MoneyRequestReportPreviewContent({
     );
 
     const isReportDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const formattedAmount = getTotalAmountForIOUReportPreviewButton(iouReport, policy, reportPreviewAction);
+    const formattedAmount = getTotalAmountForIOUReportPreviewButton(iouReport, policy, reportPreviewAction, currencyList);
 
     const reportPreviewActions = {
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (

src/libs/CurrencyUtils.ts

@@ -11,7 +11,12 @@ import {format, formatToParts} from './NumberFormatUtils';
  * @param currency - IOU currency
  */
 function getCurrencyDecimals(currency: string = CONST.CURRENCY.USD, currencies?: CurrencyList): number {
-    const decimals = currencies?.[currency]?.decimals;
+    const normalizedCurrency = currency.toUpperCase();
+    const decimals = currencies?.[normalizedCurrency]?.decimals;
+    if (decimals !== undefined) {
+        return decimals;
+    }
+
     return decimals ?? 2;
 }
 
@@ -40,7 +45,7 @@ function getLocalizedCurrencySymbol(locale: Locale | undefined, currencyCode: st
  * Get the currency symbol for a currency(ISO 4217) Code
  */
 function getCurrencySymbol(currencyCode: string, currencies?: CurrencyList): string | undefined {
-    return currencies?.[currencyCode]?.symbol;
+    return currencies?.[currencyCode.toUpperCase()]?.symbol;
 }
 
 /**
@@ -188,7 +193,9 @@ function convertToDisplayStringWithoutCurrency(amountInCents: number, currency:
  * Checks if passed currency code is a valid currency based on currency list
  */
 function isValidCurrencyCode(currencyCode: string, currencies?: CurrencyList): boolean {
-    const currency = currencies?.[currencyCode];
+    const normalizedCurrencyCode = currencyCode.toUpperCase();
+
+    const currency = currencies?.[normalizedCurrencyCode];
     return !!currency;
 }
 

src/libs/Formula.ts

@@ -2,7 +2,7 @@ import {endOfDay, endOfMonth, endOfWeek, getDay, lastDayOfMonth, set, startOfMon
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
-import type {PersonalDetails, Policy, PolicyReportField, Report, Transaction} from '@src/types/onyx';
+import type {CurrencyList, PersonalDetails, Policy, PolicyReportField, Report, Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import {convertToDisplayString, convertToDisplayStringWithoutCurrency, isValidCurrencyCode} from './CurrencyUtils';
 import {formatDate} from './FormulaDatetime';
@@ -31,6 +31,7 @@ type MinimalTransaction = Pick<Transaction, 'transactionID' | 'reportID' | 'crea
 type FormulaContext = {
     report: Report;
     policy: OnyxEntry<Policy>;
+    currencyList?: CurrencyList;
     transaction?: Transaction;
     submitterPersonalDetails?: PersonalDetails;
     managerPersonalDetails?: PersonalDetails;
@@ -370,12 +371,12 @@ function computeReportPart(part: FormulaPart, context: FormulaContext): string {
         case 'enddate':
             return formatDate(getNewestTransactionDate(report.reportID, context), format);
         case 'total': {
-            const formattedAmount = formatAmount(report.total, report.currency, format);
+            const formattedAmount = formatAmount(report.total, report.currency, format, context.currencyList);
             // Return empty string when conversion needed (formatAmount returns null for unavailable conversions)
             return formattedAmount ?? '';
         }
         case 'reimbursable': {
-            const formattedAmount = formatAmount(getMoneyRequestSpendBreakdown(report).reimbursableSpend, report.currency, format);
+            const formattedAmount = formatAmount(getMoneyRequestSpendBreakdown(report).reimbursableSpend, report.currency, format, context.currencyList);
             return formattedAmount ?? '';
         }
         case 'currency':
@@ -559,7 +560,7 @@ function getSubstring(value: string, args: string[]): string {
  * Format an amount value
  * @returns The formatted amount string, or null if currency conversion is needed (unavailable on frontend)
  */
-function formatAmount(amount: number | undefined, currency: string | undefined, displayCurrency?: string): string | null {
+function formatAmount(amount: number | undefined, currency: string | undefined, displayCurrency?: string, currencyList?: CurrencyList): string | null {
     if (amount === undefined) {
         return '';
     }
@@ -570,11 +571,11 @@ function formatAmount(amount: number | undefined, currency: string | undefined,
         const trimmedDisplayCurrency = displayCurrency?.trim().toUpperCase();
         if (trimmedDisplayCurrency) {
             if (trimmedDisplayCurrency === 'NOSYMBOL') {
-                return convertToDisplayStringWithoutCurrency(absoluteAmount, currency);
+                return convertToDisplayStringWithoutCurrency(absoluteAmount, currency, currencyList);
             }
 
             // Check if format is a valid currency code (e.g., USD, EUR, eur)
-            if (!isValidCurrencyCode(trimmedDisplayCurrency)) {
+            if (!isValidCurrencyCode(trimmedDisplayCurrency, currencyList)) {
                 return '';
             }
 
@@ -585,14 +586,14 @@ function formatAmount(amount: number | undefined, currency: string | undefined,
                 return null;
             }
 
-            return convertToDisplayString(absoluteAmount, trimmedDisplayCurrency);
+            return convertToDisplayString(absoluteAmount, trimmedDisplayCurrency, false, currencyList);
         }
 
-        if (currency && isValidCurrencyCode(currency)) {
-            return convertToDisplayString(absoluteAmount, currency, true);
+        if (currency && isValidCurrencyCode(currency, currencyList)) {
+            return convertToDisplayString(absoluteAmount, currency, true, currencyList);
         }
 
-        return convertToDisplayStringWithoutCurrency(absoluteAmount, currency);
+        return convertToDisplayStringWithoutCurrency(absoluteAmount, currency, currencyList);
     } catch (error) {
         Log.hmmm('[Formula] formatAmount failed', {error, amount, currency, displayCurrency});
         return '';

src/libs/MoneyRequestReportUtils.ts

@@ -2,7 +2,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {TransactionListItemType} from '@components/SelectionListWithSections/types';
 import CONST from '@src/CONST';
-import type {OriginalMessageIOU, Policy, Report, ReportAction, ReportMetadata, Transaction} from '@src/types/onyx';
+import type {CurrencyList, OriginalMessageIOU, Policy, Report, ReportAction, ReportMetadata, Transaction} from '@src/types/onyx';
 import {convertToDisplayString} from './CurrencyUtils';
 import {isPaidGroupPolicy} from './PolicyUtils';
 import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isDeletedParentAction, isMoneyRequestAction} from './ReportActionsUtils';
@@ -152,7 +152,12 @@ function shouldWaitForTransactions(report: OnyxEntry<Report>, transactions: Tran
  * @param reportPreviewAction - The action that will take place when button is clicked which determines how amounts are calculated and displayed.
  * @returns - The total amount to be formatted as a string. Returns an empty string if no amount is applicable.
  */
-const getTotalAmountForIOUReportPreviewButton = (report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportPreviewAction: ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>) => {
+const getTotalAmountForIOUReportPreviewButton = (
+    report: OnyxEntry<Report>,
+    policy: OnyxEntry<Policy>,
+    reportPreviewAction: ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>,
+    currencyList?: CurrencyList,
+) => {
     // Determine whether the non-held amount is appropriate to display for the PAY button.
     const {nonHeldAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(report, reportPreviewAction === CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     const hasOnlyHeldExpenses = hasOnlyHeldExpensesReportUtils(report?.reportID);
@@ -173,11 +178,11 @@ const getTotalAmountForIOUReportPreviewButton = (report: OnyxEntry<Report>, poli
         }
 
         // Default to reimbursable spend for PAY button if above conditions are not met.
-        return convertToDisplayString(reimbursableSpend, report?.currency);
+        return convertToDisplayString(reimbursableSpend, report?.currency, false, currencyList);
     }
 
     // For all other cases, return the total display spend.
-    return convertToDisplayString(totalDisplaySpend, report?.currency);
+    return convertToDisplayString(totalDisplaySpend, report?.currency, false, currencyList);
 };
 
 export {

src/libs/ReportUtils.ts

@@ -62,6 +62,7 @@ import type {
     TransactionViolation,
     TransactionViolations,
     VisibleReportActionsDerivedValue,
+    CurrencyList,
 } from '@src/types/onyx';
 import type {ReportTransactionsAndViolations} from '@src/types/onyx/DerivedValues';
 import type {Attendee, Participant} from '@src/types/onyx/IOU';
@@ -974,6 +975,7 @@ type BuildOptimisticExpenseReportParams = {
     optimisticIOUReportID?: string;
     reportTransactions?: Record<string, Transaction>;
     createdTimestamp?: string;
+    currencyList?: CurrencyList;
 };
 
 type ReportByPolicyMap = Record<string, OnyxCollection<Report>>;
@@ -6632,7 +6634,13 @@ function buildOptimisticInvoiceReport(
 /**
  * Computes the optimistic report name using the policy's title field formula, with a fallback to the default expense report name.
  */
-function computeOptimisticReportName(report: Report, policy: OnyxEntry<Policy>, policyID: string | undefined, reportTransactions: Record<string, Transaction>): string | null {
+function computeOptimisticReportName(
+    report: Report,
+    policy: OnyxEntry<Policy>,
+    policyID: string | undefined,
+    reportTransactions: Record<string, Transaction>,
+    currencyList?: CurrencyList,
+): string | null {
     if (!isGroupPolicy(policy?.type ?? '')) {
         return null;
     }
@@ -6641,6 +6649,7 @@ function computeOptimisticReportName(report: Report, policy: OnyxEntry<Policy>,
     const formulaContext: FormulaContext = {
         report,
         policy,
+        currencyList,
         allTransactions: reportTransactions,
     };
 
@@ -6713,13 +6722,14 @@ function buildOptimisticExpenseReport({
     optimisticIOUReportID,
     reportTransactions,
     createdTimestamp,
+    currencyList,
 }: BuildOptimisticExpenseReportParams): OptimisticExpenseReport {
     // The amount for Expense reports are stored as negative value in the database
     const storedTotal = total * -1;
     const storedNonReimbursableTotal = nonReimbursableTotal * -1;
     const report = chatReportID ? getReportOrDraftReport(chatReportID) : undefined;
     const policyName = getPolicyName({report});
-    const formattedTotal = convertToDisplayString(storedTotal, currency);
+    const formattedTotal = convertToDisplayString(storedTotal, currency, false, currencyList);
     // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     const policyReal = getPolicy(policyID);
@@ -6763,7 +6773,7 @@ function buildOptimisticExpenseReport({
     }
 
     // Compute optimistic report name if applicable
-    const computedName = computeOptimisticReportName(expenseReport, policy, policyID, reportTransactions ?? {});
+    const computedName = computeOptimisticReportName(expenseReport, policy, policyID, reportTransactions ?? {}, currencyList);
     if (computedName !== null) {
         expenseReport.reportName = computedName;
     }
@@ -6782,6 +6792,7 @@ function buildOptimisticEmptyReport(
     policy: OnyxEntry<Policy>,
     timeOfCreation: string,
     betas: OnyxEntry<Beta[]>,
+    currencyList?: CurrencyList,
 ) {
     const {stateNum, statusNum} = getExpenseReportStateAndStatus(policy, betas, true);
     const optimisticEmptyReport: OptimisticNewReport = {
@@ -6806,7 +6817,7 @@ function buildOptimisticEmptyReport(
     };
 
     // Compute optimistic report name if applicable
-    const optimisticReportName = computeOptimisticReportName(optimisticEmptyReport as Report, policy, policy?.id, {});
+    const optimisticReportName = computeOptimisticReportName(optimisticEmptyReport as Report, policy, policy?.id, {}, currencyList);
     if (optimisticReportName !== null) {
         optimisticEmptyReport.reportName = optimisticReportName;
     }

src/libs/actions/IOU/index.ts

@@ -1028,6 +1028,7 @@ function getAllReports(): OnyxCollection<OnyxTypes.Report> {
     return allReports;
 }
 
+
 function getAllReportActionsFromIOU(): OnyxCollection<OnyxTypes.ReportActions> {
     return allReportActions;
 }

src/libs/actions/Report/index.ts

@@ -366,6 +366,7 @@ Onyx.connect({
     },
 });
 
+
 const typingWatchTimers: Record<string, NodeJS.Timeout> = {};
 
 let reportIDDeeplinkedFromOldDot: string | undefined;