diff --git a/public/views/backupPassphrase.html b/public/views/backupPassphrase.html index aa837fcb7..70fb264fe 100644 --- a/public/views/backupPassphrase.html +++ b/public/views/backupPassphrase.html @@ -12,20 +12,33 @@ +
+
+
+
+
+
+
+
+
+ Verifying passphrase... +
+
+
Passphrase needed
- +
+
diff --git a/src/js/controllers/bachupWords.js b/src/js/controllers/bachupWords.js index 672f95682..d9bef409e 100644 --- a/src/js/controllers/bachupWords.js +++ b/src/js/controllers/bachupWords.js @@ -32,7 +32,8 @@ angular.module('copayApp.controllers').controller('backupWordsController', } self.addButton = function(word) { - var btnhtml = ''; var temp = $compile(btnhtml)($scope); angular.element(document.getElementById('addWord')).append(temp); diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index dbc37814d..433ce61c4 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -39,7 +39,6 @@ angular.module('copayApp.controllers').controller('backupController', self.credentialsEncrypted = false; setWords(fc.getMnemonic()); - // $rootScope.$emit('Local/BackupDone'); }); } } diff --git a/src/js/controllers/backupPassphrase.js b/src/js/controllers/backupPassphrase.js index bcfdd7885..da4fda063 100644 --- a/src/js/controllers/backupPassphrase.js +++ b/src/js/controllers/backupPassphrase.js @@ -6,11 +6,19 @@ angular.module('copayApp.controllers').controller('backupPassphraseController', var self = this; var fc = profileService.focusedClient; self.passphraseSuccess = false; + self.checkingPassphrase = false; self.error = ""; setWords(fc.getMnemonic()); var words = fc.getMnemonic(); + self.changePassphrase = function() { + self.passphraseSuccess = false; + $timeout(function() { + $rootScope.$apply(); + }, 1); + } + function setWords(words) { if (words) { self.mnemonicWords = words.split(/[\u3000\s]+/); @@ -20,6 +28,9 @@ angular.module('copayApp.controllers').controller('backupPassphraseController', }; self.confirm = function() { + self.checkingPassphrase = true; + self.error = ""; + var walletClient = bwcService.getClient(); walletClient.importFromMnemonic(words, { @@ -27,8 +38,19 @@ angular.module('copayApp.controllers').controller('backupPassphraseController', passphrase: $scope.passphrase, account: 0, }, function(err) { - if (err) + self.checkingPassphrase = false; + if (err) { self.error = err.message; + $timeout(function() { + $rootScope.$apply(); + }, 1); + return; + } + + self.passphraseSuccess = true; + $timeout(function() { + $rootScope.$apply(); + }, 1); }); } });