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

better proposal styling and fix confirming status on wallet master view

Browse source
This commit is contained in:
Marty Alcala 2016-11-07 15:32:28 -05:00
commit 610d42caae
3 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/walletDetails.js
View file

@ -196,7 +196,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
} }
$scope.isUnconfirmed = function(tx) { $scope.isUnconfirmed = function(tx) {
return !tx.time && (!tx.confirmations || tx.confirmations === 0); return !tx.confirmations || tx.confirmations === 0;
}; };
$scope.showMore = function() { $scope.showMore = function() {

15
www/views/includes/txp.html
View file

@ -48,30 +48,19 @@
</span> </span>
</div> </div>
<div class="wallet-details__tx-title" ng-if="tx.confirmations === 0">
<div class="ellipsis" style="color: #B4B4B4;">
Confirming
</div>
</div>
<span class="item-note text-right wallet-details__tx-amount"> <span class="item-note text-right wallet-details__tx-amount">
<span class="wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': tx.recent, 'wallet-details__tx-amount--received': tx.action == 'received', 'wallet-details__tx-amount--sent': tx.action == 'sent'}"> <span class="wallet-details__tx-amount wallet-details__tx-amount--sent">
<span ng-if="tx.action == 'sent'">–</span> <span ng-if="tx.action == 'sent'">–</span>
<span class="size-12" ng-if="tx.action == 'invalid'" translate> <span class="size-12" ng-if="tx.action == 'invalid'" translate>
(possible double spend) (possible double spend)
</span> </span>
<span ng-if="tx.action != 'invalid'"> <span ng-if="tx.action != 'invalid'">
{{tx.amountStr}} – {{tx.amountStr}}
</span> </span>
</span> </span>
<div> <div>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | amTimeAgo}}</time> <time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time> <time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time>
<!-- <span translate class="text-warning"
ng-show="!tx.time && (!tx.confirmations || tx.confirmations == 0)">
Unconfirmed
</span> -->
</div> </div>
</span> </span>
</div> </div>

7
www/views/walletDetails.html
View file

@ -104,7 +104,7 @@
<div ng-repeat="tx in txps" ng-click="openTxpModal(tx)"> <div ng-repeat="tx in txps" ng-click="openTxpModal(tx)">
<div class="wallet-details__item proposal" ng-include="'views/includes/txp.html'"></div> <div class="wallet-details__item proposal" ng-include="'views/includes/txp.html'"></div>
</div> </div>
<div class="item item-footer description" ng-show="status.lockedBalanceSat"> <div class="item item-footer description" ng-show="status.lockedBalanceSat" style="background: white;">
<span translate>Total Locked Balance</span>: <span translate>Total Locked Balance</span>:
<b>{{status.lockedBalanceStr}} </b> <b>{{status.lockedBalanceStr}} </b>
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span> <span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
@ -241,11 +241,6 @@
<div> <div>
<time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time> <time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">{{btx.time * 1000 | date:'MMMM d, y'}}</time> <time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">{{btx.time * 1000 | date:'MMMM d, y'}}</time>
<!-- <span translate class="text-warning"
ng-show="!btx.time && (!btx.confirmations || btx.confirmations == 0)">
Unconfirmed
</span> -->
</div> </div>
</span> </span>
</div> </div>