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

Merge pull request #60 from matiu/bug/starting

Browse source 
Bug/starting
This commit is contained in:
Javier Donadío 2017-04-18 17:29:38 -03:00 • committed by GitHub
commit f0dbbd0960
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/controllers/pin.js
View file

@ -175,7 +175,12 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
$scope.close = function(delay) {
$timeout(function() {
$ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
if (shouldReturn)
$ionicHistory.goBack()
else
$state.go('tabs.home');
}, delay || 1);
};
});