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

fix backup flow

Browse source
This commit is contained in:
Javier 2016-09-13 17:00:27 -03:00
commit a978062425
3 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/js/controllers/backup.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('backupController',
function($rootScope, $scope, $timeout, $log, $state, $stateParams, $ionicPopup, $ionicNavBarDelegate, uxLanguage, lodash, fingerprintService, platformInfo, configService, profileService, bwcService, walletService, ongoingProcess, storageService, popupService, gettextCatalog, $ionicModal) {
function($rootScope, $scope, $timeout, $log, $state, $stateParams, $ionicPopup, $ionicHistory, $ionicNavBarDelegate, uxLanguage, lodash, fingerprintService, platformInfo, configService, profileService, bwcService, walletService, ongoingProcess, storageService, popupService, gettextCatalog, $ionicModal) {
var wallet = profileService.getWallet($stateParams.walletId);
$ionicNavBarDelegate.title(wallet.credentials.walletName);
$scope.n = wallet.n;
@ -50,12 +50,13 @@ angular.module('copayApp.controllers').controller('backupController',
if (!keys) return;
var words = keys.mnemonic;
$scope.data = {};
$scope.mnemonicWords = words.split(/[\u3000\s]+/);
$scope.shuffledMnemonicWords = shuffledWords($scope.mnemonicWords);
$scope.mnemonicHasPassphrase = wallet.mnemonicHasPassphrase();
$scope.useIdeograms = words.indexOf("\u3000") >= 0;
$scope.passphrase = '';
$scope.data.passphrase = null;
$scope.customWords = [];
$scope.step = 1;
$scope.selectComplete = false;
@ -86,44 +87,39 @@ angular.module('copayApp.controllers').controller('backupController',
}, 1);
};
$ionicModal.fromTemplateUrl('views/includes/confirmBackupPopup.html', {
scope: $scope,
animation: 'slide-in-up'
}).then(function(modal) {
$scope.modal = modal;
});
$scope.openModal = function() {
$scope.modal.show();
function openConfirmBackupModal() {
$ionicModal.fromTemplateUrl('views/includes/confirmBackupPopup.html', {
scope: $scope,
backdropClickToClose: false,
hardwareBackButtonClose: false
}).then(function(modal) {
$scope.confirmBackupModal = modal;
$scope.confirmBackupModal.show();
});
};
$scope.closeModal = function() {
$scope.modal.hide();
};
// Cleanup the modal when we're done with it!
$scope.$on('$destroy', function() {
$scope.modal.remove();
});
var openPopup = function() {
var showBackupResult = function() {
if ($scope.backupError) {
var title = gettextCatalog.getString('uh oh...');
var message = gettextCatalog.getString("It's importante that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money Please review your backup and try again");
popupService.showAlert(title, message, function() {
$scope.goToStep(1);
})
} else {
openConfirmBackupModal();
}
else {
$scope.openModal();
$scope.closePopup = function() {
$scope.closeModal();
if ($stateParams.fromOnboarding) $state.go('onboarding.disclaimer');
else {
$ionicHistory.clearHistory();
$state.go('tabs.home')
}
};
};
$scope.closeBackupResultModal = function() {
$scope.confirmBackupModal.hide();
if ($stateParams.fromOnboarding) {
$state.go('onboarding.disclaimer');
} else {
$ionicHistory.clearHistory();
$state.go('tabs.home');
}
}
};
var confirm = function(cb) {
$scope.backupError = false;
@ -139,7 +135,7 @@ angular.module('copayApp.controllers').controller('backupController',
var walletClient = bwcService.getClient();
var separator = $scope.useIdeograms ? '\u3000' : ' ';
var customSentence = customWordList.join(separator);
var passphrase = $scope.passphrase || '';
var passphrase = $scope.data.passphrase || '';
try {
walletClient.seedFromMnemonic(customSentence, {
@ -171,7 +167,7 @@ angular.module('copayApp.controllers').controller('backupController',
backupError(err);
}
$timeout(function() {
openPopup();
showBackupResult();
return;
}, 1);
});
@ -216,4 +212,4 @@ angular.module('copayApp.controllers').controller('backupController',
$scope.selectComplete = false;
};
});
});