Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import {
isDistanceTypeRequest,
isExpenseUnreported as isExpenseUnreportedTransactionUtils,
isGPSDistanceRequest as isGPSDistanceRequestTransactionUtils,
isManagedCardTransaction as isManagedCardTransactionTransactionUtils,
isManualDistanceRequest as isManualDistanceRequestTransactionUtils,
isMapDistanceRequest as isMapDistanceRequestTransactionUtils,
isOdometerDistanceRequest as isOdometerDistanceRequestTransactionUtils,
Expand Down Expand Up @@ -297,9 +298,9 @@ function MoneyRequestView({

const transactionOriginalAmount = transaction && getOriginalAmountForDisplay(transaction, isExpenseReport(moneyRequestReport));
const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
const isManagedCardTransaction = isCardTransactionTransactionUtils(transaction);
const isFromCardImport = isCardTransactionTransactionUtils(transaction);
const cardProgramName = getCompanyCardDescription(transaction?.cardName, transaction?.cardID, nonPersonalAndWorkspaceCards);
const shouldShowCard = isManagedCardTransaction && cardProgramName;
const shouldShowCard = isFromCardImport && cardProgramName;

const taxRates = policy?.taxRates;
const formattedTaxAmount = updatedTransaction?.taxAmount
Expand Down Expand Up @@ -396,7 +397,7 @@ function MoneyRequestView({
const shouldShowReimbursable =
(isPolicyExpenseChat || (isExpenseUnreported && !!policy)) &&
(policy?.disabledFields?.reimbursable !== true || isCurrentTransactionReimbursableDifferentFromPolicyDefault) &&
!isManagedCardTransaction &&
!isManagedCardTransactionTransactionUtils(transaction) &&
!isInvoice;
const canEditReimbursable =
isEditable &&
Expand Down Expand Up @@ -439,7 +440,7 @@ function MoneyRequestView({
const shouldShowConvertedAmount =
transactionConvertedAmount &&
currency !== moneyRequestReport?.currency &&
!isManagedCardTransaction &&
!isFromCardImport &&
transaction?.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID &&
!isFromMergeTransaction &&
!isFromReviewDuplicates &&
Expand Down Expand Up @@ -486,7 +487,7 @@ function MoneyRequestView({
});
};

if (isManagedCardTransaction) {
if (isFromCardImport) {
if (transactionPostedDate) {
dateDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.posted')} ${transactionPostedDate}`;
}
Expand Down
Loading