diff --git a/css/src/main.css b/css/src/main.css index 2f476cf86..c09fb9e0e 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -417,20 +417,6 @@ a:hover { border-radius: 3px 3px 0 3px; } -a.missing-copayers { - background: #7A8C9E; - position: absolute; - display: block; - right: -1px; - bottom: -18px; - padding: 0.2rem 0.5rem; - font-size: 10px; - border-radius: 0 0 3px 3px; - text-transform: uppercase; - color: #fff; - font-weight: 700; -} - ul.tx-copayers { background: #E4E8EC; padding: 0.3rem 0.8rem; diff --git a/js/controllers/home.js b/js/controllers/home.js index 2807a6570..9c45b5278 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -174,7 +174,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc } } }); - } + }; function getParam(sname) { var params = location.search.substr(location.search.indexOf("?") + 1); diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index ef0658492..ee67815a5 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $location, rateService, notification, identityService) { +angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, identityService) { $scope.initHome = function() { var w = $rootScope.wallet; @@ -125,4 +125,28 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi _updateTxs(); }; + + $scope.openTxModal = function(btx) { + var ModalInstanceCtrl = function($scope, $modalInstance) { + $scope.btx = btx; + + $scope.getShortNetworkName = function() { + var w = $rootScope.wallet; + return w.getNetworkName().substring(0, 4); + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }; + + $modal.open({ + templateUrl: 'views/modals/tx-details.html', + windowClass: 'tiny', + controller: ModalInstanceCtrl, + }); + }; + + + }); diff --git a/views/history.html b/views/history.html index 5ef7cb102..8ad75677f 100644 --- a/views/history.html +++ b/views/history.html @@ -13,8 +13,8 @@
-
-
+
+
diff --git a/views/includes/transaction.html b/views/includes/transaction.html index a440de365..390f25a97 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -1,5 +1,4 @@ - -
+
@@ -22,25 +21,21 @@
-
- +
+
+ {{tx.merchant.domain}} + {{tx.merchant.domain}} + +
+
-
-
- {{tx.merchant.pr.pd.memo}}
- Expires {{tx.merchant.pr.pd.expires * 1000 | amTimeAgo }} - [{{tx.merchant.domain}}] - {{tx.merchant.pr.ca}} - Untrusted -
-
-
+
-
+
-
- - -
-
- - +
+
+ +
+
+ +
-
-
-
- Fee: {{tx.fee}} {{$root.wallet.settings.unitName}} -
-
+
- +
+
+ One signature missing - + {{tx.missingSignatures}} signatures missing - + Copayers - - - -
    -
  • - - - - - - - - {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} -
    • -
+
+
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 9ef101e81..2bfbba6df 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -33,9 +33,9 @@

Transaction Details

ID: {{btx.txid}}
- - : - + + + []
@@ -51,15 +51,19 @@
To: - {{btx.labelTo || btx.addressTo}} + + {{btx.merchant.domain}} + {{btx.merchant.domain}} + + + + {{btx.labelTo || btx.addressTo}} +
-
- Payment Protocol Information: -
{{btx.merchant.pr.pd.memo}} -
{{btx.paymentAckMemo}} - [{{btx.merchant.domain}}] +
+ {{btx.merchant.pr.pd.memo}}