From 26cd5570c60a28621608c3ad846c2066ab1e671b Mon Sep 17 00:00:00 2001
From: Sergey Chystiakov <anyxem@gmail.com>
Date: Wed, 24 Jul 2024 16:07:04 +0200
Subject: [PATCH] build version update, adjustments

---
 class/wallets/mintlayer-wallet.js        |  2 --
 ios/BlueWallet.xcodeproj/project.pbxproj |  4 ++--
 screen/staking/delegationDetails.js      | 14 ++++++++++++++
 screen/staking/staking.js                |  6 +++---
 screen/wallets/transactions-header.js    |  1 -
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/class/wallets/mintlayer-wallet.js b/class/wallets/mintlayer-wallet.js
index fbac28d..30dd62a 100644
--- a/class/wallets/mintlayer-wallet.js
+++ b/class/wallets/mintlayer-wallet.js
@@ -570,8 +570,6 @@ export class MintLayerWallet extends AbstractHDWallet {
       return acc;
     }, {});
 
-    console.log('poolsData', poolsData);
-
     const mergedDelegations = delegations.map((delegation, index) => {
       return {
         ...delegation,
diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj
index 340c458..760c273 100644
--- a/ios/BlueWallet.xcodeproj/project.pbxproj
+++ b/ios/BlueWallet.xcodeproj/project.pbxproj
@@ -905,7 +905,7 @@
 				CODE_SIGN_ENTITLEMENTS = BlueWallet/BlueWallet.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 7F93Z7NQJ4;
 				ENABLE_BITCODE = NO;
@@ -953,7 +953,7 @@
 				CODE_SIGN_ENTITLEMENTS = BlueWallet/BlueWalletRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 7F93Z7NQJ4;
 				ENABLE_BITCODE = NO;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
diff --git a/screen/staking/delegationDetails.js b/screen/staking/delegationDetails.js
index 4fb3938..773f53d 100644
--- a/screen/staking/delegationDetails.js
+++ b/screen/staking/delegationDetails.js
@@ -253,6 +253,7 @@ const StakingDelegationDetails = () => {
         delegation,
       });
       setIsLoading(false);
+      setAddFundsModalVisible(false);
     } catch (e) {
       console.log(e);
       setIsLoading(false);
@@ -300,6 +301,7 @@ const StakingDelegationDetails = () => {
         tx,
       });
       setIsLoading(false);
+      setWithdrawModalVisible(false);
     } catch (e) {
       console.log(e);
       setIsLoading(false);
@@ -417,6 +419,18 @@ const StakingDelegationDetails = () => {
           <View style={styles.delegationPoolSummaryData}>
             <Text>Pool Summary:</Text>
 
+            {delegation?.pool_data?.staker_balance?.decimal > 1 ? (
+              <View>
+                <Text>Pool status: Active</Text>
+              </View>
+            ) : (
+              <View>
+                <View>
+                  <Text>Pool status: Decommissioned</Text>
+                </View>
+              </View>
+            )}
+
             <View>
               <Text>Cost per block: {delegation.pool_data.cost_per_block.decimal} ML</Text>
             </View>
diff --git a/screen/staking/staking.js b/screen/staking/staking.js
index ae5e113..8c3ebd2 100644
--- a/screen/staking/staking.js
+++ b/screen/staking/staking.js
@@ -163,7 +163,7 @@ const Staking = () => {
       navigation.navigate('Delegation', { delegation: item, walletID: wallet.getID() });
     };
 
-    const isDecommissioned = item.pool_data.staker_balance.decimal < 1;
+    const isDecommissioned = item?.pool_data?.staker_balance?.decimal < 1;
 
     // make style for icon
     const iconStyle = {
@@ -203,11 +203,11 @@ const Staking = () => {
             }
             contentStyle={styles.contentStyle}
             subtitleNumberOfLines={2}
-            rightSubtitle={coin}
+            // rightSubtitle={coin}
             // rightSubtitle={`${dayjs(item.creation_time * 1000).format('YYYY-MM-DD HH:mm')}`}
             Component={View}
             chevron={false}
-            rightTitle={`${item.balance / 1e11} ML`}
+            rightTitle={`${item.balance / 1e11} ${coin}`}
             rightContentStyle={styles.rightContentStyle}
             rightTitleStyle={[styles.rowTitleStyle, stylesHook.rowTitle]}
             containerStyle={containerStyle}
diff --git a/screen/wallets/transactions-header.js b/screen/wallets/transactions-header.js
index b22a785..54e3f29 100644
--- a/screen/wallets/transactions-header.js
+++ b/screen/wallets/transactions-header.js
@@ -51,7 +51,6 @@ const WalletTransactionsHeader = () => {
             saveToDisk();
           })
         }
-        navigation={navigate}
       />
     </View>
   );