diff --git a/lib/globals.dart b/lib/globals.dart
index 4770d16..c221974 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 import 'package:gecko/models/myWallets.dart';
+import 'package:logger/logger.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 // Files paths
@@ -19,3 +20,6 @@ String cesiumPod = "https://g1.data.le-sou.org";
 // Responsive ratios
 bool isTall;
 double ratio;
+
+// Logger
+var logger = Logger();
diff --git a/lib/models/myWallets.dart b/lib/models/myWallets.dart
index b052c0e..e5a9b36 100644
--- a/lib/models/myWallets.dart
+++ b/lib/models/myWallets.dart
@@ -84,13 +84,9 @@ class MyWalletsProvider with ChangeNotifier {
     // int nbr = int.parse(_id.split(':')[1]);
     final _walletConfig = File('${walletsDirectory.path}/$chest/list.conf');
 
-    _walletConfig.readAsLinesSync().forEach((element) {
-      WalletData wallet = WalletData(element);
-      if (_id == "${wallet.chest}:${wallet.number}") {
-        return wallet;
-      }
-    });
-    return WalletData("0:0:Null:0");
+    return WalletData(_walletConfig
+        .readAsLinesSync()
+        .firstWhere((element) => element.startsWith(_id)));
   }
 
   void getDefaultWallet() {
@@ -100,14 +96,8 @@ class MyWalletsProvider with ChangeNotifier {
       File(defaultWalletFile.path).createSync();
     }
 
-    try {
-      ////////////////////////////////////////////////////////////
-      defaultWallet = getWalletData(defaultWalletFile.readAsStringSync());
-      print("found default wallet $defaultWallet");
-    } catch (e) {
-      print("ERROR $e");
-      defaultWallet = WalletData('0:0:null:0');
-    }
+    defaultWallet = getWalletData(defaultWalletFile.readAsStringSync());
+    print("found default wallet $defaultWallet");
   }
 
   Future<int> deleteAllWallet(context) async {
diff --git a/lib/screens/myWallets/walletsHome.dart b/lib/screens/myWallets/walletsHome.dart
index d9b5262..d5ac097 100644
--- a/lib/screens/myWallets/walletsHome.dart
+++ b/lib/screens/myWallets/walletsHome.dart
@@ -133,7 +133,7 @@ class WalletsHome extends StatelessWidget {
                           )),
                           ListTile(
                             // contentPadding: const EdgeInsets.only(left: 7.0),
-                            tileColor: _repository == defaultWallet
+                            tileColor: _repository.id() == defaultWallet.id()
                                 ? Color(0xffD28928)
                                 : Color(0xffFFD58D),
                             // leading: Text('IMAGE'),
@@ -148,7 +148,8 @@ class WalletsHome extends StatelessWidget {
                                         textAlign: TextAlign.center,
                                         style: TextStyle(
                                             fontSize: 16.0,
-                                            color: _repository == defaultWallet
+                                            color: _repository.id() ==
+                                                    defaultWallet.id()
                                                 ? Color(0xffF9F9F1)
                                                 : Colors.black)))),
                             // dense: true,
diff --git a/pubspec.lock b/pubspec.lock
index c5f9205..cd5e128 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -344,7 +344,7 @@ packages:
       name: logger
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.4"
+    version: "1.0.0"
   matcher:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 77e65b5..82bb194 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -37,7 +37,7 @@ dependencies:
   sync_http: ^0.2.0
   crypto: ^3.0.0
   fast_base58:
-  logger: ^0.9.4
+  logger: ^1.0.0
   flutter_logs: ^2.1.3
   sentry: ^4.0.4
   sentry_flutter: ^4.0.4