Merge pull request #5981 from gabrielbazan7/fix/pincode
fix PIN backbutton issue
This commit is contained in:
commit
6b8d7db783
1 changed files with 3 additions and 1 deletions
|
|
@ -1175,8 +1175,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
|
|
||||||
//views with disable backbutton
|
//views with disable backbutton
|
||||||
var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;
|
var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;
|
||||||
|
var matchLockedView = $ionicHistory.currentStateName() == 'lockedView' ? true : false;
|
||||||
|
var matchPin = $ionicHistory.currentStateName() == 'pin' ? true : false;
|
||||||
|
|
||||||
if ($ionicHistory.backView() && !fromTabs && !fromOnboarding && !matchComplete) {
|
if ($ionicHistory.backView() && !fromTabs && !fromOnboarding && !matchComplete && !matchPin && !matchLockedView) {
|
||||||
$ionicHistory.goBack();
|
$ionicHistory.goBack();
|
||||||
} else
|
} else
|
||||||
if ($rootScope.backButtonPressedOnceToExit) {
|
if ($rootScope.backButtonPressedOnceToExit) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue