From 3cb3ded2646e0b6acbe9c884c0a5f5ee0dcc5f11 Mon Sep 17 00:00:00 2001
From: OfficialDakari <squiggle_ground671@simplelogin.com>
Date: Mon, 18 Aug 2025 17:15:01 +0500
Subject: [PATCH] fix BuildContext crash when starting new chat

---
 lib/widgets/adaptive_dialogs/user_dialog.dart | 2 +-
 pubspec.yaml                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/adaptive_dialogs/user_dialog.dart b/lib/widgets/adaptive_dialogs/user_dialog.dart
index f0f424d..8e7cdc5 100644
--- a/lib/widgets/adaptive_dialogs/user_dialog.dart
+++ b/lib/widgets/adaptive_dialogs/user_dialog.dart
@@ -168,13 +168,13 @@ class UserDialog extends StatelessWidget {
             bigButtons: true,
             onPressed: () async {
               final router = GoRouter.of(context);
-              Navigator.of(context).pop();
               final roomIdResult = await showFutureLoadingDialog(
                 context: context,
                 future: () => client.startDirectChat(profile.userId),
               );
               final roomId = roomIdResult.result;
               if (roomId == null) return;
+              if (context.mounted) Navigator.of(context).pop();
               router.go('/rooms/$roomId');
             },
             child: Text(
diff --git a/pubspec.yaml b/pubspec.yaml
index 87ba628..d84a950 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: extera_next
 description: Chat with your friends.
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 1.0.0
+version: 2.0.0
 
 environment:
   sdk: ">=3.0.0 <4.0.0"