From 5b1c84b5f7cb22983209f5c7df4a6c45ee8ff1c2 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Tue, 4 Apr 2017 16:47:36 -0300
Subject: [PATCH] refresh selected option

---
 src/js/controllers/lock.js         | 7 ++++++-
 src/js/controllers/tab-settings.js | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/lock.js b/src/js/controllers/lock.js
index 8932ce8df..3f64c700f 100644
--- a/src/js/controllers/lock.js
+++ b/src/js/controllers/lock.js
@@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('lockController', function($st
   var PIN = 'pin';
   var FINGERPRINT = 'fingerprint';
 
-  $scope.$on("$ionicView.beforeEnter", function(event) {
+  function init() {
     var config = configService.getSync();
     $scope.locking = config.lock.method != PIN;
 
@@ -34,6 +34,10 @@ angular.module('copayApp.controllers').controller('lockController', function($st
 
     $scope.currentOption = lodash.find($scope.options, 'value');
     processWallets();
+  };
+
+  $scope.$on("$ionicView.beforeEnter", function(event) {
+    init();
   });
 
   function processWallets() {
@@ -77,6 +81,7 @@ angular.module('copayApp.controllers').controller('lockController', function($st
       if (config.lock.method == PIN) {
         askForDisablePin(function(disablePin) {
           if (disablePin) saveConfig(FINGERPRINT);
+          else init();
         });
       } else saveConfig(FINGERPRINT);
     } else if (method == PIN) {
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index 00a58359b..80152ca61 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -54,8 +54,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     $scope.isDevel = platformInfo.isDevel;
     $scope.appName = appConfigService.nameCase;
     configService.whenAvailable(function(config) {
-      $scope.locked = config.lock.method == 'fingerprint' || config.lock.value || false;
-      $scope.method = config.lock.method != '' ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
+      $scope.locked = config.lock && config.lock.method != '' ? true : false;
+      $scope.method = config.lock && config.lock.method != '' ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
     });
   });