Merge 154ff5ee7b into 6223ea85b5

2026-03-16 05:24:18 +00:00 · 2026-03-16 05:24:18 +00:00 · 30ebb3c81d
commit 30ebb3c81d
parent 6223ea85b5 154ff5ee7b
1 changed files with 8 additions and 2 deletions
--- a/lib/pages/new_private_chat/new_private_chat.dart
+++ b/lib/pages/new_private_chat/new_private_chat.dart
@ -95,8 +95,14 @@ class NewPrivateChatController extends State<NewPrivateChat> {
    }
    await showAdaptiveBottomSheet(
      context: context,
-      builder: (_) => QrScannerModal(
-        onScan: (link) => UrlLauncher(context, link).openMatrixToUrl(),
+      builder: (_) => PopScope(
+        canPop: false,
+        onPopInvokedWithResult: (didPop, result) {
+          Navigator.of(context).pop();
+        },
+        child: QrScannerModal(
+          onScan: (link) => UrlLauncher(context, link).openMatrixToUrl(),
+        ),
      ),
    );
  }