diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 31d46c5f0..b5a118a29 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -3,7 +3,7 @@ -
+
{{title}}
@@ -16,25 +16,26 @@ -
- {{btx.amountStr}} +
+ {{btx.amountStr}}
-
- +
+ {{alternativeAmountStr}} - + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}})
- Sent from {{wallet.credentials.walletName}} -
- +
+ Sent from + {{wallet.credentials.walletName}}
+
@@ -63,27 +64,26 @@ {{btx.labelTo}} - +
-
+
View transaction on the blockchain
-
- Date +
+ {{'Date'|translate}}
-
Created by
- {{btx.creatorName}} + {{'Created by'|translate}} {{btx.creatorName}} @@ -91,9 +91,8 @@
-
Fee
- {{btx.feeLevel}} ({{btx.feeStr}}) - + {{'Fee'|translate}}: {{btx.feeStr}} + Unconfirmed @@ -108,20 +107,23 @@
-
Description
- {{btx.message}} + {{'Description'|translate}} + + {{btx.message}} +
-
Merchant message
- + {{'Merchant message'|translate}} + {{btx.merchant.pr.pd.memo}}
-
Recipients
- {{btx.recipientCount}} + {{'Recipients'|translate}} + + {{btx.recipientCount}} @@ -138,21 +140,22 @@
-
- Add Memo - Memo -
- {{btx.note.body}}
- - Edited by {{btx.note.editedByName}}, - - -
+
+ {{'Memo'|translate}} + + + + + {{btx.note.body}} +
+ Edited by {{btx.note.editedByName}}, + +
+
Timeline
-
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 61bf8443b..1f89f7b4a 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -22,32 +22,30 @@
{{tx.amountStr}}
{{tx.alternativeAmountStr}}
-
-
-
+
The payment was removed by creator
+ +
+
+
Payment accepted, but not yet broadcasted
+ + +
+
+
Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
+
+
Payment Sent
+
Payment Rejected
+
-
-
-
Payment accepted, but not yet broadcasted
- - -
-
-
Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created.
-
-
Payment Sent
-
Payment Rejected
-
- -
- Warning: this transaction has unconfirmed inputs +
+ Warning: this transaction has unconfirmed inputs
@@ -55,7 +53,7 @@ To - + Multiple recipients
@@ -73,61 +71,61 @@
- From - - - - - {{wallet.name}} + {{'From'|translate}} + + + + +
{{wallet.name}}
- Created by - + {{'Created by'|translate}} + {{tx.creatorName}}
- Memo - + {{'Memo'|translate}} + {{tx.message}}
- Fee - + {{'Fee'|translate}} + {{tx.feeStr}}
Payment details
-
  • - To - +
    + {{'To'|translate}} + {{tx.paypro.domain}} {{tx.paypro.domain}} -
    • -
  • - Expired - +
    • +
    + {{'Expired'|translate}} + - -
  • - Expires - +
    • +
    + {{'Expires'|translate}} + - -
  • - Merchant Message - {{tx.paypro.pr.pd.memo}} -
    • +
    +
    + {{'Merchant Message'|translate}} + {{tx.paypro.pr.pd.memo}} +
    Timeline
    @@ -151,16 +149,20 @@
    -
    + +
    * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
    -
    - diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 1f7a26f2b..976b72c3b 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -26,7 +26,7 @@ Payment Proposals - {{txpsN}} + {{txpsN}} diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index b4e45dae1..f9d7dd4ff 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -126,6 +126,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.rateDate = res.fetchedOn; $scope.rateStr = res.rate + ' ' + $scope.alternativeIsoCode; $scope.alternativeAmountStr = $filter('formatFiatAmount')(alternativeAmountBtc * res.rate) + ' ' + $scope.alternativeIsoCode; + $timeout(function() { + $scope.$apply(); + }); } }); }; diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 75c4a3120..23ba059b3 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi var isGlidera = $scope.isGlidera; var GLIDERA_LOCK_TIME = 6 * 60 * 60; var now = Math.floor(Date.now() / 1000); + var countDown; $scope.init = function() { $scope.loading = null; @@ -18,6 +19,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.data = {}; initActionList(); + checkPaypro(); } function initActionList() { @@ -53,8 +55,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.sign(); }); - checkPaypro(); - // ToDo: use tx.customData instead of tx.message if (tx.message === 'Glidera transaction' && isGlidera) { tx.isGlidera = true; @@ -154,7 +154,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.paymentExpired = false; setExpirationTime(); - self.countDown = $interval(function() { + countDown = $interval(function() { setExpirationTime(); }, 1000); @@ -162,7 +162,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi var now = Math.floor(Date.now() / 1000); if (now > expirationTime) { $scope.paymentExpired = true; - if (self.countDown) $interval.cancel(self.countDown); + if (countDown) $interval.cancel(countDown); return; } var totalSecs = expirationTime - now; diff --git a/src/sass/main.scss b/src/sass/main.scss index 4974b6297..916c8f500 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -594,6 +594,10 @@ ul.wallet-selection.wallets { margin-right: 40px; } +.m55r { + margin-right: 55px; +} + .m25r { margin-right: 25px; } diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 363466c94..28c1d977e 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -3,7 +3,7 @@ bottom: 100px; } .head { - padding-bottom: 55px; + padding-bottom: 30px; .sending-label{ line-height: 70px; font-size: 25px;