diff --git a/app/(tabs)/beneficiaries/[id]/equipment-status.tsx b/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
index 1ea1de1..04faae6 100644
--- a/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
+++ b/app/(tabs)/beneficiaries/[id]/equipment-status.tsx
@@ -277,6 +277,15 @@ export default function EquipmentStatusScreen() {
})}
+ {/* Back to Loved Ones Button - above action button */}
+ router.replace('/(tabs)/beneficiaries')}
+ >
+
+ Back to My Loved Ones
+
+
{/* Action Button */}
{isDelivered ? (
@@ -289,16 +298,16 @@ export default function EquipmentStatusScreen() {
) : (
{isConfirming ? (
-
+
) : (
<>
-
- I received my kit
+
+ I received my kit
>
)}
@@ -326,15 +335,6 @@ export default function EquipmentStatusScreen() {
Need help? Contact support
-
- {/* Back to Loved Ones Button */}
- router.replace('/(tabs)/beneficiaries')}
- >
-
- Back to My Loved Ones
-
);
@@ -474,6 +474,7 @@ const styles = StyleSheet.create({
// Action Section
actionSection: {
marginBottom: Spacing.lg,
+ marginTop: Spacing.md,
},
primaryButton: {
flexDirection: 'row',
@@ -489,21 +490,19 @@ const styles = StyleSheet.create({
fontWeight: FontWeights.semibold,
color: AppColors.white,
},
- outlineButton: {
+ receivedButton: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
- backgroundColor: AppColors.surface,
- paddingVertical: Spacing.md,
+ backgroundColor: AppColors.surfaceSecondary,
+ paddingVertical: Spacing.sm,
borderRadius: BorderRadius.lg,
- borderWidth: 1,
- borderColor: AppColors.primary,
gap: Spacing.sm,
},
- outlineButtonText: {
- fontSize: FontSizes.base,
- fontWeight: FontWeights.semibold,
- color: AppColors.primary,
+ receivedButtonText: {
+ fontSize: FontSizes.sm,
+ fontWeight: FontWeights.medium,
+ color: AppColors.textMuted,
},
buttonDisabled: {
opacity: 0.7,
@@ -553,17 +552,14 @@ const styles = StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
- backgroundColor: AppColors.surface,
+ backgroundColor: AppColors.primary,
paddingVertical: Spacing.md,
borderRadius: BorderRadius.lg,
- borderWidth: 1,
- borderColor: AppColors.border,
gap: Spacing.sm,
- marginTop: Spacing.lg,
},
backToLovedOnesText: {
fontSize: FontSizes.base,
- fontWeight: FontWeights.medium,
- color: AppColors.primary,
+ fontWeight: FontWeights.semibold,
+ color: AppColors.white,
},
});