From a4e2177de6d0b7b45b982a5c09af75ea5bf2524f Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Wed, 22 Jan 2025 16:33:07 -0500
Subject: [PATCH] fix: don't show invite space dialog after joining room with
 code (#1541)

---
 lib/pages/chat_list/chat_list.dart                  | 11 +++++++++++
 lib/pangea/spaces/controllers/space_controller.dart |  2 --
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index bab811b1e..ce7e2b724 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -21,6 +21,7 @@ import 'package:fluffychat/pages/chat_list/chat_list_view.dart';
 import 'package:fluffychat/pangea/chat_list/utils/app_version_util.dart';
 import 'package:fluffychat/pangea/chat_list/utils/chat_list_handle_space_tap.dart';
 import 'package:fluffychat/pangea/chat_settings/constants/pangea_room_types.dart';
+import 'package:fluffychat/pangea/common/constants/local.key.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
 import 'package:fluffychat/pangea/common/utils/firebase_analytics.dart';
 import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
@@ -41,6 +42,7 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
+
 enum SelectMode {
   normal,
   share,
@@ -620,6 +622,15 @@ class ChatListController extends State<ChatList>
               MatrixState.pangeaController.matrixState.client.getRoomById(
             spaceId,
           );
+
+          final String? justInputtedCode =
+              MatrixState.pangeaController.pStoreService.read(
+            PLocalKey.justInputtedCode,
+            isAccountData: false,
+          );
+          final newSpaceCode = space?.classCode(context);
+          if (newSpaceCode == justInputtedCode) return;
+
           if (space != null) {
             chatListHandleSpaceTap(
               context,
diff --git a/lib/pangea/spaces/controllers/space_controller.dart b/lib/pangea/spaces/controllers/space_controller.dart
index 4cc930f1a..af5bac655 100644
--- a/lib/pangea/spaces/controllers/space_controller.dart
+++ b/lib/pangea/spaces/controllers/space_controller.dart
@@ -97,8 +97,6 @@ class ClassController extends BaseController {
           classCode,
           isAccountData: false,
         );
-
-        _pangeaController.pStoreService.delete(PLocalKey.justInputtedCode);
         return chosenClassId;
       },
     );