From 4b8702ed75c7b8e54f9f2055d0ccba0c7cbfe65d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 9 Dec 2014 17:43:37 -0300
Subject: [PATCH] fix expiration date value

---
 js/models/Wallet.js           | 1 -
 views/modals/paypro.html      | 7 ++++---
 views/modals/txp-details.html | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 2855a9812..853c449fc 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -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);
     }
diff --git a/views/modals/paypro.html b/views/modals/paypro.html
index 5d8fdff56..0d8620111 100644
--- a/views/modals/paypro.html
+++ b/views/modals/paypro.html
@@ -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>
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html
index 1ada9656d..f94425621 100644
--- a/views/modals/txp-details.html
+++ b/views/modals/txp-details.html
@@ -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]">