Merge branch 'main' into ALTME

TalaoDAO · Oct 30, 2024 · 9a08d95 · 9a08d95
2 parents cb0a3d5 + c5418bc
commit 9a08d95
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/dashboard/connection/operation/view/operation_page.dart b/lib/dashboard/connection/operation/view/operation_page.dart
@@ -139,6 +139,9 @@ class _OperationViewState extends State<OperationView> {
 
         return PopScope(
           onPopInvoked: (didPop) {
+            if (didPop) {
+              return;
+            }
             context.read<OperationCubit>().rejectOperation(
                   connectionBridgeType: widget.connectionBridgeType,
                 );

diff --git a/lib/dashboard/src/view/dashboard_page.dart b/lib/dashboard/src/view/dashboard_page.dart
@@ -178,7 +178,10 @@ class _DashboardViewState extends State<DashboardView> {
 
               return PopScope(
                 canPop: false,
-                onPopInvoked: (_) async {
+                onPopInvoked: (didPop) async {
+                  if (didPop) {
+                    return;
+                  }
                   if (scaffoldKey.currentState!.isDrawerOpen) {
                     // Navigator.of(context).pop();
                   }

diff --git a/lib/scan/cubit/scan_cubit.dart b/lib/scan/cubit/scan_cubit.dart
@@ -940,7 +940,8 @@ class ScanCubit extends Cubit<ScanState> {
 
       final String responseOrRedirectUri =
           uri.queryParameters['redirect_uri'] ??
-              uri.queryParameters['response_uri']!;
+              uri.queryParameters['response_uri'] ??
+              uri.origin;
 
       await activityLogManager.saveLog(
         LogData(