From a8303831289bcf63ee51bc448ae771c00f57eceb Mon Sep 17 00:00:00 2001
From: Sergei <sergei@Sergeis-MacBook-Pro.local>
Date: Fri, 9 Jan 2026 19:45:26 -0800
Subject: [PATCH] Fix navigation: use router.push for Back to Loved Ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Changed router.replace to router.push for better navigation
- Both header back button and main button now go to beneficiaries list
- Added console.log for debugging

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 app/(tabs)/beneficiaries/[id]/equipment-status.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/(tabs)/beneficiaries/[id]/equipment-status.tsx b/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
index 04faae6..084ae1b 100644
--- a/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
+++ b/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
@@ -191,7 +191,7 @@ export default function EquipmentStatusScreen() {
     <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
       {/* Header */}
       <View style={styles.header}>
-        <TouchableOpacity style={styles.backButton} onPress={() => router.replace('/(tabs)')}>
+        <TouchableOpacity style={styles.backButton} onPress={() => router.push('/(tabs)/beneficiaries')}>
           <Ionicons name="arrow-back" size={24} color={AppColors.textPrimary} />
         </TouchableOpacity>
         <Text style={styles.headerTitle}>{beneficiary.name}</Text>
@@ -280,7 +280,10 @@ export default function EquipmentStatusScreen() {
         {/* Back to Loved Ones Button - above action button */}
         <TouchableOpacity
           style={styles.backToLovedOnesButton}
-          onPress={() => router.replace('/(tabs)/beneficiaries')}
+          onPress={() => {
+            console.log('[EquipmentStatus] Back to Loved Ones pressed');
+            router.push('/(tabs)/beneficiaries');
+          }}
         >
           <Ionicons name="people" size={20} color={AppColors.white} />
           <Text style={styles.backToLovedOnesText}>Back to My Loved Ones</Text>