diff --git a/lib/providers/chest_provider.dart b/lib/providers/chest_provider.dart
index 729ab54..4027d42 100644
--- a/lib/providers/chest_provider.dart
+++ b/lib/providers/chest_provider.dart
@@ -16,11 +16,11 @@ class ChestProvider with ChangeNotifier {
 
   Future deleteChest(context, ChestData chest) async {
     final bool? answer = await (_confirmDeletingChest(context, chest.name));
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     if (answer ?? false) {
       await sub.deleteAccounts(getChestWallets(chest));
       await chestBox.delete(chest.key);
-      MyWalletsProvider myWalletProvider =
+      final myWalletProvider =
           Provider.of<MyWalletsProvider>(context, listen: false);
 
       myWalletProvider.pinCode = '';
diff --git a/lib/providers/duniter_indexer.dart b/lib/providers/duniter_indexer.dart
index 75c9029..dd9794b 100644
--- a/lib/providers/duniter_indexer.dart
+++ b/lib/providers/duniter_indexer.dart
@@ -163,7 +163,7 @@ class DuniterIndexer with ChangeNotifier {
       Color color = Colors.black,
       FontWeight fontWeight = FontWeight.w400,
       FontStyle fontStyle = FontStyle.italic]) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     if (indexerEndpoint == '') {
       if (wallet == null) {
@@ -248,7 +248,7 @@ class DuniterIndexer with ChangeNotifier {
   Widget searchIdentity(BuildContext context, String name) {
     // WalletOptionsProvider _walletOptions =
     //     Provider.of<WalletOptionsProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfiles =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart
index c82dd62..ab4c13d 100644
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@@ -12,6 +12,7 @@ import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:polkawallet_sdk/api/apiKeyring.dart';
+import 'package:polkawallet_sdk/api/types/addressIconData.dart';
 import 'package:provider/provider.dart';
 import "package:unorm_dart/unorm_dart.dart" as unorm;
 
@@ -250,7 +251,7 @@ class GenerateWalletsProvider with ChangeNotifier {
   }
 
   Future<List<String>> generateWordList(BuildContext context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     generatedMnemonic = await sub.generateMnemonic(lang: appLang);
     List<String> wordsList = [];
@@ -370,7 +371,7 @@ class GenerateWalletsProvider with ChangeNotifier {
   }
 
   Future<bool> scanDerivations(BuildContext context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     final currentChestNumber = configBox.get('currentChest');
     bool isAlive = false;
     scanedValidWalletNumber = 0;
@@ -446,6 +447,8 @@ class GenerateWalletsProvider with ChangeNotifier {
           onTimeout: () => {},
         );
 
+    log.d(balance);
+
     log.d(
         "${addressData.address!}: ${balance['transferableBalance']} $currencyName");
     if (balance['transferableBalance'] != 0) {
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
index fbc9ac8..d8f6cec 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -134,7 +134,7 @@ class HomeProvider with ChangeNotifier {
   // }
 
   Widget bottomAppBar(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     WalletsProfilesProvider historyProvider =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index dc41080..ff66466 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -86,8 +86,8 @@ class MyWalletsProvider with ChangeNotifier {
   }
 
   Future<int> deleteAllWallet(context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     try {
       log.w('DELETE ALL WALLETS ?');
@@ -124,7 +124,7 @@ class MyWalletsProvider with ChangeNotifier {
 
     int? chest = getCurrentChest();
 
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = getDefaultWallet();
 
@@ -147,7 +147,7 @@ class MyWalletsProvider with ChangeNotifier {
   }
 
   Future<void> generateRootWallet(context, String name) async {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     isNewDerivationLoading = true;
@@ -162,7 +162,7 @@ class MyWalletsProvider with ChangeNotifier {
     } else {
       newWalletNbr = walletConfig.last.number! + 1;
     }
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
 
diff --git a/lib/providers/search.dart b/lib/providers/search.dart
index 4b7c41a..82110c3 100644
--- a/lib/providers/search.dart
+++ b/lib/providers/search.dart
@@ -68,7 +68,7 @@ class SearchProvider with ChangeNotifier {
   // }
 
   Future<List<G1WalletsList>> searchAddress() async {
-    final WalletsProfilesProvider walletProfiles =
+    final walletProfiles =
         WalletsProfilesProvider('pubkey');
 
     if (walletProfiles.isAddress(searchController.text)) {
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 1aa34a5..34a4484 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -295,7 +295,7 @@ class SubstrateSdk with ChangeNotifier {
   }
 
   Future<String> idtyStatus(String address) async {
-    // WalletOptionsProvider walletOptions =
+    // final walletOptions =
     //     Provider.of<WalletOptionsProvider>(homeContext, listen: false);
 
     var idtyIndex = await _getIdentityIndexOf(address);
@@ -401,8 +401,7 @@ class SubstrateSdk with ChangeNotifier {
 
   Future<void> connectNode(BuildContext ctx) async {
     HomeProvider homeProvider = Provider.of<HomeProvider>(ctx, listen: false);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(ctx, listen: false);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(ctx, listen: false);
 
     homeProvider.changeMessage("connectionPending".tr(), 0);
 
@@ -568,7 +567,7 @@ class SubstrateSdk with ChangeNotifier {
   Future<KeyPairData?> changePassword(BuildContext context, String address,
       String passOld, String passNew) async {
     final account = getKeypair(address);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     keyring.setCurrent(account);
     myWalletProvider.resetPinCode();
@@ -1007,7 +1006,7 @@ void snackNode(BuildContext context, bool isConnected) {
   if (!isConnected) {
     message = "noDuniterNodeAvailableTryLater".tr();
   } else {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     message =
         "${"youAreConnectedToNode".tr()}\n${sub.getConnectedEndpoint()!.split('//')[1]}";
diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart
index 85e95de..15ae3a1 100644
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@@ -52,7 +52,7 @@ class WalletOptionsProvider with ChangeNotifier {
   }
 
   Future<int> deleteWallet(context, WalletData wallet) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     final bool? answer = await (confirmPopup(
         context, 'areYouSureToForgetWallet'.tr(args: [wallet.name!])));
 
@@ -60,7 +60,7 @@ class WalletOptionsProvider with ChangeNotifier {
       //Check if balance is null
       final balance = await sub.getBalance(wallet.address!);
       if (balance != {}) {
-        MyWalletsProvider myWalletProvider =
+        final myWalletProvider =
             Provider.of<MyWalletsProvider>(context, listen: false);
         final defaultWallet = myWalletProvider.getDefaultWallet();
         log.d(defaultWallet.address);
@@ -135,8 +135,7 @@ class WalletOptionsProvider with ChangeNotifier {
 
   Widget idtyStatus(BuildContext context, String address,
       {bool isOwner = false, Color color = Colors.black}) {
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     showText(String text,
         [double size = 18, bool bold = false, bool smooth = true]) {
@@ -213,16 +212,16 @@ class WalletOptionsProvider with ChangeNotifier {
   }
 
   Future<bool> isMember(BuildContext context, String address) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     return await sub.idtyStatus(address) == 'Validated';
   }
 
   Future<String?> confirmIdentityPopup(BuildContext context) async {
     TextEditingController idtyName = TextEditingController();
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    WalletOptionsProvider walletOptions =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     return showDialog<String>(
@@ -406,7 +405,7 @@ class WalletOptionsProvider with ChangeNotifier {
   }
 
   bool canValidateName(BuildContext context, TextEditingController walletName) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     bool isNameValid = walletName.text.length >= 2 &&
diff --git a/lib/providers/wallets_profiles.dart b/lib/providers/wallets_profiles.dart
index bfc6f3f..6e1f915 100644
--- a/lib/providers/wallets_profiles.dart
+++ b/lib/providers/wallets_profiles.dart
@@ -134,11 +134,10 @@ class WalletsProfilesProvider with ChangeNotifier {
       BuildContext context, String address, String? username) {
     const double avatarSize = 140;
 
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
-    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     return Stack(children: <Widget>[
       Consumer<SubstrateSdk>(builder: (context, sub, _) {
diff --git a/lib/screens/activity.dart b/lib/screens/activity.dart
index 26e55ad..a0e3332 100644
--- a/lib/screens/activity.dart
+++ b/lib/screens/activity.dart
@@ -54,8 +54,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
   }
 
   Widget historyQuery(context) {
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     if (indexerEndpoint == '') {
       Column(children: <Widget>[
@@ -157,8 +156,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
   }
 
   Widget historyView(context, result) {
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     return duniterIndexer.transBC == null
         ? Column(children: <Widget>[
@@ -190,9 +188,8 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
           ]);
   }
 
-  Widget getTransactionTile(
-      BuildContext context, DuniterIndexer duniterIndexer) {
-    CesiumPlusProvider cesiumPlusProvider =
+  Widget getTransactionTile(BuildContext context, final duniterIndexer) {
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
 
     int keyID = 0;
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index dfab7c7..68ac609 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -33,10 +33,9 @@ class HomeScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     homeContext = context;
 
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
     Provider.of<ChestProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
 
@@ -104,7 +103,7 @@ class HomeScreen extends StatelessWidget {
         builder: (ctx) => StatefulWrapper(
             onInit: () {
               WidgetsBinding.instance.addPostFrameCallback((_) async {
-                DuniterIndexer duniterIndexer =
+                final duniterIndexer =
                     Provider.of<DuniterIndexer>(ctx, listen: false);
                 duniterIndexer.getValidIndexerEndpoint();
 
@@ -183,7 +182,7 @@ class HomeScreen extends StatelessWidget {
 }
 
 Widget geckHome(context) {
-  MyWalletsProvider myWalletProvider = Provider.of<MyWalletsProvider>(context);
+  final myWalletProvider = Provider.of<MyWalletsProvider>(context);
   Provider.of<ChestProvider>(context);
 
   WalletsProfilesProvider historyProvider =
diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart
index 67ee290..05ec347 100644
--- a/lib/screens/myWallets/change_pin.dart
+++ b/lib/screens/myWallets/change_pin.dart
@@ -26,8 +26,8 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
 
   @override
   Widget build(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     return WillPopScope(
diff --git a/lib/screens/myWallets/chest_options.dart b/lib/screens/myWallets/chest_options.dart
index 77db191..b8df652 100644
--- a/lib/screens/myWallets/chest_options.dart
+++ b/lib/screens/myWallets/chest_options.dart
@@ -25,8 +25,7 @@ class ChestOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    ChestProvider chestProvider =
-        Provider.of<ChestProvider>(context, listen: false);
+    final chestProvider = Provider.of<ChestProvider>(context, listen: false);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
 
@@ -60,7 +59,7 @@ class ChestOptions extends StatelessWidget {
               InkWell(
                 key: keyShowSeed,
                 onTap: () async {
-                  MyWalletsProvider myWalletProvider =
+                  final myWalletProvider =
                       Provider.of<MyWalletsProvider>(context, listen: false);
                   WalletData? defaultWallet =
                       myWalletProvider.getDefaultWallet();
diff --git a/lib/screens/myWallets/choose_chest.dart b/lib/screens/myWallets/choose_chest.dart
index da30e4f..23a224e 100644
--- a/lib/screens/myWallets/choose_chest.dart
+++ b/lib/screens/myWallets/choose_chest.dart
@@ -30,8 +30,7 @@ class _ChooseChestState extends State<ChooseChest> {
 
   @override
   Widget build(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
 
     return Scaffold(
         backgroundColor: backgroundColor,
diff --git a/lib/screens/myWallets/choose_wallet.dart b/lib/screens/myWallets/choose_wallet.dart
index cf59120..cf60b78 100644
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@@ -23,7 +23,7 @@ class ChooseWalletScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     final int chest = configBox.get('currentChest');
 
     return Scaffold(
@@ -72,9 +72,7 @@ class ChooseWalletScreen extends StatelessWidget {
   }
 
   Widget myWalletsTiles(BuildContext context, int currentChest) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
 
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
diff --git a/lib/screens/myWallets/custom_derivations.dart b/lib/screens/myWallets/custom_derivations.dart
index cd3814f..d03769c 100644
--- a/lib/screens/myWallets/custom_derivations.dart
+++ b/lib/screens/myWallets/custom_derivations.dart
@@ -27,7 +27,7 @@ class _CustomDerivationState extends State<CustomDerivation> {
 
   @override
   Widget build(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     final derivationList = <String>[
diff --git a/lib/screens/myWallets/import_g1_v1.dart b/lib/screens/myWallets/import_g1_v1.dart
index 2992578..8f22332 100644
--- a/lib/screens/myWallets/import_g1_v1.dart
+++ b/lib/screens/myWallets/import_g1_v1.dart
@@ -22,9 +22,9 @@ class ImportG1v1 extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     Timer? debounce;
@@ -308,7 +308,7 @@ class ImportG1v1 extends StatelessWidget {
   }
 
   void resetScreen(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     sub.csSalt.text = '';
     sub.csPassword.text = '';
diff --git a/lib/screens/myWallets/manage_membership.dart b/lib/screens/myWallets/manage_membership.dart
index 97115eb..65db2e7 100644
--- a/lib/screens/myWallets/manage_membership.dart
+++ b/lib/screens/myWallets/manage_membership.dart
@@ -115,9 +115,9 @@ class ManageMembership extends StatelessWidget {
             false;
 
         if (answer) {
-          MyWalletsProvider myWalletProvider =
+          final myWalletProvider =
               Provider.of<MyWalletsProvider>(context, listen: false);
-          SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+          final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
           // MyWalletsProvider mw = MyWalletsProvider();
           // final wallet = mw.getWalletDataByAddress(address);
diff --git a/lib/screens/myWallets/migrate_identity.dart b/lib/screens/myWallets/migrate_identity.dart
index 77d844f..515cdf5 100644
--- a/lib/screens/myWallets/migrate_identity.dart
+++ b/lib/screens/myWallets/migrate_identity.dart
@@ -20,13 +20,12 @@ class MigrateIdentityScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
-    WalletOptionsProvider walletOptions =
+    // final _homeProvider = Provider.of<HomeProvider>(context);
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     final fromAddress = walletOptions.address.text;
     final defaultWallet = myWalletProvider.getDefaultWallet();
diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart
index a8d785d..c7a3a8f 100644
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@@ -19,9 +19,8 @@ class RestoreChest extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider genW =
-        Provider.of<GenerateWalletsProvider>(context, listen: false);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final genW = Provider.of<GenerateWalletsProvider>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     genW.actualWallet = null;
     if (genW.isSentenceComplete(context)) {
@@ -182,7 +181,7 @@ class RestoreChest extends StatelessWidget {
   }
 
   Widget arrayCell(BuildContext context, TextEditingController cellCtl) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
 
     return Container(
diff --git a/lib/screens/myWallets/show_seed.dart b/lib/screens/myWallets/show_seed.dart
index 1089dc8..68118d0 100644
--- a/lib/screens/myWallets/show_seed.dart
+++ b/lib/screens/myWallets/show_seed.dart
@@ -24,11 +24,11 @@ class ShowSeed extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     CommonElements common = CommonElements();
 
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
 
diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart
index b684f71..8703081 100644
--- a/lib/screens/myWallets/unlocking_wallet.dart
+++ b/lib/screens/myWallets/unlocking_wallet.dart
@@ -30,8 +30,7 @@ class UnlockingWallet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context);
+    final walletOptions = Provider.of<WalletOptionsProvider>(context);
     // final double statusBarHeight = MediaQuery.of(context).padding.top;
 
     currentChestNumber = configBox.get('currentChest');
@@ -162,11 +161,9 @@ class UnlockingWallet extends StatelessWidget {
     StreamController<ErrorAnimationType> errorController =
         StreamController<ErrorAnimationType>();
     TextEditingController enterPin = TextEditingController();
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final walletOptions = Provider.of<WalletOptionsProvider>(context);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     FocusNode pinFocus = FocusNode();
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 5006e44..aa402ec 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -27,18 +27,17 @@ class WalletOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     WalletsProfilesProvider historyProvider =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
-    // SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    // final sub = Provider.of<SubstrateSdk>(context, listen: false);
     // sub.spawnBlock();
     // sub.spawnBlock(0, 20);
 
@@ -437,7 +436,7 @@ class WalletOptions extends StatelessWidget {
   }
 
   Widget manageMembership(BuildContext context) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     return InkWell(
       key: keyManageMembership,
@@ -469,8 +468,8 @@ class WalletOptions extends StatelessWidget {
   Widget setDefaultWalletWidget(
       BuildContext context,
       WalletOptionsProvider walletProvider,
-      MyWalletsProvider myWalletProvider,
-      WalletOptionsProvider walletOptions,
+      final myWalletProvider,
+      final walletOptions,
       int currentChest) {
     return Consumer<MyWalletsProvider>(builder: (context, myWalletProvider, _) {
       WalletData defaultWallet = myWalletProvider.getDefaultWallet();
@@ -511,10 +510,10 @@ class WalletOptions extends StatelessWidget {
   }
 
   Future setDefaultWallet(BuildContext context, int currentChest) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
 
     // WalletData defaultWallet = _myWalletProvider.getDefaultWallet()!;
@@ -527,8 +526,8 @@ class WalletOptions extends StatelessWidget {
 
   Widget deleteWallet(BuildContext context,
       WalletOptionsProvider walletProvider, int currentChest) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     final defaultWallet = myWalletProvider.getDefaultWallet();
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index cf5538e..88d5c19 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -29,8 +29,7 @@ class WalletsHome extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
 
@@ -108,8 +107,7 @@ class WalletsHome extends StatelessWidget {
     );
   }
 
-  Widget chestOptions(
-      BuildContext context, MyWalletsProvider myWalletProvider) {
+  Widget chestOptions(BuildContext context, final myWalletProvider) {
     return Column(children: [
       const SizedBox(height: 50),
       SizedBox(
@@ -188,12 +186,11 @@ class WalletsHome extends StatelessWidget {
   }
 
   Widget myWalletsTiles(BuildContext context, int currentChestNumber) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    WalletOptionsProvider walletOptions =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     if (!isWalletsExists) {
       return const Text('');
@@ -396,10 +393,9 @@ class WalletsHome extends StatelessWidget {
 
   Widget nameBuilder(BuildContext context, WalletData repository,
       WalletData defaultWallet, int currentChestNumber) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
     return ListTile(
       shape: const RoundedRectangleBorder(
           borderRadius: BorderRadius.vertical(bottom: Radius.circular(12))),
@@ -435,8 +431,7 @@ class WalletsHome extends StatelessWidget {
   }
 
   Widget addNewDerivation(context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
 
     String newDerivationName =
         '${'wallet'.tr()} ${myWalletProvider.listWallets.last.number! + 2}';
diff --git a/lib/screens/my_contacts.dart b/lib/screens/my_contacts.dart
index 50d00d5..25d2b54 100644
--- a/lib/screens/my_contacts.dart
+++ b/lib/screens/my_contacts.dart
@@ -19,14 +19,13 @@ class ContactsScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    CesiumPlusProvider cesiumPlusProvider =
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfilesClass =
         Provider.of<WalletsProfilesProvider>(context, listen: true);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     double avatarSize = 55;
 
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index b8f53d1..89ea95b 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -29,10 +29,9 @@ class OnboardingStepTen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context);
+    final walletOptions = Provider.of<WalletOptionsProvider>(context);
     CommonElements common = CommonElements();
     final int pinLenght = generateWalletProvider.pin.text.length;
 
@@ -131,18 +130,17 @@ class OnboardingStepTen extends StatelessWidget {
         ));
   }
 
-  Widget pinForm(context, WalletOptionsProvider walletOptions, pinLenght,
-      int walletNbr, int derivation) {
+  Widget pinForm(
+      context, final walletOptions, pinLenght, int walletNbr, int derivation) {
     // var _walletPin = '';
 // ignore: close_sinks
     StreamController<ErrorAnimationType> errorController =
         StreamController<ErrorAnimationType>();
     TextEditingController enterPin = TextEditingController();
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    GenerateWalletsProvider generateWalletProvider =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     final int currentChest = myWalletProvider.getCurrentChest();
 
diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart
index 2777725..b29d54c 100644
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@@ -29,7 +29,7 @@ class OnboardingStepFive extends StatefulWidget {
 class _ChooseChestState extends State<OnboardingStepFive> {
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: false);
 
     final CommonElements common = CommonElements();
@@ -111,7 +111,7 @@ class _ChooseChestState extends State<OnboardingStepFive> {
 }
 
 Widget sentanceArray(BuildContext context) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
 
   return Padding(
@@ -188,7 +188,7 @@ class PrintWallet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: false);
     return MaterialApp(
       home: Scaffold(
@@ -221,9 +221,9 @@ class PrintWallet extends StatelessWidget {
 
 Widget nextButton(
     BuildContext context, String text, bool isFast, bool skipIntro) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
-  MyWalletsProvider myWalletProvider =
+  final myWalletProvider =
       Provider.of<MyWalletsProvider>(context, listen: false);
   return SizedBox(
     width: 380 * ratio,
diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart
index 730faec..69e0aac 100644
--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@@ -24,7 +24,7 @@ class OnboardingStepSix extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: true);
 
     CommonElements common = CommonElements();
@@ -144,7 +144,7 @@ class OnboardingStepSix extends StatelessWidget {
 }
 
 Widget nextButton(BuildContext context, String text, nextScreen, bool isFast) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
 
   generateWalletProvider.isAskedWordValid = false;
diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart
index 7e19727..cde70f2 100644
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@@ -16,9 +16,9 @@ class OnboardingStepNine extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    // MyWalletsProvider myWalletProvider =
+    // final myWalletProvider =
     //     Provider.of<MyWalletsProvider>(context);
     CommonElements common = CommonElements();
 
diff --git a/lib/screens/search.dart b/lib/screens/search.dart
index 6c360af..5805bdc 100644
--- a/lib/screens/search.dart
+++ b/lib/screens/search.dart
@@ -16,9 +16,9 @@ class SearchScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SearchProvider searchProvider = Provider.of<SearchProvider>(context);
+    final searchProvider = Provider.of<SearchProvider>(context);
     final double screenHeight = MediaQuery.of(context).size.height;
-    // HomeProvider _homeProvider =
+    // final _homeProvider =
     //     Provider.of<HomeProvider>(context, listen: false);
 
     return WillPopScope(
diff --git a/lib/screens/search_result.dart b/lib/screens/search_result.dart
index f08ecc0..2d0a207 100644
--- a/lib/screens/search_result.dart
+++ b/lib/screens/search_result.dart
@@ -20,16 +20,14 @@ class SearchResultScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SearchProvider searchProvider =
-        Provider.of<SearchProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
+    final searchProvider = Provider.of<SearchProvider>(context, listen: false);
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfilesClass =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     double avatarSize = 55;
 
diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
index 38595a3..b1de5e3 100644
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@@ -108,7 +108,7 @@ class SettingsScreen extends StatelessWidget {
   }
 
   Widget duniterEndpointSelection(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     String? selectedDuniterEndpoint;
 
     // List of items in our dropdown menu
@@ -269,7 +269,7 @@ class SettingsScreen extends StatelessWidget {
   }
 
   Widget indexerEndpointSelection(BuildContext context) {
-    DuniterIndexer indexer =
+    final duniterIndexer =
         Provider.of<DuniterIndexer>(context, listen: false);
 
     String? selectedIndexerEndpoint;
@@ -280,7 +280,7 @@ class SettingsScreen extends StatelessWidget {
     }
 
     if (selectedIndexerEndpoint == '') {
-      selectedIndexerEndpoint = indexer.listIndexerEndpoints[0];
+      selectedIndexerEndpoint = duniterIndexer.listIndexerEndpoints[0];
     }
 
     TextEditingController indexerEndpointController = TextEditingController(
diff --git a/lib/screens/template_screen.dart b/lib/screens/template_screen.dart
index 33e48e0..7a006b7 100644
--- a/lib/screens/template_screen.dart
+++ b/lib/screens/template_screen.dart
@@ -6,7 +6,7 @@ class TemplateScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
+    // final _homeProvider = Provider.of<HomeProvider>(context);
 
     return Scaffold(
         backgroundColor: backgroundColor,
diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index 2966c2c..77451f6 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -20,10 +20,10 @@ class TransactionInProgress extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: true);
-    WalletsProfilesProvider walletViewProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: true);
+    final walletProfiles =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     bool isValid = false;
 
@@ -34,11 +34,11 @@ class TransactionInProgress extends StatelessWidget {
 
     // sub.spawnBlock();
 
-    log.d(walletViewProvider.address);
+    log.d(walletProfiles.address);
 
     final from = fromAddress ?? myWalletProvider.getDefaultWallet().name!;
-    final to = toAddress ?? getShortPubkey(walletViewProvider.address);
-    final amount = walletViewProvider.payAmount.text;
+    final to = toAddress ?? getShortPubkey(walletProfiles.address);
+    final amount = walletProfiles.payAmount.text;
     String actionName = '';
     final bool isUdUnit = configBox.get('isUdUnit') ?? false;
 
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index cdea732..ca40f3b 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -37,13 +37,13 @@ class WalletViewScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     WalletsProfilesProvider walletProfile =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
+    final cesiumPlusProvider =
         Provider.of<CesiumPlusProvider>(context, listen: false);
     walletProfile.address = address;
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     HomeProvider homeProvider =
         Provider.of<HomeProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
 
@@ -422,9 +422,7 @@ void paymentPopup(BuildContext context, String toAddress) {
     log.d(pin);
     if (pin != null || myWalletProvider.pinCode != '') {
       // Payment workflow !
-      WalletsProfilesProvider walletViewProvider =
-          Provider.of<WalletsProfilesProvider>(context, listen: false);
-      SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+      final sub = Provider.of<SubstrateSdk>(context, listen: false);
       final acc = sub.getCurrentWallet();
       log.d(
           "fromAddress: ${acc.address!},destAddress: $toAddress, amount: ${double.parse(walletViewProvider.payAmount.text)},  password: $pin");