From cd22335d68b48961ad43744844effe03fda9c8c6 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Thu, 17 Mar 2022 17:57:34 +0100
Subject: [PATCH] Fixes

---
 cw_monero/lib/monero_account_list.dart |  2 +-
 ios/Podfile.lock                       | 23 +++++++++++++++++++++++
 tool/configure.dart                    |  4 +++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/cw_monero/lib/monero_account_list.dart b/cw_monero/lib/monero_account_list.dart
index 2fd937ced..12cda5680 100644
--- a/cw_monero/lib/monero_account_list.dart
+++ b/cw_monero/lib/monero_account_list.dart
@@ -46,7 +46,7 @@ abstract class MoneroAccountListBase with Store {
       .getAllAccount()
       .map((accountRow) => Account(
         id: accountRow.getId(),
-        label: row.getLabel()))
+        label: accountRow.getLabel()))
       .toList();
 
   Future addAccount({String label}) async {
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 7848d2603..d90ef8ca3 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -27,6 +27,25 @@ PODS:
   - cw_haven/Sodium (0.0.1):
     - cw_shared_external
     - Flutter
+  - cw_monero (0.0.2):
+    - cw_monero/Boost (= 0.0.2)
+    - cw_monero/Monero (= 0.0.2)
+    - cw_monero/OpenSSL (= 0.0.2)
+    - cw_monero/Sodium (= 0.0.2)
+    - cw_shared_external
+    - Flutter
+  - cw_monero/Boost (0.0.2):
+    - cw_shared_external
+    - Flutter
+  - cw_monero/Monero (0.0.2):
+    - cw_shared_external
+    - Flutter
+  - cw_monero/OpenSSL (0.0.2):
+    - cw_shared_external
+    - Flutter
+  - cw_monero/Sodium (0.0.2):
+    - cw_shared_external
+    - Flutter
   - cw_shared_external (0.0.1):
     - cw_shared_external/Boost (= 0.0.1)
     - cw_shared_external/OpenSSL (= 0.0.1)
@@ -113,6 +132,7 @@ DEPENDENCIES:
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
   - CryptoSwift
   - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
+  - cw_monero (from `.symlinks/plugins/cw_monero/ios`)
   - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
   - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
   - esys_flutter_share (from `.symlinks/plugins/esys_flutter_share/ios`)
@@ -150,6 +170,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/connectivity/ios"
   cw_haven:
     :path: ".symlinks/plugins/cw_haven/ios"
+  cw_monero:
+    :path: ".symlinks/plugins/cw_monero/ios"
   cw_shared_external:
     :path: ".symlinks/plugins/cw_shared_external/ios"
   devicelocale:
@@ -187,6 +209,7 @@ SPEC CHECKSUMS:
   connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
   CryptoSwift: 093499be1a94b0cae36e6c26b70870668cb56060
   cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
+  cw_monero: 88c5e7aa596c6848330750f5f8bcf05fb9c66375
   cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
   devicelocale: b22617f40038496deffba44747101255cee005b0
   DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d
diff --git a/tool/configure.dart b/tool/configure.dart
index a50772087..843d665b3 100644
--- a/tool/configure.dart
+++ b/tool/configure.dart
@@ -472,8 +472,10 @@ Future<void> generatePubspec({bool hasMonero, bool hasBitcoin, bool hasHaven}) a
     output += '\n$cwBitcoin';
   }
 
-  if (hasHaven) {
+  if (hasHaven && !hasMonero) {
     output += '\n$cwSharedExternal\n$cwHaven';
+  } else if (hasHaven) {
+    output += '\n$cwHaven';
   }
 
   final outputLines = output.split('\n');