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

Merge pull request #3505 from cmgustavo/bug/txp-01

Browse source 
Fix parse error of TXP. Removes unused variables
This commit is contained in:
Matias Alejo Garcia 2015-11-20 11:48:14 -03:00
commit 76965f7ac0
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
 
</div>
<div class="small-10 columns">
<div ng-if="!$root.updatingBalance">
<div>
<span class="text-bold size-16"><span translate>Send</span> {{tx.amountStr}}</span>
<time class="right size-12 text-gray m5t">{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>

4
public/views/walletHome.html
View file

@ -160,8 +160,8 @@
<div ng-if="index.txps[0]">
<h4 ng-show="index.requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!index.requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div class="last-transactions pr" ng-repeat="tx in index.txps"
ng-include="index.txTemplateUrl">
<div class="last-transactions pr" ng-repeat="tx in index.txps">
<div ng-include="index.txTemplateUrl"></div>
</div>
<div class="text-gray text-center size-12 p10t"

1
src/js/controllers/index.js
View file

@ -615,7 +615,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.alternativeConversionRate = $filter('noFractionNumber')(alternativeConversionRate, 2);
self.alternativeBalanceAvailable = true;
self.updatingBalance = false;
self.isRateAvailable = true;
$rootScope.$apply();