BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #51 from cmgustavo/bug/01-generateaddress 

Fixed generateAddress in front-end...
This commit is contained in:
Mario Colque 2014-04-15 15:05:34 -03:00
parent 8d0743a948 86e47b8fcd
commit 072e55665d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/controllers/home.js
View File

@ -6,14 +6,13 @@ angular.module('copay.home').controller('HomeController',
$scope.oneAtATime = true; $scope.oneAtATime = true;
if (!$rootScope.wallet.id) { if (!$rootScope.wallet || !$rootScope.wallet.id) {
$location.path('signin'); $location.path('signin');
} }
else {
$scope.addrs = $rootScope.wallet.publicKeyRing.getAddresses();
$scope.selectedAddr = $scope.addrs[0];
$scope.addrs = $rootScope.wallet.publicKeyRing.getAddresses(); }
$scope.selectedAddr = $scope.addrs[0];
$scope.newAddr = function() { $scope.newAddr = function() {
var a = $rootScope.wallet.publicKeyRing.generateAddress(); var a = $rootScope.wallet.publicKeyRing.generateAddress();

5
js/models/core/Wallet.js
View File

@ -29,13 +29,12 @@ Wallet.prototype._startInterface = function(config) {
this.blockchain = new Blockchain(config.blockchain); this.blockchain = new Blockchain(config.blockchain);
this.networkName = config.networkName; this.networkName = config.networkName;
this.requiredCopayers = config.requiredCopayers; this.requiredCopayers = config.wallet.requiredCopayers;
this.totalCopayers = config.totalCopayers; this.totalCopayers = config.wallet.totalCopayers;
}; };
Wallet.prototype.create = function(opts) { Wallet.prototype.create = function(opts) {
this.id = opts.id || Wallet.getRandomId(); this.id = opts.id || Wallet.getRandomId();
this.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID')); this.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID'));