Skip to content

Commit bbe1f57

Browse files
committed
Fix report page border: use full-width and correct last item check
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
1 parent b4afeb9 commit bbe1f57

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ function MoneyRequestReportTransactionItem({
146146
}}
147147
disabled={isTransactionPendingDelete(transaction)}
148148
ref={viewRef}
149-
wrapperStyle={[animatedHighlightStyle, styles.userSelectNone]}
149+
wrapperStyle={[
150+
animatedHighlightStyle,
151+
styles.userSelectNone,
152+
shouldUseNarrowLayout && !isLastItem && {...styles.borderBottom, borderColor: isSelected ? theme.buttonHoveredBG : theme.border},
153+
]}
150154
>
151155
{({hovered}) => (
152156
<TransactionItemRow
@@ -170,7 +174,6 @@ function MoneyRequestReportTransactionItem({
170174
}}
171175
onArrowRightPress={() => onArrowRightPress?.(transaction.transactionID)}
172176
isHover={hovered}
173-
shouldShowBottomBorder={shouldUseNarrowLayout && !isLastItem}
174177
nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
175178
/>
176179
)}

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ function MoneyRequestReportTransactionList({
597597
pendingAction={selectionState.pendingAction}
598598
shouldUseNarrowLayout={shouldUseNarrowLayout}
599599
/>
600-
{group.transactions.map((transaction, index) => (
600+
{group.transactions.map((transaction) => (
601601
<MoneyRequestReportTransactionItem
602602
key={transaction.transactionID}
603603
transaction={transaction}
@@ -616,7 +616,7 @@ function MoneyRequestReportTransactionList({
616616
scrollToNewTransaction={transaction.transactionID === newTransactions?.at(0)?.transactionID ? scrollToNewTransaction : undefined}
617617
onArrowRightPress={handleArrowRightPress}
618618
nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards ?? {}}
619-
isLastItem={index === group.transactions.length - 1}
619+
isLastItem={transaction.transactionID === lastTransactionID}
620620
/>
621621
))}
622622
</View>

0 commit comments

Comments
 (0)