From 6419342c4b877e7894d8d1f3867d9c0b6eff1c2e Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Thu, 2 Mar 2017 16:49:07 -0300
Subject: [PATCH] show lock screen at start

---
 src/js/controllers/advancedSettings.js |  2 +-
 src/js/controllers/tab-home.js         | 11 -----------
 src/js/routes.js                       | 11 ++++++++++-
 src/js/services/pincodeService.js      |  2 +-
 www/views/modals/pincode.html          |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 0a678b27d..60f32b9e9 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -54,7 +54,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
 
   $scope.usePincodeChange = function() {
     pincodeService.lockChange({
-      from: 'settings',
+      fromSettings: true,
       locking: $scope.usePincode.enabled
     });
   };
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 00566a01f..7a3fd83f8 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -15,17 +15,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
     $scope.isNW = platformInfo.isNW;
     $scope.showRateCard = {};
 
-    function openPincodeModal() {
-      $ionicModal.fromTemplateUrl('views/modals/pincode.html', {
-        scope: $scope,
-        backdropClickToClose: false,
-        hardwareBackButtonClose: false
-      }).then(function(modal) {
-        $scope.pincodeModal = modal;
-        $scope.pincodeModal.show();
-      });
-    };
-    // openPincodeModal();
     $scope.$on("$ionicView.afterEnter", function() {
       startupService.ready();
     });
diff --git a/src/js/routes.js b/src/js/routes.js
index 4fc657bd4..2f9e02317 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -1091,11 +1091,20 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       });
   })
-  .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, /* plugins START HERE => */ coinbaseService, glideraService, amazonService, bitpayCardService) {
+  .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, pincodeService, /* plugins START HERE => */ coinbaseService, glideraService, amazonService, bitpayCardService) {
 
     uxLanguage.init();
 
     $ionicPlatform.ready(function() {
+      configService.whenAvailable(function(config) {
+        if (config.pincode && config.pincode.enabled) {
+          pincodeService.lockChange({
+            fromSettings: false,
+            locking: false,
+          });
+        }
+      });
+
       if (screen.width < 768 && platformInfo.isCordova)
         screen.lockOrientation('portrait');
 
diff --git a/src/js/services/pincodeService.js b/src/js/services/pincodeService.js
index 15f20420e..fea790bca 100644
--- a/src/js/services/pincodeService.js
+++ b/src/js/services/pincodeService.js
@@ -5,7 +5,7 @@ angular.module('copayApp.services').factory('pincodeService', function($log, $ro
 
   root.lockChange = function(opts) {
     var scope = $rootScope.$new(true);
-    scope.from = opts.from;
+    scope.fromSettings = opts.fromSettings;
     scope.locking = opts.locking;
     $ionicModal.fromTemplateUrl('views/modals/pincode.html', {
       scope: scope,
diff --git a/www/views/modals/pincode.html b/www/views/modals/pincode.html
index 78790b052..765d374a7 100644
--- a/www/views/modals/pincode.html
+++ b/www/views/modals/pincode.html
@@ -1,5 +1,5 @@
 <ion-modal-view id="pin-code" ng-controller="pincodeController">
-  <div ng-if="from == 'settings'" ng-click="close()" class="close" translate>Close</div>
+  <div ng-if="fromSettings" ng-click="close()" class="close" translate>Close</div>
   <div class="content">
     <div class="block-code">
       <div class="row">