From f259d11f4e0a537c6403fbdb1cc73fd18d3aac1f Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 18 Nov 2015 12:29:56 -0300 Subject: [PATCH] complete flow views --- public/views/backupWords.html | 10 ++-------- src/js/controllers/backup.js | 15 +++++++-------- src/js/routes.js | 11 +++++++++++ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/public/views/backupWords.html b/public/views/backupWords.html index 4a8199cb3..b8560609a 100644 --- a/public/views/backupWords.html +++ b/public/views/backupWords.html @@ -16,20 +16,16 @@
-
Your Wallet Seed
-
-
- -
+
@@ -44,12 +40,11 @@ ng-disabled="!wordsC.sorted" ng-style="{'background-color':index.backgroundColor}" class="button black round expand" - ng-click="" + ng-click="$root.go('backupConfirm');" translate>Continue
-
@@ -62,6 +57,5 @@
-
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index f787dbc31..f0c3c0bc8 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -6,19 +6,18 @@ angular.module('copayApp.controllers').controller('wordsController', var msg = gettext('Are you sure you want to delete the backup words?'); var successMsg = gettext('Backup words deleted'); var self = this; - self.show = false; - self.sorted = false; - $scope.seed = ''; var customSortWords = []; var fc = profileService.focusedClient; + self.show = false; + self.sorted = false; - if (fc.isPrivKeyEncrypted()) self.credentialsEncrypted = true; - else { + if (fc.isPrivKeyEncrypted()) + self.credentialsEncrypted = true; + else setWords(fc.getMnemonic()); - } - if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic) { + + if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic) self.deleted = true; - } self.toggle = function() { self.error = ""; diff --git a/src/js/routes.js b/src/js/routes.js index e0260bf17..500fb70aa 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -445,6 +445,17 @@ angular }, } }) + .state('backupConfirm', { + url: '/backupConfirm', + templateUrl: 'views/backupConfirm.html', + walletShouldBeComplete: true, + needProfile: true, + views: { + 'main': { + templateUrl: 'views/backupConfirm.html' + }, + } + }) .state('preferencesGlobal', { url: '/preferencesGlobal', needProfile: true,