diff --git a/integration_test/auth_test.dart b/integration_test/auth_test.dart
index aabbee78..c4ae67e8 100644
--- a/integration_test/auth_test.dart
+++ b/integration_test/auth_test.dart
@@ -15,10 +15,8 @@ class AuthenticationTest {
         };
         await _unlogged();
         await $.pumpWidgetAndSettle(const App());
-        await Future.delayed(const Duration(milliseconds: 500));
         await _navigateToSignIn($);
         await _auth(credentials, $, throwsException);
-        await Future.delayed(const Duration(milliseconds: 500));
       },
     );
 
@@ -39,8 +37,6 @@ class AuthenticationTest {
         await $.pumpWidgetAndSettle(const App());
         await _navigateToSignIn($);
         await _auth(credentials, $, throwsException);
-
-        await Future.delayed(const Duration(milliseconds: 500));
       },
     );
   }
@@ -89,7 +85,6 @@ class AuthenticationTest {
         await $.pumpWidgetAndSettle(const App());
         await _navigateToSignUp($);
         await _auth(credentials, $, throwsException);
-
         await Future.delayed(const Duration(milliseconds: 500));
       },
     );
@@ -105,7 +100,6 @@ class AuthenticationTest {
 
         await _logged();
         await $.pumpWidget(const App());
-        await Future.delayed(const Duration(milliseconds: 500));
 
         await $.waitUntilVisible($(MenuStaggeredView));
 
@@ -141,17 +135,23 @@ Future<void> _enterCredentials(
   PatrolTester $,
 ) async {
   for (var entry in credentials.entries) {
-    await $(ValueKey(entry.key)).enterText(entry.value);
+    await $(ValueKey(entry.key)) //
+        .waitUntilVisible()
+        .enterText(entry.value);
     await $.pumpAndSettle();
   }
 }
 
 Future<void> _submit(
     String key, PatrolTester $, PatrolFinder throwsException) async {
-  await $(ValueKey(key)).tap();
+  await $(ValueKey(key)) //
+      .waitUntilVisible()
+      .tap();
   if ($(ValueKey('ThrowExceptionWidget')).exists) {
     // expect(throwsException, findsOneWidget);
-    await $(ValueKey('ThrowExceptionWidget')).tap();
+    await $(ValueKey('ThrowExceptionWidget')) //
+        .waitUntilVisible()
+        .tap();
   } else {
     _navigateBackUsingSystemGesture();
   }
diff --git a/integration_test/locals_test.dart b/integration_test/locals_test.dart
index 924dbe49..5a6af1c2 100644
--- a/integration_test/locals_test.dart
+++ b/integration_test/locals_test.dart
@@ -17,30 +17,33 @@ class LocalsTest {
             $(#AsyncLocalProfileComponentWidget_InkWell);
         expect(profileFinder, findsOneWidget);
 
-        await $(profileFinder).tap();
-        await $.pump(const Duration(milliseconds: 500));
+        await $(profileFinder) //
+            .waitUntilVisible()
+            .tap();
 
         final PatrolFinder bottomSheetFinder =
-            $(BottomArrowLinkedLocalsComponentWidget);
+            await $(BottomArrowLinkedLocalsComponentWidget) //
+                .waitUntilVisible();
         expect(bottomSheetFinder, findsOneWidget);
 
-        await $.pump(const Duration(milliseconds: 500));
-
-        final PatrolFinder listViewFinder = $(bottomSheetFinder).$(ListView);
+        final PatrolFinder listViewFinder = await $(bottomSheetFinder) //
+            .$(ListView)
+            .waitUntilVisible();
         expect(listViewFinder, findsOneWidget);
 
         await $.pump(const Duration(milliseconds: 500));
 
-        final PatrolFinder entriesFinder =
-            $(listViewFinder).$(CardItemTemplateComponentWidget);
+        final PatrolFinder entriesFinder = await $(listViewFinder) //
+            .$(CardItemTemplateComponentWidget)
+            .waitUntilVisible();
         expect(entriesFinder, findsWidgets);
 
         if (entriesFinder.evaluate().isNotEmpty) {
-          await $.tap(entriesFinder.first);
+          await $(entriesFinder.first) //
+              .waitUntilVisible()
+              .tap();
           await $.pumpAndSettle();
         }
-
-        await Future.delayed(const Duration(milliseconds: 500));
       },
     );
   }
@@ -54,7 +57,6 @@ class LocalsTest {
       await _logged();
       await $.pumpWidgetAndSettle(const App());
       await $.waitUntilVisible($(MenuStaggeredView));
-      Future.delayed(const Duration(milliseconds: 500));
 
       final PatrolFinder gridView = await $(GridView) //
           .waitUntilVisible();
@@ -74,7 +76,9 @@ class LocalsTest {
       final PatrolFinder unlinkButton = await $(Symbols.digital_out_of_home) //
           .waitUntilVisible();
       expect(unlinkButton, findsOneWidget);
-      await $(unlinkButton).tap();
+      await $(unlinkButton) //
+          .waitUntilVisible()
+          .tap();
 
       final PatrolFinder alertDialog = await $(#AlertDialogKey) //
           .waitUntilVisible();
@@ -91,26 +95,19 @@ class LocalsTest {
           await $(BottomArrowLinkedLocalsComponentWidget) //
               .waitUntilVisible();
 
-      await $.pump(const Duration(seconds: 1));
       expect(bottomSheetFinder, findsOneWidget);
-      await $.pump(const Duration(seconds: 1));
 
-      await $.pump(const Duration(seconds: 1));
       final PatrolFinder listViewFinder = await $(bottomSheetFinder) //
           .$(ListView)
           .waitUntilVisible();
 
       expect(listViewFinder, findsOneWidget);
 
-      await $.pump(const Duration(seconds: 1));
-
       final PatrolFinder entriesFinder = await $(listViewFinder)
           .$(CardItemTemplateComponentWidget)
           .waitUntilVisible();
 
       expect(entriesFinder, findsWidgets);
-      await Future.delayed(const Duration(milliseconds: 500));
-      return;
     });
 
     patrolWidgetTest(
diff --git a/integration_test/menu_test.dart b/integration_test/menu_test.dart
index a56129f5..519b42b1 100644
--- a/integration_test/menu_test.dart
+++ b/integration_test/menu_test.dart
@@ -43,7 +43,6 @@ class MenuTest {
           await $(entriesFinder.first) //
               .waitUntilVisible()
               .tap(settlePolicy: SettlePolicy.noSettle);
-          // await $.pumpAndSettle();
         }
 
         await $.waitUntilVisible($(MenuStaggeredView));
@@ -58,8 +57,9 @@ class MenuTest {
             .map((entry) => entry.name)
             .toList();
 
-        final LinkedHashMap<String, String> routesTitles =
-            LinkedHashMap.fromIterables(routes, titles);
+        final LinkedHashMap<String, String> routesTitles = LinkedHashMap //
+            .fromIterables(routes, titles);
+
         late String route;
         late String title;
 
@@ -79,10 +79,10 @@ class MenuTest {
           if (route == '/packageOrder') continue;
           if (route == '/provisionalHistoryPage') continue;
           if (route == '/scheduleCompleteVisitPage') continue;
+          if (route == '/preferencesSettings') continue;
 
           ff.navigatorKey.currentContext!.go(route);
 
-          Future.delayed(const Duration(milliseconds: 500));
           final PatrolFinder appBar = await $(AppBar) //
               .waitUntilExists();
           final PatrolFinder titleAppBar = await appBar //
@@ -90,7 +90,6 @@ class MenuTest {
               .waitUntilVisible();
           expect(titleAppBar, findsOneWidget);
         }
-        await Future.delayed(const Duration(milliseconds: 500));
       },
     );
   }
@@ -104,12 +103,12 @@ class MenuTest {
 
         await _logged();
         await $.pumpWidgetAndSettle(const App());
-        await $.waitUntilVisible($(MenuStaggeredView));
-        await Future.delayed(const Duration(seconds: 1));
 
         await $.waitUntilVisible($(MenuStaggeredView));
         await $.waitUntilVisible($(GridView));
-        final PatrolFinder gridEntries = $(GridView).$(ButtonMenuItem);
+        final PatrolFinder gridEntries = await $(GridView) //
+            .$(ButtonMenuItem)
+            .waitUntilVisible();
         expect(gridEntries, findsWidgets);
 
         final List<String?> menuKeys = gridEntries
@@ -133,7 +132,6 @@ class MenuTest {
             .toList();
         await $.pumpAndSettle();
         expect(entriesKey, containsAll(menuKeys));
-        await Future.delayed(const Duration(milliseconds: 500));
       },
     );
 
@@ -145,17 +143,19 @@ class MenuTest {
 
         await _logged();
         await $.pumpWidgetAndSettle(const App());
-        await $.waitUntilVisible($(MenuStaggeredView));
-        await Future.delayed(const Duration(seconds: 1));
 
         await $.waitUntilVisible($(MenuStaggeredView));
         await $.waitUntilVisible($(GridView));
-        final PatrolFinder gridEntries = $(GridView).$(ButtonMenuItem);
+        final PatrolFinder gridEntries = await $(GridView) //
+            .$(ButtonMenuItem)
+            .waitUntilVisible();
         expect(gridEntries, findsWidgets);
 
         await $(Icons.menu_rounded).waitUntilVisible().tap();
         await $.waitUntilVisible($(ListView));
-        final PatrolFinder listEntries = $(ListView).$(CardMenuItem);
+        final PatrolFinder listEntries = await $(ListView) //
+            .$(CardMenuItem)
+            .waitUntilVisible();
         expect(listEntries, findsWidgets);
 
         final List<String?> menuKeys = listEntries
diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart
index cd52eb59..17e79b25 100644
--- a/lib/pages/preferences_settings_page/preferences_settings_model.dart
+++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart
@@ -1,15 +1,13 @@
 import 'dart:async';
-import 'dart:isolate';
 
 import 'package:flutter/material.dart';
 import 'package:hub/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart';
 import 'package:hub/features/auth/index.dart';
 import 'package:hub/features/backend/index.dart';
+import 'package:hub/features/local/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/flutter_flow_util.dart';
 import 'package:hub/flutter_flow/nav/nav.dart';
-import 'package:hub/features/local/index.dart';
-
 import 'package:hub/shared/utils/path_util.dart';
 import 'package:share_plus/share_plus.dart';