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

Merge pull request #241 from cmgustavo/ref/toggle-hw-01 

Fix toggle
This commit is contained in:
Matias Alejo Garcia 2017-06-12 22:09:26 +02:00 committed by GitHub
parent da15bc939b 210d867c59
commit d29faf708a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/controllers/import.js
View File

@ -17,6 +17,7 @@ angular.module('copayApp.controllers').controller('importController',
$scope.formData.account = 1;
$scope.importErr = false;
$scope.isCopay = appConfigService.name == 'copay';
$scope.fromHardwareWallet = { value: false };
if ($stateParams.code)
$scope.processWalletInfo($stateParams.code);
@ -273,7 +274,7 @@ angular.module('copayApp.controllers').controller('importController',
opts.passphrase = $scope.formData.passphrase || null;
if ($scope.formData.fromHardwareWallet) {
if ($scope.fromHardwareWallet.value) {
$log.debug('Importing seed from hardware wallet');
$log.warn('This wont work for Intel TEE wallets');

11
www/views/tab-import-phrase.html
View File

@ -50,11 +50,16 @@
</label>
<ion-toggle ng-model="formData.fromHardwareWallet" toggle-class="toggle-positive">
<span translate>From Hardware Wallet</span>
<ion-toggle ng-model="fromHardwareWallet.value" toggle-class="toggle-positive">
<span class="toggle-label" translate>From Hardware Wallet</span>
</ion-toggle>
<select ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
<label class="item item-input item-select" ng-if="fromHardwareWallet.value">
<div class="input-label" translate>
Wallet Type
</div>
<select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
</label>
<ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
<span translate>Testnet</span>