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

apply pin logic to modal view

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-09 12:36:32 -03:00
commit 9b21292a68
6 changed files with 45 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/js/routes.js
View file

@ -119,18 +119,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
/*
*
* Pin
*
*/
.state('pin', {
url: '/pin/:action',
controller: 'pinController',
templateUrl: 'views/pin.html',
})
/*
*
* Locked
@ -1245,7 +1233,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$ionicPlatform.on('resume', function() {
applicationService.successfullUnlocked = false;
applicationService.pinModal();
applicationService.pinModal('check');
// checkAndApplyLock(true);
});
@ -1319,13 +1307,11 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$log.debug(' fromParams:' + JSON.stringify(fromParams || {}));
configService.whenAvailable(function(config) {
var lockMethod = config.lock && config.lock.method;
console.log(lockMethod);
console.log("########################");
if (!lockMethod || lockMethod == 'none') return;
if (!applicationService.successfullUnlocked && !applicationService.pinIsOpen) {
console.log("################################# OPEN PIN MODAL");
applicationService.pinModal();
applicationService.pinModal('check');
}
});
});