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

Merge pull request #3587 from cmgustavo/bug/modals-home

Browse source 
Bug/modals home
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-03 18:09:05 -03:00
commit 87cbb11bfb
5 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,5 +12,5 @@
<!-- <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">
<img style="height:1em" class="animated flash infinite" ng-show="index.loadingWallet" src="img/icon-sync.svg">

10
public/views/modals/paypro.html
View file

@ -24,15 +24,15 @@
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh">
<span class="text-gray" translate>Pay To</span>:
<span class="text-gray" translate>Pay To</span>
<span class="right enable_text_select">{{paypro.domain}}</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.toAddress">
<span class="text-gray" translate>Address</span>:
<span class="text-gray" translate>Address</span>
<span class="right enable_text_select">{{paypro.toAddress}}</span>
</li>
<li class="line-b p10 oh">
<span class="text-gray" translate>Certified by</span>:
<span class="text-gray" translate>Certified by</span>
<span class="right text-right">
<span ng-show="paypro.caTrusted">
<i class="fi-lock color-greeni"></i>
@ -51,11 +51,11 @@
</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.memo">
<span class="text-gray" translate>Memo</span>:
<span class="text-gray" translate>Memo</span>
<span class="right">{{paypro.memo}}</span>
</li>
<li class="line-b p10 oh" ng-if="paypro.expires">
<span class="text-gray" translate>Expires</span>:
<span class="text-gray" translate>Expires</span>
<span class="right">{{paypro.expires * 1000 | amTimeAgo }}</span>
</li>
</ul>

2
public/views/modals/txp-details.html
View file

@ -87,7 +87,7 @@
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh">
<li class="line-b p10 oh" ng-show="tx.message">
<span class="text-gray" translate>Note</span>
<span class="right">{{tx.message}}</span>
</li>

15
public/views/walletHome.html
View file

@ -162,7 +162,7 @@
</div>
<div class="text-gray text-center size-12 p10t"
ng-show="index.lockedBalanceSat && !index.updatingStatus">
ng-show="index.lockedBalanceSat">
<span translate>Total Locked Balance</span>:
<b>{{index.lockedBalanceStr}} </b>
<span> {{index.lockedBalanceAlternative}}
@ -172,22 +172,22 @@
<!-- Activity -->
<h4 class="title m0" translate>Activity</h4>
<div class="row m20t" ng-show="!index.updatingTxHistory[index.walletId] && !index.txHistory[0]">
<div class="row"
ng-show="!index.loadingWallet && !index.txHistory[0]">
<div class="large-12 columns">
<div class="oh text-center">
<div class="oh text-gray size-12 text-center m20t">
<span ng-if="!index.txHistoryError" translate>
No transactions yet
</span>
<span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.updateTxHistory()'>
<p class="size-12 m10b db text-gray" translate>Could not fetch transaction history</p>
<p translate>Could not fetch transaction history</p>
<button class="outline round light-gray tiny" translate>Tap to retry</button>
</span>
</div>
</div>
</div>
<div ng-show="index.updatingTxHistory[index.walletId]">
<div class="row p20 text-center" ng-show="index.txProgress > 6">
<div ng-show="index.updatingTxHistory[index.walletId] && index.txProgress > 6">
<div class="row p20 text-center">
<div class="columns large-12 medium-12 small-12 m10b">
<div class="spinner">
<div class="rect1"></div>
@ -206,6 +206,7 @@
</div>
<div ng-show="index.txHistory[0]">
<h4 class="title m0" translate>Activity</h4>
<div ng-repeat="btx in index.txHistory"
ng-click="home.openTxModal(btx)"
class="row collapse last-transactions-content">