From 9a6970b9a464170690a93610125934aa9a9619b2 Mon Sep 17 00:00:00 2001 From: Milad Date: Tue, 7 Jun 2022 10:58:24 +0430 Subject: [PATCH 1/3] Hidden Mining menu when there is no wallet --- src/Features/Blockcore.Features.Miner/UI/NavItem.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs index 78bb4445c..8a9af33bf 100644 --- a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs +++ b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs @@ -8,10 +8,12 @@ public class MineNavigationItem : INavigationItem { private readonly Network network; private readonly IWalletSyncManager walletSyncManager; - public MineNavigationItem(Network network, IWalletSyncManager walletSyncManager) + private readonly IWalletManager WalletManager; + public MineNavigationItem(Network network, IWalletSyncManager walletSyncManager, IWalletManager WalletManager) { this.network = network; this.walletSyncManager = walletSyncManager; + this.WalletManager = WalletManager; } public string Name => "Mining"; @@ -25,7 +27,7 @@ private bool CheckIsVisible() { return false; } - return true; + return this.WalletManager?.ContainsWallets ?? false; } } public class StakeNavigationItem : INavigationItem From 0268425ad546ae186353c84125eccdfa72554816 Mon Sep 17 00:00:00 2001 From: Milad Date: Tue, 7 Jun 2022 13:44:16 +0430 Subject: [PATCH 2/3] Use walletManager instead of walletSyncManager --- src/Features/Blockcore.Features.Miner/UI/NavItem.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs index 8a9af33bf..ef6af582b 100644 --- a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs +++ b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs @@ -7,12 +7,10 @@ namespace Blockcore.Features.Miner.UI public class MineNavigationItem : INavigationItem { private readonly Network network; - private readonly IWalletSyncManager walletSyncManager; private readonly IWalletManager WalletManager; - public MineNavigationItem(Network network, IWalletSyncManager walletSyncManager, IWalletManager WalletManager) + public MineNavigationItem(Network network, IWalletManager WalletManager) { this.network = network; - this.walletSyncManager = walletSyncManager; this.WalletManager = WalletManager; } @@ -23,7 +21,7 @@ public MineNavigationItem(Network network, IWalletSyncManager walletSyncManager, public int NavOrder => 15; private bool CheckIsVisible() { - if (this.network.Consensus.IsProofOfStake && (this.walletSyncManager.WalletTip.Height > this.network.Consensus.LastPOWBlock)) + if (this.network.Consensus.IsProofOfStake && (this.WalletManager?.WalletTipHeight > this.network.Consensus.LastPOWBlock)) { return false; } From 0a9efdba46cfaf148b181ba5a886332770d457b2 Mon Sep 17 00:00:00 2001 From: Milad Date: Tue, 7 Jun 2022 14:04:38 +0430 Subject: [PATCH 3/3] Clean Codes Fields should start with lowercase initial character, properties with uppercase. --- .../UI/NavItem.cs | 8 ++++---- .../Blockcore.Features.Miner/UI/NavItem.cs | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs index bfd16489a..ba94d52e5 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs +++ b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs @@ -6,17 +6,17 @@ namespace Blockcore.Features.Wallet.UI { public class ColdStakingNavigationItem : INavigationItem { - private readonly IWalletManager WalletManager; + private readonly IWalletManager walletManager; - public ColdStakingNavigationItem(IWalletManager WalletManager) + public ColdStakingNavigationItem(IWalletManager walletManager) { - this.WalletManager = WalletManager; + this.walletManager = walletManager; } public string Name => "Cold Staking"; public string Navigation => "ColdStaking"; public string Icon => "oi-pulse"; - public bool IsVisible => this.WalletManager?.ContainsWallets ?? false; + public bool IsVisible => this.walletManager?.ContainsWallets ?? false; public int NavOrder => 30; } diff --git a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs index ef6af582b..c6114e36f 100644 --- a/src/Features/Blockcore.Features.Miner/UI/NavItem.cs +++ b/src/Features/Blockcore.Features.Miner/UI/NavItem.cs @@ -7,11 +7,11 @@ namespace Blockcore.Features.Miner.UI public class MineNavigationItem : INavigationItem { private readonly Network network; - private readonly IWalletManager WalletManager; - public MineNavigationItem(Network network, IWalletManager WalletManager) + private readonly IWalletManager walletManager; + public MineNavigationItem(Network network, IWalletManager walletManager) { this.network = network; - this.WalletManager = WalletManager; + this.walletManager = walletManager; } public string Name => "Mining"; @@ -21,26 +21,26 @@ public MineNavigationItem(Network network, IWalletManager WalletManager) public int NavOrder => 15; private bool CheckIsVisible() { - if (this.network.Consensus.IsProofOfStake && (this.WalletManager?.WalletTipHeight > this.network.Consensus.LastPOWBlock)) + if (this.network.Consensus.IsProofOfStake && (this.walletManager?.WalletTipHeight > this.network.Consensus.LastPOWBlock)) { return false; } - return this.WalletManager?.ContainsWallets ?? false; + return this.walletManager?.ContainsWallets ?? false; } } public class StakeNavigationItem : INavigationItem { - private readonly IWalletManager WalletManager; + private readonly IWalletManager walletManager; - public StakeNavigationItem(IWalletManager WalletManager) + public StakeNavigationItem(IWalletManager walletManager) { - this.WalletManager = WalletManager; + this.walletManager = walletManager; } public string Name => "Staking"; public string Navigation => "Stake"; public string Icon => "oi-bolt"; - public bool IsVisible => this.WalletManager?.ContainsWallets ?? false; + public bool IsVisible => this.walletManager?.ContainsWallets ?? false; public int NavOrder => 20; } } \ No newline at end of file