diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/store.js | 10 | ||||
| -rw-r--r-- | src/locales/en.json | 3 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/settings/[...tab]/_security.svelte | 17 |
4 files changed, 13 insertions, 19 deletions
diff --git a/src/lib/store.js b/src/lib/store.js index 6a2d7fd6..7383716d 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -1,19 +1,13 @@ import { get, writable } from 'svelte/store'; import { browser } from '$app/environment'; -const persistSession = (key, defaultValue, expiry) => { - if (expiry && browser && new Date() - expiry > sessionStorage.getItem(key + 'time')) { - sessionStorage.removeItem(key); - } - +const persistSession = (key, defaultValue) => { let s = writable( browser && sessionStorage.getItem(key) && sessionStorage.getItem(key) !== 'undefined' ? JSON.parse(sessionStorage.getItem(key)) : defaultValue ); - expiry && browser && sessionStorage.setItem(key + 'time', Date.now()); - s.subscribe((v) => browser && sessionStorage.setItem(key, JSON.stringify(v))); return s; @@ -49,7 +43,7 @@ export const newPayment = persistLocal('newPayment'); export const colorTheme = writable('from-primary to-gradient'); export const avatarUpload = writable(); export const bannerUpload = writable(); -export const pin = persistSession('pin', undefined, 5 * 60 * 1000); +export const pin = persistSession('pin', undefined); export const last = writable(); export const request = writable(); export const invoice = writable(); diff --git a/src/locales/en.json b/src/locales/en.json index a5d0ad02..9b24935e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -221,6 +221,9 @@ "localCurrency": "Currency", "btcUnit": "Display bitcoin in:", "bitcoin": "bitcoin", + "minutes": "minutes", + "hour": "hour", + "hours": "hours", "satoshis": "Satoshis", "securityPIN": "Security PIN", "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte index b2602625..22fc3ca6 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte @@ -55,9 +55,7 @@ let data = new FormData(formElement); if (data.get('password')) { - console.log('reencrypting', user.cipher); data.set('cipher', await reEncryptEntropy(user, data.get('password'))); - console.log(data.get('cipher')); } try { diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte index ef4b9fba..4d175025 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte @@ -188,20 +188,19 @@ {/if} </div> -<!-- TODO <div> - <label for="auto-lock" class="font-bold mb-1">{$t('user.settings.autoLock')}</label> + <label for="locktime" class="font-bold mb-1">{$t('user.settings.autoLock')}</label> <p class="text-secondary mb-1"> {$t('user.settings.autoLockDescription')} </p> - <select name="auto-lock" class="select-styles block py-3 w-full"> - <option value="5">5 min</option> - <option value="10">10 min</option> - <option value="30">30 min</option> - <option value="60">1 h</option> - <option value="480">8 h</option> + <select name="locktime" class="select-styles block py-3 w-full" value={parseInt(user.locktime)}> + <option value={5 * 60}>5 {$t('user.settings.minutes')}</option> + <option value={10 * 60}>10 {$t('user.settings.minutes')}</option> + <option value={30 * 60}>30 {$t('user.settings.minutes')}</option> + <option value={60 * 60}>1 {$t('user.settings.hour')}</option> + <option value={8 * 60 * 60}>8 {$t('user.settings.hours')}</option> </select> -</div> --> +</div> <div> <span class="font-bold mb-1">{$t('user.settings.twofa')}</span> |