diff --git a/src/CONST/index.ts b/src/CONST/index.ts index eb408a6b85e3..e6c0529f456f 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -6701,6 +6701,7 @@ const CONST = { MERCHANT: this.TABLE_COLUMNS.MERCHANT, FROM: this.TABLE_COLUMNS.FROM, TO: this.TABLE_COLUMNS.TO, + CARD: this.TABLE_COLUMNS.CARD, CATEGORY: this.TABLE_COLUMNS.CATEGORY, TAG: this.TABLE_COLUMNS.TAG, ORIGINAL_AMOUNT: this.TABLE_COLUMNS.ORIGINAL_AMOUNT, diff --git a/src/components/TransactionItemRow/index.tsx b/src/components/TransactionItemRow/index.tsx index 51b9a6f69a6c..2a145a672634 100644 --- a/src/components/TransactionItemRow/index.tsx +++ b/src/components/TransactionItemRow/index.tsx @@ -428,6 +428,14 @@ function TransactionItemRow({ )} ), + [CONST.SEARCH.TABLE_COLUMNS.CARD]: ( + + + + ), [CONST.SEARCH.TABLE_COLUMNS.COMMENTS]: ( { + const aValue = a.cardName === CONST.EXPENSE.TYPE.CASH_CARD_NAME ? '' : (a.cardName ?? ''); + const bValue = b.cardName === CONST.EXPENSE.TYPE.CASH_CARD_NAME ? '' : (b.cardName ?? ''); + return compareValues(aValue, bValue, sortOrder, sortBy, localeCompare); + }); + } + if (sortBy === CONST.SEARCH.TABLE_COLUMNS.STATUS) { return data.sort((a, b) => { const aReport = a.report; @@ -2352,6 +2360,8 @@ function getSearchColumnTranslationKey(columnId: SearchCustomColumnIds): Transla return 'common.title'; case CONST.SEARCH.TABLE_COLUMNS.STATUS: return 'common.status'; + case CONST.SEARCH.TABLE_COLUMNS.CARD: + return 'common.card'; case CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE_TOTAL: return 'common.reimbursableTotal'; case CONST.SEARCH.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL: @@ -2797,7 +2807,6 @@ function getColumnsToShow( [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: false, [CONST.SEARCH.TABLE_COLUMNS.COMMENTS]: false, [CONST.SEARCH.TABLE_COLUMNS.TYPE]: false, - [CONST.SEARCH.TABLE_COLUMNS.CARD]: false, [CONST.SEARCH.TABLE_COLUMNS.WITHDRAWAL_ID]: false, }; } @@ -2825,6 +2834,7 @@ function getColumnsToShow( [CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]: false, [CONST.SEARCH.TABLE_COLUMNS.FROM]: false, [CONST.SEARCH.TABLE_COLUMNS.TO]: false, + [CONST.SEARCH.TABLE_COLUMNS.CARD]: false, [CONST.SEARCH.TABLE_COLUMNS.CATEGORY]: false, [CONST.SEARCH.TABLE_COLUMNS.TAG]: false, [CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE]: false, diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts index f26e89452ffb..3c5f6cc3b029 100644 --- a/src/styles/utils/index.ts +++ b/src/styles/utils/index.ts @@ -1784,6 +1784,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({ case CONST.SEARCH.TABLE_COLUMNS.ACTION: columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter}; break; + case CONST.SEARCH.TABLE_COLUMNS.CARD: case CONST.SEARCH.TABLE_COLUMNS.REPORT_ID: case CONST.SEARCH.TABLE_COLUMNS.BASE_62_REPORT_ID: case CONST.SEARCH.TABLE_COLUMNS.MERCHANT: