Skip to content

Add card column #77921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JS00001 merged 9 commits into from
Dec 17, 2025
Merged

Add card column #77921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d176eb
add card column
luacmartins Dec 17, 2025
589daf6
add more logic
luacmartins Dec 17, 2025
22d4799
rm dupe
luacmartins Dec 17, 2025
4b295e0
rm unnecessary key
luacmartins Dec 17, 2025
8e5dd9d
rm useless columns from task
luacmartins Dec 17, 2025
9374870
update sorting
luacmartins Dec 17, 2025
293d25f
fix sorting
luacmartins Dec 17, 2025
a6c885a
resolve conflicts
luacmartins Dec 17, 2025
81d75a7
resolve conflicts
luacmartins Dec 17, 2025
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
1 change: 1 addition & 0 deletions src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 8 additions & 0 deletions src/components/TransactionItemRow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,14 @@ function TransactionItemRow({
)}
</View>
),
[CONST.SEARCH.TABLE_COLUMNS.CARD]: (
<View
key={CONST.SEARCH.TABLE_COLUMNS.CARD}
style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.CARD)]}
>
<TextCell text={transactionItem.cardName === CONST.EXPENSE.TYPE.CASH_CARD_NAME ? '' : (transactionItem.cardName ?? '')} />
</View>
),
[CONST.SEARCH.TABLE_COLUMNS.COMMENTS]: (
<View
key={CONST.SEARCH.TABLE_COLUMNS.COMMENTS}
Expand Down
12 changes: 11 additions & 1 deletion src/libs/SearchUIUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2061,6 +2061,14 @@ function getSortedTransactionData(
});
}

if (sortBy === CONST.SEARCH.TABLE_COLUMNS.CARD) {
return data.sort((a, b) => {
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;
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
};
}
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/styles/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading