diff --git a/lib/models/widgets_keys.dart b/lib/models/widgets_keys.dart
index acc7b25..58b3935 100644
--- a/lib/models/widgets_keys.dart
+++ b/lib/models/widgets_keys.dart
@@ -83,10 +83,11 @@ const keyGoWalletsHome = Key('keyGoWalletsHome');
 const keySearchField = Key('keySearchField');
 const keyConfirmSearch = Key('keyConfirmSearch');
 
-// Unit keys
+// Items keys
 Key keyTransaction(int keyId) => Key('keyTransaction$keyId');
 Key keyMnemonicWord(String word) => Key('keyMnemonicWord$word');
-Key keySearchResult(String keyId) => Key('keySearchResult$keyId');
-Key keySelectDuniterNode(String keyId) => Key('keySelectDuniterNode$keyId');
-Key keyOpenWallet(String keyId) => Key('keyOpenWallet$keyId');
-Key keySelectThisWallet(String keyId) => Key('keySelectThisWallet$keyId');
+Key keySearchResult(String address) => Key('keySearchResult$address');
+Key keySelectDuniterNode(String endpoint) =>
+    Key('keySelectDuniterNode$endpoint');
+Key keyOpenWallet(String address) => Key('keyOpenWallet$address');
+Key keySelectThisWallet(String address) => Key('keySelectThisWallet$address');
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
index d939007..fe5102f 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -167,7 +167,8 @@ class HomeProvider with ChangeNotifier {
           ),
           const SizedBox(width: 22),
           const Spacer(),
-          IconButton(key: keyAppBarQrcode,
+          IconButton(
+            key: keyAppBarQrcode,
             iconSize: 70,
             icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
             onPressed: () async {
@@ -180,7 +181,8 @@ class HomeProvider with ChangeNotifier {
           ),
           const Spacer(),
           const SizedBox(width: 15),
-          IconButton(key: keyAppBarChest,
+          IconButton(
+            key: keyAppBarChest,
             iconSize: 60,
             icon: const Image(image: AssetImage('assets/wallet.png')),
             onPressed: () async {
diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart
index f581a8b..ac2f106 100644
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@@ -238,7 +238,8 @@ class WalletOptionsProvider with ChangeNotifier {
             height: 100,
             child: Column(children: [
               const SizedBox(height: 20),
-              TextField(key: keyEnterIdentityUsername,
+              TextField(
+                key: keyEnterIdentityUsername,
                 onChanged: (_) => notifyListeners(),
                 inputFormatters: <TextInputFormatter>[
                   // FilteringTextInputFormatter.allow(RegExp("[0-9a-zA-Z]")),
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index a6abfc2..de5e74e 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -292,7 +292,8 @@ class WalletOptions extends StatelessWidget {
                 SizedBox(
                   width: 320,
                   height: 60,
-                  child: ElevatedButton(key: keyConfirmIdentity,
+                  child: ElevatedButton(
+                    key: keyConfirmIdentity,
                     style: ElevatedButton.styleFrom(
                       elevation: 4,
                       primary: orangeC, // background
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index ae13fc7..29b6db6 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -481,7 +481,8 @@ class WalletViewScreen extends StatelessWidget {
                         ),
                         const SizedBox(height: 10),
                         Consumer<SubstrateSdk>(builder: (context, sub, _) {
-                          return InkWell(key: keyChangeChest,
+                          return InkWell(
+                            key: keyChangeChest,
                             onTap: () async {
                               String? pin;
                               if (myWalletProvider.pinCode == '') {