Fix issues from code review

lib/core/auth_service.dart

@@ -42,25 +42,27 @@ class AuthService with Store {
     return decodedPin == pin;
   }
 
-  void saveLastAuthTime(){
+  void saveLastAuthTime() {
+    
     int timestamp = DateTime.now().millisecondsSinceEpoch;
     sharedPreferences.setInt(PreferencesKey.lastAuthTimeMilliseconds, timestamp);
   }
 
-  bool requireAuth(){  
-      final timestamp = sharedPreferences.getInt(PreferencesKey.lastAuthTimeMilliseconds);
-      final duration =  _durationToRequireAuth(timestamp ?? 0);
-      final requiredPinInterval = getIt.get<SettingsStore>().pinTimeOutDuration;
+  bool requireAuth() {  
+
+    final timestamp = sharedPreferences.getInt(PreferencesKey.lastAuthTimeMilliseconds);
+    final duration =  _durationToRequireAuth(timestamp ?? 0);
+    final requiredPinInterval = getIt.get<SettingsStore>().pinTimeOutDuration;
      
-      return duration >= requiredPinInterval.value;
-    }
+    return duration >= requiredPinInterval.value;
+  }
 
-  int _durationToRequireAuth(int timestamp){
+  int _durationToRequireAuth(int timestamp) {
 
-      DateTime before = DateTime.fromMillisecondsSinceEpoch(timestamp);
-      DateTime now = DateTime.now();
-      Duration timeDifference = now.difference(before);
+    DateTime before = DateTime.fromMillisecondsSinceEpoch(timestamp);
+    DateTime now = DateTime.now();
+    Duration timeDifference = now.difference(before);
 
-      return timeDifference.inMinutes; 
+    return timeDifference.inMinutes; 
   }
 }

lib/src/screens/root/root.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'package:cake_wallet/core/auth_service.dart';
-import 'package:cake_wallet/di.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
@@ -14,12 +13,15 @@ class Root extends StatefulWidget {
       required this.authenticationStore,
       required this.appStore,
       required this.child,
-      required this.navigatorKey})
+      required this.navigatorKey,
+      required this.authService,
+      })
       : super(key: key);
 
   final AuthenticationStore authenticationStore;
   final AppStore appStore;
   final GlobalKey<NavigatorState> navigatorKey;
+  final AuthService authService;
   final Widget child;
 
   @override
@@ -30,7 +32,7 @@ class RootState extends State<Root> with WidgetsBindingObserver {
   RootState()
     : _isInactiveController = StreamController<bool>.broadcast(),
     _isInactive = false,
-   _requestAuth = getIt.get<AuthService>().requireAuth(),
+    _requestAuth = true,
     _postFrameCallback = false;
 
   Stream<bool> get isInactive => _isInactiveController.stream;
@@ -41,7 +43,7 @@ class RootState extends State<Root> with WidgetsBindingObserver {
 
   @override
   void initState() {
-
+    _requestAuth = widget.authService.requireAuth();
     _isInactiveController = StreamController<bool>.broadcast();
     _isInactive = false;
     _postFrameCallback = false;
@@ -58,7 +60,7 @@ class RootState extends State<Root> with WidgetsBindingObserver {
         }
 
         setState(() {
-          _requestAuth = getIt.get<AuthService>().requireAuth();
+          _requestAuth = widget.authService.requireAuth();
         });
 
         if (!_isInactive &&

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -220,93 +220,88 @@ class WalletListBodyState extends State<WalletListBody> {
   }
 
   Future<void> _loadWallet(WalletListItem wallet) async {
-    if(await widget.walletListViewModel.checkIfAuthRequired()){
-      await Navigator.of(context).pushNamed(Routes.auth, arguments:
-        (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
-      if (!isAuthenticatedSuccessfully) {
-        return;
-      }
+    if (await widget.walletListViewModel.checkIfAuthRequired()) {
+      await Navigator.of(context).pushNamed(Routes.auth,
+          arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+        if (!isAuthenticatedSuccessfully) {
+          return;
+        }
 
-      try {
-        auth.changeProcessText(
-            S.of(context).wallet_list_loading_wallet(wallet.name));
-        await widget.walletListViewModel.loadWallet(wallet);
-        auth.hideProgressText();
-        auth.close();
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          Navigator.of(context).pop();
-        });
-      } catch (e) {
-        auth.changeProcessText(S
-            .of(context)
-            .wallet_list_failed_to_load(wallet.name, e.toString()));
-      }
-    });
-    }else{
+        try {
+          auth.changeProcessText(S.of(context).wallet_list_loading_wallet(wallet.name));
+          await widget.walletListViewModel.loadWallet(wallet);
+          auth.hideProgressText();
+          auth.close();
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            Navigator.of(context).pop();
+          });
+        } catch (e) {
+          auth.changeProcessText(
+              S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
+        }
+      });
+    } else {
       try {
         changeProcessText(S.of(context).wallet_list_loading_wallet(wallet.name));
         await widget.walletListViewModel.loadWallet(wallet);
         hideProgressText();
-        Navigator.of(context).pop(); 
+        Navigator.of(context).pop();
       } catch (e) {
-        changeProcessText(S
-            .of(context)
-            .wallet_list_failed_to_load(wallet.name, e.toString()));  
+        changeProcessText(S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
       }
     }
   }
 
   Future<void> _removeWallet(WalletListItem wallet) async {
-    if(widget.walletListViewModel.checkIfAuthRequired()){
-     await Navigator.of(context).pushNamed(Routes.auth, arguments:
-        (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
-      if (!isAuthenticatedSuccessfully) {
-        return;
-      }
-      _onSuccessfulAuth(wallet, auth);
-    });
-  }else{
+    if (widget.walletListViewModel.checkIfAuthRequired()) {
+      await Navigator.of(context).pushNamed(Routes.auth,
+          arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+        if (!isAuthenticatedSuccessfully) {
+          return;
+        }
+        _onSuccessfulAuth(wallet, auth);
+      });
+    } else {
       _onSuccessfulAuth(wallet, null);
     }
   }
 
-  _onSuccessfulAuth(WalletListItem wallet, AuthPageState? auth)async{
+  void _onSuccessfulAuth(WalletListItem wallet, AuthPageState? auth) async {
     bool confirmed = false;
-      await showPopUp<void>(
-          context: context,
-          builder: (BuildContext context) {
-            return AlertWithTwoActions(
-              alertTitle: S.of(context).delete_wallet,
-              alertContent: S.of(context).delete_wallet_confirm_message(wallet.name),
-              leftButtonText: S.of(context).cancel,
-              rightButtonText: S.of(context).delete,
-              actionLeftButton: () => Navigator.of(context).pop(),
-              actionRightButton: () {
-                confirmed = true;
-                Navigator.of(context).pop();
-              },
-            );
-          });
-
-      if (confirmed) {
-        try {
-        auth != null ? 
-        auth.changeProcessText(
-          S.of(context).wallet_list_removing_wallet(wallet.name)) 
-          : changeProcessText( S.of(context).wallet_list_removing_wallet(wallet.name));
-          await widget.walletListViewModel.remove(wallet);
-        } catch (e) {
-          auth != null ? 
-          auth.changeProcessText(
-            S.of(context).wallet_list_failed_to_remove(wallet.name, e.toString()),
-          ) 
-          : changeProcessText(
-            S.of(context).wallet_list_failed_to_remove(wallet.name, e.toString()),
+    await showPopUp<void>(
+        context: context,
+        builder: (BuildContext context) {
+          return AlertWithTwoActions(
+            alertTitle: S.of(context).delete_wallet,
+            alertContent: S.of(context).delete_wallet_confirm_message(wallet.name),
+            leftButtonText: S.of(context).cancel,
+            rightButtonText: S.of(context).delete,
+            actionLeftButton: () => Navigator.of(context).pop(),
+            actionRightButton: () {
+              confirmed = true;
+              Navigator.of(context).pop();
+            },
           );
-        }
-      }
+        });
 
-      auth?.close();
+    if (confirmed) {
+      try {
+        auth != null
+            ? auth.changeProcessText(S.of(context).wallet_list_removing_wallet(wallet.name))
+            : changeProcessText(S.of(context).wallet_list_removing_wallet(wallet.name));
+        await widget.walletListViewModel.remove(wallet);
+      } catch (e) {
+        auth != null
+            ? auth.changeProcessText(
+                S.of(context).wallet_list_failed_to_remove(wallet.name, e.toString()),
+              )
+            : changeProcessText(
+                S.of(context).wallet_list_failed_to_remove(wallet.name, e.toString()),
+              );
+      }
+    }
+
+    auth?.close();
   }
 
   void changeProcessText(String text) {
@@ -319,16 +314,16 @@ class WalletListBodyState extends State<WalletListBody> {
   }
 
   ActionPane _actionPane(WalletListItem wallet) => ActionPane(
-    motion: const ScrollMotion(),
-    extentRatio: 0.3,
-    children: [
-      SlidableAction(
-        onPressed: (_) => _removeWallet(wallet),
-        backgroundColor: Colors.red,
-        foregroundColor: Colors.white,
-        icon: CupertinoIcons.delete,
-        label: S.of(context).delete,
-      ),
-    ],
-  );
+        motion: const ScrollMotion(),
+        extentRatio: 0.3,
+        children: [
+          SlidableAction(
+            onPressed: (_) => _removeWallet(wallet),
+            backgroundColor: Colors.red,
+            foregroundColor: Colors.white,
+            icon: CupertinoIcons.delete,
+            label: S.of(context).delete,
+          ),
+        ],
+      );
 }

lib/view_model/auth_view_model.dart

@@ -121,8 +121,8 @@ abstract class AuthViewModelBase with Store {
     }
   }
 
-  void _saveLastAuthTime(ExecutionState state){
-    if(state is ExecutedSuccessfullyState){
+  void _saveLastAuthTime(ExecutionState state) {
+    if(state is ExecutedSuccessfullyState) {
     _authService.saveLastAuthTime();
     }
   }