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

Merge pull request #22 from gabrielbazan7/ref/routes

Browse source 
WIP: move wallet preferences to global settings and show tabs on activity view
This commit is contained in:
Matias Alejo Garcia 2016-08-31 18:28:25 -03:00 • committed by GitHub
commit 9a2cdf057c
19 changed files with 256 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/backController.js
View file

@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('backController', function($sc
$scope.importGoBack = function() {
if ($stateParams.fromOnboarding) $state.go('onboarding.welcome');
else $state.go('add.main');
else $state.go('tabs.add');
};
$scope.onboardingMailSkip = function() {

2
src/js/controllers/onboarding/welcomeController.js
View file

@ -3,7 +3,7 @@
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
$scope.goImport = function() {
$state.go('add.import.phrase', {
$state.go('tabs.import.phrase', {
fromOnboarding: true
});
};

1
src/js/controllers/tab-settings.js
View file

@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
return w.id != self.walletId;
});
$scope.wallets = profileService.getWallets();
};
$scope.openAddressbookModal = function() {