From ee167f01e4bd65627e15e74eaa129ace90399508 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Fri, 25 Oct 2024 11:47:59 -0400
Subject: [PATCH] fixed error in server mixup test

---
 lib/main.dart | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 05e4ca5cc..9f5e656bd 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/pangea/config/environment.dart';
 import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
@@ -105,13 +106,14 @@ Future<void> startGui(List<Client> clients, SharedPreferences store) async {
   // errors seems to happen a lot when users switch better production / staging
   // while testing by accident. If the account is a production account but server is
   // staging or vice versa, logout.
-  // final isStagingUser = firstClient?.userID?.domain?.contains("staging");
-  // final isStagingServer = Environment.isStaging;
-  // if (isStagingServer != isStagingUser) {
-  //   await firstClient?.logout();
-  // }
+  if (firstClient?.userID?.domain != null) {
+    final isStagingUser = firstClient!.userID!.domain!.contains("staging");
+    final isStagingServer = Environment.isStaging;
+    if (isStagingServer != isStagingUser) {
+      await firstClient.logout();
+    }
+  }
   // Pangea#
-
   runApp(FluffyChatApp(clients: clients, pincode: pin, store: store));
 }