Skip to content

Commit ef852da

Browse files
committed
Fix Total column not aligned to right edge when no flex column is visible
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
1 parent 087ebec commit ef852da

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
1616
import useTransactionViolations from '@hooks/useTransactionViolations';
1717
import ControlSelection from '@libs/ControlSelection';
1818
import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
19+
import {hasFlexColumn} from '@libs/SearchUIUtils';
1920
import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
2021
import variables from '@styles/variables';
2122
import CONST from '@src/CONST';
@@ -180,7 +181,7 @@ function MoneyRequestReportTransactionItem({
180181
onArrowRightPress={() => onArrowRightPress?.(transaction.transactionID)}
181182
isHover={hovered}
182183
nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
183-
shouldRemoveTotalColumnFlex
184+
shouldRemoveTotalColumnFlex={hasFlexColumn(columns)}
184185
/>
185186
)}
186187
</PressableWithFeedback>

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import {
6060
isSortableColumnName,
6161
} from '@libs/ReportUtils';
6262
import type {SortableColumnName} from '@libs/ReportUtils';
63-
import {compareValues, getColumnsToShow, getTableMinWidth, isTransactionAmountTooLong, isTransactionTaxAmountTooLong} from '@libs/SearchUIUtils';
63+
import {compareValues, getColumnsToShow, getTableMinWidth, hasFlexColumn, isTransactionAmountTooLong, isTransactionTaxAmountTooLong} from '@libs/SearchUIUtils';
6464
import {getPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
6565
import {getTransactionPendingAction, isTransactionPendingDelete, shouldShowExpenseBreakdown} from '@libs/TransactionUtils';
6666
import shouldShowTransactionYear from '@libs/TransactionUtils/shouldShowTransactionYear';
@@ -692,7 +692,7 @@ function MoneyRequestReportTransactionList({
692692
shouldShowSorting
693693
sortBy={sortBy}
694694
sortOrder={sortOrder}
695-
shouldRemoveTotalColumnFlex
695+
shouldRemoveTotalColumnFlex={hasFlexColumn(columnsToShow)}
696696
columns={columnsToShow}
697697
dateColumnSize={dateColumnSize}
698698
amountColumnSize={amountColumnSize}

src/libs/SearchUIUtils.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5760,6 +5760,18 @@ function applySelectionToItem(
57605760
return {originalItem: item, itemWithSelection: {...item, isSelected, transactions}, isSelected};
57615761
}
57625762

5763+
const FLEX_COLUMNS = new Set<string>([
5764+
CONST.SEARCH.TABLE_COLUMNS.MERCHANT,
5765+
CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION,
5766+
CONST.SEARCH.TABLE_COLUMNS.CATEGORY,
5767+
CONST.SEARCH.TABLE_COLUMNS.TAG,
5768+
CONST.SEARCH.TABLE_COLUMNS.TAX_RATE,
5769+
]);
5770+
5771+
function hasFlexColumn(columns: SearchColumnType[]): boolean {
5772+
return columns.some((col) => FLEX_COLUMNS.has(col));
5773+
}
5774+
57635775
export {
57645776
getSearchBulkEditPolicyID,
57655777
getSuggestedSearches,
@@ -5836,6 +5848,7 @@ export {
58365848
FILTER_LABEL_MAP,
58375849
doesSearchItemMatchSort,
58385850
isPolicyEligibleForSpendOverTime,
5851+
hasFlexColumn,
58395852
};
58405853
export type {
58415854
SavedSearchMenuItem,

0 commit comments

Comments
 (0)