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

fix history sync

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-10 20:05:05 -03:00
commit 232b78ee8c
12 changed files with 96 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
public/views/includes/walletInfo.html
View file

@ -1,11 +1,16 @@
<span ng-show="index.isShared"><span translate>{{index.m}}-of-{{index.n}}</span></span>
<img style="height:1em" ng-show="index.network != 'livenet'" src="img/icon-testnet.svg">
<img style="height:1em" ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-view.svg">
<img style="height:1em" ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-read-only.svg">
<img style="height:1em" ng-show="index.externalSource == 'trezor'" src="img/icon-trezor.svg">
<img style="height:1em" ng-show="index.externalSource == 'ledger'" src="img/icon-ledger.svg">
<span style="height:1em" ng-show="index.account">#{{index.account || 0}} </span>
<img style="height:1em" ng-show="index.isPrivKeyEncrypted" src="img/icon-lock.svg">
<img style="height:1em" ng-show="index.preferences.email" src="img/icon-email.svg">
<!-- <img style="height:1em" ng&#45;show="index.preferences.email" src="img/icon&#45;email.svg"> -->
<img style="height:1em" ng-show="index.usingCustomBWS" src="img/icon-bws.svg">
<img style="height:1em" class="animated flash infinite" ng-show="index.updatingTxHistory[index.walletId]" src="img/icon-sync.svg">

8
public/views/walletHome.html
View file

@ -442,7 +442,7 @@
-->
<div id="history" class="history tab-view">
<div class="row m20t" ng-show="!index.txHistory[0] && !index.updatingTxHistory">
<div class="row m20t" ng-show="!index.txHistory[0] && !index.updatingTxHistory[index.walletId]">
<div class="large-12 columns">
<div class="oh text-center">
<span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.updateTxHistory()'>
@ -455,7 +455,7 @@
</div>
</div>
</div>
<div class="row m20t text-center" ng-show="index.updatingtxhistory">
<div class="row m20t text-center" ng-show="index.updatingTxHistory[index.walletId]">
<div class="columns large-12 medium-12 small-12">
<div class="spinner">
<div class="rect1"></div>
@ -465,11 +465,11 @@
<div class="rect5"></div>
</div>
</div>
<div ng-show="index.showWaitingSign" translate class="size-12 text-gray m20t">
<div ng-show="index.txProgress > 6" translate class="size-12 text-gray m20t">
Initial transaction history synchronization can take some minutes for wallets with many transactions.</br>
Please stand by.
</div>
<div ng-show="index.showWaitingSign" translate class="size-14 text-gray m20t">
<div ng-show="index.txProgress > 6" translate class="size-14 text-gray m20t">
<b>{{index.txProgress}}</b> Transactions<br>
Downloaded
</div>