mirror of https://github.com/BTCPrivate/copay.git
fix expiration date value
This commit is contained in:
parent
4a1db111e4
commit
4b8702ed75
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -47,7 +47,13 @@
|
|||
|
||||
<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>
|
||||
|
|
Loading…
Reference in New Issue