Skip to content
Draft
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
1 change: 1 addition & 0 deletions src/components/Search/SearchList/ListItem/StatusCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function StatusCell({stateNum, statusNum, isPending, isDeleted, isSelected}: Sta
backgroundColor={backgroundColor}
textColor={reportStatusColorStyle.textColor}
tooltipText={tooltipText}
badgeStyles={styles.alignSelfStart}
/>
</View>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search/SearchList/ListItem/TotalCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function TotalCell({total, currency, isScanning = false}: TotalCellProps) {
testID="TotalCell"
shouldShowTooltip
text={displayText}
style={[styles.optionDisplayName, styles.pre, styles.justifyContentCenter, styles.textBold, styles.textAlignRight, styles.fontWeightNormal]}
style={[styles.optionDisplayName, styles.pre, styles.justifyContentCenter, styles.textBold, styles.fontWeightNormal]}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/TransactionItemRow/DataCells/TaxCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function TaxCell({transactionItem, shouldShowTooltip}: TransactionDataCellProps)
<TextWithTooltip
shouldShowTooltip={shouldShowTooltip}
text={convertToDisplayString(taxAmount, currency)}
style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, styles.textAlignRight]}
style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter]}
/>
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/TransactionItemRow/DataCells/TotalCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
<TextWithTooltip
shouldShowTooltip={shouldShowTooltip}
text={amountToDisplay}
style={[styles.optionDisplayName, styles.justifyContentCenter, styles.flexShrink1, styles.textAlignRight]}
style={[styles.optionDisplayName, styles.justifyContentCenter, styles.flexShrink1]}
/>
);

Expand Down Expand Up @@ -175,9 +175,9 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
// EditableCell is responsible for the cell's hover and focus styles (border, background).
// Suppress MoneyRequestAmountInput's own border and background to avoid visual conflicts.
containerStyle={[styles.editableCellInputStyle]}
inputStyle={[styles.textAlignRight, styles.pr0]}
inputStyle={[styles.textAlignLeft, styles.pr0]}
touchableInputWrapperStyle={styles.editableCellInputStyle}
scrollViewStyle={[styles.flexRow, styles.justifyContentEnd]}
scrollViewStyle={[styles.flexRow, styles.justifyContentStart]}
symbolTextStyle={[styles.editableCellSymbolStyle, hasSymbolSpaceInPreview && styles.pr1]}
negativeSymbolStyle={styles.editableCellSymbolStyle}
/>
Expand Down
20 changes: 10 additions & 10 deletions src/styles/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1884,22 +1884,22 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
let columnWidth;
switch (columnName) {
case CONST.SEARCH.TABLE_COLUMNS.COMMENTS:
columnWidth = {...getWidthStyle(variables.w36), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w36)};
break;
case CONST.SEARCH.TABLE_COLUMNS.RECEIPT:
columnWidth = {...getWidthStyle(variables.w28), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w28)};
break;
case CONST.SEARCH.TABLE_COLUMNS.AVATAR:
columnWidth = {...getWidthStyle(variables.w28), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w28)};
break;
case CONST.SEARCH.TABLE_COLUMNS.STATUS:
columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w80)};
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};
columnWidth = {...getWidthStyle(variables.w130)};
break;
case CONST.SEARCH.TABLE_COLUMNS.SUBMITTED:
columnWidth = {...getWidthStyle(isSubmittedColumnWide ? variables.w102 : variables.w62)};
Expand Down Expand Up @@ -1935,7 +1935,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
columnWidth = {...getWidthStyle(variables.w36), ...styles.flex1};
break;
case CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT:
columnWidth = {...getWidthStyle(isTaxAmountColumnWide ? variables.w130 : variables.w96), ...styles.alignItemsEnd};
columnWidth = {...getWidthStyle(isTaxAmountColumnWide ? variables.w130 : variables.w96)};
break;
case CONST.SEARCH.TABLE_COLUMNS.EXPENSES:
case CONST.SEARCH.TABLE_COLUMNS.GROUP_EXPENSES:
Expand All @@ -1948,10 +1948,10 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
case CONST.SEARCH.TABLE_COLUMNS.GROUP_TOTAL:
case CONST.SEARCH.TABLE_COLUMNS.TOTAL_PER_ATTENDEE:
case CONST.SEARCH.TABLE_COLUMNS.TOTAL:
columnWidth = {...getWidthStyle(isAmountColumnWide ? variables.w130 : variables.w96), ...(!shouldRemoveTotalColumnFlex && styles.flex1), ...styles.alignItemsEnd};
columnWidth = {...getWidthStyle(isAmountColumnWide ? variables.w130 : variables.w96), ...(!shouldRemoveTotalColumnFlex && styles.flex1)};
break;
case CONST.SEARCH.TABLE_COLUMNS.TYPE:
columnWidth = {...getWidthStyle(variables.w16), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w16)};
break;
case CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE:
case CONST.SEARCH.TABLE_COLUMNS.BILLABLE:
Expand All @@ -1969,10 +1969,10 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
columnWidth = {...getWidthStyle(variables.w92), ...styles.flex1};
break;
case CONST.SEARCH.TABLE_COLUMNS.ACTION:
columnWidth = {...getWidthStyle(isActionColumnWide ? variables.w80 : variables.w68), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(isActionColumnWide ? variables.w80 : variables.w68)};
break;
case CONST.SEARCH.TABLE_COLUMNS.EXPORTED_TO:
columnWidth = {...getWidthStyle(variables.w72), ...styles.alignItemsCenter};
columnWidth = {...getWidthStyle(variables.w72)};
break;
case CONST.SEARCH.TABLE_COLUMNS.ATTENDEES:
columnWidth = {...getWidthStyle(variables.w72)};
Expand Down
Loading