Skip to content

Commit 39dc75a

Browse files
committed
Fix merge expense page: remove stretched background and conditional border
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
1 parent 5c6be96 commit 39dc75a

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/pages/TransactionMerge/MergeTransactionItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
1616
import CONST from '@src/CONST';
1717
import ONYXKEYS from '@src/ONYXKEYS';
1818

19-
function MergeTransactionItem<TItem extends ListItem>({item, isFocused, showTooltip, isDisabled, onFocus, shouldSyncFocus, onSelectRow}: ListItemProps<TItem>) {
19+
function MergeTransactionItem<TItem extends ListItem>({item, isFocused, showTooltip, isDisabled, onFocus, shouldSyncFocus, onSelectRow, isLastItem}: ListItemProps<TItem>) {
2020
const styles = useThemeStyles();
2121
const transactionItem = item as unknown as TransactionListItemType;
2222
const theme = useTheme();
@@ -56,7 +56,7 @@ function MergeTransactionItem<TItem extends ListItem>({item, isFocused, showTool
5656
isFocused && StyleUtils.getItemBackgroundColorStyle(false, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
5757
]}
5858
onFocus={onFocus}
59-
wrapperStyle={[styles.flex1, animatedHighlightStyle, styles.userSelectNone, styles.borderBottom]}
59+
wrapperStyle={[styles.flex1, animatedHighlightStyle, styles.userSelectNone, !isLastItem && styles.borderBottom]}
6060
>
6161
<TransactionItemRow
6262
transactionItem={transactionItem}

src/pages/TransactionMerge/MergeTransactionsListContent.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
212212
shouldShowLoadingPlaceholder={!eligibleTransactions}
213213
textInputOptions={textInputOptions}
214214
shouldShowTextInput={shouldShowTextInput}
215-
style={{listStyle: [styles.mh5, styles.highlightBG, styles.searchTableTopRadius, styles.searchTableBottomRadius, styles.overflowHidden, styles.mb4]}}
215+
style={{
216+
listStyle: [styles.mh5, styles.searchTableTopRadius, styles.searchTableBottomRadius, styles.mb4, styles.overflowHidden],
217+
contentContainerStyle: [styles.pb0, styles.searchTableBottomRadius, styles.overflowHidden],
218+
}}
216219
/>
217220
);
218221
}

0 commit comments

Comments
 (0)