From 5c49be4f1242b7a600e6b3f67bef5d31ae760007 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sun, 5 Jun 2022 21:28:16 +0200
Subject: [PATCH] bump v0.0.8+0 dataVersion 4

---
 lib/globals.dart                          |  2 +-
 lib/models/chest_data.dart                |  4 ++--
 lib/models/chest_data.g.dart              |  4 ++--
 lib/providers/generate_wallets.dart       |  1 -
 lib/providers/my_wallets.dart             |  2 +-
 lib/providers/substrate_sdk.dart          | 20 ++++++++++++++++++++
 lib/screens/myWallets/wallet_options.dart |  2 +-
 pubspec.yaml                              |  2 +-
 8 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/lib/globals.dart b/lib/globals.dart
index 6bf48de..74b5b32 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -8,7 +8,7 @@ import 'package:logger/logger.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 // Version of box data
-const int dataVersion = 3;
+const int dataVersion = 4;
 
 // Files paths
 Directory? appPath;
diff --git a/lib/models/chest_data.dart b/lib/models/chest_data.dart
index 7e04b13..34632b7 100644
--- a/lib/models/chest_data.dart
+++ b/lib/models/chest_data.dart
@@ -19,14 +19,14 @@ class ChestData extends HiveObject {
   File? imageFile;
 
   @HiveField(4)
-  bool? isCesium;
+  int? memberWallet;
 
   ChestData({
     this.name,
     this.defaultWallet,
     this.imageName,
     this.imageFile,
-    this.isCesium,
+    this.memberWallet,
   });
 
   @override
diff --git a/lib/models/chest_data.g.dart b/lib/models/chest_data.g.dart
index b547a6b..cf1aa52 100644
--- a/lib/models/chest_data.g.dart
+++ b/lib/models/chest_data.g.dart
@@ -21,7 +21,7 @@ class ChestDataAdapter extends TypeAdapter<ChestData> {
       defaultWallet: fields[1] as int?,
       imageName: fields[2] as String?,
       imageFile: fields[3] as File?,
-      isCesium: fields[4] as bool?,
+      memberWallet: fields[4] as int?,
     );
   }
 
@@ -38,7 +38,7 @@ class ChestDataAdapter extends TypeAdapter<ChestData> {
       ..writeByte(3)
       ..write(obj.imageFile)
       ..writeByte(4)
-      ..write(obj.isCesium);
+      ..write(obj.memberWallet);
   }
 
   @override
diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart
index 350d5b3..d4560d0 100644
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@@ -71,7 +71,6 @@ class GenerateWalletsProvider with ChangeNotifier {
       name: chestName,
       defaultWallet: 0,
       imageName: '${chestNumber % 8}.png',
-      isCesium: false,
     );
     await chestBox.add(thisChest);
     int? chestKey = chestBox.keys.last;
diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index 15101a4..a03832d 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -13,7 +13,7 @@ class MyWalletsProvider with ChangeNotifier {
   int? pinLenght;
   bool isNewDerivationLoading = false;
 
-  int? getCurrentChest() {
+  int getCurrentChest() {
     if (configBox.get('currentChest') == null) {
       configBox.put('currentChest', 0);
     }
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index feeac4d..bc6a662 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -564,7 +564,27 @@ class SubstrateSdk with ChangeNotifier {
     return await idtyStatus(address) == 'Validated';
   }
 
+  Future<String> getMemberAddress() async {
+    // TODO: Continue digging memberAddress detection
+    String memberAddress = '';
+    walletBox.toMap().forEach((key, value) async {
+      final bool _isMember = await isMember(value.address!);
+      log.d(_isMember);
+      if (_isMember) {
+        final currentChestNumber = configBox.get('currentChest');
+        ChestData _newChestData = chestBox.get(currentChestNumber)!;
+        _newChestData.memberWallet = value.number;
+        await chestBox.put(currentChestNumber, _newChestData);
+        memberAddress = value.address!;
+        return;
+      }
+    });
+    log.d(memberAddress);
+    return memberAddress;
+  }
+
   Future<Map<String, int>> certState(String from, String to) async {
+    // String from = await getMemberAddress();
     if (from != to && await isMember(from)) {
       Map<String, int> _result = {};
       final _certData = await getCertData(from, to);
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index fa1a4bf..fd974a6 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -33,7 +33,7 @@ class WalletOptions extends StatelessWidget {
 
     log.d(_walletOptions.address.text);
 
-    final int _currentChest = _myWalletProvider.getCurrentChest()!;
+    final int _currentChest = _myWalletProvider.getCurrentChest();
 
     // final currentWallet = _myWalletProvider.getDefaultWallet();
     // log.d(_walletOptions.getAddress(_currentChest, 3));
diff --git a/pubspec.yaml b/pubspec.yaml
index f790dad..43fad76 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: Pay with G1.
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 0.0.7+12
+version: 0.0.8+0
 
 environment:
   sdk: '>=2.12.0 <3.0.0'