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

hide testnet options for bch wallets in import process

Browse source
This commit is contained in:
JDonadio 2017-09-01 14:59:14 -03:00
commit 92cab1871a
No known key found for this signature in database
GPG key ID: EC1F4E04B2BFA730
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,9 @@ angular.module('copayApp.controllers').controller('importController',
$scope.formData.coin = 'btc'; $scope.formData.coin = 'btc';
$scope.importErr = false; $scope.importErr = false;
$scope.isCopay = appConfigService.name == 'copay'; $scope.isCopay = appConfigService.name == 'copay';
$scope.fromHardwareWallet = { value: false }; $scope.fromHardwareWallet = {
value: false
};
if (config.cashSupport.enabled) $scope.enableCash = true; if (config.cashSupport.enabled) $scope.enableCash = true;
@ -63,6 +65,14 @@ angular.module('copayApp.controllers').controller('importController',
}); });
}; };
$scope.switchTestnetOff = function() {
$scope.formData.testnetEnabled = false;
$scope.resizeView();
$timeout(function() {
$scope.$apply();
});
};
$scope.processWalletInfo = function(code) { $scope.processWalletInfo = function(code) {
if (!code) return; if (!code) return;
@ -286,7 +296,7 @@ angular.module('copayApp.controllers').controller('importController',
$log.warn('This wont work for Intel TEE wallets'); $log.warn('This wont work for Intel TEE wallets');
var id = $scope.formData.seedSourceAll.id; var id = $scope.formData.seedSourceAll.id;
var isMultisig = opts.derivationStrategy =='BIP48'; var isMultisig = opts.derivationStrategy == 'BIP48';
var account = opts.account; var account = opts.account;
opts.entropySourcePath = 'm/' + hwWallet.getEntropyPath(id, isMultisig, account); opts.entropySourcePath = 'm/' + hwWallet.getEntropyPath(id, isMultisig, account);
} }

2
www/views/includes/cash.html
View file

@ -2,7 +2,7 @@
<div class="input-label" translate> <div class="input-label" translate>
Coin Coin
</div> </div>
<select ng-model="formData.coin"> <select ng-model="formData.coin" ng-change="switchTestnetOff()">
<option value="btc">BTC</option> <option value="btc">BTC</option>
<option value="bch">BCH</option> <option value="bch">BCH</option>
</select> </select>

2
www/views/tab-import-phrase.html
View file

@ -64,7 +64,7 @@
<select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select> <select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
</label> </label>
<ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive"> <ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive" ng-if="formData.coin == 'btc'">
<span translate>Testnet</span> <span translate>Testnet</span>
</ion-toggle> </ion-toggle>