From 44126d6eedf75d8b8343fcaa7ff3b838b0589e71 Mon Sep 17 00:00:00 2001 From: huhuanming Date: Mon, 23 Dec 2024 11:58:33 +0800 Subject: [PATCH 1/3] fix: resolved the issue where headerShown: false was not working after the interface rendering & added the AnchorSizableText component & fixed the issue of the Loading indicator showing twice on the market detail page. (OK-32345) (#6395) --- .../components/src/actions/Toast/index.tsx | 69 +++----------- .../src/content/AnchorSizableText/index.tsx | 46 +++++++++ packages/components/src/content/index.ts | 1 + .../Navigator/TabStackNavigator.tsx | 2 +- .../kit/src/components/TradingView/index.tsx | 34 +------ .../kit/src/routes/Tab/Discovery/router.ts | 1 + packages/kit/src/routes/Tab/Earn/router.ts | 2 + packages/kit/src/routes/Tab/Marktet/router.ts | 2 + packages/kit/src/routes/Tab/Swap/router.ts | 3 +- packages/kit/src/routes/Tab/router.ts | 2 - .../Gallery/Components/stories/Toast.tsx | 10 ++ .../Components/stories/TradingView.tsx | 1 + packages/kit/src/views/Home/router/index.ts | 3 +- .../Market/components/TokenPriceChart.tsx | 93 +++++++++++++------ 14 files changed, 149 insertions(+), 120 deletions(-) create mode 100644 packages/components/src/content/AnchorSizableText/index.tsx diff --git a/packages/components/src/actions/Toast/index.tsx b/packages/components/src/actions/Toast/index.tsx index a243e2038ca..6c3bf9edc4f 100644 --- a/packages/components/src/actions/Toast/index.tsx +++ b/packages/components/src/actions/Toast/index.tsx @@ -8,15 +8,9 @@ import { useMedia } from 'tamagui'; import { dismissKeyboard } from '@onekeyhq/shared/src/keyboard'; import platformEnv from '@onekeyhq/shared/src/platformEnv'; +import { AnchorSizableText } from '../../content/AnchorSizableText'; import { Portal } from '../../hocs'; -import { - Anchor, - Icon, - SizableText, - View, - XStack, - YStack, -} from '../../primitives'; +import { Icon, View, XStack, YStack } from '../../primitives'; import { ShowCustom, ShowToasterClose } from './ShowCustom'; import { showMessage } from './showMessage'; @@ -48,7 +42,6 @@ const iconMap = { warning: , }; -const urlRegex = /]*?)?>(.*?)<\/url>/g; const RenderLines = ({ size, children: text, @@ -69,52 +62,18 @@ const RenderLines = ({ return ( - {lines.map((line, index) => { - const hasUrl = urlRegex.test(line); - if (!hasUrl) { - return ( - - {line} - - ); - } - const parts = line.split(urlRegex); - const hrefMatch = line.match(/href="(.*?)"/); - return ( - - {parts.map((part, partIndex) => { - if (partIndex % 2 === 1) { - return ( - - {part} - - ); - } - return part; - })} - - ); - })} + {lines.map((line, index) => ( + + {line} + + ))} ); }; diff --git a/packages/components/src/content/AnchorSizableText/index.tsx b/packages/components/src/content/AnchorSizableText/index.tsx new file mode 100644 index 00000000000..ce00fb6905f --- /dev/null +++ b/packages/components/src/content/AnchorSizableText/index.tsx @@ -0,0 +1,46 @@ +import { Anchor, SizableText } from '../../primitives'; + +import type { IAnchorProps, ISizableTextProps } from '../../primitives'; + +export interface IAnchorSizableTextProps extends ISizableTextProps { + anchorRegExp?: RegExp; + hrefRegExp?: RegExp; + anchorProps?: IAnchorProps; +} + +export function AnchorSizableText({ + anchorRegExp = /]*?)?>(.*?)<\/url>/g, + hrefRegExp = /href="(.*?)"/, + children, + anchorProps, + ...props +}: IAnchorSizableTextProps) { + const line = children as string; + const isAnchor = anchorRegExp.test(line); + if (isAnchor) { + const parts = line.split(anchorRegExp); + const hrefMatch = line.match(/href="(.*?)"/); + return ( + + {parts.map((part, partIndex) => { + if (partIndex === 1) { + return ( + + {part} + + ); + } + return part; + })} + + ); + } + return {line}; +} diff --git a/packages/components/src/content/index.ts b/packages/components/src/content/index.ts index a4aed8eb613..b0b593328c9 100644 --- a/packages/components/src/content/index.ts +++ b/packages/components/src/content/index.ts @@ -1,3 +1,4 @@ +export * from './AnchorSizableText'; export * from './Badge'; export * from './HeightTransition'; export * from './LinearGradient'; diff --git a/packages/components/src/layouts/Navigation/Navigator/TabStackNavigator.tsx b/packages/components/src/layouts/Navigation/Navigator/TabStackNavigator.tsx index 8007b8e302e..fa979359543 100644 --- a/packages/components/src/layouts/Navigation/Navigator/TabStackNavigator.tsx +++ b/packages/components/src/layouts/Navigation/Navigator/TabStackNavigator.tsx @@ -34,13 +34,13 @@ function TabSubStackNavigator({ component={component} options={({ navigation }: { navigation: any }) => ({ freezeOnBlur: true, - headerShown, title: translationId ? intl.formatMessage({ id: translationId, }) : '', ...makeTabScreenOptions({ navigation, bgColor, titleColor }), + headerShown, })} /> ))} diff --git a/packages/kit/src/components/TradingView/index.tsx b/packages/kit/src/components/TradingView/index.tsx index 6fa042b89de..798d0975223 100644 --- a/packages/kit/src/components/TradingView/index.tsx +++ b/packages/kit/src/components/TradingView/index.tsx @@ -19,59 +19,27 @@ interface IBaseTradingViewProps { identifier: string; baseToken: string; targetToken: string; + onLoadEnd: () => void; } export type ITradingViewProps = IBaseTradingViewProps & IStackStyle; -function Loading() { - return ( - - - - ); -} - export function TradingView(props: ITradingViewProps & WebViewProps) { const [restProps, style] = usePropsAndStyle(props); const { targetToken, identifier, baseToken, ...otherProps } = restProps as IBaseTradingViewProps; - const [showLoading, changeShowLoading] = useState(true); const tradingViewProps = useTradingViewProps({ targetToken, identifier, baseToken, }); - const onLoadEnd = useCallback(() => { - changeShowLoading(false); - }, []); return ( - - {showLoading ? ( - - - - ) : null} - ); } diff --git a/packages/kit/src/routes/Tab/Discovery/router.ts b/packages/kit/src/routes/Tab/Discovery/router.ts index 5c03dbc8dcb..557af131bff 100644 --- a/packages/kit/src/routes/Tab/Discovery/router.ts +++ b/packages/kit/src/routes/Tab/Discovery/router.ts @@ -15,6 +15,7 @@ export const discoveryRouters: ITabSubNavigatorConfig[] = [ { name: ETabDiscoveryRoutes.TabDiscovery, rewrite: '/', + headerShown: !platformEnv.isNative, component: platformEnv.isNative && !platformEnv.isNativeIOSPad ? Browser diff --git a/packages/kit/src/routes/Tab/Earn/router.ts b/packages/kit/src/routes/Tab/Earn/router.ts index c9f67b26b9c..767da079c99 100644 --- a/packages/kit/src/routes/Tab/Earn/router.ts +++ b/packages/kit/src/routes/Tab/Earn/router.ts @@ -1,4 +1,5 @@ import type { ITabSubNavigatorConfig } from '@onekeyhq/components'; +import platformEnv from '@onekeyhq/shared/src/platformEnv'; import { ETabEarnRoutes } from '@onekeyhq/shared/src/routes'; import { LazyLoadRootTabPage } from '../../../components/LazyLoadPage'; @@ -12,5 +13,6 @@ export const earnRouters: ITabSubNavigatorConfig[] = [ rewrite: '/', name: ETabEarnRoutes.EarnHome, component: EarnHome, + headerShown: !platformEnv.isNative, }, ]; diff --git a/packages/kit/src/routes/Tab/Marktet/router.ts b/packages/kit/src/routes/Tab/Marktet/router.ts index 5fc51e88b55..2ffb02d8692 100644 --- a/packages/kit/src/routes/Tab/Marktet/router.ts +++ b/packages/kit/src/routes/Tab/Marktet/router.ts @@ -1,4 +1,5 @@ import type { ITabSubNavigatorConfig } from '@onekeyhq/components'; +import platformEnv from '@onekeyhq/shared/src/platformEnv'; import { ETabMarketRoutes } from '@onekeyhq/shared/src/routes'; import { @@ -18,6 +19,7 @@ export const marketRouters: ITabSubNavigatorConfig[] = [ { rewrite: '/', name: ETabMarketRoutes.TabMarket, + headerShown: !platformEnv.isNative, component: MarketHome, }, { diff --git a/packages/kit/src/routes/Tab/Swap/router.ts b/packages/kit/src/routes/Tab/Swap/router.ts index baf849d1749..ff796d75500 100644 --- a/packages/kit/src/routes/Tab/Swap/router.ts +++ b/packages/kit/src/routes/Tab/Swap/router.ts @@ -1,5 +1,5 @@ import type { ITabSubNavigatorConfig } from '@onekeyhq/components'; -import { ETranslations } from '@onekeyhq/shared/src/locale'; +import platformEnv from '@onekeyhq/shared/src/platformEnv'; import { ETabSwapRoutes } from '@onekeyhq/shared/src/routes'; import { LazyLoadRootTabPage } from '../../../components/LazyLoadPage'; @@ -11,6 +11,7 @@ export const swapRouters: ITabSubNavigatorConfig[] = [ name: ETabSwapRoutes.TabSwap, component: Swap, rewrite: '/', + headerShown: !platformEnv.isNative, // translationId: ETranslations.global_swap, }, ]; diff --git a/packages/kit/src/routes/Tab/router.ts b/packages/kit/src/routes/Tab/router.ts index 4aba38a48e9..afa43f67ae1 100644 --- a/packages/kit/src/routes/Tab/router.ts +++ b/packages/kit/src/routes/Tab/router.ts @@ -5,11 +5,9 @@ import type { ITabNavigatorConfig, ITabNavigatorExtraConfig, } from '@onekeyhq/components/src/layouts/Navigation/Navigator/types'; -import { useDevSettingsPersistAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms'; import { ETranslations } from '@onekeyhq/shared/src/locale'; import platformEnv from '@onekeyhq/shared/src/platformEnv'; import { ETabRoutes } from '@onekeyhq/shared/src/routes'; -import { EShortcutEvents } from '@onekeyhq/shared/src/shortcuts/shortcuts.enum'; import { developerRouters } from '../../views/Developer/router'; import { homeRouters } from '../../views/Home/router'; diff --git a/packages/kit/src/views/Developer/pages/Gallery/Components/stories/Toast.tsx b/packages/kit/src/views/Developer/pages/Gallery/Components/stories/Toast.tsx index 9921abf1086..c1f498b2703 100644 --- a/packages/kit/src/views/Developer/pages/Gallery/Components/stories/Toast.tsx +++ b/packages/kit/src/views/Developer/pages/Gallery/Components/stories/Toast.tsx @@ -37,6 +37,16 @@ const ToastGallery = () => ( > All Types + diff --git a/packages/kit/src/views/AssetList/hooks/useTokenManagement.ts b/packages/kit/src/views/AssetList/hooks/useTokenManagement.ts index 7673c8af43d..97dde1d20ee 100644 --- a/packages/kit/src/views/AssetList/hooks/useTokenManagement.ts +++ b/packages/kit/src/views/AssetList/hooks/useTokenManagement.ts @@ -39,7 +39,15 @@ export function useTokenManagement({ allNetworkAccountId: isAllNetwork ? accountId : undefined, }), ]); - const allTokens = [...tokenList.tokens, ...customTokens]; + const allTokens = await Promise.all( + [...tokenList.tokens, ...customTokens].map((token) => + backgroundApiProxy.serviceToken.mergeTokenMetadataWithCustomData({ + token, + customTokens, + networkId, + }), + ), + ); const uniqueTokens = allTokens.filter( (token, index, self) => index === diff --git a/packages/kit/src/views/Discovery/pages/SearchModal/index.tsx b/packages/kit/src/views/Discovery/pages/SearchModal/index.tsx index 46d33372e57..09411cb685d 100644 --- a/packages/kit/src/views/Discovery/pages/SearchModal/index.tsx +++ b/packages/kit/src/views/Discovery/pages/SearchModal/index.tsx @@ -101,10 +101,7 @@ function SearchModal() { setSearchList([]); return; } - const logo = - await backgroundApiProxy.serviceDiscovery.buildWebsiteIconUrl( - 'https://google.com', - ); + const logo = 'https://uni.onekey-asset.com/static/logo/google.png'; setSearchList([ { dappId: SEARCH_ITEM_ID, From 7c708039c6f71b70c21fe1056b16f5b6e56f7a4a Mon Sep 17 00:00:00 2001 From: JellyWang <38491708+ezailWang@users.noreply.github.com> Date: Mon, 23 Dec 2024 16:17:44 +0800 Subject: [PATCH 3/3] fix: lock settings i18n (#6398) --- packages/shared/src/locale/json/bn.json | 2 +- packages/shared/src/locale/json/de.json | 2 +- packages/shared/src/locale/json/en.json | 2 +- packages/shared/src/locale/json/en_US.json | 2 +- packages/shared/src/locale/json/es.json | 2 +- packages/shared/src/locale/json/fr_FR.json | 2 +- packages/shared/src/locale/json/hi_IN.json | 2 +- packages/shared/src/locale/json/id.json | 2 +- packages/shared/src/locale/json/it_IT.json | 2 +- packages/shared/src/locale/json/ja_JP.json | 2 +- packages/shared/src/locale/json/ko_KR.json | 2 +- packages/shared/src/locale/json/pt.json | 2 +- packages/shared/src/locale/json/pt_BR.json | 2 +- packages/shared/src/locale/json/ru.json | 2 +- packages/shared/src/locale/json/th_TH.json | 2 +- packages/shared/src/locale/json/uk_UA.json | 2 +- packages/shared/src/locale/json/vi.json | 2 +- packages/shared/src/locale/json/zh_CN.json | 2 +- packages/shared/src/locale/json/zh_HK.json | 2 +- packages/shared/src/locale/json/zh_TW.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/shared/src/locale/json/bn.json b/packages/shared/src/locale/json/bn.json index 327c929ec77..5f744933026 100644 --- a/packages/shared/src/locale/json/bn.json +++ b/packages/shared/src/locale/json/bn.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "এটি OneKey এর সমস্ত ডাটা মুছে ফেলবে। নিশ্চিত করুন যে আপনার কাছে ব্যাকআপ রয়েছে, তারপর \"RESET\" লিখে এগিয়ে যান।", "settings.resources": "রিসোর্স", "settings.select_wallet": "ওয়ালেট নির্বাচন করুন", - "settings.set_auto_lock_duration_desktop": "যখন অ্যাপ উইন্ডোটি ছোট করা হয় বা ডিভাইসের স্ক্রিনটি লক করা হয়, তখন এটি নির্দিষ্ট সময়ের পরে স্বয়ংক্রিয়ভাবে লক হবে।", + "settings.set_auto_lock_duration_desktop": "যখন অ্যাপটি বের হয়ে যাওয়া বা ডিভাইসের স্ক্রিন লক হয়ে যাওয়ার বিনা পটভূমিতে চলে, তখন এটি নির্দিষ্ট সময়ের পরে স্বয়ংক্রিয়ভাবে লক হয়ে যাবে।", "settings.set_auto_lock_duration_extension": "যখন প্লাগইন উইন্ডো বন্ধ করা হয় বা অব্যবহৃত ট্যাবগুলির সাথে পূর্ণ স্ক্রিন মোডে থাকা হয়, তখন এটি নির্দিষ্ট সময়ের পর স্বয়ংক্রিয়ভাবে লক হয়ে যায়।", "settings.set_auto_lock_duration_mobile": "যখন অ্যাপটি বের হয়ে যাওয়া বা ডিভাইসের স্ক্রিন লক হয়ে যাওয়ার বিনা পটভূমিতে চলে, তখন এটি নির্দিষ্ট সময়ের পরে স্বয়ংক্রিয়ভাবে লক হয়ে যাবে।", "settings.set_auto_lock_duration_web": "যখন অ্যাপটি একটি অব্যবহৃত ট্যাব বা সংকোচিত উইন্ডোতে থাকে, তখন এটি নির্দিষ্ট সময় পর স্বয়ংক্রিয়ভাবে লক হয়ে যাবে।", diff --git a/packages/shared/src/locale/json/de.json b/packages/shared/src/locale/json/de.json index 00101e456e7..e2e78038909 100644 --- a/packages/shared/src/locale/json/de.json +++ b/packages/shared/src/locale/json/de.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Dies wird alle Daten auf OneKey löschen. Stellen Sie sicher, dass Sie ein Backup haben, und geben Sie dann \"RESET\" ein, um fortzufahren.", "settings.resources": "Ressourcen", "settings.select_wallet": "Brieftasche auswählen", - "settings.set_auto_lock_duration_desktop": "Wenn das App-Fenster minimiert ist oder der Bildschirm des Geräts gesperrt ist, wird es automatisch nach einer festgelegten Zeit gesperrt.", + "settings.set_auto_lock_duration_desktop": "Wenn die App im Hintergrund läuft, ohne beendet zu werden, oder wenn der Bildschirm des Geräts gesperrt ist, wird sie automatisch nach einer festgelegten Zeit gesperrt.", "settings.set_auto_lock_duration_extension": "Wenn das Plugin-Fenster geschlossen wird oder sich im Vollbildmodus mit ungenutzten Tabs befindet, wird es automatisch nach einer festgelegten Zeit gesperrt.", "settings.set_auto_lock_duration_mobile": "Wenn die App im Hintergrund läuft, ohne beendet zu werden, oder wenn der Bildschirm des Geräts gesperrt ist, wird sie automatisch nach einer festgelegten Zeit gesperrt.", "settings.set_auto_lock_duration_web": "Wenn die App in einem ungenutzten Tab oder minimierten Fenster ist, wird sie automatisch nach einer festgelegten Zeit gesperrt.", diff --git a/packages/shared/src/locale/json/en.json b/packages/shared/src/locale/json/en.json index 68059507f19..1cc82fe2203 100644 --- a/packages/shared/src/locale/json/en.json +++ b/packages/shared/src/locale/json/en.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "This will delete all data on OneKey. Ensure you have a backup, then enter \"RESET\" to proceed.", "settings.resources": "Resources", "settings.select_wallet": "Select wallet", - "settings.set_auto_lock_duration_desktop": "When the app window is minimized or the device screen is locked, it will automatically lock after a specified period of time.", + "settings.set_auto_lock_duration_desktop": "When the app runs in the background without exiting or when the device screen is locked, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_extension": "When closing the plugin window or when in full-screen mode with unused tabs, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_mobile": "When the app runs in the background without exiting or when the device screen is locked, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_web": "When the app is in an unused tab or minimized window, it will automatically lock after a specified period of time.", diff --git a/packages/shared/src/locale/json/en_US.json b/packages/shared/src/locale/json/en_US.json index 208a3137224..ffc58d8099f 100644 --- a/packages/shared/src/locale/json/en_US.json +++ b/packages/shared/src/locale/json/en_US.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "This will delete all data on OneKey. Ensure you have a backup, then enter \"RESET\" to proceed.", "settings.resources": "Resources", "settings.select_wallet": "Select wallet", - "settings.set_auto_lock_duration_desktop": "When the app window is minimized or the device screen is locked, it will automatically lock after a specified period of time.", + "settings.set_auto_lock_duration_desktop": "When the app runs in the background without exiting or when the device screen is locked, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_extension": "When closing the plugin window or when in full-screen mode with unused tabs, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_mobile": "When the app runs in the background without exiting or when the device screen is locked, it will automatically lock after a specified period of time.", "settings.set_auto_lock_duration_web": "When the app is in an unused tab or minimized window, it will automatically lock after a specified period of time.", diff --git a/packages/shared/src/locale/json/es.json b/packages/shared/src/locale/json/es.json index f0fc24cf461..4c7bd134445 100644 --- a/packages/shared/src/locale/json/es.json +++ b/packages/shared/src/locale/json/es.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Esto eliminará todos los datos en OneKey. Asegúrate de tener una copia de seguridad, luego ingresa \"RESET\" para proceder.", "settings.resources": "Recursos", "settings.select_wallet": "Seleccione el monedero", - "settings.set_auto_lock_duration_desktop": "Cuando la ventana de la aplicación está minimizada o la pantalla del dispositivo está bloqueada, se bloqueará automáticamente después de un período de tiempo especificado.", + "settings.set_auto_lock_duration_desktop": "Cuando la aplicación se ejecuta en segundo plano sin salir o cuando la pantalla del dispositivo está bloqueada, se bloqueará automáticamente después de un período de tiempo especificado.", "settings.set_auto_lock_duration_extension": "Cuando se cierra la ventana del complemento o cuando se está en modo de pantalla completa con pestañas sin usar, se bloqueará automáticamente después de un período de tiempo especificado.", "settings.set_auto_lock_duration_mobile": "Cuando la aplicación se ejecuta en segundo plano sin salir o cuando la pantalla del dispositivo está bloqueada, se bloqueará automáticamente después de un período de tiempo especificado.", "settings.set_auto_lock_duration_web": "Cuando la aplicación está en una pestaña sin usar o en una ventana minimizada, se bloqueará automáticamente después de un período de tiempo especificado.", diff --git a/packages/shared/src/locale/json/fr_FR.json b/packages/shared/src/locale/json/fr_FR.json index a646aefa606..d895263d02f 100644 --- a/packages/shared/src/locale/json/fr_FR.json +++ b/packages/shared/src/locale/json/fr_FR.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Cela supprimera toutes les données sur OneKey. Assurez-vous d'avoir une sauvegarde, puis saisissez \"RESET\" pour continuer.", "settings.resources": "Ressources", "settings.select_wallet": "Sélectionnez le portefeuille", - "settings.set_auto_lock_duration_desktop": "Lorsque la fenêtre de l'application est minimisée ou que l'écran de l'appareil est verrouillé, elle se verrouillera automatiquement après une période de temps spécifiée.", + "settings.set_auto_lock_duration_desktop": "Lorsque l'application fonctionne en arrière-plan sans quitter ou lorsque l'écran de l'appareil est verrouillé, elle se verrouillera automatiquement après une période de temps spécifiée.", "settings.set_auto_lock_duration_extension": "Lors de la fermeture de la fenêtre du plugin ou en mode plein écran avec des onglets inutilisés, il se verrouillera automatiquement après une période de temps spécifiée.", "settings.set_auto_lock_duration_mobile": "Lorsque l'application fonctionne en arrière-plan sans quitter ou lorsque l'écran de l'appareil est verrouillé, elle se verrouillera automatiquement après une période de temps spécifiée.", "settings.set_auto_lock_duration_web": "Lorsque l'application est dans un onglet inutilisé ou une fenêtre réduite, elle se verrouillera automatiquement après une période de temps spécifiée.", diff --git a/packages/shared/src/locale/json/hi_IN.json b/packages/shared/src/locale/json/hi_IN.json index dd9ba59af85..ca57fb44283 100644 --- a/packages/shared/src/locale/json/hi_IN.json +++ b/packages/shared/src/locale/json/hi_IN.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "यह OneKey पर सभी डेटा को हटा देगा। सुनिश्चित करें कि आपके पास बैकअप है, फिर \"RESET\" दर्ज करें जारी रखने के लिए।", "settings.resources": "संसाधन", "settings.select_wallet": "वॉलेट चुनें", - "settings.set_auto_lock_duration_desktop": "जब ऐप की विंडो को छोटा कर दिया जाता है या डिवाइस की स्क्रीन को लॉक कर दिया जाता है, तो यह निर्धारित समयावधि के बाद स्वचालित रूप से लॉक हो जाएगा।", + "settings.set_auto_lock_duration_desktop": "जब ऐप बिना बाहर निकले पृष्ठभूमि में चलता है या जब डिवाइस स्क्रीन लॉक होती है, तो यह निर्धारित समयावधि के बाद स्वचालित रूप से लॉक हो जाएगा।", "settings.set_auto_lock_duration_extension": "जब प्लगइन विंडो को बंद किया जाता है या जब अप्रयुक्त टैब्स के साथ पूर्ण स्क्रीन मोड में होता है, तो यह निर्धारित समयावधि के बाद स्वचालित रूप से लॉक हो जाएगा।", "settings.set_auto_lock_duration_mobile": "जब ऐप बिना बाहर निकले पृष्ठभूमि में चलता है या जब डिवाइस स्क्रीन लॉक होती है, तो यह निर्धारित समयावधि के बाद स्वचालित रूप से लॉक हो जाएगा।", "settings.set_auto_lock_duration_web": "जब ऐप एक अप्रयुक्त टैब या संकुचित विंडो में होता है, तो यह एक निर्दिष्ट समयावधि के बाद स्वचालित रूप से लॉक हो जाएगा।", diff --git a/packages/shared/src/locale/json/id.json b/packages/shared/src/locale/json/id.json index 595d27709d8..c9c78778d99 100644 --- a/packages/shared/src/locale/json/id.json +++ b/packages/shared/src/locale/json/id.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Ini akan menghapus semua data di OneKey. Pastikan Anda memiliki cadangan, lalu masukkan \"RESET\" untuk melanjutkan.", "settings.resources": "Sumber Daya", "settings.select_wallet": "Pilih dompet", - "settings.set_auto_lock_duration_desktop": "Ketika jendela aplikasi diminimalkan atau layar perangkat dikunci, aplikasi akan secara otomatis terkunci setelah periode waktu tertentu.", + "settings.set_auto_lock_duration_desktop": "Ketika aplikasi berjalan di latar belakang tanpa keluar atau ketika layar perangkat dikunci, aplikasi akan secara otomatis terkunci setelah periode waktu tertentu.", "settings.set_auto_lock_duration_extension": "Ketika menutup jendela plugin atau saat dalam mode layar penuh dengan tab yang tidak digunakan, ini akan secara otomatis terkunci setelah periode waktu tertentu.", "settings.set_auto_lock_duration_mobile": "Ketika aplikasi berjalan di latar belakang tanpa keluar atau ketika layar perangkat dikunci, aplikasi akan secara otomatis terkunci setelah periode waktu tertentu.", "settings.set_auto_lock_duration_web": "Ketika aplikasi berada di tab yang tidak digunakan atau jendela yang diminimalkan, aplikasi akan secara otomatis terkunci setelah periode waktu tertentu.", diff --git a/packages/shared/src/locale/json/it_IT.json b/packages/shared/src/locale/json/it_IT.json index 27bad61440c..467437e48d9 100644 --- a/packages/shared/src/locale/json/it_IT.json +++ b/packages/shared/src/locale/json/it_IT.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Questo cancellerà tutti i dati su OneKey. Assicurati di avere un backup, poi inserisci \"RESET\" per procedere.", "settings.resources": "Risorse", "settings.select_wallet": "Seleziona portafoglio", - "settings.set_auto_lock_duration_desktop": "Quando la finestra dell'app è minimizzata o lo schermo del dispositivo è bloccato, si bloccherà automaticamente dopo un periodo di tempo specificato.", + "settings.set_auto_lock_duration_desktop": "Quando l'applicazione è in esecuzione in background senza uscire o quando lo schermo del dispositivo è bloccato, si bloccherà automaticamente dopo un periodo di tempo specificato.", "settings.set_auto_lock_duration_extension": "Quando si chiude la finestra del plugin o quando si è in modalità a schermo intero con schede inutilizzate, si bloccherà automaticamente dopo un periodo di tempo specificato.", "settings.set_auto_lock_duration_mobile": "Quando l'applicazione è in esecuzione in background senza uscire o quando lo schermo del dispositivo è bloccato, si bloccherà automaticamente dopo un periodo di tempo specificato.", "settings.set_auto_lock_duration_web": "Quando l'app è in una scheda inutilizzata o in una finestra minimizzata, si bloccherà automaticamente dopo un periodo di tempo specificato.", diff --git a/packages/shared/src/locale/json/ja_JP.json b/packages/shared/src/locale/json/ja_JP.json index 3ac7d314f8a..fe4487d79c1 100644 --- a/packages/shared/src/locale/json/ja_JP.json +++ b/packages/shared/src/locale/json/ja_JP.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "これによりOneKeyのすべてのデータが削除されます。バックアップを取ってから、「RESET」を入力して進行してください。", "settings.resources": "リソース", "settings.select_wallet": "ウォレットを選択", - "settings.set_auto_lock_duration_desktop": "アプリのウィンドウが最小化されたり、デバイスの画面がロックされたりすると、指定された時間が経過すると自動的にロックされます。", + "settings.set_auto_lock_duration_desktop": "アプリが終了せずにバックグラウンドで動作している場合や、デバイスの画面がロックされている場合、指定された時間が経過すると自動的にロックされます。", "settings.set_auto_lock_duration_extension": "プラグインウィンドウを閉じるか、使用していないタブがあるフルスクリーンモードの場合、指定された時間が経過すると自動的にロックされます。", "settings.set_auto_lock_duration_mobile": "アプリが終了せずにバックグラウンドで動作している場合や、デバイスの画面がロックされている場合、指定された時間が経過すると自動的にロックされます。", "settings.set_auto_lock_duration_web": "アプリが使用されていないタブや最小化されたウィンドウにある場合、指定された時間が経過すると自動的にロックされます。", diff --git a/packages/shared/src/locale/json/ko_KR.json b/packages/shared/src/locale/json/ko_KR.json index e66d94aaa97..d046b0b052a 100644 --- a/packages/shared/src/locale/json/ko_KR.json +++ b/packages/shared/src/locale/json/ko_KR.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "이렇게 하면 OneKey의 모든 데이터가 삭제됩니다. 백업이 있는지 확인한 후 \"RESET\"을 입력하여 진행하십시오.", "settings.resources": "자원", "settings.select_wallet": "지갑 선택", - "settings.set_auto_lock_duration_desktop": "앱 창이 최소화되거나 장치 화면이 잠겨 있을 때, 지정된 시간 후에 자동으로 잠금이 설정됩니다.", + "settings.set_auto_lock_duration_desktop": "앱이 종료되지 않고 백그라운드에서 실행되거나 장치 화면이 잠겨있을 때, 지정된 시간 후에 자동으로 잠금이 설정됩니다.", "settings.set_auto_lock_duration_extension": "플러그인 창을 닫거나 사용하지 않는 탭이 있는 전체 화면 모드에서는 지정된 시간이 지나면 자동으로 잠급니다.", "settings.set_auto_lock_duration_mobile": "앱이 종료되지 않고 백그라운드에서 실행되거나 장치 화면이 잠겨있을 때, 지정된 시간 후에 자동으로 잠금이 설정됩니다.", "settings.set_auto_lock_duration_web": "앱이 사용하지 않는 탭이나 최소화된 창에 있을 때, 지정된 시간이 지나면 자동으로 잠길 것입니다.", diff --git a/packages/shared/src/locale/json/pt.json b/packages/shared/src/locale/json/pt.json index a4a6dd6e9f8..eeffb29aa98 100644 --- a/packages/shared/src/locale/json/pt.json +++ b/packages/shared/src/locale/json/pt.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Isso irá apagar todos os dados no OneKey. Certifique-se de ter um backup, depois digite \"RESET\" para prosseguir.", "settings.resources": "Recursos", "settings.select_wallet": "Selecione a carteira", - "settings.set_auto_lock_duration_desktop": "Quando a janela do aplicativo é minimizada ou a tela do dispositivo está bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", + "settings.set_auto_lock_duration_desktop": "Quando o aplicativo é executado em segundo plano sem sair ou quando a tela do dispositivo está bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", "settings.set_auto_lock_duration_extension": "Quando fechar a janela do plugin ou quando estiver em modo de tela cheia com abas não utilizadas, ele será bloqueado automaticamente após um período de tempo especificado.", "settings.set_auto_lock_duration_mobile": "Quando o aplicativo é executado em segundo plano sem sair ou quando a tela do dispositivo está bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", "settings.set_auto_lock_duration_web": "Quando o aplicativo está em uma aba não utilizada ou janela minimizada, ele será bloqueado automaticamente após um período de tempo especificado.", diff --git a/packages/shared/src/locale/json/pt_BR.json b/packages/shared/src/locale/json/pt_BR.json index fc715120adb..a77302be34c 100644 --- a/packages/shared/src/locale/json/pt_BR.json +++ b/packages/shared/src/locale/json/pt_BR.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Isso excluirá todos os dados no OneKey. Certifique-se de ter um backup, depois digite \"RESET\" para prosseguir.", "settings.resources": "Recursos", "settings.select_wallet": "Selecione a carteira", - "settings.set_auto_lock_duration_desktop": "Quando a janela do aplicativo é minimizada ou a tela do dispositivo é bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", + "settings.set_auto_lock_duration_desktop": "Quando o aplicativo é executado em segundo plano sem sair ou quando a tela do dispositivo está bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", "settings.set_auto_lock_duration_extension": "Quando fechar a janela do plugin ou quando estiver em modo de tela cheia com abas não utilizadas, ele será bloqueado automaticamente após um período de tempo especificado.", "settings.set_auto_lock_duration_mobile": "Quando o aplicativo é executado em segundo plano sem sair ou quando a tela do dispositivo está bloqueada, ele será automaticamente bloqueado após um período de tempo especificado.", "settings.set_auto_lock_duration_web": "Quando o aplicativo está em uma aba não utilizada ou janela minimizada, ele será bloqueado automaticamente após um período de tempo especificado.", diff --git a/packages/shared/src/locale/json/ru.json b/packages/shared/src/locale/json/ru.json index b112c8a9c2a..cfdf5cf0179 100644 --- a/packages/shared/src/locale/json/ru.json +++ b/packages/shared/src/locale/json/ru.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Это приведет к удалению всех данных на OneKey. Убедитесь, что у вас есть резервная копия, затем введите \"RESET\", чтобы продолжить.", "settings.resources": "Ресурсы", "settings.select_wallet": "Выберите кошелек", - "settings.set_auto_lock_duration_desktop": "Когда окно приложения свернуто или экран устройства заблокирован, оно автоматически блокируется после указанного периода времени.", + "settings.set_auto_lock_duration_desktop": "Когда приложение работает в фоновом режиме без выхода или когда экран устройства заблокирован, оно автоматически блокируется после определенного периода времени.", "settings.set_auto_lock_duration_extension": "При закрытии окна плагина или при работе в полноэкранном режиме с неиспользуемыми вкладками, он автоматически блокируется после определенного периода времени.", "settings.set_auto_lock_duration_mobile": "Когда приложение работает в фоновом режиме без выхода или когда экран устройства заблокирован, оно автоматически блокируется после определенного периода времени.", "settings.set_auto_lock_duration_web": "Когда приложение находится на неактивной вкладке или свернутом окне, оно автоматически блокируется после определенного периода времени.", diff --git a/packages/shared/src/locale/json/th_TH.json b/packages/shared/src/locale/json/th_TH.json index 1100c77338c..c46f59b7530 100644 --- a/packages/shared/src/locale/json/th_TH.json +++ b/packages/shared/src/locale/json/th_TH.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "การดำเนินการนี้จะลบข้อมูลทั้งหมดบน OneKey โปรดตรวจสอบว่าคุณมีการสำรองข้อมูลแล้ว จากนั้นใส่ \"RESET\" เพื่อดำเนินการต่อ", "settings.resources": "ทรัพยากร", "settings.select_wallet": "เลือกกระเป๋าเงิน", - "settings.set_auto_lock_duration_desktop": "เมื่อหน้าต่างแอปถูกย่อขนาดลงหรือหน้าจออุปกรณ์ถูกล็อค ระบบจะล็อคอัตโนมัติหลังจากช่วงเวลาที่ระบุ", + "settings.set_auto_lock_duration_desktop": "เมื่อแอปทำงานในพื้นหลังโดยไม่ออกหรือเมื่อหน้าจอของอุปกรณ์ถูกล็อค มันจะล็อคอัตโนมัติหลังจากช่วงเวลาที่ระบุ", "settings.set_auto_lock_duration_extension": "เมื่อปิดหน้าต่างปลั๊กอินหรืออยู่ในโหมดเต็มหน้าจอที่มีแท็บที่ไม่ได้ใช้งาน ระบบจะล็อคอัตโนมัติหลังจากช่วงเวลาที่ระบุ", "settings.set_auto_lock_duration_mobile": "เมื่อแอปทำงานในพื้นหลังโดยไม่ออกหรือเมื่อหน้าจอของอุปกรณ์ถูกล็อค มันจะล็อคอัตโนมัติหลังจากช่วงเวลาที่ระบุ", "settings.set_auto_lock_duration_web": "เมื่อแอปอยู่ในแท็บที่ไม่ได้ใช้งานหรือหน้าต่างที่ถูกย่อขนาดลง แอปจะล็อคอัตโนมัติหลังจากช่วงเวลาที่ระบุ", diff --git a/packages/shared/src/locale/json/uk_UA.json b/packages/shared/src/locale/json/uk_UA.json index 83104ca974f..bf87196c88f 100644 --- a/packages/shared/src/locale/json/uk_UA.json +++ b/packages/shared/src/locale/json/uk_UA.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Це видалить всі дані на OneKey. Переконайтеся, що у вас є резервна копія, а потім введіть \"RESET\", щоб продовжити.", "settings.resources": "Ресурси", "settings.select_wallet": "Виберіть гаманець", - "settings.set_auto_lock_duration_desktop": "Коли вікно додатку згорнуто або екран пристрою заблоковано, воно автоматично блокується після вказаного періоду часу.", + "settings.set_auto_lock_duration_desktop": "Коли додаток працює у фоновому режимі без виходу або коли екран пристрою заблоковано, він автоматично блокується після вказаного періоду часу.", "settings.set_auto_lock_duration_extension": "При закритті вікна плагіна або при роботі в повноекранному режимі з неактивними вкладками, він автоматично блокується після вказаного періоду часу.", "settings.set_auto_lock_duration_mobile": "Коли додаток працює у фоновому режимі без виходу або коли екран пристрою заблоковано, він автоматично блокується після вказаного періоду часу.", "settings.set_auto_lock_duration_web": "Коли додаток знаходиться на неактивній вкладці або в згорнутому вікні, він автоматично блокується після вказаного періоду часу.", diff --git a/packages/shared/src/locale/json/vi.json b/packages/shared/src/locale/json/vi.json index 9e53756c83c..96d07d4e25c 100644 --- a/packages/shared/src/locale/json/vi.json +++ b/packages/shared/src/locale/json/vi.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "Điều này sẽ xóa tất cả dữ liệu trên OneKey. Hãy đảm bảo bạn đã sao lưu, sau đó nhập \"RESET\" để tiếp tục.", "settings.resources": "Tài nguyên", "settings.select_wallet": "Chọn ví", - "settings.set_auto_lock_duration_desktop": "Khi cửa sổ ứng dụng được thu nhỏ hoặc màn hình thiết bị bị khóa, nó sẽ tự động khóa sau một khoảng thời gian đã chỉ định.", + "settings.set_auto_lock_duration_desktop": "Khi ứng dụng chạy ở chế độ nền mà không thoát ra hoặc khi màn hình thiết bị bị khóa, nó sẽ tự động khóa sau một khoảng thời gian đã chỉ định.", "settings.set_auto_lock_duration_extension": "Khi đóng cửa sổ plugin hoặc khi ở chế độ toàn màn hình với các tab không sử dụng, nó sẽ tự động khóa sau một khoảng thời gian đã chỉ định.", "settings.set_auto_lock_duration_mobile": "Khi ứng dụng chạy ở chế độ nền mà không thoát ra hoặc khi màn hình thiết bị bị khóa, nó sẽ tự động khóa sau một khoảng thời gian đã chỉ định.", "settings.set_auto_lock_duration_web": "Khi ứng dụng đang ở trong một tab không sử dụng hoặc cửa sổ đã thu nhỏ, nó sẽ tự động khóa sau một khoảng thời gian đã chỉ định.", diff --git a/packages/shared/src/locale/json/zh_CN.json b/packages/shared/src/locale/json/zh_CN.json index 80692d300a5..46d873a963f 100644 --- a/packages/shared/src/locale/json/zh_CN.json +++ b/packages/shared/src/locale/json/zh_CN.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "这将删除 OneKey App 上的所有数据，请确保您已完成备份，然后输入“RESET”以继续。", "settings.resources": "资源", "settings.select_wallet": "选择钱包", - "settings.set_auto_lock_duration_desktop": "最小化 App，或锁定设备屏幕时，经过指定时间后将自动锁定", + "settings.set_auto_lock_duration_desktop": "未退出 App 而于后台运行、或锁定设备屏幕时，经过指定时间后将自动锁定", "settings.set_auto_lock_duration_extension": "关闭插件窗口，或展开模式中处于未使用的标签页时，经过指定时间后将自动锁定", "settings.set_auto_lock_duration_mobile": "未退出 App 而于后台运行、或锁定设备屏幕时，经过指定时间后将自动锁定", "settings.set_auto_lock_duration_web": "最小化浏览器，或 App 于未使用的标签页时，经过指定时间后将自动锁定", diff --git a/packages/shared/src/locale/json/zh_HK.json b/packages/shared/src/locale/json/zh_HK.json index 5167df14150..58bf482b2c1 100644 --- a/packages/shared/src/locale/json/zh_HK.json +++ b/packages/shared/src/locale/json/zh_HK.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "這將刪除 OneKey App 上的所有數據，請確保您已完成備份，然後輸入“RESET”以繼續。", "settings.resources": "資源", "settings.select_wallet": "選擇錢包", - "settings.set_auto_lock_duration_desktop": "最小化 App，或鎖定設備屏幕時，經過指定時間後將自動鎖定", + "settings.set_auto_lock_duration_desktop": "未退出 App 而於後台運行、或鎖定設備屏幕時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_extension": "關閉插件窗口，或展開模式中處於未使用的標籤頁時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_mobile": "未退出 App 而於後台運行、或鎖定設備屏幕時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_web": "最小化瀏覽器，或 App 於未使用的標籤頁時，經過指定時間後將自動鎖定", diff --git a/packages/shared/src/locale/json/zh_TW.json b/packages/shared/src/locale/json/zh_TW.json index 5072be82d70..40afcb33df2 100644 --- a/packages/shared/src/locale/json/zh_TW.json +++ b/packages/shared/src/locale/json/zh_TW.json @@ -1719,7 +1719,7 @@ "settings.reset_app_desc": "這將刪除 OneKey App 上的所有數據，請確保您已完成備份，然後輸入“RESET”以繼續。", "settings.resources": "資源", "settings.select_wallet": "选择钱包", - "settings.set_auto_lock_duration_desktop": "最小化 App，或鎖定裝置螢幕時，經過指定時間後將自動鎖定", + "settings.set_auto_lock_duration_desktop": "未退出 App 而於後台運行、或鎖定裝置螢幕時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_extension": "關閉插件視窗，或展開模式中處於未使用的分頁時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_mobile": "未退出 App 而於後台運行、或鎖定裝置螢幕時，經過指定時間後將自動鎖定", "settings.set_auto_lock_duration_web": "最小化瀏覽器，或 App 於未使用的分頁時，經過指定時間後將自動鎖定",