anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2526 from cmgustavo/bug/minors-01

Browse source 
Bug/minors 01
This commit is contained in:
Matias Alejo Garcia 2015-04-16 15:17:25 -03:00
commit c728f2958f
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/walletHome.js
View file

@ -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();
};
};

2
src/js/directives/directives.js
View file

@ -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;

3
src/js/services/configService.js
View file

@ -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