From e2d5602c7dd55cdef3b173ac303dc370eeaf8d73 Mon Sep 17 00:00:00 2001
From: Dhruv80576 <agarwaldhruv8057@gmail.com>
Date: Thu, 7 Nov 2024 17:21:37 +0530
Subject: [PATCH 1/3] fix: inefficient ui flow of scan qr

---
 lib/pages/new_private_chat/new_private_chat.dart | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart
index 7cb177afc..ec4f28630 100644
--- a/lib/pages/new_private_chat/new_private_chat.dart
+++ b/lib/pages/new_private_chat/new_private_chat.dart
@@ -83,8 +83,14 @@ class NewPrivateChatController extends State<NewPrivateChat> {
     }
     await showAdaptiveBottomSheet(
       context: context,
-      builder: (_) => QrScannerModal(
-        onScan: (link) => UrlLauncher(context, link).openMatrixToUrl(),
+      builder: (_) => WillPopScope(
+        onWillPop: () async {
+          Navigator.of(context).pop();
+          return false;
+        },
+        child: QrScannerModal(
+          onScan: (link) => UrlLauncher(context, link).openMatrixToUrl(),
+        ),
       ),
     );
   }

From e57684d3ed43eb1d0a28093804c416e5326bda79 Mon Sep 17 00:00:00 2001
From: Dhruv80576 <agarwaldhruv8057@gmail.com>
Date: Thu, 7 Nov 2024 18:39:30 +0530
Subject: [PATCH 2/3] update new_private_chat.dart

---
 lib/pages/new_private_chat/new_private_chat.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart
index ec4f28630..4f17425c6 100644
--- a/lib/pages/new_private_chat/new_private_chat.dart
+++ b/lib/pages/new_private_chat/new_private_chat.dart
@@ -83,10 +83,9 @@ class NewPrivateChatController extends State<NewPrivateChat> {
     }
     await showAdaptiveBottomSheet(
       context: context,
-      builder: (_) => WillPopScope(
-        onWillPop: () async {
+      builder: (_) => PopScope(
+        onPopInvokedWithResult:(didPop, result) {
           Navigator.of(context).pop();
-          return false;
         },
         child: QrScannerModal(
           onScan: (link) => UrlLauncher(context, link).openMatrixToUrl(),

From 7143e8b358b6e39654a3d421589836be2fd8c227 Mon Sep 17 00:00:00 2001
From: Dhruv80576 <agarwaldhruv8057@gmail.com>
Date: Fri, 8 Nov 2024 16:45:01 +0530
Subject: [PATCH 3/3] fix: formatting corrected

---
 lib/pages/new_private_chat/new_private_chat.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart
index 4f17425c6..dc03785e3 100644
--- a/lib/pages/new_private_chat/new_private_chat.dart
+++ b/lib/pages/new_private_chat/new_private_chat.dart
@@ -84,7 +84,8 @@ class NewPrivateChatController extends State<NewPrivateChat> {
     await showAdaptiveBottomSheet(
       context: context,
       builder: (_) => PopScope(
-        onPopInvokedWithResult:(didPop, result) {
+        canPop: false,
+        onPopInvokedWithResult: (didPop, result) {
           Navigator.of(context).pop();
         },
         child: QrScannerModal(