From e3a97c0ae94aa5c164434194a6b37e21d13182d4 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikander.saleem@cloudsolutions.com.sa>
Date: Mon, 18 Aug 2025 16:00:55 +0300
Subject: [PATCH] enable engineer time picker issue fixed, session expired
 dialog issue fixed.

---
 lib/models/user.dart                 |  1 +
 lib/new_views/pages/splash_page.dart | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/models/user.dart b/lib/models/user.dart
index b7a50619..75045ac0 100644
--- a/lib/models/user.dart
+++ b/lib/models/user.dart
@@ -297,6 +297,7 @@ class AssetGroup {
     data['id'] = id;
     data['name'] = name;
     data['code'] = code;
+    data['enabledEngineerTimer'] = enabledEngineerTimer;
     return data;
   }
 }
diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart
index 3e3cbc97..ec2bfe10 100644
--- a/lib/new_views/pages/splash_page.dart
+++ b/lib/new_views/pages/splash_page.dart
@@ -85,9 +85,7 @@ class _SplashPageState extends State<SplashPage> {
       setState(() {
         loading = false;
       });
-      if (isValid && _settingProvider.isLocalAuthEnable) {
-        handleLocalAuth();
-      } else {
+      if (isValid == false) {
         showDialog(
           context: context,
           builder: (BuildContext cxt) => SingleBtnDialog(
@@ -99,6 +97,12 @@ class _SplashPageState extends State<SplashPage> {
                 Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
               }),
         );
+      } else {
+        if (isValid && _settingProvider.isLocalAuthEnable) {
+          handleLocalAuth();
+          return;
+        }
+        Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
       }
     }
   }