anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Display timer icon for all m of n wallets. Use cards on balance view. Minor text explanation changes.

Browse source
This commit is contained in:
Andy Phillipson 2016-12-13 17:42:49 -05:00
commit ffa8d7a576
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
www/views/modals/wallet-balance.html
View file

@ -16,7 +16,7 @@
</ion-header-bar>
<ion-content>
<div class="wallet-balance__heading" translate>All of your bitcoin wallet balance may not be available for immediate spending.</div>
<div class="wallet-balance__list list">
<div class="wallet-balance__list list card">
<div class="wallet-balance__item item">
<img class="wallet-balance__icon" src="img/icon-sigma.svg" height="18" width="18"\>
<div class="wallet-balance__content no-border">
@ -33,7 +33,9 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate><b>Total</b> is the total amount of bitcoin stored in this wallet. It is the sum of Available, Confirming, and Locked amounts.</div>
<div class="wallet-balance__description" translate><b>Total</b> is the total amount of bitcoin stored in this wallet; the sum of Available, Confirming, and Locked amounts.</div>
</div>
<div class="wallet-balance__list list card">
<div class="wallet-balance__item item">
<i class="wallet-balance__icon icon ion-ios-checkmark-outline"></i>
<div class="wallet-balance__content no-border">
@ -50,7 +52,9 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate><b>Available</b> is the immediatley spendable amount of bitcoin stored in this wallet. It is the Total less Confirming and Locked amounts. If you have enabled Use Unconfirmed Funds setting then the Available amount is the Total less Locked amount.</div>
<div class="wallet-balance__description" translate><b>Available</b> is the immediatley spendable amount of bitcoin stored in this wallet; the Total less Confirming and Locked amounts.</div>
</div>
<div class="wallet-balance__list list card">
<div class="wallet-balance__item item">
<img class="wallet-balance__icon" src="img/icon-confirming-clear.svg" width="18"\>
<div class="wallet-balance__content no-border">
@ -67,7 +71,9 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate><b>Confirming</b> is the amount of bitcoin stored in this wallet with fewer than 6 block chain confirmations.</div>
<div class="wallet-balance__description" translate><b>Confirming</b> is the amount of bitcoin stored in this wallet with less than 1 block chain confirmation.</div>
</div>
<div class="wallet-balance__list list card">
<div class="wallet-balance__item item">
<img class="wallet-balance__icon" src="img/icon-lock.svg" width="18"\>
<div class="wallet-balance__content no-border">

2
www/views/tab-home.html
View file

@ -84,8 +84,8 @@
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
{{wallet.m}}-of-{{wallet.n}}
<i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
</span>
<i ng-if="!wallet.balanceHidden && (wallet.status.totalBalanceSat != wallet.status.spendableAmount)" class="tab-home__wallet__status-icon ion-ios-timer-outline"></i>
<span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
</span>
&nbsp;