refacto: headerprofileview

lib/providers/duniter_indexer.dart

@@ -14,6 +14,7 @@ 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/wallet_view.dart';
+import 'package:gecko/widgets/wallet_name.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:truncate/truncate.dart';
@@ -169,7 +170,8 @@ class DuniterIndexer with ChangeNotifier {
         return const SizedBox();
       } else {
         if (canEdit) {
-          return walletOptions.walletName(context, wallet, size, color);
+          return WalletName(
+              context: context, wallet: wallet, size: size, color: color);
         } else {
           return walletOptions.walletNameController(context, wallet, size);
         }
@@ -221,7 +223,11 @@ class DuniterIndexer with ChangeNotifier {
                 return const SizedBox();
               } else {
                 if (canEdit) {
-                  return walletOptions.walletName(context, wallet, size, color);
+                  return WalletName(
+                      context: context,
+                      wallet: wallet,
+                      size: size,
+                      color: color);
                 } else {
                   return walletOptions.walletNameController(
                       context, wallet, size);

lib/providers/home.dart

@@ -10,15 +10,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'dart:async';
 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/unlocking_wallet.dart';
-import 'package:gecko/screens/myWallets/wallets_home.dart';
-import 'package:gecko/screens/search.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb;
 import 'package:path_provider/path_provider.dart' as pp;
@@ -132,104 +125,6 @@ class HomeProvider with ChangeNotifier {
   //       volume: volume, mode: PlayerMode.LOW_LATENCY, stayAwake: false);
   // }
 
-  Widget bottomAppBar(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context, listen: false);
-    WalletsProfilesProvider historyProvider =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-
-    final size = MediaQuery.of(context).size;
-
-    const bool showBottomBar = true;
-
-    return Visibility(
-      visible: showBottomBar,
-      child: Container(
-        color: yellowC,
-        width: size.width,
-        height: 80,
-        child:
-            // Stack(
-            //   children: [
-            //     // CustomPaint(
-            //     //   size: Size(size.width, 110),
-            //     //   painter: CustomRoundedButton(),
-            //     // ),
-            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-          // SizedBox(width: 0),
-          const Spacer(),
-          const SizedBox(width: 11),
-          IconButton(
-            key: keyAppBarSearch,
-            iconSize: 40,
-            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
-            onPressed: () {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (homeContext) {
-                  return const SearchScreen();
-                }),
-              );
-            },
-          ),
-          const SizedBox(width: 22),
-          const Spacer(),
-          IconButton(
-            key: keyAppBarQrcode,
-            iconSize: 70,
-            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
-            onPressed: () async {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              historyProvider.scan(homeContext);
-            },
-          ),
-          const Spacer(),
-          const SizedBox(width: 15),
-          IconButton(
-            key: keyAppBarChest,
-            iconSize: 60,
-            icon: const Image(image: AssetImage('assets/wallet.png')),
-            onPressed: () async {
-              WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
-              String? pin;
-              if (myWalletProvider.pinCode == '') {
-                pin = await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (homeContext) {
-                      return UnlockingWallet(wallet: defaultWallet);
-                    },
-                  ),
-                );
-              }
-
-              if (pin != null || myWalletProvider.pinCode != '') {
-                Navigator.popUntil(
-                  context,
-                  ModalRoute.withName('/'),
-                );
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) {
-                    return const WalletsHome();
-                  }),
-                );
-              }
-            },
-          ),
-          const Spacer(),
-        ]),
-      ),
-    );
-  }
-
   void reload() {
     notifyListeners();
   }

lib/providers/wallet_options.dart

@@ -18,7 +18,6 @@ import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:image_cropper/image_cropper.dart';
-import 'package:truncate/truncate.dart';
 
 class WalletOptionsProvider with ChangeNotifier {
   TextEditingController address = TextEditingController();
@@ -504,26 +503,6 @@ class WalletOptionsProvider with ChangeNotifier {
       ]),
     );
   }
-
-  Widget walletName(BuildContext context, WalletData wallet,
-      [double size = 20, Color color = Colors.black]) {
-    double newSize = wallet.name!.length <= 15 ? size : size - 2;
-
-    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
-      Text(
-        truncate(wallet.name!, 20),
-        textAlign: TextAlign.center,
-        style: TextStyle(
-          fontSize: isTall ? newSize : newSize * 0.9,
-          color: color,
-          fontWeight: FontWeight.w400,
-          fontStyle: FontStyle.italic,
-        ),
-        softWrap: false,
-        overflow: TextOverflow.ellipsis,
-      ),
-    ]);
-  }
 }
 
 Map<String, double> balanceCache = {};

lib/providers/wallets_profiles.dart

@@ -1,20 +1,13 @@
 import 'dart:io';
 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/g1_wallets_list.dart';
-import 'package:gecko/models/widgets_keys.dart';
-import 'package:gecko/providers/cesium_plus.dart';
-import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
-import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
 import 'package:jdenticon_dart/jdenticon_dart.dart';
 import 'package:permission_handler/permission_handler.dart';
 // import 'package:qrscan/qrscan.dart' as scanner;
 import 'package:barcode_scan2/barcode_scan2.dart';
-import 'package:provider/provider.dart';
 
 class WalletsProfilesProvider with ChangeNotifier {
   WalletsProfilesProvider(this.address);
@@ -129,102 +122,6 @@ class WalletsProfilesProvider with ChangeNotifier {
     return _balance;
   }
 
-  Widget headerProfileView(
-      BuildContext context, String address, String? username) {
-    const double avatarSize = 140;
-
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
-    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
-
-    return Stack(children: <Widget>[
-      Consumer<SubstrateSdk>(builder: (context, sub, _) {
-        bool isAccountExist = balanceCache[address] != 0;
-        return Container(
-            height: 180,
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [
-                  isAccountExist ? yellowC : Colors.grey[400]!,
-                  isAccountExist ? const Color(0xFFE7811A) : Colors.grey[600]!,
-                ],
-              ),
-            ));
-      }),
-      Padding(
-        padding: const EdgeInsets.only(left: 30, right: 40),
-        child: Row(children: <Widget>[
-          Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Container(
-                  height: 10,
-                  color: yellowC, // Colors.grey[400],
-                ),
-                Row(children: [
-                  GestureDetector(
-                    key: keyCopyAddress,
-                    onTap: () {
-                      Clipboard.setData(ClipboardData(text: address));
-                      snackCopyKey(context);
-                    },
-                    child: Text(
-                      getShortPubkey(address),
-                      style: const TextStyle(
-                        fontSize: 30,
-                        fontWeight: FontWeight.w800,
-                      ),
-                    ),
-                  ),
-                ]),
-                const SizedBox(height: 25),
-                balance(context, address, 22),
-                const SizedBox(height: 10),
-                walletOptions.idtyStatus(context, address,
-                    isOwner: false, color: Colors.black),
-                getCerts(context, address, 14),
-                // if (username == null &&
-                //     g1WalletsBox.get(address)?.username != null)
-                //   SizedBox(
-                //     width: 230,
-                //     child: Text(
-                //       g1WalletsBox.get(address)?.username ?? '',
-                //       style: const TextStyle(
-                //         fontSize: 27,
-                //         color: Color(0xff814C00),
-                //       ),
-                //     ),
-                //   ),
-                // if (username != null)
-                //   SizedBox(
-                //     width: 230,
-                //     child: Text(
-                //       username,
-                //       style: const TextStyle(
-                //         fontSize: 27,
-                //         color: Color(0xff814C00),
-                //       ),
-                //     ),
-                //   ),
-                const SizedBox(height: 55),
-              ]),
-          const Spacer(),
-          Column(children: <Widget>[
-            ClipOval(
-              child: cesiumPlusProvider.defaultAvatar(avatarSize),
-            ),
-            const SizedBox(height: 25),
-          ]),
-        ]),
-      ),
-      CommonElements().offlineInfo(context),
-    ]);
-  }
-
   bool isContact(String address) {
     return contactsBox.containsKey(address);
   }

lib/screens/activity.dart

@@ -7,11 +7,11 @@ import 'package:gecko/models/queries_indexer.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/header_profile_view.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
 
@@ -32,10 +32,6 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
   @override
   Widget build(BuildContext context) {
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    WalletsProfilesProvider walletProfile =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
 
     return Scaffold(
         key: _scaffoldKey,
@@ -47,9 +43,10 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
             child: Text('accountActivity'.tr()),
           ),
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
         body: Column(children: <Widget>[
-          walletProfile.headerProfileView(context, address, username),
+          HeaderProfileView(
+              context: context, address: address, username: username),
           historyQuery(context),
         ]));
   }

lib/screens/myWallets/chest_options.dart

@@ -8,7 +8,6 @@ import 'package:flutter/services.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/chest_provider.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -16,6 +15,7 @@ import 'package:gecko/screens/myWallets/change_pin.dart';
 import 'package:gecko/screens/myWallets/custom_derivations.dart';
 import 'package:gecko/screens/myWallets/show_seed.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 
 class ChestOptions extends StatelessWidget {
@@ -28,8 +28,6 @@ class ChestOptions extends StatelessWidget {
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     ChestProvider chestProvider =
         Provider.of<ChestProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
 
     ChestData currentChest = chestBox.get(configBox.get('currentChest'))!;
 
@@ -52,7 +50,7 @@ class ChestOptions extends StatelessWidget {
             height: 22,
             child: Text(currentChest.name!),
           )),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
       body: Stack(children: [
         Builder(
           builder: (ctx) => SafeArea(

lib/screens/myWallets/wallet_options.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
@@ -15,6 +14,7 @@ import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/activity.dart';
 import 'package:gecko/screens/myWallets/manage_membership.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/services.dart';
 import 'package:qr_flutter/qr_flutter.dart';
@@ -33,8 +33,6 @@ class WalletOptions extends StatelessWidget {
         Provider.of<WalletsProfilesProvider>(context, listen: false);
     MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
     DuniterIndexer duniterIndexer =
         Provider.of<DuniterIndexer>(context, listen: false);
 
@@ -99,7 +97,7 @@ class WalletOptions extends StatelessWidget {
             ),
           ],
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
         body: Stack(children: [
           Builder(
             builder: (ctx) => SafeArea(

lib/screens/myWallets/wallets_home.dart

@@ -9,7 +9,6 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/models/chest_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:flutter/material.dart';
@@ -22,6 +21,7 @@ import 'package:gecko/screens/myWallets/import_g1_v1.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 
 class WalletsHome extends StatelessWidget {
@@ -32,8 +32,6 @@ class WalletsHome extends StatelessWidget {
     SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
 
     final int currentChestNumber = myWalletProvider.getCurrentChest();
     final ChestData currentChest = chestBox.get(currentChestNumber)!;
@@ -66,7 +64,7 @@ class WalletsHome extends StatelessWidget {
           backgroundColor: const Color(0xffFFD58D),
         ),
         bottomNavigationBar: myWalletProvider.lastFlyBy == ''
-            ? homeProvider.bottomAppBar(context)
+            ? BottomAppBarCustom(context: context)
             : dragInfo(context),
         body: SafeArea(
           child: Stack(children: [

lib/screens/my_contacts.dart

@@ -6,12 +6,12 @@ import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.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/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 
 class ContactsScreen extends StatelessWidget {
@@ -24,8 +24,6 @@ class ContactsScreen extends StatelessWidget {
         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);
 
@@ -53,7 +51,7 @@ class ContactsScreen extends StatelessWidget {
               'contactsManagementWithNbr'.tr(args: ['${myContacts.length}'])),
         ),
       ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
       body: SafeArea(
         child: Stack(children: [
           Padding(

lib/screens/search_result.dart

@@ -6,13 +6,13 @@ import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.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/providers/search.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 
 class SearchResultScreen extends StatelessWidget {
@@ -27,8 +27,6 @@ class SearchResultScreen extends StatelessWidget {
         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);
 
@@ -44,7 +42,7 @@ class SearchResultScreen extends StatelessWidget {
           child: Text('researchResults'.tr()),
         ),
       ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: BottomAppBarCustom(context: context),
       body: SafeArea(
         child: Stack(children: [
           Padding(

lib/screens/settings.dart

@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/settings_provider.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/globals.dart';
+import 'package:gecko/widgets/choose_currency_unit.dart';
 import 'package:polkawallet_sdk/api/types/networkParams.dart';
 import 'package:provider/provider.dart';
 
@@ -48,7 +48,7 @@ class SettingsScreen extends StatelessWidget {
           style: TextStyle(color: Colors.grey[500], fontSize: 22),
         ),
         const SizedBox(height: 20),
-        chooseCurrencyUnit(context),
+        ChooseCurrencyUnit(context: context),
 
         // SizedBox(height: isTall ? 80 : 120),
         const Spacer(),
@@ -79,36 +79,6 @@ class SettingsScreen extends StatelessWidget {
     );
   }
 
-  Widget chooseCurrencyUnit(BuildContext context) {
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
-    return InkWell(
-      key: keyUdUnit,
-      onTap: () async {
-        await homeProvider.changeCurrencyUnit(context);
-      },
-      child: SizedBox(
-        height: 50,
-        child: Row(
-          children: [
-            const SizedBox(width: 12),
-            Text('showUdAmounts'.tr()),
-            const Spacer(),
-            Consumer<HomeProvider>(builder: (context, homeProvider, _) {
-              final bool isUdUnit = configBox.get('isUdUnit') ?? false;
-              return Icon(
-                isUdUnit ? Icons.check_box : Icons.check_box_outline_blank,
-                color: orangeC,
-                size: 32,
-              );
-            }),
-            const SizedBox(width: 30),
-          ],
-        ),
-      ),
-    );
-  }
-
   Widget duniterEndpointSelection(BuildContext context) {
     SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
     String? selectedDuniterEndpoint;

lib/screens/wallet_view.dart

@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/my_wallets.dart';
@@ -19,6 +18,8 @@ import 'package:gecko/screens/myWallets/choose_wallet.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/header_profile_view.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
@@ -41,8 +42,6 @@ class WalletViewScreen extends StatelessWidget {
         Provider.of<CesiumPlusProvider>(context, listen: false);
     walletProfile.address = address;
     SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
     MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
@@ -104,10 +103,11 @@ class WalletViewScreen extends StatelessWidget {
             child: Text('seeAWallet'.tr()),
           ),
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: BottomAppBarCustom(context: context),
         body: SafeArea(
           child: Column(children: <Widget>[
-            walletProfile.headerProfileView(context, address, username),
+            HeaderProfileView(
+                context: context, address: address, username: username),
             SizedBox(height: isTall ? 10 : 0),
             Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
               Column(children: <Widget>[

lib/widgets/bottom_app_bar.dart

@@ -0,0 +1,120 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.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/wallets_profiles.dart';
+import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/screens/myWallets/wallets_home.dart';
+import 'package:gecko/screens/search.dart';
+import 'package:provider/provider.dart';
+
+class BottomAppBarCustom extends StatelessWidget {
+  const BottomAppBarCustom({
+    Key? key,
+    required this.context,
+  }) : super(key: key);
+
+  final BuildContext context;
+
+  @override
+  Widget build(BuildContext context) {
+    MyWalletsProvider myWalletProvider =
+        Provider.of<MyWalletsProvider>(context, listen: false);
+    WalletsProfilesProvider historyProvider =
+        Provider.of<WalletsProfilesProvider>(context, listen: false);
+
+    final size = MediaQuery.of(context).size;
+
+    const bool showBottomBar = true;
+
+    return Visibility(
+      visible: showBottomBar,
+      child: Container(
+        color: yellowC,
+        width: size.width,
+        height: 80,
+        child:
+            // Stack(
+            //   children: [
+            //     // CustomPaint(
+            //     //   size: Size(size.width, 110),
+            //     //   painter: CustomRoundedButton(),
+            //     // ),
+            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
+          // SizedBox(width: 0),
+          const Spacer(),
+          const SizedBox(width: 11),
+          IconButton(
+            key: keyAppBarSearch,
+            iconSize: 40,
+            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
+            onPressed: () {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              Navigator.push(
+                context,
+                MaterialPageRoute(builder: (homeContext) {
+                  return const SearchScreen();
+                }),
+              );
+            },
+          ),
+          const SizedBox(width: 22),
+          const Spacer(),
+          IconButton(
+            key: keyAppBarQrcode,
+            iconSize: 70,
+            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
+            onPressed: () async {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              historyProvider.scan(homeContext);
+            },
+          ),
+          const Spacer(),
+          const SizedBox(width: 15),
+          IconButton(
+            key: keyAppBarChest,
+            iconSize: 60,
+            icon: const Image(image: AssetImage('assets/wallet.png')),
+            onPressed: () async {
+              WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
+              String? pin;
+              if (myWalletProvider.pinCode == '') {
+                pin = await Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (homeContext) {
+                      return UnlockingWallet(wallet: defaultWallet);
+                    },
+                  ),
+                );
+              }
+
+              if (pin != null || myWalletProvider.pinCode != '') {
+                Navigator.popUntil(
+                  context,
+                  ModalRoute.withName('/'),
+                );
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(builder: (context) {
+                    return const WalletsHome();
+                  }),
+                );
+              }
+            },
+          ),
+          const Spacer(),
+        ]),
+      ),
+    );
+  }
+}

lib/widgets/choose_currency_unit.dart

@@ -0,0 +1,46 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/home.dart';
+import 'package:provider/provider.dart';
+
+class ChooseCurrencyUnit extends StatelessWidget {
+  const ChooseCurrencyUnit({
+    Key? key,
+    required this.context,
+  }) : super(key: key);
+
+  final BuildContext context;
+
+  @override
+  Widget build(BuildContext context) {
+    HomeProvider homeProvider =
+        Provider.of<HomeProvider>(context, listen: false);
+    return InkWell(
+      key: keyUdUnit,
+      onTap: () async {
+        await homeProvider.changeCurrencyUnit(context);
+      },
+      child: SizedBox(
+        height: 50,
+        child: Row(
+          children: [
+            const SizedBox(width: 12),
+            Text('showUdAmounts'.tr()),
+            const Spacer(),
+            Consumer<HomeProvider>(builder: (context, homeProvider, _) {
+              final bool isUdUnit = configBox.get('isUdUnit') ?? false;
+              return Icon(
+                isUdUnit ? Icons.check_box : Icons.check_box_outline_blank,
+                color: orangeC,
+                size: 32,
+              );
+            }),
+            const SizedBox(width: 30),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/header_profile_view.dart

@@ -0,0 +1,119 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/cesium_plus.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/common_elements.dart';
+import 'package:provider/provider.dart';
+import 'package:flutter/services.dart';
+
+class HeaderProfileView extends StatelessWidget {
+  const HeaderProfileView({
+    Key? key,
+    required this.context,
+    required this.address,
+    required this.username,
+  }) : super(key: key);
+
+  final BuildContext context;
+  final String address;
+  final String? username;
+
+  @override
+  Widget build(BuildContext context) {
+    const double avatarSize = 140;
+
+    WalletOptionsProvider walletOptions =
+        Provider.of<WalletOptionsProvider>(context, listen: false);
+    CesiumPlusProvider cesiumPlusProvider =
+        Provider.of<CesiumPlusProvider>(context, listen: false);
+    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
+
+    return Stack(children: <Widget>[
+      Consumer<SubstrateSdk>(builder: (context, sub, _) {
+        bool isAccountExist = balanceCache[address] != 0;
+        return Container(
+            height: 180,
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: [
+                  isAccountExist ? yellowC : Colors.grey[400]!,
+                  isAccountExist ? const Color(0xFFE7811A) : Colors.grey[600]!,
+                ],
+              ),
+            ));
+      }),
+      Padding(
+        padding: const EdgeInsets.only(left: 30, right: 40),
+        child: Row(children: <Widget>[
+          Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Container(
+                  height: 10,
+                  color: yellowC, // Colors.grey[400],
+                ),
+                Row(children: [
+                  GestureDetector(
+                    key: keyCopyAddress,
+                    onTap: () {
+                      Clipboard.setData(ClipboardData(text: address));
+                      snackCopyKey(context);
+                    },
+                    child: Text(
+                      getShortPubkey(address),
+                      style: const TextStyle(
+                        fontSize: 30,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                  ),
+                ]),
+                const SizedBox(height: 25),
+                balance(context, address, 22),
+                const SizedBox(height: 10),
+                walletOptions.idtyStatus(context, address,
+                    isOwner: false, color: Colors.black),
+                getCerts(context, address, 14),
+                // if (username == null &&
+                //     g1WalletsBox.get(address)?.username != null)
+                //   SizedBox(
+                //     width: 230,
+                //     child: Text(
+                //       g1WalletsBox.get(address)?.username ?? '',
+                //       style: const TextStyle(
+                //         fontSize: 27,
+                //         color: Color(0xff814C00),
+                //       ),
+                //     ),
+                //   ),
+                // if (username != null)
+                //   SizedBox(
+                //     width: 230,
+                //     child: Text(
+                //       username,
+                //       style: const TextStyle(
+                //         fontSize: 27,
+                //         color: Color(0xff814C00),
+                //       ),
+                //     ),
+                //   ),
+                const SizedBox(height: 55),
+              ]),
+          const Spacer(),
+          Column(children: <Widget>[
+            ClipOval(
+              child: cesiumPlusProvider.defaultAvatar(avatarSize),
+            ),
+            const SizedBox(height: 25),
+          ]),
+        ]),
+      ),
+      CommonElements().offlineInfo(context),
+    ]);
+  }
+}

lib/widgets/wallet_name.dart

@@ -0,0 +1,39 @@
+import 'package:gecko/globals.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:truncate/truncate.dart';
+
+class WalletName extends StatelessWidget {
+  const WalletName({
+    Key? key,
+    required this.context,
+    required this.wallet,
+    required this.size,
+    required this.color,
+  }) : super(key: key);
+
+  final BuildContext context;
+  final WalletData wallet;
+  final double size;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    double newSize = wallet.name!.length <= 15 ? size : size - 2;
+
+    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+      Text(
+        truncate(wallet.name!, 20),
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          fontSize: isTall ? newSize : newSize * 0.9,
+          color: color,
+          fontWeight: FontWeight.w400,
+          fontStyle: FontStyle.italic,
+        ),
+        softWrap: false,
+        overflow: TextOverflow.ellipsis,
+      ),
+    ]);
+  }
+}