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

Merge pull request #5196 from ajp8164/feat/balance-modal

Browse source 
Initial implementation for balance modal.
This commit is contained in:
Javier Donadío 2016-12-15 13:58:11 -03:00 • committed by GitHub
commit 685a11cbfc
12 changed files with 350 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

96
www/views/modals/wallet-balance.html Normal file
View file

@ -0,0 +1,96 @@
<ion-modal-view id="wallet-balance">
<ion-header-bar align-title="center" ng-style="{'background-color': wallet.color}">
<button class="button button-clear" ng-click="close()" translate>
Close
</button>
<div class="title">
{{wallet.name}}
</div>
<div class="buttons buttons-right header-item">
<span class="secondary-buttons">
<button class="button button-clear" ng-click="updateAll(true)">
<i class="icon ion-ios-refresh-empty"></i>
</button>
</span>
</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 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">
<div class="wallet-balance__title" translate>Total</div>
<span class="item-note text-right wallet-balance__amount">
<span class="wallet-balance__amount wallet-balance__amount--total">
{{status.totalBalanceStr}}
</span>
<div>
<span class="wallet-balance__amount--alternative ng-binding">
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
</span>
</div>
</span>
</div>
</div>
<div class="wallet-balance__description" translate>The total amount of bitcoin stored in this wallet.</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">
<div class="wallet-balance__title" translate>Available</div>
<span class="item-note text-right wallet-balance__amount">
<span class="wallet-balance__amount wallet-balance__amount--available">
{{status.spendableBalanceStr}}
</span>
<div>
<span class="wallet-balance__amount--alternative ng-binding">
{{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
</span>
</div>
</span>
</div>
</div>
<div class="wallet-balance__description" translate>The amount of bitcoin immediately spendable from this wallet.</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">
<div class="wallet-balance__title" translate>Confirming</div>
<span class="item-note text-right wallet-balance__amount">
<span class="wallet-balance__amount wallet-balance__amount--confirming">
{{status.pendingBalanceStr}}
</span>
<div>
<span class="wallet-balance__amount--alternative ng-binding">
{{status.pendingBalanceAlternative}} {{status.alternativeIsoCode}}
</span>
</div>
</span>
</div>
</div>
<div class="wallet-balance__description" translate>The amount of bitcoin stored in this wallet with less than 1 blockchain 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">
<div class="wallet-balance__title" translate>Locked</div>
<span class="item-note text-right wallet-balance__amount">
<span class="wallet-balance__amount wallet-balance__amount--locked">
{{status.lockedBalanceStr}}
</span>
<div>
<span class="wallet-balance__amount--alternative ng-binding">
{{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}}
</span>
</div>
</span>
</div>
</div>
<div class="wallet-balance__description" translate>The amount of bitcoin stored in this wallet that is allocated as inputs to your pending transaction proposals. The amount is determined using unspent transaction outputs associated with this wallet and may be more than the actual amounts associated with your pending transaction proposals.</div>
</div>
</ion-content>
</ion-modal-view>

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

@ -80,11 +80,12 @@
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>
<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}}
</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;

42
www/views/walletDetails.html
View file

@ -27,11 +27,12 @@
<div ng-if="!notAuthorized && !updatingStatus">
<div ng-show="updateStatusError">
<span class="size-12 db m10">{{updateStatusError}}</span>
<a class="button button-outline button-light button-small" ng-click='update()' translate>Tap to retry</a>
</div>
<div ng-show="walletNotRegistered">
<span class="size-12 db m10b" translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
<span class="size-12 db m10" translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
<a class="button button-outline button-light button-small" ng-click='recreate()' translate>Recreate</a>
</div>
@ -45,21 +46,15 @@
ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden"
on-hold="hideToggle()"
ng-style="{'transform': amountScale}"
class="amount__balance"
>
<strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong>
class="amount__balance">
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div
ng-if="!status.pendingAmount"
class="size-14 amount-alternative"
ng-if="status.totalBalanceAlternative"
ng-style="{opacity: altAmountOpacity}"
>
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
</div>
<div class="size-20" ng-if="status.pendingAmount">
<div style="margin-bottom:.5rem"><span translate>Available</span>: {{status.totalBalanceStr}}</div>
<div><span translate>Confirming</span>: {{status.pendingAmountStr}}</div>
</div>
</div>
<div ng-style="{'transform': amountScale}"
@ -71,6 +66,20 @@
Tap and hold to show
</div>
</div>
<div ng-if="!wallet.balanceHidden && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">
<button class="button button-standard button-primary amount__button-balance size-14" ng-click="openBalanceModal()">
<i class="icon ion-ios-checkmark-outline"></i>
<strong>
{{status.spendableBalanceStr}}
</strong>
&nbsp;
<span>
{{status.spendableBalanceAlternative}} {{status.alternativeIsoCode}}
</span>
</button>
</div>
</div>
<div ng-if="updatingStatus" class="amount__updating">
<div class="size-36">
@ -78,7 +87,6 @@
</div>
</div>
</div>
<div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
<span ng-include="'views/includes/walletInfo.html'"></span>
</div>
@ -105,24 +113,14 @@
<div ng-if="!updatingStatus">
<div ng-show="updateStatusError">
<span class="size-12 db m10b">{{updateStatusError}}</span>
<span class="size-12 db m10">{{updateStatusError}}</span>
<a class="button button-outline button-light button-small" ng-click='updateAll()' translate>Tap to retry</a>
</div>
<div ng-show="walletNotRegistered">
<span class="size-12 db m10b" translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
<span class="size-12 db m10" translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
<a class="button button-outline button-light button-small" ng-click='recreate()' translate>Recreate</a>
</div>
<div ng-click='updateAll(true)' ng-show="!updateStatusError && !wallet.balanceHidden" on-hold="hideToggle()">
<strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong>
<div ng-if="!status.pendingAmount" class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-20" ng-if="status.pendingAmount">
<div style="margin-bottom:.5rem"><span translate>Available</span>: {{status.totalBalanceStr}}</div>
<div><span translate>Confirming</span>: {{status.pendingAmountStr}}</div>
</div>
</div>
<div ng-show="!updateStatusError && wallet.balanceHidden" on-hold="hideToggle()">
<strong class="size-24" translate>[Balance Hidden]</strong>
<div class="size-14" translate>