From b06b1ff16c98c5e1f3e969a4cb8a2324ebd82c9a Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Tue, 7 Oct 2025 13:56:04 -0400
Subject: [PATCH] fix: don't show language mismatch warning popup if activity
 lang matches L1 (#4269)

---
 lib/pages/chat/chat.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index dd77c9272..f71339c17 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -2165,9 +2165,14 @@ class ChatController extends State<ChatPageWithRoom>
       return false;
     }
 
+    final l1 = choreographer.l1Lang?.langCodeShort;
     final l2 = choreographer.l2Lang?.langCodeShort;
     final activityLang = room.activityPlan?.req.targetLanguage.split('-').first;
-    return activityLang != null && l2 != null && l2 != activityLang;
+
+    return activityLang != null &&
+        l2 != null &&
+        l2 != activityLang &&
+        l1 != activityLang;
   }
 
   Future<void> showLanguageMismatchPopup() async {