WIP: furiously going to refactor state manager...

Merge branch 'dev-compute-transactionTile' into dev
fix: bug on delimiter redondance
2022-12-09 07:51:59 +01:00 · 2022-12-09 06:24:00 +01:00 · 2022-12-09 06:23:47 +01:00 · 2022-12-09 05:21:00 +01:00
52 changed files with 404 additions and 378 deletions
--- a/integration_test/launch_test.sh
+++ b/integration_test/launch_test.sh
@ -24,6 +24,6 @@ echo "ip_address=127.0.0.1" > .env

 # Stop Duniter
 cd integration_test/duniter
-docker compose down
+# docker compose down


--- a/integration_test/utility/general_actions.dart
+++ b/integration_test/utility/general_actions.dart
@ -4,7 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/generate_wallets.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'tests_utility.dart';

 // GENERAL ACTIONS
--- a/integration_test/utility/tests_utility.dart
+++ b/integration_test/utility/tests_utility.dart
@ -8,7 +8,7 @@ import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/generate_wallets.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'dart:io' as io;
 import 'package:gecko/main.dart' as app;

@ -309,7 +309,7 @@ Future bkFastStart([bool restoreChest = true]) async {
 Future startWait() async {
  app.main();
  await waitFor('Test starting...', reverse: true);
-  await tester.pumpAndSettle(const Duration(milliseconds: 300));
+  await tester.pumpAndSettle(const Duration(milliseconds: 700));
  await sleep(3000);
 }

--- a/lib/globals.dart
+++ b/lib/globals.dart
@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/chest_data.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
@ -55,3 +56,18 @@ late int udValue;
 late DateTime startBlockchainTime;

 late int currentUdIndex;
+
+  final Map<int, String> monthsInYear = {
+    1: "month1".tr(),
+    2: "month2".tr(),
+    3: "month3".tr(),
+    4: "month4".tr(),
+    5: "month5".tr(),
+    6: "month6".tr(),
+    7: "month7".tr(),
+    8: "month8".tr(),
+    9: "month9".tr(),
+    10: "month10".tr(),
+    11: "month11".tr(),
+    12: "month12".tr()
+  };
--- a/lib/main.dart
+++ b/lib/main.dart
@ -39,7 +39,7 @@ import 'package:gecko/screens/myWallets/wallets_home.dart';
 import 'package:gecko/screens/search.dart';
 import 'package:gecko/screens/search_result.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter/foundation.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
--- a/lib/providers/chest_provider.dart
+++ b/lib/providers/chest_provider.dart
@ -7,7 +7,7 @@ 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:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ChestProvider with ChangeNotifier {
  void reload() {
--- a/lib/providers/duniter_indexer.dart
+++ b/lib/providers/duniter_indexer.dart
@ -6,22 +6,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 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/search.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallets_profiles.dart';
-import 'package:gecko/screens/wallet_view.dart';
-import 'package:gecko/widgets/balance.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
-import 'package:provider/provider.dart';

 class DuniterIndexer with ChangeNotifier {
  Map<String, String?> walletNameIndexer = {};
  String? fetchMoreCursor;
  Map? pageInfo;
-  int nPage = 1;
-  int nRepositories = 20;
  List? transBC;
  List listIndexerEndpoints = [];
  bool isLoadingIndexer = false;
@ -92,7 +83,6 @@ class DuniterIndexer with ChangeNotifier {

    if (configBox.containsKey('customIndexer')) {
      return configBox.get('customIndexer');
-      // listIndexerEndpoints.insert(0, configBox.get('customIndexer'));
    }

    if (configBox.containsKey('indexerEndpoint')) {
@ -154,125 +144,6 @@ class DuniterIndexer with ChangeNotifier {
    return indexerEndpoint;
  }

-  Widget searchIdentity(BuildContext context, String name) {
-    // WalletOptionsProvider _walletOptions =
-    //     Provider.of<WalletOptionsProvider>(context, listen: false);
-    WalletsProfilesProvider walletsProfiles =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-    final searchProvider = Provider.of<SearchProvider>(context, listen: false);
-    if (indexerEndpoint == '') {
-      return const Text('Aucun résultat');
-    }
-
-    log.d(indexerEndpoint);
-    final httpLink = HttpLink(
-      '$indexerEndpoint/v1/graphql',
-    );
-
-    final client = ValueNotifier(
-      GraphQLClient(
-        cache: GraphQLCache(
-            store: HiveStore()), // GraphQLCache(store: HiveStore())
-        link: httpLink,
-      ),
-    );
-    return GraphQLProvider(
-      client: client,
-      child: Query(
-          options: QueryOptions(
-            document: gql(
-                searchAddressByNameQ), // this is the query string you just created
-            variables: {
-              'name': name,
-            },
-            // pollInterval: const Duration(seconds: 10),
-          ),
-          builder: (QueryResult result,
-              {VoidCallback? refetch, FetchMore? fetchMore}) {
-            if (result.hasException) {
-              return Text(result.exception.toString());
-            }
-
-            if (result.isLoading) {
-              return Text('loading'.tr());
-            }
-
-            final List identities = result.data?['search_identity'] ?? [];
-
-            if (identities.isEmpty) {
-              return Text('noResult'.tr());
-            }
-
-            for (Map profile in identities) {
-              duniterIndexer.walletNameIndexer
-                  .putIfAbsent(profile['pubkey'], () => profile['name']);
-            }
-
-            searchProvider.resultLenght = identities.length;
-            // TODO: Find a way to reload a provider here, in Widget build...
-
-            double avatarSize = 55;
-            return Expanded(
-              child: ListView(children: <Widget>[
-                for (Map profile in identities)
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 5),
-                    child: ListTile(
-                        key: keySearchResult(profile['pubkey']),
-                        horizontalTitleGap: 40,
-                        contentPadding: const EdgeInsets.all(5),
-                        leading: defaultAvatar(avatarSize),
-                        title: Row(children: <Widget>[
-                          Text(getShortPubkey(profile['pubkey']),
-                              style: const TextStyle(
-                                  fontSize: 18,
-                                  fontFamily: 'Monospace',
-                                  fontWeight: FontWeight.w500),
-                              textAlign: TextAlign.center),
-                        ]),
-                        trailing: SizedBox(
-                          width: 110,
-                          child: Row(
-                              mainAxisAlignment: MainAxisAlignment.end,
-                              children: [
-                                Column(
-                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    children: [
-                                      Balance(
-                                          address: profile['pubkey'], size: 16),
-                                    ]),
-                              ]),
-                        ),
-                        subtitle: Row(children: <Widget>[
-                          Text(profile['name'] ?? '',
-                              style: const TextStyle(
-                                  fontSize: 18, fontWeight: FontWeight.w500),
-                              textAlign: TextAlign.center),
-                        ]),
-                        dense: false,
-                        isThreeLine: false,
-                        onTap: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(builder: (context) {
-                              walletsProfiles.address = profile['pubkey'];
-                              return WalletViewScreen(
-                                address: profile['pubkey'],
-                                username: name,
-                                avatar:
-                                    g1WalletsBox.get(profile['pubkey'])?.avatar,
-                              );
-                            }),
-                          );
-                        }),
-                  ),
-              ]),
-            );
-          }),
-    );
-  }
-
  List parseHistory(blockchainTX, pubkey) {
    List transBC = [];
    int i = 0;
@ -296,35 +167,22 @@ class DuniterIndexer with ChangeNotifier {
      }
      transBC[i].add(amount);
      transBC[i].add(direction);
-      // transBC[i].add(''); //transaction comment

      i++;
    }
    return transBC;
  }

-  FetchMoreOptions? checkQueryResult(result, opts, pubkey) {
+  FetchMoreOptions? mergeQueryResult(result, opts, pubkey, nRepositories) {
    final List<dynamic>? blockchainTX =
        (result.data['transaction_connection']['edges'] as List<dynamic>?);
-    // final List<dynamic> mempoolTX =
-    //     (result.data['txsHistoryMp']['receiving'] as List<dynamic>);

    pageInfo = result.data['transaction_connection']['pageInfo'];
    fetchMoreCursor = pageInfo!['endCursor'];
    final hasNextPage = pageInfo!['hasNextPage'];
    final hasPreviousPage = pageInfo!['hasPreviousPage'];
-    if (fetchMoreCursor == null) nPage = 1;
-
    log.d('endCursor: $fetchMoreCursor $hasNextPage $hasPreviousPage');

-    // if (nPage == 1) {
-    //   nRepositories = 20;
-    // } else if (nPage == 4) {
-    //   nRepositories = 40;
-    // }
-    // // nRepositories = 10;
-    nPage++;
-
    if (fetchMoreCursor != null) {
      opts = FetchMoreOptions(
        variables: {'cursor': fetchMoreCursor, 'number': nRepositories},
@ -336,18 +194,12 @@ class DuniterIndexer with ChangeNotifier {
                as List<dynamic>
          ];

-          log.d('repos:  $previousResultData');
-          log.d('repos:  $fetchMoreResultData');
-          log.d('repos:  $repos');
-
          fetchMoreResultData['transaction_connection']['edges'] = repos;
          return fetchMoreResultData;
        },
      );
    }

-    log.d(
-        "###### DEBUG H Parse blockchainTX list. Cursor: $fetchMoreCursor ######");
    if (fetchMoreCursor != null) {
      transBC = parseHistory(blockchainTX, pubkey);
    } else {
@ -395,3 +247,86 @@ Future<QueryResult> _execQuery(

  return await client.query(options);
 }
+
+Map computeHistoryView(repository, lastDateDelimiter, isDouble) {
+  bool isTody = false;
+  bool isYesterday = false;
+  bool isThisWeek = false;
+  bool isMigrationTime = false;
+  String? dateDelimiter;
+  DateTime now = DateTime.now();
+  final bool isUdUnit = configBox.get('isUdUnit') ?? false;
+
+  late double amount;
+  late String finalAmount;
+  DateTime date = repository[0];
+  String dateForm;
+  bool isDelimiter = true;
+
+  if ({4, 10, 11, 12}.contains(date.month)) {
+    dateForm = "${date.day} ${monthsInYear[date.month]!.substring(0, 3)}.";
+  } else if ({1, 2, 7, 9}.contains(date.month)) {
+    dateForm = "${date.day} ${monthsInYear[date.month]!.substring(0, 4)}.";
+  } else {
+    dateForm = "${date.day} ${monthsInYear[date.month]}";
+  }
+
+  final transactionDate = DateTime(date.year, date.month, date.day);
+  final todayDate = DateTime(now.year, now.month, now.day);
+  final yesterdayDate = DateTime(now.year, now.month, now.day - 1);
+
+  if (transactionDate == todayDate && !isTody) {
+    dateDelimiter = lastDateDelimiter = "today".tr();
+    isTody = true;
+  } else if (transactionDate == yesterdayDate && !isYesterday) {
+    dateDelimiter = lastDateDelimiter = "yesterday".tr();
+    isYesterday = true;
+  } else if (weekNumber(date) == weekNumber(now) &&
+      date.year == now.year &&
+      transactionDate != yesterdayDate &&
+      transactionDate != todayDate &&
+      !isThisWeek) {
+    dateDelimiter = lastDateDelimiter = "thisWeek".tr();
+    isThisWeek = true;
+  } else if (lastDateDelimiter != "${monthsInYear[date.month]} ${date.year}" &&
+      transactionDate != todayDate &&
+      transactionDate != yesterdayDate &&
+      !(weekNumber(date) == weekNumber(now) && date.year == now.year)) {
+    if (date.year == now.year) {
+      dateDelimiter = lastDateDelimiter = monthsInYear[date.month];
+    } else {
+      dateDelimiter =
+          lastDateDelimiter = "${monthsInYear[date.month]} ${date.year}";
+    }
+  } else {
+    isDelimiter = false;
+  }
+
+  amount = repository[4] == 'RECEIVED' ? repository[3] : repository[3] * -1;
+
+  if (isUdUnit) {
+    amount = round(amount / balanceRatio);
+    finalAmount = 'ud'.tr(args: ['$amount ']);
+  } else {
+    finalAmount = '$amount $currencyName';
+  }
+
+  if (date.compareTo(startBlockchainTime) < 0) {
+    isMigrationTime = true;
+  } else {
+    isMigrationTime = false;
+  }
+
+  return {
+    'finalAmount': finalAmount,
+    'isMigrationTime': isMigrationTime,
+    'dateDelimiter': dateDelimiter ?? '',
+    'isDelimiter': isDelimiter,
+    'dateForm': dateForm,
+  };
+}
+
+int weekNumber(DateTime date) {
+  int dayOfYear = int.parse(DateFormat("D").format(date));
+  return ((dayOfYear - date.weekday + 10) / 7).floor();
+}
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@ -11,7 +11,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:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import "package:unorm_dart/unorm_dart.dart" as unorm;

 class GenerateWalletsProvider with ChangeNotifier {
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@ -18,7 +18,7 @@ import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb;
 import 'package:path_provider/path_provider.dart' as pp;
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class HomeProvider with ChangeNotifier {
  bool? isSearching;
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@ -5,9 +5,9 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/common_elements.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

-class MyWalletsProvider with ChangeNotifier {
+class MyWalletsProvider extends ChangeNotifier {
  List<WalletData> listWallets = [];
  String pinCode = '';
  late String mnemonic;
@ -233,3 +233,9 @@ class MyWalletsProvider with ChangeNotifier {
    notifyListeners();
  }
 }
+
+  // Finally, we are using StateNotifierProvider to allow the UI to interact with
+// our TodosNotifier class.
+final myWalletsProvider = ChangeNotifierProvider<MyWalletsProvider>((ref) {
+  return MyWalletsProvider();
+});
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@ -19,7 +19,7 @@ import 'package:polkawallet_sdk/polkawallet_sdk.dart';
 import 'package:polkawallet_sdk/storage/keyring.dart';
 import 'package:polkawallet_sdk/storage/types/keyPairData.dart';
 import 'package:polkawallet_sdk/webviewWithExtension/types/signExtrinsicParam.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:truncate/truncate.dart';
 import 'package:pointycastle/pointycastle.dart' as pc;
 import "package:hex/hex.dart";
@ -180,8 +180,6 @@ class SubstrateSdk with ChangeNotifier {
  }

  Future<Map<String, double>> getBalance(String address) async {
-    log.d('BALANCE: $address');
-
    if (!nodeConnected) {
      return {
        'transferableBalance': 0,
@ -220,6 +218,8 @@ class SubstrateSdk with ChangeNotifier {
    };

    // log.i(finalBalances);
+    log.d(
+        '${getShortPubkey(address)} --- BALANCE: ${finalBalances['transferableBalance']}');

    return finalBalances;
  }
@ -887,7 +887,7 @@ class SubstrateSdk with ChangeNotifier {

    final toCerts = await getCertsCounter(destAddress);

-    // log.d('debug: ${currencyParameters['minCertForMembership']}');
+    log.i('debug: ${currencyParameters['minCertForMembership']}');

    if (toIdtyStatus == 'noid') {
      txInfo = TxInfoData(
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@ -15,7 +15,7 @@ import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:image_cropper/image_cropper.dart';

 class WalletOptionsProvider with ChangeNotifier {
--- a/lib/screens/activity.dart
+++ b/lib/screens/activity.dart
@ -6,13 +6,12 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/models/queries_indexer.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/header_profile.dart';
 import 'package:gecko/widgets/transaction_tile.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ActivityScreen extends StatefulWidget with ChangeNotifier {
  ActivityScreen({required this.address, required this.avatar, this.username})
@ -26,14 +25,10 @@ class ActivityScreen extends StatefulWidget with ChangeNotifier {
 }

 class _ActivityScreenState extends State<ActivityScreen> {
-  @override
-  void initState() {
-    final duniterIndexerInit =
-        Provider.of<DuniterIndexer>(context, listen: false);
-    duniterIndexerInit.nPage = 1;
-
-    super.initState();
-  }
+  // @override
+  // void initState() {
+  //   super.initState();
+  // }

  final ScrollController scrollController = ScrollController();
  final double avatarsSize = 80;
@ -62,6 +57,8 @@ class _ActivityScreenState extends State<ActivityScreen> {

  Widget historyQuery(context) {
    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+    int nPage = 1;
+    int nRepositories = 20;

    if (indexerEndpoint == '') {
      return Column(children: <Widget>[
@ -132,9 +129,22 @@ class _ActivityScreenState extends State<ActivityScreen> {
              }

              if (result.isNotLoading) {
-                // log.d(result.data);
-                opts = duniterIndexer.checkQueryResult(
-                    result, opts, widget.address);
+                if (duniterIndexer.fetchMoreCursor == null) nPage = 1;
+
+                // log.d('nPage: $nPage');
+
+                if (nPage <= 3) {
+                  nRepositories = 20;
+                } else if (nPage <= 6) {
+                  nRepositories = 40;
+                } else if (nPage <= 12) {
+                  nRepositories = 80;
+                } else {
+                  nRepositories = 120;
+                }
+                nPage++;
+                opts = duniterIndexer.mergeQueryResult(
+                    result, opts, widget.address, nRepositories);
              }

              // Build history list
@ -167,6 +177,11 @@ class _ActivityScreenState extends State<ActivityScreen> {

  Widget historyView(context, result) {
    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+    int keyID = 0;
+    const double avatarSize = 200;
+    String? lastDateDelimiter;
+    bool? isDouble;
+    bool isMigrationPassed = false;

    return duniterIndexer.transBC == null
        ? Column(children: <Widget>[
@ -177,7 +192,53 @@ class _ActivityScreenState extends State<ActivityScreen> {
            )
          ])
        : Column(children: <Widget>[
-            getHistory(context, duniterIndexer),
+            Column(
+                children: duniterIndexer.transBC!.map((repository) {
+              final answer =
+                  computeHistoryView(repository, lastDateDelimiter, isDouble);
+              isDouble = lastDateDelimiter == answer['dateDelimiter'] ||
+                  answer['dateDelimiter'] == '';
+              lastDateDelimiter = answer['dateDelimiter'];
+              bool isMigrationTime = false;
+              if (answer['isMigrationTime'] && !isMigrationPassed) {
+                isMigrationPassed = true;
+                isMigrationTime = true;
+              }
+
+              return Column(children: <Widget>[
+                if (isMigrationTime)
+                  const Padding(
+                    padding: EdgeInsets.symmetric(vertical: 30),
+                    child: Text(
+                      'Début de la ĞDev',
+                      style: TextStyle(
+                          fontSize: 25,
+                          color: Colors.blueAccent,
+                          fontWeight: FontWeight.w500),
+                    ),
+                  ),
+                if (!isDouble!)
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 30),
+                    child: Text(
+                      answer['dateDelimiter'],
+                      style: const TextStyle(
+                          fontSize: 23,
+                          color: orangeC,
+                          fontWeight: FontWeight.w300),
+                    ),
+                  ),
+                TransactionTile(
+                    widget: widget,
+                    keyID: keyID,
+                    avatarSize: avatarSize,
+                    repository: repository,
+                    dateForm: answer['dateForm'],
+                    finalAmount: answer['finalAmount'],
+                    duniterIndexer: duniterIndexer,
+                    context: context),
+              ]);
+            }).toList()),
            if (result.isLoading && duniterIndexer.pageInfo!['hasPreviousPage'])
              Row(
                mainAxisAlignment: MainAxisAlignment.center,
@ -197,138 +258,4 @@ class _ActivityScreenState extends State<ActivityScreen> {
              )
          ]);
  }
-
-  Widget getHistory(BuildContext context, DuniterIndexer duniterIndexer) {
-    int keyID = 0;
-    String? dateDelimiter;
-    String? lastDateDelimiter;
-    const double avatarSize = 200;
-
-    bool isTody = false;
-    bool isYesterday = false;
-    bool isThisWeek = false;
-    bool isMigrationTime = false;
-    bool isMigrationTimePassed = false;
-
-    final Map<int, String> monthsInYear = {
-      1: "month1".tr(),
-      2: "month2".tr(),
-      3: "month3".tr(),
-      4: "month4".tr(),
-      5: "month5".tr(),
-      6: "month6".tr(),
-      7: "month7".tr(),
-      8: "month8".tr(),
-      9: "month9".tr(),
-      10: "month10".tr(),
-      11: "month11".tr(),
-      12: "month12".tr()
-    };
-
-    return Column(
-        children: duniterIndexer.transBC!.map((repository) {
-      // log.d('bbbbbbbbbbbbbbbbbbbbbb: ' + repository.toString());
-
-      DateTime now = DateTime.now();
-      DateTime date = repository[0];
-
-      String dateForm;
-      if ({4, 10, 11, 12}.contains(date.month)) {
-        dateForm = "${date.day} ${monthsInYear[date.month]!.substring(0, 3)}.";
-      } else if ({1, 2, 7, 9}.contains(date.month)) {
-        dateForm = "${date.day} ${monthsInYear[date.month]!.substring(0, 4)}.";
-      } else {
-        dateForm = "${date.day} ${monthsInYear[date.month]}";
-      }
-
-      int weekNumber(DateTime date) {
-        int dayOfYear = int.parse(DateFormat("D").format(date));
-        return ((dayOfYear - date.weekday + 10) / 7).floor();
-      }
-
-      final transactionDate = DateTime(date.year, date.month, date.day);
-      final todayDate = DateTime(now.year, now.month, now.day);
-      final yesterdayDate = DateTime(now.year, now.month, now.day - 1);
-
-      if (transactionDate == todayDate && !isTody) {
-        dateDelimiter = lastDateDelimiter = "today".tr();
-        isTody = true;
-      } else if (transactionDate == yesterdayDate && !isYesterday) {
-        dateDelimiter = lastDateDelimiter = "yesterday".tr();
-        isYesterday = true;
-      } else if (weekNumber(date) == weekNumber(now) &&
-          date.year == now.year &&
-          lastDateDelimiter != "thisWeek".tr() &&
-          transactionDate != yesterdayDate &&
-          transactionDate != todayDate &&
-          !isThisWeek) {
-        dateDelimiter = lastDateDelimiter = "thisWeek".tr();
-        isThisWeek = true;
-      } else if (lastDateDelimiter != monthsInYear[date.month] &&
-          lastDateDelimiter != "${monthsInYear[date.month]} ${date.year}" &&
-          transactionDate != todayDate &&
-          transactionDate != yesterdayDate &&
-          !(weekNumber(date) == weekNumber(now) && date.year == now.year)) {
-        if (date.year == now.year) {
-          dateDelimiter = lastDateDelimiter = monthsInYear[date.month];
-        } else {
-          dateDelimiter =
-              lastDateDelimiter = "${monthsInYear[date.month]} ${date.year}";
-        }
-      } else {
-        dateDelimiter = null;
-      }
-
-      final bool isUdUnit = configBox.get('isUdUnit') ?? false;
-      late double amount;
-      late String finalAmount;
-      amount = repository[4] == 'RECEIVED' ? repository[3] : repository[3] * -1;
-
-      if (isUdUnit) {
-        amount = round(amount / balanceRatio);
-        finalAmount = 'ud'.tr(args: ['$amount ']);
-      } else {
-        finalAmount = '$amount $currencyName';
-      }
-
-      if (!isMigrationTimePassed && date.compareTo(startBlockchainTime) < 0) {
-        isMigrationTimePassed = true;
-        isMigrationTime = true;
-      } else {
-        isMigrationTime = false;
-      }
-
-      return Column(children: <Widget>[
-        if (isMigrationTime)
-          const Padding(
-            padding: EdgeInsets.symmetric(vertical: 30),
-            child: Text(
-              'Début de la ĞDev',
-              style: TextStyle(
-                  fontSize: 25,
-                  color: Colors.blueAccent,
-                  fontWeight: FontWeight.w500),
-            ),
-          ),
-        if (dateDelimiter != null)
-          Padding(
-            padding: const EdgeInsets.symmetric(vertical: 30),
-            child: Text(
-              dateDelimiter!,
-              style: const TextStyle(
-                  fontSize: 23, color: orangeC, fontWeight: FontWeight.w300),
-            ),
-          ),
-        TransactionTile(
-            widget: widget,
-            keyID: keyID,
-            avatarSize: avatarSize,
-            repository: repository,
-            dateForm: dateForm,
-            finalAmount: finalAmount,
-            duniterIndexer: duniterIndexer,
-            context: context),
-      ]);
-    }).toList());
-  }
 }
--- a/lib/screens/common_elements.dart
+++ b/lib/screens/common_elements.dart
@ -5,7 +5,7 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class CommonElements {
  // Exemple de Widget
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@ -25,7 +25,7 @@ import 'package:gecko/screens/search.dart';
 import 'package:gecko/screens/settings.dart';
 import 'package:hive_flutter/hive_flutter.dart';

-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:gecko/screens/my_contacts.dart';

 class HomeScreen extends StatefulWidget {
--- a/lib/screens/myWallets/change_pin.dart
+++ b/lib/screens/myWallets/change_pin.dart
@ -11,7 +11,7 @@ import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';

-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ChangePinScreen extends StatelessWidget with ChangeNotifier {
  ChangePinScreen(
--- a/lib/screens/myWallets/chest_options.dart
+++ b/lib/screens/myWallets/chest_options.dart
@ -16,7 +16,7 @@ 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';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ChestOptions extends StatelessWidget {
  const ChestOptions({Key? keyMyWallets, required this.walletProvider})
--- a/lib/screens/myWallets/choose_chest.dart
+++ b/lib/screens/myWallets/choose_chest.dart
@ -12,7 +12,7 @@ import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:gecko/screens/myWallets/wallets_home.dart';
 import 'package:gecko/screens/onBoarding/5.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ChooseChest extends StatefulWidget {
  const ChooseChest({Key? key}) : super(key: key);
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@ -12,9 +12,9 @@ import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/myWallets/wallets_home.dart';
 import 'package:gecko/widgets/balance.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 // import 'package:gecko/models/home.dart';
-// import 'package:provider/provider.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ChooseWalletScreen extends StatelessWidget {
  ChooseWalletScreen({Key? key, required this.pin}) : super(key: key);
--- a/lib/screens/myWallets/custom_derivations.dart
+++ b/lib/screens/myWallets/custom_derivations.dart
@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class CustomDerivation extends StatefulWidget {
  const CustomDerivation({Key? key}) : super(key: key);
--- a/lib/screens/myWallets/import_g1_v1.dart
+++ b/lib/screens/myWallets/import_g1_v1.dart
@ -16,7 +16,7 @@ import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:gecko/widgets/certifications.dart';
 import 'package:gecko/widgets/idty_status.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ImportG1v1 extends StatelessWidget {
  const ImportG1v1({Key? key}) : super(key: key);
--- a/lib/screens/myWallets/manage_membership.dart
+++ b/lib/screens/myWallets/manage_membership.dart
@ -12,14 +12,14 @@ import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/myWallets/migrate_identity.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 // import 'package:gecko/models/wallet_data.dart';
 // import 'package:gecko/providers/my_wallets.dart';
 // import 'package:gecko/providers/substrate_sdk.dart';
 // import 'package:gecko/screens/common_elements.dart';
 // import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 // import 'package:gecko/screens/transaction_in_progress.dart';
-// import 'package:provider/provider.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ManageMembership extends StatelessWidget {
  const ManageMembership({Key? key, required this.address}) : super(key: key);
--- a/lib/screens/myWallets/migrate_identity.dart
+++ b/lib/screens/myWallets/migrate_identity.dart
@ -13,7 +13,7 @@ import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class MigrateIdentityScreen extends StatelessWidget {
  const MigrateIdentityScreen({Key? key}) : super(key: key);
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@ -9,9 +9,9 @@ import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/7.dart';
 import 'package:gecko/screens/onBoarding/9.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 // import 'package:gecko/models/home.dart';
-// import 'package:provider/provider.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';

 class RestoreChest extends StatelessWidget {
  const RestoreChest({Key? key, this.skipIntro = false}) : super(key: key);
--- a/lib/screens/myWallets/show_seed.dart
+++ b/lib/screens/myWallets/show_seed.dart
@ -11,7 +11,7 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:pdf/pdf.dart';
 import 'package:printing/printing.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:pdf/widgets.dart' as pw;

 class ShowSeed extends StatelessWidget {
--- a/lib/screens/myWallets/unlocking_wallet.dart
+++ b/lib/screens/myWallets/unlocking_wallet.dart
@ -13,7 +13,7 @@ import 'package:gecko/providers/wallet_options.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/screens/myWallets/choose_chest.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:gecko/globals.dart';

 class UnlockingWallet extends StatelessWidget {
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@ -22,7 +22,7 @@ import 'package:gecko/widgets/certifications.dart';
 import 'package:gecko/widgets/idty_status.dart';
 import 'package:gecko/widgets/name_by_address.dart';
 import 'package:gecko/widgets/page_route_no_transition.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 import 'package:qr_flutter/qr_flutter.dart';

--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@ -21,16 +21,17 @@ import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/screens/wallet_view.dart';
 import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:truncate/truncate.dart';

-class WalletsHome extends StatelessWidget {
+class WalletsHome extends ConsumerWidget {
  const WalletsHome({Key? key}) : super(key: key);

  @override
-  Widget build(BuildContext context) {
-    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+  Widget build(BuildContext context, WidgetRef ref) {
+    // final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    final listWallets = ref.watch(myWalletsProvider).listWallets;

    final currentChestNumber = myWalletProvider.getCurrentChest();
    final ChestData currentChest = chestBox.get(currentChestNumber)!;
--- a/lib/screens/my_contacts.dart
+++ b/lib/screens/my_contacts.dart
@ -7,7 +7,7 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/contacts_list.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class ContactsScreen extends StatelessWidget {
  const ContactsScreen({Key? key}) : super(key: key);
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@ -16,7 +16,7 @@ import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/11_congratulations.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class OnboardingStepTen extends StatelessWidget {
  OnboardingStepTen({Key? validationKey, this.scanDerivation = false})
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@ -12,7 +12,7 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/6.dart';
 import 'package:printing/printing.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 AsyncSnapshot<List>? mnemoList;

--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@ -10,7 +10,7 @@ import 'package:gecko/providers/generate_wallets.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/7.dart';
 import 'package:gecko/screens/onBoarding/9.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class OnboardingStepSix extends StatelessWidget {
  OnboardingStepSix(
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@ -7,7 +7,7 @@ import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/generate_wallets.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/10.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class OnboardingStepNine extends StatelessWidget {
  const OnboardingStepNine({Key? key, this.scanDerivation = false})
--- a/lib/screens/qrcode_fullscreen.dart
+++ b/lib/screens/qrcode_fullscreen.dart
@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 // import 'package:gecko/models/home.dart';
-// import 'package:provider/provider.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';

 class QrCodeFullscreen extends StatelessWidget {
  TextEditingController tplController = TextEditingController();
--- a/lib/screens/search.dart
+++ b/lib/screens/search.dart
@ -11,7 +11,7 @@ import 'package:gecko/providers/search.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/search_result.dart';
 import 'package:gecko/screens/wallet_view.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class SearchScreen extends StatefulWidget {
  const SearchScreen({Key? key}) : super(key: key);
--- a/lib/screens/search_result.dart
+++ b/lib/screens/search_result.dart
@ -8,7 +8,7 @@ import 'package:gecko/providers/search.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/search_result_list.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class SearchResultScreen extends StatelessWidget {
  const SearchResultScreen({Key? key}) : super(key: key);
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@ -9,7 +9,7 @@ import 'package:gecko/providers/settings_provider.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/globals.dart';
 import 'package:polkawallet_sdk/api/types/networkParams.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class SettingsScreen extends StatelessWidget {
  final MyWalletsProvider _myWallets = MyWalletsProvider();
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@ -6,9 +6,9 @@ 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/wallets_profiles.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 // import 'package:gecko/models/home.dart';
-// import 'package:provider/provider.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';

 class TransactionInProgress extends StatelessWidget {
  const TransactionInProgress(
@ -32,8 +32,6 @@ class TransactionInProgress extends StatelessWidget {
    // Map jsonResult;
    final result = sub.transactionStatus;

-    // sub.spawnBlock();
-
    log.d(walletProfiles.address);

    final from = fromAddress ?? myWalletProvider.getDefaultWallet().name!;
@ -98,8 +96,7 @@ class TransactionInProgress extends StatelessWidget {
          if (result.contains('blockHash: ')) {
            isValid = true;
            resultText = 'extrinsicValidated'.tr(args: [actionName]);
-            log.i(
-                'g1migration Bloc of last transaction: ${sub.blocNumber} --- $result');
+            log.i('Bloc of last transaction: ${sub.blocNumber} --- $result');
          } else {
            isValid = false;
            resultText = "${"anErrorOccurred".tr()}:\n";
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@ -24,7 +24,7 @@ import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:gecko/widgets/header_profile.dart';
 import 'package:gecko/widgets/page_route_no_transition.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:qr_flutter/qr_flutter.dart';

 class WalletViewScreen extends StatelessWidget {
@ -162,8 +162,8 @@ class WalletViewScreen extends StatelessWidget {
                  builder: (context, AsyncSnapshot<Map<String, int>> snapshot) {
                    if (snapshot.data == null) return const SizedBox();
                    String duration = '';
-                    log.d('certDelay ${snapshot.data!['certDelay']}');
-                    log.d('certRenewable ${snapshot.data!['certRenewable']}');
+                    log.d(
+                        '${getShortPubkey(address)} --- certDelay ${snapshot.data!['certDelay']} --- certRenewable ${snapshot.data!['certRenewable']}');

                    if (snapshot.data!['certDelay'] != null ||
                        snapshot.data!['certRenewable'] != null) {
--- a/lib/widgets/balance.dart
+++ b/lib/widgets/balance.dart
@ -3,7 +3,7 @@ import 'package:gecko/globals.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/widgets/ud_unit_display.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class Balance extends StatelessWidget {
  const Balance(
--- a/lib/widgets/bottom_app_bar.dart
+++ b/lib/widgets/bottom_app_bar.dart
@ -10,7 +10,7 @@ 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';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class GeckoBottomAppBar extends StatelessWidget {
  const GeckoBottomAppBar({Key? key, this.actualRoute = ''}) : super(key: key);
--- a/lib/widgets/certifications.dart
+++ b/lib/widgets/certifications.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class Certifications extends StatelessWidget {
  const Certifications(
--- a/lib/widgets/certs_counter.dart
+++ b/lib/widgets/certs_counter.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class CertsCounter extends StatelessWidget {
  const CertsCounter({Key? key, required this.address, this.isSent = false})
--- a/lib/widgets/header_profile.dart
+++ b/lib/widgets/header_profile.dart
@ -13,7 +13,7 @@ import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/certifications.dart';
 import 'package:gecko/widgets/idty_status.dart';
 import 'package:gecko/widgets/page_route_no_transition.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class HeaderProfile extends StatelessWidget {
  const HeaderProfile({
--- a/lib/widgets/idty_status.dart
+++ b/lib/widgets/idty_status.dart
@ -5,7 +5,7 @@ import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/widgets/animated_text.dart';
 import 'package:gecko/widgets/name_by_address.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class IdentityStatus extends StatelessWidget {
  const IdentityStatus(
--- a/lib/widgets/name_by_address.dart
+++ b/lib/widgets/name_by_address.dart
@ -6,7 +6,7 @@ import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/widgets/wallet_name.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:truncate/truncate.dart';

 class NameByAddress extends StatelessWidget {
--- a/lib/widgets/search_identity_query.dart
+++ b/lib/widgets/search_identity_query.dart
@ -0,0 +1,137 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+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/search.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:graphql_flutter/graphql_flutter.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class SearchIdentityQuery extends StatelessWidget {
+  const SearchIdentityQuery({Key? key, required this.name}) : super(key: key);
+  final String name;
+
+  @override
+  Widget build(BuildContext context) {
+    WalletsProfilesProvider walletsProfiles =
+        Provider.of<WalletsProfilesProvider>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+    final searchProvider = Provider.of<SearchProvider>(context, listen: false);
+    if (indexerEndpoint == '') {
+      return const Text('Aucun résultat');
+    }
+
+    log.d(indexerEndpoint);
+    final httpLink = HttpLink(
+      '$indexerEndpoint/v1/graphql',
+    );
+
+    final client = ValueNotifier(
+      GraphQLClient(
+        cache: GraphQLCache(
+            store: HiveStore()), // GraphQLCache(store: HiveStore())
+        link: httpLink,
+      ),
+    );
+    return GraphQLProvider(
+      client: client,
+      child: Query(
+          options: QueryOptions(
+            document: gql(
+                searchAddressByNameQ), // this is the query string you just created
+            variables: {
+              'name': name,
+            },
+            // pollInterval: const Duration(seconds: 10),
+          ),
+          builder: (QueryResult result,
+              {VoidCallback? refetch, FetchMore? fetchMore}) {
+            if (result.hasException) {
+              return Text(result.exception.toString());
+            }
+
+            if (result.isLoading) {
+              return Text('loading'.tr());
+            }
+
+            final List identities = result.data?['search_identity'] ?? [];
+
+            if (identities.isEmpty) {
+              return Text('noResult'.tr());
+            }
+
+            for (Map profile in identities) {
+              duniterIndexer.walletNameIndexer
+                  .putIfAbsent(profile['pubkey'], () => profile['name']);
+            }
+
+            searchProvider.resultLenght = identities.length;
+            // TODO: Find a way to reload a provider here, in Widget build...
+
+            double avatarSize = 55;
+            return Expanded(
+              child: ListView(children: <Widget>[
+                for (Map profile in identities)
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 5),
+                    child: ListTile(
+                        key: keySearchResult(profile['pubkey']),
+                        horizontalTitleGap: 40,
+                        contentPadding: const EdgeInsets.all(5),
+                        leading: defaultAvatar(avatarSize),
+                        title: Row(children: <Widget>[
+                          Text(getShortPubkey(profile['pubkey']),
+                              style: const TextStyle(
+                                  fontSize: 18,
+                                  fontFamily: 'Monospace',
+                                  fontWeight: FontWeight.w500),
+                              textAlign: TextAlign.center),
+                        ]),
+                        trailing: SizedBox(
+                          width: 110,
+                          child: Row(
+                              mainAxisAlignment: MainAxisAlignment.end,
+                              children: [
+                                Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Balance(
+                                          address: profile['pubkey'], size: 16),
+                                    ]),
+                              ]),
+                        ),
+                        subtitle: Row(children: <Widget>[
+                          Text(profile['name'] ?? '',
+                              style: const TextStyle(
+                                  fontSize: 18, fontWeight: FontWeight.w500),
+                              textAlign: TextAlign.center),
+                        ]),
+                        dense: false,
+                        isThreeLine: false,
+                        onTap: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (context) {
+                              walletsProfiles.address = profile['pubkey'];
+                              return WalletViewScreen(
+                                address: profile['pubkey'],
+                                username: name,
+                                avatar:
+                                    g1WalletsBox.get(profile['pubkey'])?.avatar,
+                              );
+                            }),
+                          );
+                        }),
+                  ),
+              ]),
+            );
+          }),
+    );
+  }
+}
--- a/lib/widgets/search_result_list.dart
+++ b/lib/widgets/search_result_list.dart
@ -11,6 +11,7 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/wallet_view.dart';
 import 'package:gecko/widgets/balance.dart';
 import 'package:gecko/widgets/name_by_address.dart';
+import 'package:gecko/widgets/search_identity_query.dart';

 class SearchResult extends StatelessWidget {
  const SearchResult({
@ -33,8 +34,8 @@ class SearchResult extends StatelessWidget {
      builder: (context, AsyncSnapshot<List?> snapshot) {
        if (snapshot.connectionState == ConnectionState.done) {
          if (snapshot.data?.isEmpty ?? true) {
-            return duniterIndexer.searchIdentity(
-                context, searchProvider.searchController.text);
+            return SearchIdentityQuery(
+                name: searchProvider.searchController.text);
            // const Text('Aucun résultat');
          } else {
            return Expanded(
--- a/lib/widgets/template.dart
+++ b/lib/widgets/template.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';

 class TemplateWidget extends StatelessWidget {
  const TemplateWidget(
--- a/lib/widgets/transaction_tile.dart
+++ b/lib/widgets/transaction_tile.dart
@ -80,8 +80,6 @@ class TransactionTile extends StatelessWidget {
          dense: false,
          isThreeLine: false,
          onTap: () {
-            duniterIndexer.nPage = 1;
-            // _cesiumPlusProvider.avatarCancelToken.cancel('cancelled');
            Navigator.push(
              context,
              PageNoTransit(builder: (context) {
--- a/pubspec.lock
+++ b/pubspec.lock
@ -436,6 +436,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.7"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
  flutter_svg:
    dependency: "direct main"
    description:
@ -792,13 +799,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.1.3"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
  nm:
    dependency: transitive
    description:
@ -1025,13 +1025,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.1.0"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.0.4"
  pub_semver:
    dependency: transitive
    description:
@ -1083,6 +1076,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.2.0"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
  rxdart:
    dependency: transitive
    description:
@ -1221,6 +1221,13 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "1.10.0"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.2+1"
  stream_channel:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -28,7 +28,7 @@ dependencies:
  permission_handler: ^10.0.0
  pin_code_fields: ^7.4.0
  printing: ^5.9.3
-  provider: ^6.0.1
+  # provider: ^6.0.4
  barcode_scan2: ^4.2.1
  qr_flutter: #^4.0.0
    git:
@ -64,6 +64,7 @@ dependencies:
  fast_base58: ^0.2.1
  graphql: ^5.1.1
  hive_generator: ^2.0.0
+  flutter_riverpod: ^2.1.1

 dev_dependencies:
  # flutter_launcher_icons: ^0.9.2
Author	SHA1	Message	Date
poka	79e12eb44b	WIP: furiously going to refactor state manager...	2022-12-09 07:51:59 +01:00
poka	ad92a06060	Merge branch 'dev-compute-transactionTile' into dev	2022-12-09 06:24:00 +01:00
poka	792ac2f715	fix: bug on delimiter redondance	2022-12-09 06:23:47 +01:00
poka	f7fe3fa7df	WIP: extract transaction view computation; bug on delimiter redondance	2022-12-09 05:21:00 +01:00