diff --git a/app/config.json b/app/config.json index 8ee695da0c1f304c5309b59a52725a86f248f548..1596adcb2a9920f26677dbf4b4eeca4c2588e7c2 100644 --- a/app/config.json +++ b/app/config.json @@ -2,12 +2,12 @@ "default": { "cacheTimeMs": 300000, "fallbackLanguage": "en", - "rememberMe": false, + "rememberMe": true, "showUDHistory": false, "timeout": 300000, "timeWarningExpireMembership": 5184000, "timeWarningExpire": 7776000, - "logoutIlde": 600, + "keepAuthIlde": 600, "useLocalStorage": true, "useRelative": false, "expertMode": false, @@ -54,12 +54,12 @@ "default_fr": { "cacheTimeMs": 300000, "fallbackLanguage": "fr", - "rememberMe": false, + "rememberMe": true, "showUDHistory": false, "timeout": 300000, "timeWarningExpireMembership": 5184000, "timeWarningExpire": 7776000, - "logoutIlde": 600, + "keepAuthIlde": 600, "useLocalStorage": true, "useRelative": false, "expertMode": false, @@ -105,8 +105,7 @@ "g1-test": { "cacheTimeMs": 300000, "fallbackLanguage": "en", - "rememberMe": false, - "showUDHistory": false, + "rememberMe": true, "timeout": 300000, "timeWarningExpireMembership": 5184000, "timeWarningExpire": 7776000, diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js index e9771368f430244b458b7517796769307411cbaf..4191d639c3d49546e275c80f46d5c40e382b13ab 100644 --- a/www/js/controllers/login-controllers.js +++ b/www/js/controllers/login-controllers.js @@ -248,7 +248,8 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils, // Scrypt (advanced or not) if (method == 'SCRYPT_DEFAULT' || method == 'SCRYPT_ADVANCED') { - $scope.changeScrypt($scope.scryptParamsValues[1]/*=default scrypt params*/); + var defaultScrypt = _.findWhere($scope.scryptParamsValues, {id: 'DEFAULT'}); + $scope.changeScrypt(defaultScrypt); $scope.autoComputePubkey = $scope.autoComputePubkey && (method == 'SCRYPT_DEFAULT'); } else {