diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 8756efd59..40579a52a 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -340,6 +340,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.walletId = data.stateParams.walletId; $scope.wallet = profileService.getWallet($scope.walletId); + if (!$scope.wallet) return; $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; addressbookService.list(function(err, ab) { diff --git a/src/js/routes.js b/src/js/routes.js index f29107c6f..9f92325fc 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1177,7 +1177,20 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + // Reload tab-home if necessary (from root path: starting) + $state.go('starting', {}, { + 'reload': true, + 'notify': $state.current.name == 'starting' ? false : true + }).then(function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true, + historyRoot: true + }); + $state.transitionTo('tabs.home').then(function() { + // Clear history + $ionicHistory.clearHistory(); + }); + }); } // After everything have been loaded, initialize handler URL