BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes balance display on home tab (displays total). Adds (!) icon next to balance on home tab when total is not equal to available balance.

This commit is contained in:
Andy Phillipson 2016-12-12 10:48:43 -05:00
parent 7851188979
commit cd3677b57c
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sass/views/tab-home.scss
View File

@ -111,6 +111,12 @@
font-weight: 300;
color: $light-gray;
}
&__icon {
width: 20px;
position: relative;
top: 4px;
color: $light-gray;
}
}
}
.release {

11
www/img/icon-important.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
<path fill="#9B9BAB" d="M50,0C22.41,0,0,22.409,0,50s22.41,50,50,50c27.59,0,50-22.409,50-50S77.59,0,50,0z M50,4
c25.429,0,46,20.571,46,46S75.429,96,50,96S4,75.429,4,50S24.571,4,50,4z M47.562,25.812c-0.43,0-0.688,0.257-0.688,0.688v5.25
c0,0.43,0.255,0.75,0.688,0.75h4.875c0.428,0,0.688-0.32,0.688-0.75V26.5c0-0.43-0.258-0.688-0.688-0.688H47.562z M47.438,40.25
C47.176,40.351,47,40.615,47,40.938v32.938c0,0.43,0.257,0.688,0.688,0.688h4.625c0.43,0,0.688-0.256,0.688-0.688V40.938
c0-0.43-0.256-0.688-0.688-0.688h-4.625C47.581,40.25,47.525,40.216,47.438,40.25z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

8
www/views/modals/wallet-balance.html
View File

@ -7,12 +7,9 @@
Balance
</div>
</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__description" translate>Total is the total amount of bitcoin stored in this wallet. It is the sum of Available, Confirming, and Locked balances.</div>
<div class="wallet-balance__item item">
<img class="wallet-balance__icon" src="img/icon-sigma.svg" height="18"\>
@ -30,7 +27,6 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate>Available is the immediatley spendable amount of bitcoin stored in this wallet. It is the Total less Confirming and Locked balances. If you have enabled Use Unconfirmed Funds setting then the Available amount is the Total less Locked balance.</div>
<div class="wallet-balance__item item">
<i class="wallet-balance__icon icon ion-ios-checkmark-outline"></i>
@ -48,7 +44,6 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate>Confirming is the amount of bitcoin stored in this wallet with fewer than 3 block chain confirmations.</div>
<div class="wallet-balance__item item">
<i class="wallet-balance__icon icon ion-more"></i>
@ -66,7 +61,6 @@
</span>
</div>
</div>
<div class="wallet-balance__description" translate>Locked is the amount of bitcoin stored in this wallet that is allocated as inputs to pending transaction proposals. This amount is determined using unspent transaction outputs associated with the wallet and may be more than the actual amounts associated with your pending transaction proposals.</div>
<div class="wallet-balance__item item">
<i class="wallet-balance__icon icon ion-ios-locked-outline"></i>
@ -84,8 +78,6 @@
</span>
</div>
</div>
</div>
</ion-content>
</ion-modal-view>

3
www/views/tab-home.html
View File

@ -80,7 +80,8 @@
Incomplete
</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.pendingBalanceStr}}</span>
<span ng-if="!wallet.balanceHidden">{{wallet.status.totalBalanceStr}}</span>
<img ng-if="!wallet.balanceHidden && (status.totalBalanceSat == status.spendableAmount)" class="tab-home__wallet__icon" src="img/icon-important.svg"/>
<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}}