From 1a0d33ee319888931aa060604048c70eec878a07 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Thu, 13 Jan 2022 16:48:42 +0200
Subject: [PATCH] Fixes for android bundle id. Fixes for feeRates picking for
 electrum wallets. Change ios build number to 72.

---
 cw_bitcoin/lib/electrum_wallet.dart | 12 ++++++++----
 scripts/android/app_env.sh          |  2 +-
 scripts/ios/app_env.sh              |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 99b9adf83..00367acc7 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -329,11 +329,15 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       });
 
   int feeRate(TransactionPriority priority) {
-    if (priority is BitcoinTransactionPriority) {
-      return _feeRates[priority.raw];
-    }
+    try {
+      if (priority is BitcoinTransactionPriority) {
+        return _feeRates[priority.raw];
+      }
 
-    return 0;
+      return 0;
+    } catch(_) {
+      return 0;
+    }
   }
 
   int feeAmountForPriority(BitcoinTransactionPriority priority, int inputsCount,
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index e647d504f..69e9129c6 100755
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -21,7 +21,7 @@ MONERO_COM_PACKAGE="com.monero.app"
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.3.0"
 CAKEWALLET_BUILD_NUMBER=71
-CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
+CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_ANDROID_TYPE} " ]]; then
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 9ca026e48..6de3ce442 100755
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -18,7 +18,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.3.0"
-CAKEWALLET_BUILD_NUMBER=71
+CAKEWALLET_BUILD_NUMBER=72
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_IOS_TYPE} " ]]; then