Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6617,6 +6617,7 @@ const CONST = {
FIRST_APPROVED: this.TABLE_COLUMNS.FIRST_APPROVED,
EXPORTED: this.TABLE_COLUMNS.EXPORTED,
STATUS: this.TABLE_COLUMNS.STATUS,
PAID_STATUS: this.TABLE_COLUMNS.PAID_STATUS,
TITLE: this.TABLE_COLUMNS.TITLE,
FROM: this.TABLE_COLUMNS.FROM,
TO: this.TABLE_COLUMNS.TO,
Expand Down Expand Up @@ -6844,6 +6845,7 @@ const CONST = {
ORDER_DEAL_NUMBERS: 'orderDealNumbers',
AVATAR: 'avatar',
STATUS: 'status',
PAID_STATUS: 'paidstatus',
EXPENSES: 'expenses',
FEED: 'feed',
WITHDRAWN: 'withdrawn',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ function ExpenseReportListItemRowWide({
/>
</View>
),
[CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS]: (
<View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS)]}>
<TextCell
text={item.formattedPaidStatus ?? ''}
isLargeScreenWidth
/>
</View>
),
[CONST.SEARCH.TABLE_COLUMNS.TITLE]: (
<View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TITLE)]}>
<TextCell
Expand Down
3 changes: 3 additions & 0 deletions src/components/Search/SearchList/ListItem/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ type TransactionReportGroupListItemType = TransactionGroupListItemType & {groupe
/** Final and formatted "status" value used for displaying and sorting */
formattedStatus?: string;

/** Final and formatted "paid status" value (Marked as paid / Withdrawing / Confirmed) used for displaying and sorting */
formattedPaidStatus?: string;

/** Final and formatted "from" value used for displaying and sorting */
formattedFrom?: string;

Expand Down
4 changes: 4 additions & 0 deletions src/components/Search/SearchTableHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@ const getExpenseReportHeaders = (profileIcon?: IconAsset): SearchColumnConfig[]
columnName: CONST.SEARCH.TABLE_COLUMNS.STATUS,
translationKey: 'common.status',
},
{
columnName: CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS,
translationKey: 'common.paidStatus',
},
{
columnName: CONST.SEARCH.TABLE_COLUMNS.TITLE,
translationKey: 'common.title',
Expand Down
6 changes: 6 additions & 0 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ import {
getReimbursableTotal,
getReportCustomColumnValue,
getReportOrDraftReport,
getReportStatusTooltipTranslation,
getReportStatusTranslation,
hasHeldExpenses,
hasInvoiceReports,
Expand Down Expand Up @@ -320,6 +321,7 @@ const expenseReportColumnNamesToSortingProperty: ExpenseReportSorting = {
[CONST.SEARCH.TABLE_COLUMNS.FIRST_APPROVED]: 'firstApproved' as const,
[CONST.SEARCH.TABLE_COLUMNS.EXPORTED]: 'exported' as const,
[CONST.SEARCH.TABLE_COLUMNS.STATUS]: 'formattedStatus' as const,
[CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS]: 'formattedPaidStatus' as const,
[CONST.SEARCH.TABLE_COLUMNS.TITLE]: 'reportName' as const,
[CONST.SEARCH.TABLE_COLUMNS.FROM]: 'formattedFrom' as const,
[CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
Expand Down Expand Up @@ -2890,6 +2892,7 @@ function getReportSections({
const formattedFirstApprover = firstApproverAccountID ? formatPhoneNumber(temporaryGetDisplayNameOrDefault({passedPersonalDetails: firstApproverDetails, translate})) : '';

const formattedStatus = getReportStatusTranslation({stateNum: reportItem.stateNum, statusNum: reportItem.statusNum, translate});
const formattedPaidStatus = getReportStatusTooltipTranslation({stateNum: reportItem.stateNum, statusNum: reportItem.statusNum, translate});
const policy = getPolicyFromKey(data, reportItem);

const shouldShowStatusAsPending = !!isOffline && reportItem?.pendingFields?.nextStep === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
Expand Down Expand Up @@ -2934,6 +2937,7 @@ function getReportSections({
formattedFrom,
formattedTo,
formattedStatus,
formattedPaidStatus,
transactions,
shouldShowStatusAsPending,
...(reportPendingAction ? {pendingAction: reportPendingAction} : {}),
Expand Down Expand Up @@ -4403,6 +4407,8 @@ function getSearchColumnTranslationKey(column: SearchSortBy): TranslationPaths {
return 'common.title';
case CONST.SEARCH.TABLE_COLUMNS.STATUS:
return 'common.status';
case CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS:
return 'common.paidStatus';
case CONST.SEARCH.TABLE_COLUMNS.EXCHANGE_RATE:
return 'common.exchangeRate';
case CONST.SEARCH.TABLE_COLUMNS.POLICY_NAME:
Expand Down
3 changes: 3 additions & 0 deletions src/styles/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,9 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
case CONST.SEARCH.TABLE_COLUMNS.STATUS:
columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter};
break;
case CONST.SEARCH.TABLE_COLUMNS.PAID_STATUS:
columnWidth = {...getWidthStyle(variables.w130)};
break;
case CONST.SEARCH.TABLE_COLUMNS.GROUP_WITHDRAWAL_STATUS:
columnWidth = {...getWidthStyle(variables.w130), ...styles.alignItemsCenter};
break;
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/Search/ColumnAvailabilityTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ describe('Column availability single source of truth', () => {
TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL,
TABLE_COLUMNS.FIRST_APPROVER,
TABLE_COLUMNS.FIRST_APPROVED,
TABLE_COLUMNS.PAID_STATUS,
// Grouped search views.
TABLE_COLUMNS.EXPENSES,
TABLE_COLUMNS.FEED,
Expand Down Expand Up @@ -107,6 +108,7 @@ describe('Column availability single source of truth', () => {
const reportColumns = Object.values(CONST.SEARCH.REPORT_DETAILS_CUSTOM_COLUMNS);
const reportLevelColumns = [
TABLE_COLUMNS.STATUS,
TABLE_COLUMNS.PAID_STATUS,
TABLE_COLUMNS.SUBMITTED,
TABLE_COLUMNS.APPROVED,
TABLE_COLUMNS.EXPORTED,
Expand Down
4 changes: 4 additions & 0 deletions tests/unit/Search/SearchUIUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,7 @@ const transactionReportGroupListItems = [
currency: 'USD',
formattedFrom: 'Admin',
formattedStatus: 'Draft',
formattedPaidStatus: '',
formattedTo: '',
from: {
accountID: 18439984,
Expand Down Expand Up @@ -1240,6 +1241,7 @@ const transactionReportGroupListItems = [
currency: 'USD',
formattedFrom: 'Admin',
formattedStatus: 'Outstanding',
formattedPaidStatus: '',
formattedTo: 'Admin',
from: {
accountID: 18439984,
Expand Down Expand Up @@ -1374,6 +1376,7 @@ const transactionReportGroupListItems = [
currency: 'VND',
formattedFrom: 'Admin',
formattedStatus: 'Outstanding',
formattedPaidStatus: '',
formattedTo: 'Approver',
hasVisibleViolations: false,
isActionColumnWide: false,
Expand Down Expand Up @@ -1581,6 +1584,7 @@ const transactionReportGroupListItems = [
currency: 'USD',
formattedFrom: 'Admin',
formattedStatus: 'Draft',
formattedPaidStatus: '',
formattedTo: '',
from: {
accountID: 18439984,
Expand Down
Loading