diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 6864eb19f..2cba794ca 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -19,8 +19,8 @@
  • Amount: - {{tx.amountStr}} - {{tx.alternativeAmountStr}} + {{amountStr}} + {{alternativeAmountStr}}
  • @@ -122,21 +122,13 @@ -
    -
    - -
    -
    - Transaction sent! +
    +
    + Transaction sent!
    + ng-show="tx.status=='rejected'" translate> Transaction finally rejected
    diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 505b634f2..72f01841c 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -27,6 +27,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var ModalInstanceCtrl = function($scope, $modalInstance) { $scope.error = null; $scope.tx = tx; + $scope.amountStr = tx.amountStr; + $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.loading = null; $scope.color = fc.backgroundColor; @@ -191,7 +193,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.cancel = function() { - $modalInstance.dismiss('cancel'); + $modalInstance.close(); }; };