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

WIP trezor 48

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-04 00:53:26 -03:00
commit d1c1638b14
7 changed files with 141 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/js/controllers/create.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('createController',
function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isCordova, gettext, ledger, trezor, isMobile) {
function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isCordova, gettext, ledger, trezor, isMobile, isChromeApp) {
var self = this;
var defaults = configService.getDefaults();
@ -38,11 +38,48 @@ angular.module('copayApp.controllers').controller('createController',
$scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
};
var updateSeedSourceSelect = function(n) {
self.seedOptions = [{
id: 'new',
label: gettext('New Random Seed'),
}, {
id: 'set',
label: gettext('Specify Seed...'),
}];
$scope.seedSource = self.seedOptions[0];
// TODO
// if (!isChromeApp) return;
if (n > 1)
self.seedOptions.push({
id: 'ledger',
label: gettext('Ledger Hardware Wallet'),
});
self.seedOptions.push({
id: 'trezor',
label: gettext('Trezor Hardware Wallet'),
});
};
this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
$scope.totalCopayers = defaults.wallet.totalCopayers;
this.setTotalCopayers = function(tc) {
updateRCSelect(tc);
updateSeedSourceSelect(tc);
};
this.setSeedSource = function(src) {
self.seedSourceId = $scope.seedSource.id;
console.log('[create.js.78:seedSourceId:]',self.seedSourceId); //TODO
$timeout(function() {
$rootScope.$apply();
});
};
this.create = function(form) {
@ -81,9 +118,8 @@ angular.module('copayApp.controllers').controller('createController',
var src = form.hwLedger.$modelValue ? ledger : trezor;
// TODO : account
var account = 0;
src.getInfoForNewWallet(account, function(err, lopts) {
var account = form.account.$modelValue;
src.getInfoForNewWallet(opts.n > 1, account, function(err, lopts) {
self.hwWallet = false;
if (err) {
self.error = err;
@ -141,4 +177,5 @@ angular.module('copayApp.controllers').controller('createController',
$scope.$on("$destroy", function() {
$rootScope.hideWalletNavigation = false;
});
updateSeedSourceSelect(1);
});

10
src/js/controllers/import.js
View file

@ -188,8 +188,10 @@ angular.module('copayApp.controllers').controller('importController',
return;
}
self.hwWallet = 'Trezor';
// TODO account
trezor.getInfoForNewWallet(0, function(err, lopts) {
var account = form.account.$modelValue;
var isMultisig = form.isMultisig.$modelValue;
trezor.getInfoForNewWallet(isMultisig, account, function(err, lopts) {
self.hwWallet = false;
if (err) {
self.error = err;
@ -227,8 +229,8 @@ angular.module('copayApp.controllers').controller('importController',
return;
}
self.hwWallet = 'Ledger';
// TODO account
ledger.getInfoForNewWallet(0, function(err, lopts) {
var account = form.account.$modelValue;
ledger.getInfoForNewWallet(true, account, function(err, lopts) {
self.hwWallet = false;
if (err) {
self.error = err;

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

@ -47,9 +47,9 @@ angular.module('copayApp.controllers').controller('joinController',
if (form.hwLedger.$modelValue || form.hwTrezor.$modelValue) {
self.hwWallet = form.hwLedger.$modelValue ? 'Ledger' : 'TREZOR';
var src = form.hwLedger.$modelValue ? ledger : trezor;
var account = form.account.$modelValue;
var account = 0;
src.getInfoForNewWallet(account, function(err, lopts) {
src.getInfoForNewWallet(true, account, function(err, lopts) {
self.hwWallet = false;
if (err) {
self.error = err;