From 112c092bde01de5e9c978a8779e38afffd5ff29a Mon Sep 17 00:00:00 2001
From: m <m@cakewallet.com>
Date: Thu, 9 May 2024 21:04:21 +0100
Subject: [PATCH] Disable haven configuration for iOS as default. Add ability
to configure cakewallet for iOS with for configuration script. Remove
cw_shared configuration for cw_monero.
---
scripts/ios/app_config.sh | 5 ++++-
tool/configure.dart | 6 ++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/scripts/ios/app_config.sh b/scripts/ios/app_config.sh
index ab7fbd422..5482868bf 100755
--- a/scripts/ios/app_config.sh
+++ b/scripts/ios/app_config.sh
@@ -28,7 +28,10 @@ case $APP_IOS_TYPE in
CONFIG_ARGS="--monero"
;;
$CAKEWALLET)
- CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana --tron"
+ CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron"
+ if [ "$CW_WITH_HAVEN" = true ];then
+ CONFIG_ARGS="$CONFIG_ARGS --haven"
+ fi
;;
$HAVEN)
diff --git a/tool/configure.dart b/tool/configure.dart
index 22013aa57..b549805c1 100644
--- a/tool/configure.dart
+++ b/tool/configure.dart
@@ -1223,7 +1223,7 @@ Future<void> generatePubspec(
var output = cwCore;
if (hasMonero) {
- output += '\n$cwMonero\n$cwSharedExternal';
+ output += '\n$cwMonero';
}
if (hasBitcoin) {
@@ -1258,10 +1258,8 @@ Future<void> generatePubspec(
output += '\n$cwTron';
}
- if (hasHaven && !hasMonero) {
+ if (hasHaven) {
output += '\n$cwSharedExternal\n$cwHaven';
- } else if (hasHaven) {
- output += '\n$cwHaven';
}
if (hasFlutterSecureStorage) {