fix: the default duraction for auto lock (#10638)

DimensionDev · Aug 28, 2023 · 326c3af · 326c3af
1 parent 9ed646a
commit 326c3af
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/packages/mask/background/services/wallet/services/wallet/database/locker.ts b/packages/mask/background/services/wallet/services/wallet/database/locker.ts
@@ -1,7 +1,7 @@
 import { CrossIsolationMessages } from '@masknet/shared-base'
 import { walletDatabase } from '../../../database/Plugin.db.js'
 
-const DEFAULT_LOCK_DURATION = 1000 * 60 * 15 // 15 mins
+const DEFAULT_LOCK_DURATION = 1000 * 60 * 60 * 24 // One day
 
 const ID = 'locker'
 

diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json
@@ -868,6 +868,8 @@
     "popups_wallet_settings_change_network": "Change Network",
     "popups_wallet_settings_auto_unlock_time": "Auto-lock Time",
     "popups_wallet_settings_auto_unlock_time_mins": "{{time}} Mins",
+    "popups_wallet_settings_auto-unlock_time_hour_one": "{{count}} Hour",
+    "popups_wallet_settings_auto-unlock_time_hour_other": "{{count}} Hours",
     "popups_wallet_settings_auto_unlock_time_title": "Auto-lock",
     "popups_wallet_settings_change_payment_password": "Change Payment Password",
     "popups_wallet_settings_show_private_key": "Show Private Key",

diff --git a/packages/mask/src/extension/popups/UI.tsx b/packages/mask/src/extension/popups/UI.tsx
@@ -42,6 +42,7 @@ import {
     VerifyBackupPasswordModal,
 } from './modals/index.js'
 import SwitchWallet from './pages/Wallet/SwitchWallet/index.js'
+import { noop } from 'lodash-es'
 
 const Wallet = lazy(() => import(/* webpackPreload: true */ './pages/Wallet/index.js'))
 const Personas = lazy(() => import(/* webpackPreload: true */ './pages/Personas/index.js'))
@@ -142,7 +143,10 @@ export default function Popups() {
         [title, extension, customBackHandler],
     )
 
-    useIdleTimer({ onAction: Services.Wallet.setAutoLockTimer, throttle: 10000 })
+    useIdleTimer({
+        onAction: !location.hash.includes('/swap') ? Services.Wallet.setAutoLockTimer : noop,
+        throttle: 10000,
+    })
     useEffect(() => {
         if (location.hash.includes('/swap')) return
         return CrossIsolationMessages.events.popupRouteUpdated.on((url) => PopupsHistory.replace(url))

diff --git a/packages/mask/src/extension/popups/modals/WalletAutoLockSettingModal/index.tsx b/packages/mask/src/extension/popups/modals/WalletAutoLockSettingModal/index.tsx
@@ -54,7 +54,7 @@ enum OptionName {
     NEVER = 'Never',
 }
 
-const DEFAULT_MIN_AUTO_LOCKER_TIME = 1000 * 60 * 15 // 15 mins
+const DEFAULT_MIN_AUTO_LOCKER_TIME = 1000 * 60 * 60 * 24 // One day
 
 const ONE_DAY_IN_MILLISECONDS = hoursToMilliseconds(24)
 
@@ -114,7 +114,7 @@ function WalletAutoLockSettingDrawer(props: BottomDrawerProps) {
                     sx={{ mt: 2 }}
                     error={error}
                     fullWidth
-                    placeholder={'15'}
+                    placeholder={'1440'}
                     value={time || initialTime}
                     onChange={(e) => {
                         if (!e.target.value) setTime('')

diff --git a/packages/mask/src/extension/popups/pages/Wallet/WalletSettings/AutoLock.tsx b/packages/mask/src/extension/popups/pages/Wallet/WalletSettings/AutoLock.tsx
@@ -1,6 +1,8 @@
+import { useMemo } from 'react'
 import { Icons } from '@masknet/icons'
 import { Box, ListItem, Typography, useTheme } from '@mui/material'
 import millisecondsToMinutes from 'date-fns/millisecondsToMinutes'
+import millisecondsToHours from 'date-fns/millisecondsToHours'
 import { useI18N } from '../../../../../utils/index.js'
 import { useStyles } from './useStyles.js'
 import { WalletAutoLockSettingModal } from '../../../modals/modals.js'
@@ -13,6 +15,7 @@ export function AutoLock() {
 
     const { value } = useWalletAutoLockTime()
 
+    const minutes = useMemo(() => (value ? millisecondsToMinutes(value) : undefined), [value])
     return (
         <ListItem
             className={classes.item}
@@ -28,7 +31,9 @@ export function AutoLock() {
             <Box className={classes.itemBox}>
                 {value ? (
                     <Typography className={classes.itemText}>
-                        {t('popups_wallet_settings_auto_unlock_time_mins', { time: millisecondsToMinutes(value) })}
+                        {minutes && minutes >= 60
+                            ? t('popups_wallet_settings_auto-unlock_time_hour', { count: millisecondsToHours(value) })
+                            : t('popups_wallet_settings_auto_unlock_time_mins', { time: millisecondsToMinutes(value) })}
                     </Typography>
                 ) : null}
                 <Icons.ArrowRight color={theme.palette.maskColor.second} size={24} />