diff --git a/public/views/import.html b/public/views/import.html index 58f2a9739..b1ea99694 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -50,19 +50,11 @@ Type the Recovery Phrase (usually 12 words): -
+
-
-
- -
-
- -
-
- +
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 6cc4db05c..8c9f72295 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -8,7 +8,6 @@ angular.module('copayApp.controllers').controller('importController', var reader = new FileReader(); var defaults = configService.getDefaults(); var errors = bwcService.getErrors(); - $scope.dataFromQR = null; $scope.bwsurl = defaults.bws.url; $scope.derivationPath = derivationPathHelper.default; $scope.account = 1; @@ -36,7 +35,6 @@ angular.module('copayApp.controllers').controller('importController', $scope.processWalletInfo = function(code) { if (!code) return; - $scope.dataFromQR = null; $scope.importErr = false; $scope.error = null; var parsedCode = code.split('|'); @@ -62,8 +60,7 @@ angular.module('copayApp.controllers').controller('importController', $scope.testnetEnabled = info.network == 'testnet' ? true : false; $timeout(function() { - $scope.words = null; - $scope.dataFromQR = info.data; + $scope.words = info.data; $rootScope.$apply(); }, 1); }; @@ -252,7 +249,7 @@ angular.module('copayApp.controllers').controller('importController', opts.networkName = pathData.networkName; opts.derivationStrategy = pathData.derivationStrategy; - var words = form.words.$modelValue || $scope.dataFromQR; + var words = form.words.$modelValue || null; $scope.error = null; if (!words) { diff --git a/src/sass/main.scss b/src/sass/main.scss index 41f1a7904..985a219c3 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -895,12 +895,6 @@ ul.manage li { background-color: #1ABC9C; } -.lock-fromQR { - position: absolute; - width: 100%; - margin-top: 20px; -} - .tx-proposal i { padding: .1rem .3rem; background-color: #A5B2BF;