BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix expiration date value

This commit is contained in:
Matias Alejo Garcia 2014-12-09 17:43:37 -03:00
parent 4a1db111e4
commit 4b8702ed75
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/models/Wallet.js
View File

@ -2686,7 +2686,6 @@ Wallet.prototype.getTransactionHistory = function(opts, cb) {
tx.sentTs = proposal.sentTs;
tx.merchant = proposal.merchant;
tx.peerActions = proposal.peerActions;
tx.merchant = proposal.merchant;
tx.paymentAckMemo = proposal.paymentAckMemo;
tx.actionList = self._getActionList(proposal);
}

7
views/modals/paypro.html
View File

@ -19,9 +19,10 @@
<span class="text-gray" ng-if="isRateAvailable">
{{ alternative }} {{ alternativeIsoCode }}
</span>
<p>
<b>Expires</b> {{md.expiration | amTimeAgo }}
</p>
<div ng-if="md.expirationDate" class="m10v">
<b>Expires</b>: {{md.expirationDate | amTimeAgo }}
</div>
</div>
</div>

6
views/modals/txp-details.html
View File

@ -47,8 +47,14 @@
<div ng-if="tx.merchant" class="size-12 m10v">
{{tx.merchant.pr.pd.memo}}
<div ng-if="tx.merchant.expirationDate" class="m10v">
<b>Expires</b>: {{tx.merchant.expirationDate | amTimeAgo }}
</div>
</div>
<div ng-if="tx.actionList[0]" class="m10v">
<b>Copayers Signatures</b>
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]">