change choose wallet in payment popup to dropdown

assets/translations/en.json

@@ -23,7 +23,7 @@
     "toUnlockEnterPassword": "To unlock your safe, enter your secret code, away from prying lizards:",
     "rememberPassword": "Keep this code in memory for 15 minutes",
     "myRootWallet": "My root wallet",
-    "currentWallet": "My current chest",
+    "currentWallet": "My current wallet",
     "wallet": "Wallet",
     "displayMnemonic": "Display my mnemonic sentence",
     "changePassword": "Change my password",

assets/translations/es.json

@@ -23,7 +23,7 @@
     "toUnlockEnterPassword": "Para desbloquear tu cofre, introduce tu contraseña, lejos de lagartijas curiosas:",
     "rememberPassword": "Mantener en memoria mi contraseña durante 15 minutos",
     "myRootWallet": "Mi monedero principal",
-    "currentWallet": "Mi cofre actual",
+    "currentWallet": "Mi monedero actual",
     "wallet": "monedero",
     "displayMnemonic": "Mostrar mi frase de restauración",
     "changePassword": "Cambiar mi contraseña",

lib/providers/generate_wallets.dart

@@ -20,7 +20,7 @@ class GenerateWalletsProvider with ChangeNotifier {
   // NewWallet generatedWallet;
   durt.NewWallet? actualWallet;
 
-  FocusNode walletNameFocus = FocusNode();
+  final walletNameFocus = FocusNode();
   Color? askedWordColor = Colors.black;
   bool isAskedWordValid = false;
   int scanedValidWalletNumber = -1;

lib/screens/myWallets/wallets_home.dart

@@ -24,7 +24,6 @@ import 'package:gecko/widgets/payment_popup.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
-// import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
 
 class WalletsHome extends StatefulWidget {
   const WalletsHome({Key? key}) : super(key: key);

lib/screens/wallet_view.dart

@@ -344,8 +344,23 @@ class WalletViewScreen extends StatelessWidget {
                           key: keyPay,
                           splashColor: yellowC,
                           onTap: sub.nodeConnected
-                              ? () {
+                              ? () async {
-                                  paymentPopup(context, address, username);
+                                  String? pin;
+                                  if (myWalletProvider.pinCode == '') {
+                                    pin = await Navigator.push(
+                                      context,
+                                      MaterialPageRoute(
+                                        builder: (homeContext) {
+                                          return UnlockingWallet(
+                                              wallet: defaultWallet);
+                                        },
+                                      ),
+                                    );
+                                  }
+                                  if (pin != null ||
+                                      myWalletProvider.pinCode != '') {
+                                    paymentPopup(context, address, username);
+                                  }
                                 }
                               : null,
                           child: const Padding(

lib/widgets/payment_popup.dart

@@ -4,12 +4,12 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
+import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
-import 'package:gecko/screens/myWallets/choose_wallet.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:gecko/widgets/balance.dart';
@@ -24,8 +24,10 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
 
   double fees = 0;
   const double shapeSize = 20;
-  final defaultWallet = myWalletProvider.getDefaultWallet();
+  var defaultWallet = myWalletProvider.getDefaultWallet();
   bool canValidate = false;
+  final amountFocus = FocusNode();
+  final dropdownKey = GlobalKey();
 
   Future executeTransfert() async {
     String? pin;
@@ -60,6 +62,9 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
     }
   }
 
+  myWalletProvider.readAllWallets();
+  log.d(myWalletProvider.listWallets);
+
   showModalBottomSheet<void>(
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
@@ -140,49 +145,66 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
                       ),
                       const SizedBox(height: 10),
                       Consumer<SubstrateSdk>(builder: (context, sub, _) {
-                        return InkWell(
+                        return DropdownButton(
-                          key: keyChangeChest,
+                          dropdownColor: const Color(0xffffeed1),
-                          onTap: () async {
+                          elevation: 12,
-                            String? pin;
+                          key: dropdownKey,
-                            if (myWalletProvider.pinCode == '') {
+                          value: defaultWallet,
-                              pin = await Navigator.push(
+                          // onTap: () async {
-                                context,
+                          //   await Future.delayed(const Duration(milliseconds: 10));
-                                MaterialPageRoute(
+                          //   amountFocus.requestFocus();
-                                  builder: (homeContext) {
+                          // },
-                                    return UnlockingWallet(
+                          selectedItemBuilder: (_) {
-                                        wallet: defaultWallet);
+                            return myWalletProvider.listWallets
-                                  },
+                                .map((WalletData wallet) {
+                              return Container(
+                                width: 408,
+                                decoration: BoxDecoration(
+                                  border: Border.all(
+                                      color: Colors.blueAccent.shade200,
+                                      width: 2),
+                                  borderRadius: const BorderRadius.all(
+                                      Radius.circular(10.0)),
                                 ),
+                                padding: const EdgeInsets.all(10),
+                                child: Row(children: [
+                                  Text(g1WalletsBox
+                                          .get(wallet.address)
+                                          ?.username ??
+                                      wallet.name!),
+                                  const Spacer(),
+                                  Balance(address: wallet.address, size: 20),
+                                ]),
                               );
-                            }
+                            }).toList();
-                            if (pin != null || myWalletProvider.pinCode != '') {
-                              Navigator.push(
-                                context,
-                                MaterialPageRoute(builder: (context) {
-                                  return ChooseWalletScreen(
-                                      pin: pin ?? myWalletProvider.pinCode);
-                                }),
-                              );
-                            }
                           },
-                          child: Container(
+                          onChanged: (WalletData? newSelectedWallet) async {
-                            width: double.infinity,
+                            defaultWallet = newSelectedWallet!;
-                            decoration: BoxDecoration(
+                            await sub.setCurrentWallet(newSelectedWallet);
-                              border: Border.all(
+                            sub.reload();
-                                  color: Colors.blueAccent.shade200, width: 2),
+                            amountFocus.requestFocus();
-                              borderRadius:
+                            setState(() {});
-                                  const BorderRadius.all(Radius.circular(10.0)),
+                          },
-                            ),
+                          items: myWalletProvider.listWallets
-                            padding: const EdgeInsets.all(10),
+                              .map((WalletData wallet) {
-                            child: Row(children: [
+                            return DropdownMenuItem(
-                              Text(g1WalletsBox
+                              value: wallet,
-                                      .get(defaultWallet.address)
+                              child: Container(
-                                      ?.username ??
+                                color: const Color(0xffffeed1),
-                                  defaultWallet.name!),
+                                width: 408,
-                              const Spacer(),
+                                height: 80,
-                              Balance(address: defaultWallet.address, size: 20),
+                                padding: const EdgeInsets.all(10),
-                            ]),
+                                child: Row(children: [
-                          ),
+                                  Text(g1WalletsBox
+                                          .get(wallet.address)
+                                          ?.username ??
+                                      wallet.name!),
+                                  const Spacer(),
+                                  Balance(address: wallet.address, size: 20),
+                                ]),
+                              ),
+                            );
+                          }).toList(),
                         );
                       }),
                       const SizedBox(height: 12),
@@ -252,6 +274,7 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
                         key: keyAmountField,
                         controller: walletViewProvider.payAmount,
                         autofocus: true,
+                        focusNode: amountFocus,
                         maxLines: 1,
                         textAlign: TextAlign.center,
                         keyboardType: const TextInputType.numberWithOptions(