From 4aa15c531da8a7760ca84d3bcd712c1a7543181e Mon Sep 17 00:00:00 2001 From: Hunter Date: Tue, 12 May 2020 09:55:28 +0100 Subject: [PATCH 1/5] Split create & recover wallet --- .../UI/Pages/WalletCreate.razor | 41 ++------ .../UI/Pages/WalletRecover.razor | 99 +++++++++++++++++++ .../UI/Pages/Wallets.razor | 17 ++-- 3 files changed, 119 insertions(+), 38 deletions(-) create mode 100644 src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor index 8d627a465..5240cc030 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor @@ -1,4 +1,4 @@ -@page "/walletcrate" +@page "/walletcreate" @using Blockcore.Features.Wallet.Interfaces @using NBitcoin; @@ -10,18 +10,21 @@ @inject IWalletSyncManager WalletSyncManager

Create a Wallet

- +

Create your wallet by generating a Mnemonic & adding an optional phrase. Then give your wallet a name & password.

@{ +
+ +
Mnemonic
- +

Important: The Mnemonic is your wallet and must be kept safe and secure.

@@ -33,10 +36,6 @@

Important: The Passphrase is permanently linked to the wallet and must be kept safe and secure.

-
- -
-
Wallet name: @@ -52,7 +51,6 @@
-
@@ -61,13 +59,11 @@ } @code { - public string WalletName { get; set; } public string AccountName { get; set; } public string Mnemonic { get; set; } private string Password { get; set; } private string Passphrase { get; set; } - string Alert { get; set; } private void GenerateMnemonic() @@ -90,28 +86,11 @@ { NavigationManager.NavigateTo("wallets"); } - - private void RecoverWallet() - { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No Password"; return; } - if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "No Mnemonic"; return; } - if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; } - - if (this.Passphrase == null) - this.Passphrase = string.Empty; - - this.Alert = string.Empty; - - var wallet = this.WalletManager.RecoverWallet(this.Password, this.WalletName, this.Mnemonic, this.DateTimeProvider.GetUtcNow(), passphrase: this.Passphrase); - - NavigationManager.NavigateTo("walletaccount/" + WalletName + "/account 0"); - } - private void CreateWallet() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No Password"; return; } - if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "No Mnemonic"; return; } - if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "Ensure that you have generated a new Mnemonic"; return; } + if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; } if (this.Passphrase == null) this.Passphrase = string.Empty; diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor new file mode 100644 index 000000000..9399271d7 --- /dev/null +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor @@ -0,0 +1,99 @@ +@page "/walletrecover" + +@using Blockcore.Features.Wallet.Interfaces +@using NBitcoin; +@using Blockcore.Features.Wallet.Api.Controllers + +@inject NavigationManager NavigationManager +@inject IWalletManager WalletManager +@inject Blockcore.Utilities.IDateTimeProvider DateTimeProvider +@inject IWalletSyncManager WalletSyncManager + + +
+ +

Recover a Wallet

+

Recover your wallet by entering your Mnemonic & your passphrase. Then give your wallet a name & password.

+@{ +
+
+ Mnemonic +
+ +
+

Reminder: The Mnemonic is your wallet and must be kept safe and secure.

+ +
+
+ Passphrase (optional): +
+ +
+

Reminder: The Passphrase is permanently linked to the wallet and must be kept safe and secure.

+ +
+
+ Wallet name: +
+ +
+ +
+
+ Wallet Password: +
+ +
+ + + +
+
+
@Alert
+
+} + +@code { + + public string WalletName { get; set; } + public string AccountName { get; set; } + public string Mnemonic { get; set; } + private string Password { get; set; } + private string Passphrase { get; set; } + + string Alert { get; set; } + + private void NavigateToReceiveWallet(string walletName, string accountname) + { + NavigationManager.NavigateTo("walletreceive/" + walletName + "/" + accountname); + } + + private void NavigateToSendWallet(string walletName, string accountname) + { + NavigationManager.NavigateTo("walletsend/" + walletName + "/" + accountname); + } + + private void NavigateToWallets() + { + NavigationManager.NavigateTo("wallets"); + } + + private void RecoverWallet() + { + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "Ensure that you have entered your Mnemonic"; return; } + if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; } + + if (this.Passphrase == null) + this.Passphrase = string.Empty; + + this.Alert = string.Empty; + + var wallet = this.WalletManager.RecoverWallet(this.Password, this.WalletName, this.Mnemonic, this.DateTimeProvider.GetUtcNow(), passphrase: this.Passphrase); + + NavigationManager.NavigateTo("walletaccount/" + WalletName + "/account 0"); + } + +} \ No newline at end of file diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor index 44dafaf00..ede7bc851 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor @@ -21,17 +21,17 @@

Wallet Tip: @this.WalletSyncManager.WalletTip.Height / @ChainIndexer.Height

- - - + + +

- - + + @@ -64,9 +64,12 @@ private void NavigateToWalletCreate() { - NavigationManager.NavigateTo("walletcrate"); + NavigationManager.NavigateTo("walletcreate"); + } + private void NavigateToWalletRecover() + { + NavigationManager.NavigateTo("walletrecover"); } - private void Resync() { this.WalletSyncManager.SyncFromHeight(1); From 642f84b824d08c1704067b9c7f6d05c5cc52295c Mon Sep 17 00:00:00 2001 From: Hunter Date: Tue, 12 May 2020 09:56:39 +0100 Subject: [PATCH 2/5] Rename peer nodes to add nodes --- .../UI/Pages/{PeersNodes.razor => AddNodes.razor} | 6 +++--- .../Blockcore.Features.WebHost/UI/Pages/Peers.razor | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/Features/Blockcore.Features.WebHost/UI/Pages/{PeersNodes.razor => AddNodes.razor} (91%) diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/PeersNodes.razor b/src/Features/Blockcore.Features.WebHost/UI/Pages/AddNodes.razor similarity index 91% rename from src/Features/Blockcore.Features.WebHost/UI/Pages/PeersNodes.razor rename to src/Features/Blockcore.Features.WebHost/UI/Pages/AddNodes.razor index 7ed6708f3..b2ddc3595 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Pages/PeersNodes.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/Pages/AddNodes.razor @@ -1,12 +1,12 @@ -@page "/peers-nodes" +@page "/add-nodes" @using Blockcore.Utilities.Extensions @inject Blockcore.Connection.IConnectionManager ConnectionManager -

Connected peers

+

Add new nodes

-

Information about connected peers.

+

Add the IP address of known network peers.

@{
diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor b/src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor index e3b7b24b4..2fa770b77 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/Pages/Peers.razor @@ -9,7 +9,7 @@ @{
- +
Wallet / accountConfirmed blanaceWallet / AccountConfirmed balance Unconfirmed balance
@@ -37,8 +37,8 @@ @code { - private void NavigateToPeernodes() + private void NavigateToAddNodes() { - NavigationManager.NavigateTo("peers-nodes"); + NavigationManager.NavigateTo("add-nodes"); } } \ No newline at end of file From bb1a938332113e2898c0c91f81653af0085b0f96 Mon Sep 17 00:00:00 2001 From: Hunter Date: Tue, 12 May 2020 09:57:30 +0100 Subject: [PATCH 3/5] Improve error messages, fix some typos --- .../UI/NavItem.cs | 2 +- .../UI/Pages/ColdStake.razor | 60 ++++++++++--------- .../UI/Pages/ColdStakeSetup.razor | 6 +- .../UI/Pages/ColdStakeWithdraw.razor | 4 +- .../UI/Pages/Stake.razor | 8 +-- .../UI/Pages/WalletAccount.razor | 32 ++++++---- .../UI/Pages/WalletSend.razor | 38 ++++++++---- .../UI/Pages/Logs.razor | 6 +- 8 files changed, 90 insertions(+), 66 deletions(-) diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs index d4f96f14b..e17f87f1d 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs +++ b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs @@ -4,7 +4,7 @@ namespace Blockcore.Features.Wallet.UI { public class ColdStakingNavigationItem : INavigationItem { - public string Name => "ColdStaking"; + public string Name => "Cold Staking"; public string Navigation => "ColdStaking"; } diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor index f815449cc..5a019777c 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor @@ -11,11 +11,33 @@ @if (!NodeDeployments.GetFlags().ScriptFlags.HasFlag(ScriptVerify.CheckColdStakeVerify)) { -

Coldstaking is not activated

+

Cold staking is not activated

return; } -

Coldstaking Wallets

+

Cold staking Wallets

+ +

Enable cold staking on an existing wallet.

+ +
+
+
+ Wallet Name: +
+ +
+ +
+
+ Password: +
+ +
+ +
+ +
+

Information about the deployed wallets.

@@ -23,10 +45,10 @@
- - + + - + @@ -66,7 +88,7 @@ var hotAccountBalance = ColdStakingManager.GetBalances(walletName, hotStakingAccount.Name).Single(); - + @@ -103,26 +125,6 @@ }
Wallet / accountConfirmed blanaceWallet / AccountConfirmed balance Unconfirmed balanceActioneAction
@walletName /@hotStakingAccount.Name @walletName / @hotStakingAccount.Name @hotAccountBalance.AmountConfirmed @hotAccountBalance.AmountUnconfirmed @@ -94,7 +116,7 @@ @if (accountBalance.AmountConfirmed + accountBalance.AmountUnconfirmed > 0) { - + }
-
-
-
- Wallet Name: -
- -
- -
-
- Password: -
- -
- -
- -
-
- } @code @@ -146,8 +148,8 @@ private void CreateColdStakeAccount() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; } - if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; } this.Alert = string.Empty; this.ColdStakingManager.GetOrCreateColdStakingAccount(this.WalletName, true, this.Password); diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor index dccc6db8f..64f0c4425 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor @@ -156,9 +156,9 @@ private async Task Setup() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; } - if (string.IsNullOrEmpty(this.ColdWalletAddress)) { this.Alert = "No ColdWalletAddress"; return; } - if (string.IsNullOrEmpty(this.HotWalletAddress)) { this.Alert = "No HotWalletAddress"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.ColdWalletAddress)) { this.Alert = "Your cold wallet address is missing"; return; } + if (string.IsNullOrEmpty(this.HotWalletAddress)) { this.Alert = "Your hot wallet address is missing"; return; } this.Alert = string.Empty; diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor index 385724e17..bb7686ef6 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor @@ -112,8 +112,8 @@ private async Task Withdraw() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; } - if (string.IsNullOrEmpty(this.Address)) { this.Alert = "No Address"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.Address)) { this.Alert = "Please enter a withdrawal address"; return; } this.Alert = string.Empty; try diff --git a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor index b773e1c75..747d55824 100644 --- a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor +++ b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor @@ -35,8 +35,8 @@ - - + + @@ -139,8 +139,8 @@ private void StartStaking() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; } - if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No password"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; } var wallet = this.WalletManager.GetWallet(this.WalletName); diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor index 7dc90f2cd..6d24ce085 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor @@ -10,27 +10,36 @@ @inject Network Network
-

Wallet Account

-

Information about @walletname / @accountname

- +

Wallet Account: @walletname / @accountname

@{ var accountBalance = this.WalletManager.GetBalances(walletname, accountname).Single();
- -

Amount Confirmed: @accountBalance.AmountConfirmed

-

Amount Unconfirmed: @accountBalance.AmountUnconfirmed

-

Spendable Amount: @accountBalance.SpendableAmount

- - + -

+
Wallet/accountBlanaceWallet / AccountBalance
+ + + + + + + + + + + + + + +
Amount ConfirmedAmount UnconfirmedSpendable Amount
@accountBalance.AmountConfirmed@accountBalance.AmountUnconfirmed@accountBalance.SpendableAmount
+

Wallet History

@@ -52,6 +61,7 @@ foreach (var transaction in history.TransactionsHistory) { + @transaction. @transaction.ToAddress @transaction.Amount @transaction.ConfirmedInBlock diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor index c67b46660..657c77f55 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor @@ -19,9 +19,7 @@
-

Send Coins

- -

Send coins from account @walletname / @accountname

+

Send Coins: @walletname / @accountname

@{ @@ -29,9 +27,23 @@
-

Amount Confirmed: @accountBalance.AmountConfirmed

-

Amount Unconfirmed: @accountBalance.AmountUnconfirmed

-

Spendable Amount: @accountBalance.SpendableAmount

+ + + + + + + + + + + + + + + +
Amount ConfirmedAmount UnconfirmedSpendable Amount
@accountBalance.AmountConfirmed@accountBalance.AmountUnconfirmed@accountBalance.SpendableAmount
+
@@ -151,13 +163,13 @@ private async Task Broadcast() { - if (string.IsNullOrEmpty(this.TransactionHex)) { this.Alert = "No trx"; return; } + if (string.IsNullOrEmpty(this.TransactionHex)) { this.Alert = "No transaction details, please click send coins first"; return; } this.Alert = string.Empty; if (!this.ConnectionManager.ConnectedPeers.Any()) { - this.Alert = "No peers connected"; + this.Alert = "No peers connected. You need connections before a transaction can be brodcast to the network."; return; } @@ -169,7 +181,7 @@ if (transactionBroadCastEntry.TransactionBroadcastState == TransactionBroadcastState.FailedBroadcast) { - this.Alert = "Error occurred: " + transactionBroadCastEntry.ErrorMessage; + this.Alert = "An error occurred: " + transactionBroadCastEntry.ErrorMessage; return; } @@ -178,10 +190,10 @@ private void SendCoins() { - if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; } - if (string.IsNullOrEmpty(this.Address)) { this.Alert = "No address"; return; } - if (this.Amount == 0) { this.Alert = "No amount"; return; } - if (this.Fee == 0) { this.Alert = "No fee"; return; } + if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; } + if (string.IsNullOrEmpty(this.Address)) { this.Alert = "Please enter a valid address"; return; } + if (this.Amount == 0) { this.Alert = "Please enter the number of coins you want to send"; return; } + if (this.Fee == 0) { this.Alert = "Please ensure you enter a fee"; return; } this.Alert = string.Empty; diff --git a/src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor b/src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor index 9dd077305..042863632 100644 --- a/src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor +++ b/src/Features/Blockcore.Features.WebHost/UI/Pages/Logs.razor @@ -5,7 +5,7 @@

Node logs

@{ - +
+@(((Blockcore.FullNode)this.FullNode).LastLogOutput.TrimStart(' '))
+
} \ No newline at end of file From 724694befc17554a6c033753e01b4fbf373e4652 Mon Sep 17 00:00:00 2001 From: Hunter Date: Tue, 12 May 2020 17:58:12 +0100 Subject: [PATCH 4/5] Remove breadcrumbs & fix tx address bug --- .../UI/Pages/ColdStake.razor | 2 +- .../UI/Pages/WalletAccount.razor | 20 ++++++++----------- .../UI/Pages/WalletCreate.razor | 5 ----- .../UI/Pages/WalletReceive.razor | 5 ----- .../UI/Pages/WalletRecover.razor | 5 ----- .../UI/Pages/WalletSend.razor | 5 ----- .../UI/Pages/Wallets.razor | 7 ++----- 7 files changed, 11 insertions(+), 38 deletions(-) diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor index 5a019777c..85e069274 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor @@ -15,7 +15,7 @@ return; } -

Cold staking Wallets

+

Cold staking wallets

Enable cold staking on an existing wallet.

diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor index 6d24ce085..a5b8ef2fc 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor @@ -9,11 +9,6 @@ @inject IWalletManager WalletManager @inject Network Network - -
-

Wallet Account: @walletname / @accountname

@{ var accountBalance = this.WalletManager.GetBalances(walletname, accountname).Single(); @@ -49,10 +44,11 @@ - - - + + + + @@ -61,11 +57,11 @@ foreach (var transaction in history.TransactionsHistory) { - - - - + + + + } } diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor index 5240cc030..8a1888f68 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor @@ -9,11 +9,6 @@ @inject Blockcore.Utilities.IDateTimeProvider DateTimeProvider @inject IWalletSyncManager WalletSyncManager - -
-

Create a Wallet

Create your wallet by generating a Mnemonic & adding an optional phrase. Then give your wallet a name & password.

@{ diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor index 0a97e262b..d3d918f5c 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor @@ -7,11 +7,6 @@ @inject IWalletManager WalletManager @inject NavigationManager NavigationManager - -
-

Receive Coins

Generate receive address for @walletname / @accountname

diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor index 9399271d7..f38c354b4 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor @@ -9,11 +9,6 @@ @inject Blockcore.Utilities.IDateTimeProvider DateTimeProvider @inject IWalletSyncManager WalletSyncManager - -
-

Recover a Wallet

Recover your wallet by entering your Mnemonic & your passphrase. Then give your wallet a name & password.

@{ diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor index 657c77f55..b14ab34b2 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor @@ -14,11 +14,6 @@ @inject IWalletTransactionHandler WalletTransactionHandler @inject IBroadcasterManager BroadcasterManager - -
-

Send Coins: @walletname / @accountname

@{ diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor index ede7bc851..16f9099d0 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor @@ -17,16 +17,13 @@

Information about the deployed wallets.

@{ -

Wallet Tip: @this.WalletSyncManager.WalletTip.Height / @ChainIndexer.Height

-
-
-
+

To AddressAmountConfirmed In Block TypeBlockAmountTo AddressTxID
@transaction.@transaction.ToAddress@transaction.Amount@transaction.ConfirmedInBlock @transaction.Type@transaction.ConfirmedInBlock@transaction.Amount@transaction.ToAddress@transaction.Id
@@ -44,7 +41,7 @@ var accountBalance = this.WalletManager.GetBalances(walletName, account.Name).Single(); - + From b28d5ced0e981bcc80d02631eadacb3063e0169b Mon Sep 17 00:00:00 2001 From: Hunter Date: Wed, 13 May 2020 20:51:03 +0100 Subject: [PATCH 5/5] Even up the labels --- .../UI/Pages/ColdStake.razor | 4 +-- .../UI/Pages/ColdStakeSetup.razor | 36 ++++++++++++------- .../UI/Pages/ColdStakeWithdraw.razor | 12 +++---- .../UI/Pages/Stake.razor | 4 +-- .../UI/Pages/WalletCreate.razor | 29 ++++++++------- .../UI/Pages/WalletRecover.razor | 8 ++--- .../UI/Pages/WalletSend.razor | 14 ++++---- 7 files changed, 61 insertions(+), 46 deletions(-) diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor index 85e069274..75d33774b 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor @@ -22,14 +22,14 @@
- Wallet Name: + Wallet Name:
- Password: + Password:
diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor index 64f0c4425..610435b3f 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor @@ -20,19 +20,31 @@ @{ var accountBalance = this.WalletManager.GetBalances(walletname, "account 0").Single(); -

Amount Confirmed: @accountBalance.AmountConfirmed

-

Amount Unconfirmed: @accountBalance.AmountUnconfirmed

-

Spendable Amount: @accountBalance.SpendableAmount

- +
@walletName / @account.Name@walletName / @account.Name @accountBalance.AmountConfirmed @accountBalance.AmountUnconfirmed
+ + + + + + + + + + + + + + +
Amount ConfirmedAmount UnconfirmedSpendable Amount
@accountBalance.AmountConfirmed@accountBalance.AmountUnconfirmed@accountBalance.SpendableAmount
- ColdWalletAddress: + ColdWalletAddress:
- from wallet: @walletname + from wallet: @walletname
@@ -45,34 +57,34 @@
- HotWalletAddress: + HotWalletAddress:
- Amount: + Amount:
- @this.Network.CoinTicker.ToUpper() + @this.Network.CoinTicker.ToUpper()
- Fee: + Fee:
- Optional (default to low) + Optional (default to low)
- Password: + Password:
diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor index bb7686ef6..d79c8d80c 100644 --- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor +++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor @@ -30,14 +30,14 @@
- Password: + Password:
- Address: + Address:
@@ -45,21 +45,21 @@
- Amount: + Amount:
- @this.Network.CoinTicker.ToUpper() + @this.Network.CoinTicker.ToUpper()
- Fee: + Fee:
- Optional (default to low) + Optional (default to low)
diff --git a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor index 747d55824..66e25c972 100644 --- a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor +++ b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor @@ -61,14 +61,14 @@ {
- Wallet Name: + Wallet Name:
- Password: + Password:
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor index 8a1888f68..c89bf59d0 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor @@ -12,37 +12,40 @@

Create a Wallet

Create your wallet by generating a Mnemonic & adding an optional phrase. Then give your wallet a name & password.

@{ +
-
+ +
- Mnemonic + Mnemonic:
- +

Important: The Mnemonic is your wallet and must be kept safe and secure.

-
+
- Passphrase (optional): + Passphrase (optional):
- +
-

Important: The Passphrase is permanently linked to the wallet and must be kept safe and secure.

+

Important: The Passphrase is permanently linked to the wallet and must be kept safe and secure.

-
+ +
- Wallet name: + Wallet name:
- +
-
+
- Wallet Password: + Wallet Password:
- +
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor index f38c354b4..7992a7148 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor @@ -14,7 +14,7 @@ @{
- Mnemonic + Mnemonic
@@ -22,7 +22,7 @@
- Passphrase (optional): + Passphrase (optional):
@@ -30,14 +30,14 @@
- Wallet name: + Wallet name:
- Wallet Password: + Wallet Password:
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor index b14ab34b2..2ce1d9d7b 100644 --- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor +++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor @@ -42,34 +42,34 @@
- To Address: + To Address:
- Amount: + Amount:
- @this.Network.CoinTicker.ToUpper() + @this.Network.CoinTicker.ToUpper()
- Fee: + Fee:
- Optional (default to low) + Optional (default to low)
- Wallet Password: + Wallet Password:
@@ -89,7 +89,7 @@
- Raw Transaction + Raw Transaction