From 5ab0ba4c2c9b4c0553903e5737b15f23d6df9e3e Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Wed, 5 Mar 2025 11:09:01 +0300
Subject: [PATCH] bug 710 & 711 fixed.

---
 lib/new_views/common_widgets/app_drawer.dart                  | 2 +-
 lib/new_views/pages/land_page/land_page.dart                  | 4 ++--
 lib/new_views/swipe_module/swipe_view.dart                    | 4 ++--
 .../components/bottom_sheets/service_request_bottomsheet.dart | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart
index 0558822d..3426a056 100644
--- a/lib/new_views/common_widgets/app_drawer.dart
+++ b/lib/new_views/common_widgets/app_drawer.dart
@@ -86,7 +86,7 @@ class AppDrawer extends StatelessWidget {
               context: context,
               builder: (_) => AAlertDialog(title: context.translation.signOut, content: context.translation.logoutAlert),
             );
-            if (result ?? false) {
+            if (result) {
               settingProvider.resetSettings();
               userProvider.reset();
               Navigator.of(context).pop();
diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart
index 282963ed..2f4b6921 100644
--- a/lib/new_views/pages/land_page/land_page.dart
+++ b/lib/new_views/pages/land_page/land_page.dart
@@ -18,6 +18,7 @@ import 'package:test_sa/new_views/pages/land_page/create_request-type_bottomshee
 import 'package:test_sa/new_views/pages/land_page/mark_attendance_widget.dart';
 import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart';
 import 'package:test_sa/new_views/pages/land_page/non_hmg_employee_swipe_view.dart';
+import 'package:test_sa/new_views/pages/login_page.dart';
 import 'package:test_sa/new_views/pages/settings_page.dart';
 import 'package:test_sa/views/widgets/equipment/single_device_picker.dart';
 
@@ -131,8 +132,7 @@ class _LandPageState extends State<LandPage> {
         if (result) {
           Provider.of<SettingProvider>(context, listen: false).resetSettings();
           Provider.of<UserProvider>(context, listen: false).reset();
-          Navigator.of(context).pop();
-          Navigator.of(context).pop();
+          Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
         }
         return false;
       },
diff --git a/lib/new_views/swipe_module/swipe_view.dart b/lib/new_views/swipe_module/swipe_view.dart
index 455b3cc0..40eabe46 100644
--- a/lib/new_views/swipe_module/swipe_view.dart
+++ b/lib/new_views/swipe_module/swipe_view.dart
@@ -9,6 +9,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_drawer.dart';
+import 'package:test_sa/new_views/pages/login_page.dart';
 import 'package:test_sa/new_views/swipe_module/circular_animated_widget.dart';
 import 'package:test_sa/new_views/swipe_module/swipe_history_view.dart';
 import 'package:test_sa/new_views/swipe_module/utils/swipe_general_utils.dart';
@@ -56,8 +57,7 @@ class _SwipeViewState extends State<SwipeView> {
         if (result) {
           Provider.of<SettingProvider>(context, listen: false).resetSettings();
           Provider.of<UserProvider>(context, listen: false).reset();
-          Navigator.of(context).pop();
-          Navigator.of(context).pop();
+          Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
         }
         return false;
       },
diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
index 5a53e8b9..150b59d8 100644
--- a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
+++ b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
@@ -818,6 +818,7 @@ class ServiceRequestBottomSheet {
                     buttonColor: AppColor.primary10,
                     loading: false,
                     onPressed: () {
+                      Navigator.pop(context);
                       Provider.of<ServiceRequestDetailProvider>(context, listen: false).sparePartHelperModel = SparePartHelperModel();
                       Navigator.pushReplacement(
                         context,