diff --git a/public/views/import.html b/public/views/import.html index dfbc3cb34..7a72834e8 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -50,19 +50,19 @@ Type the Recovery Phrase (usually 12 words): -
+
-
-
+
+
-
+
- +
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 59a80e138..a7d147c3e 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -8,12 +8,11 @@ angular.module('copayApp.controllers').controller('importController', var reader = new FileReader(); var defaults = configService.getDefaults(); var errors = bwcService.getErrors(); - var dataFromQR = null; + $scope.dataFromQR = null; $scope.bwsurl = defaults.bws.url; $scope.derivationPath = derivationPathHelper.default; $scope.account = 1; $scope.importErr = false; - $scope.fromQR = null; var updateSeedSourceSelect = function() { $scope.seedOptions = []; @@ -35,7 +34,7 @@ angular.module('copayApp.controllers').controller('importController', }; $scope.processWalletInfo = function(code) { - $scope.fromQR = null; + $scope.dataFromQR = null; $scope.importErr = false; $scope.error = null; var parsedCode = code.split('|'); @@ -60,9 +59,8 @@ angular.module('copayApp.controllers').controller('importController', $scope.testnetEnabled = info.network == 'testnet' ? true : false; $timeout(function() { - $scope.fromQR = true; $scope.words = null; - dataFromQR = info.data; + $scope.dataFromQR = info.data; $rootScope.$apply(); }, 1); }; @@ -251,7 +249,7 @@ angular.module('copayApp.controllers').controller('importController', opts.networkName = pathData.networkName; opts.derivationStrategy = pathData.derivationStrategy; - var words = form.words.$modelValue || dataFromQR; + var words = form.words.$modelValue || $scope.dataFromQR; $scope.error = null; if (!words) {