diff --git a/src/components/TransactionDetails/TransactionDetailsReceipt.tsx b/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
index 02a1c649e..304c1542b 100644
--- a/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
+++ b/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
@@ -217,6 +217,46 @@ export const TransactionDetailsReceipt = ({
         return rowKey === lastVisibleRow
     }
 
+    // reusable helper to get the last visible row in a specific group
+    const getLastVisibleInGroup = (groupKeys: TransactionDetailsRowKey[]) => {
+        const visibleInGroup = groupKeys.filter((key) => rowVisibilityConfig[key])
+        return visibleInGroup[visibleInGroup.length - 1]
+    }
+
+    // define row groups
+    const rowGroups = useMemo(
+        () => ({
+            dateRows: ['createdAt', 'cancelled', 'claimed', 'completed', 'closed'] as TransactionDetailsRowKey[],
+            txnDetails: ['tokenAndNetwork', 'txId'] as TransactionDetailsRowKey[],
+            fees: ['networkFee', 'peanutFee'] as TransactionDetailsRowKey[],
+        }),
+        []
+    )
+
+    // get last visible row for each group
+    const lastVisibleInGroups = useMemo(
+        () => ({
+            dateRows: getLastVisibleInGroup(rowGroups.dateRows),
+            txnDetails: getLastVisibleInGroup(rowGroups.txnDetails),
+            fees: getLastVisibleInGroup(rowGroups.fees),
+        }),
+        [rowVisibilityConfig]
+    )
+
+    // reusable helper to check if border should be hidden for a row in a specific group
+    const shouldHideGroupBorder = (rowKey: TransactionDetailsRowKey, groupName: keyof typeof rowGroups) => {
+        const isLastInGroup = rowKey === lastVisibleInGroups[groupName]
+        const isGlobalLast = shouldHideBorder(rowKey)
+
+        // if it's the last in its group, show border UNLESS it's also the global last
+        if (isLastInGroup) {
+            return isGlobalLast
+        }
+
+        // if not last in group, always hide border
+        return true
+    }
+
     const isPendingRequestee = useMemo(() => {
         if (!transaction) return false
         return (
@@ -548,10 +588,46 @@ export const TransactionDetailsReceipt = ({
                         <PaymentInfoRow
                             label={'Created'}
                             value={formatDate(new Date(transaction.createdAt!.toString()))}
-                            hideBottomBorder={shouldHideBorder('createdAt')}
+                            hideBottomBorder={shouldHideGroupBorder('createdAt', 'dateRows')}
+                        />
+                    )}
+
+                    {rowVisibilityConfig.cancelled && (
+                        <PaymentInfoRow
+                            label="Cancelled"
+                            value={formatDate(new Date(transaction.cancelledDate!))}
+                            hideBottomBorder={shouldHideGroupBorder('cancelled', 'dateRows')}
+                        />
+                    )}
+
+                    {rowVisibilityConfig.claimed && (
+                        <PaymentInfoRow
+                            label="Claimed"
+                            value={formatDate(new Date(transaction.claimedAt!))}
+                            hideBottomBorder={shouldHideGroupBorder('claimed', 'dateRows')}
+                        />
+                    )}
+
+                    {rowVisibilityConfig.completed && (
+                        <PaymentInfoRow
+                            label={getLabelText(transaction)}
+                            value={formatDate(new Date(transaction.completedAt!))}
+                            hideBottomBorder={shouldHideGroupBorder('completed', 'dateRows')}
                         />
                     )}
 
+                    {rowVisibilityConfig.closed && (
+                        <>
+                            {transaction.cancelledDate && (
+                                <PaymentInfoRow
+                                    label="Closed at"
+                                    value={formatDate(new Date(transaction.cancelledDate))}
+                                    hideBottomBorder={shouldHideBorder('closed')}
+                                />
+                            )}
+                        </>
+                    )}
+
                     {rowVisibilityConfig.to && (
                         <PaymentInfoRow
                             label={'To'}
@@ -620,7 +696,7 @@ export const TransactionDetailsReceipt = ({
                                                 </div>
                                             )
                                         }
-                                        hideBottomBorder={shouldHideBorder('tokenAndNetwork')}
+                                        hideBottomBorder={shouldHideGroupBorder('tokenAndNetwork', 'txnDetails')}
                                     />
                                 )}
                             </>
@@ -647,56 +723,10 @@ export const TransactionDetailsReceipt = ({
                                     </div>
                                 )
                             }
-                            hideBottomBorder={shouldHideBorder('txId')}
+                            hideBottomBorder={shouldHideGroupBorder('txId', 'txnDetails')}
                         />
                     )}
 
-                    {rowVisibilityConfig.cancelled && (
-                        <>
-                            {transaction.cancelledDate && (
-                                <PaymentInfoRow
-                                    label="Cancelled"
-                                    value={formatDate(new Date(transaction.cancelledDate))}
-                                    hideBottomBorder={shouldHideBorder('cancelled')}
-                                />
-                            )}
-                        </>
-                    )}
-
-                    {rowVisibilityConfig.closed && (
-                        <>
-                            {transaction.cancelledDate && (
-                                <PaymentInfoRow
-                                    label="Closed at"
-                                    value={formatDate(new Date(transaction.cancelledDate))}
-                                    hideBottomBorder={shouldHideBorder('closed')}
-                                />
-                            )}
-                        </>
-                    )}
-
-                    {rowVisibilityConfig.claimed && (
-                        <>
-                            {transaction.claimedAt && (
-                                <PaymentInfoRow
-                                    label="Claimed"
-                                    value={formatDate(new Date(transaction.claimedAt))}
-                                    hideBottomBorder={shouldHideBorder('claimed')}
-                                />
-                            )}
-                        </>
-                    )}
-
-                    {rowVisibilityConfig.completed && (
-                        <>
-                            <PaymentInfoRow
-                                label={getLabelText(transaction)}
-                                value={formatDate(new Date(transaction.completedAt!))}
-                                hideBottomBorder={shouldHideBorder('completed')}
-                            />
-                        </>
-                    )}
-
                     {rowVisibilityConfig.fee && (
                         <PaymentInfoRow label="Fee" value={feeDisplay} hideBottomBorder={shouldHideBorder('fee')} />
                     )}
@@ -739,6 +769,7 @@ export const TransactionDetailsReceipt = ({
                                 <PaymentInfoRow
                                     label={`Value in ${transaction.currency!.code}`}
                                     value={`${transaction.currency!.code} ${formatCurrency(transaction.currency!.amount)}`}
+                                    hideBottomBorder
                                 />
                             )}
                             {/* TODO: stop using snake_case!!!!! */}
@@ -844,7 +875,7 @@ export const TransactionDetailsReceipt = ({
                                                 />
                                             </div>
                                         }
-                                        hideBottomBorder={false}
+                                        hideBottomBorder={true}
                                     />
                                     <PaymentInfoRow
                                         label="Bank Address"
@@ -885,7 +916,7 @@ export const TransactionDetailsReceipt = ({
                                                         />
                                                     </div>
                                                 }
-                                                hideBottomBorder={false}
+                                                hideBottomBorder={true}
                                             />
                                             <PaymentInfoRow
                                                 label="BIC"
@@ -994,7 +1025,7 @@ export const TransactionDetailsReceipt = ({
                                                             />
                                                         </div>
                                                     }
-                                                    hideBottomBorder={false}
+                                                    hideBottomBorder={true}
                                                 />
                                             )}
                                             {transaction.extraDataForDrawer.depositInstructions
@@ -1028,13 +1059,6 @@ export const TransactionDetailsReceipt = ({
                         </>
                     )}
 
-                    {rowVisibilityConfig.peanutFee && (
-                        <PaymentInfoRow
-                            label="Peanut fee"
-                            value={'Sponsored by Peanut!'}
-                            hideBottomBorder={shouldHideBorder('peanutFee')}
-                        />
-                    )}
                     {rowVisibilityConfig.points && transaction.points && (
                         <PaymentInfoRow
                             label="Points earned"
@@ -1061,7 +1085,15 @@ export const TransactionDetailsReceipt = ({
                             label="Network fee"
                             value={transaction.networkFeeDetails!.amountDisplay}
                             moreInfoText={transaction.networkFeeDetails!.moreInfoText}
-                            hideBottomBorder={shouldHideBorder('networkFee')}
+                            hideBottomBorder={shouldHideGroupBorder('networkFee', 'fees')}
+                        />
+                    )}
+
+                    {rowVisibilityConfig.peanutFee && (
+                        <PaymentInfoRow
+                            label="Peanut fee"
+                            value={'Sponsored by Peanut!'}
+                            hideBottomBorder={shouldHideGroupBorder('peanutFee', 'fees')}
                         />
                     )}
 
diff --git a/src/components/TransactionDetails/transaction-details.utils.ts b/src/components/TransactionDetails/transaction-details.utils.ts
index 73fa42274..e1b93915b 100644
--- a/src/components/TransactionDetails/transaction-details.utils.ts
+++ b/src/components/TransactionDetails/transaction-details.utils.ts
@@ -20,26 +20,27 @@ export type TransactionDetailsRowKey =
     | 'mantecaDepositInfo'
     | 'closed'
 
-// order of the rows in the receipt
+// order of the rows in the receipt (must match actual rendering order in component)
 export const transactionDetailsRowKeys: TransactionDetailsRowKey[] = [
     'createdAt',
-    'to',
-    'tokenAndNetwork',
-    'txId',
     'cancelled',
     'claimed',
     'completed',
+    'closed',
+    'to',
+    'tokenAndNetwork',
+    'txId',
     'fee',
+    'mantecaDepositInfo',
     'exchangeRate',
     'bankAccountDetails',
     'transferId',
     'depositInstructions',
-    'peanutFee',
     'points',
     'comment',
     'networkFee',
+    'peanutFee',
     'attachment',
-    'closed',
 ]
 
 export const getBankAccountLabel = (type: string) => {