From e28dcc1592b51211127bfaaf041907065d4c4158 Mon Sep 17 00:00:00 2001
From: Jamie Brunton <jamie@jbrunton.co.uk>
Date: Sat, 17 Jan 2026 23:00:36 +0000
Subject: [PATCH] Fix match modal question display

---
 apps/mobile/app/(app)/_layout.tsx                     | 2 +-
 apps/mobile/src/components/MatchNotificationModal.tsx | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/mobile/app/(app)/_layout.tsx b/apps/mobile/app/(app)/_layout.tsx
index d02dc24..67b8707 100755
--- a/apps/mobile/app/(app)/_layout.tsx
+++ b/apps/mobile/app/(app)/_layout.tsx
@@ -392,7 +392,7 @@ export default function AppLayout() {
                         .eq("id", payload.new.id)
                         .single();
 
-                    if (matchWithQuestion) {
+                    if (matchWithQuestion && matchWithQuestion.question) {
                         // Track milestone events before adding (so count is accurate)
                         const currentMatchCount = matches.length;
                         if (currentMatchCount === 0) {
diff --git a/apps/mobile/src/components/MatchNotificationModal.tsx b/apps/mobile/src/components/MatchNotificationModal.tsx
index fabd031..1fd9afd 100644
--- a/apps/mobile/src/components/MatchNotificationModal.tsx
+++ b/apps/mobile/src/components/MatchNotificationModal.tsx
@@ -177,7 +177,7 @@ export const MatchNotificationModal: React.FC<Props> = ({
         ]).start(() => onChat());
     };
 
-    if (!visible || !match) return null;
+    if (!visible || !match || !match.question) return null;
 
     // Determine responses based on match_type if not explicitly provided
     const getUserResponse = (): AnswerType => {
@@ -266,13 +266,15 @@ export const MatchNotificationModal: React.FC<Props> = ({
                         {/* Question text and responses */}
                         {match.question.partner_text ? (
                             // Two-part question - show what each person saw
+                            // The current user triggered the match (answered second), so they saw partner_text
+                            // The partner answered first, so they saw text
                             <View style={styles.twoPartContainer}>
                                 <View style={styles.responseSection}>
                                     <View style={styles.responseLabelRow}>
                                         <Text style={styles.responsePersonLabel}>You said</Text>
                                         <ResponseBadge response={userResponse} />
                                     </View>
-                                    <Text style={styles.questionTextSmall}>"{match.question.text}"</Text>
+                                    <Text style={styles.questionTextSmall}>"{match.question.partner_text}"</Text>
                                 </View>
 
                                 <View style={styles.matchConnector}>
@@ -288,7 +290,7 @@ export const MatchNotificationModal: React.FC<Props> = ({
                                         <Text style={styles.responsePersonLabel}>{partnerDisplayName} said</Text>
                                         <ResponseBadge response={partnerResponse} isPartner />
                                     </View>
-                                    <Text style={styles.questionTextSmall}>"{match.question.partner_text}"</Text>
+                                    <Text style={styles.questionTextSmall}>"{match.question.text}"</Text>
                                 </View>
                             </View>
                         ) : (