Skip to content

Commit 640980b

Browse files
authored
Fixes as per testing (#70)
1 parent 9e9f071 commit 640980b

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/app/wallet/advanced/advanced.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<li class="nav-item">
1414
<a class="nav-link" [routerLink]="['about']" routerLinkActive="active">About</a>
1515
</li>
16+
<li class="nav-item">
17+
<a class="nav-link" [routerLink]="['consolidate-wallet']" routerLinkActive="active">Consolidate Wallet</a>
18+
</li>
1619
<li class="nav-item">
1720
<a class="nav-link" [routerLink]="['extpubkey']" routerLinkActive="active">Extended Public Key</a>
1821
</li>
@@ -26,10 +29,6 @@
2629
<li class="nav-item">
2730
<a class="nav-link" [routerLink]="['remove-wallet']" routerLinkActive="active">Remove Wallet</a>
2831
</li>
29-
<li class="nav-item">
30-
<a class="nav-link" [routerLink]="['consolidate-wallet']" routerLinkActive="active">Consolidate
31-
Wallet</a>
32-
</li>
3332
</ul>
3433
<!-- /ul -->
3534
</div>

src/app/wallet/advanced/components/consolidate-wallet/consolidate-wallet.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<div class="card-body" style="min-height:200px;">
44

55
<div class="alert alert-info" role="alert">
6-
<p>This will consolidate all unspent transactions (UTXOs) into a single UTXO, greatly improving wallet performance (only 1000 can be consolidated at a time).</p>
7-
<p>You currently have <b>{{currentUtxoCount}}</b> UTXOs in your wallet, anything less than 100 is desirable.</p>
6+
<p>This will consolidate all unspent transactions (UTXOs) into a single UTXO. You should routinely consolidate your wallet if receiving lots of individual transactions; a UTXO count below 100 is optimal. You may have to consolidate multiple times if your UTXO count exceeds 1000.</p>
7+
<p>Your wallet currently has <b>{{currentUtxoCount}}</b> UTXOs.</p>
88
</div>
99

1010
<div>

src/app/wallet/advanced/components/consolidate-wallet/consolidate-wallet.component.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,18 @@ export class ConsolidateWalletComponent implements OnInit {
5252
}
5353

5454
public consolidateWallet(): void {
55-
const modal = this.modalService.open(ConfirmationModalComponent, {
56-
backdrop: 'static',
57-
});
5855

56+
this.apiError = '';
57+
5958
FormHelper.ValidateForm(this.consolidateWalletForm, this.consolidateWalletFormErrors, ConsolidateWalletComponentFormResources.consolidateWalletValidationMessages);
6059

6160
if(this.consolidateWalletFormErrors.length > 0)
6261
return;
6362

63+
const modal = this.modalService.open(ConfirmationModalComponent, {
64+
backdrop: 'static',
65+
});
66+
6467
const instance = modal.componentInstance;
6568

6669
instance.title = 'Consolidate wallet';

0 commit comments

Comments
 (0)