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 408be7f64..40ac16dd3 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -29,6 +29,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; @@ -193,7 +195,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; $scope.cancel = function() { - $modalInstance.dismiss('cancel'); + $modalInstance.close(); }; }; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 70ab5efe0..c5c3a9162 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -127,7 +127,7 @@ angular.module('copayApp.directives') link: function(scope, elem, attrs, ctrl) { var validator = function(value) { if (value.length > 0) { - var m = value.match(/^[1-9A-HJ-NP-Za-km-z]{70,80}$/); + var m = value.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/); ctrl.$setValidity('walletSecret', m ? true : false); } return value; diff --git a/src/js/services/configService.js b/src/js/services/configService.js index ea8d8be7b..a9c0a1b9d 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -12,8 +12,7 @@ angular.module('copayApp.services').factory('configService', function(localStora // Bitcore wallet service URL bws: { - url: 'http://162.242.245.33:3232/bws/api', -// url: 'http://localhost:3001/bws/api', + url: 'https://copay.io:3232/bws/api', }, // insight