From 1b20578e76727bbd617181ab282c4cfe40cd3ff5 Mon Sep 17 00:00:00 2001 From: Mike Mhlv Date: Wed, 6 Mar 2024 13:04:32 +0000 Subject: [PATCH] JS-3580: isLocalOnly method --- src/ts/component/popup/page/settings/data.tsx | 15 +++++---------- src/ts/lib/util/data.ts | 7 +++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/ts/component/popup/page/settings/data.tsx b/src/ts/component/popup/page/settings/data.tsx index a7a7c5d345..cc3833463c 100644 --- a/src/ts/component/popup/page/settings/data.tsx +++ b/src/ts/component/popup/page/settings/data.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Title, Label, IconObject, ObjectName, Button } from 'Component'; -import { analytics, C, UtilRouter, UtilFile, I, translate, UtilCommon } from 'Lib'; +import { analytics, C, UtilRouter, UtilFile, I, translate, UtilCommon, UtilData } from 'Lib'; import { observer } from 'mobx-react'; import { authStore, commonStore, popupStore } from 'Store'; @@ -21,13 +21,11 @@ const PopupSettingsPageDataManagement = observer(class PopupSettingsPageStorageI render () { const { onPage } = this.props; const { localUsage } = commonStore.spaceStorage; - const { walletPath, accountPath, account } = authStore; - const { info } = account; + const { walletPath, accountPath } = authStore; const { config } = commonStore; const localStorage = { name: translate('popupSettingsDataLocalFiles'), iconEmoji: ':desktop_computer:' }; const canMove = config.experimental; - const localOnly = info.networkId == ''; - const suffix = localOnly ? 'LocalOnly' : ''; + const suffix = UtilData.isLocalOnly() ? 'LocalOnly' : ''; return ( @@ -67,17 +65,14 @@ const PopupSettingsPageDataManagement = observer(class PopupSettingsPageStorageI onOffload (e: any) { const { setLoading } = this.props; - const { account } = authStore; - const { info } = account; - const localOnly = info.networkId == ''; - const suffix = localOnly ? 'LocalOnly' : ''; + const localOnly = UtilData.isLocalOnly(); analytics.event('ScreenFileOffloadWarning'); popupStore.open('confirm',{ data: { title: translate('popupSettingsDataOffloadWarningTitle'), - text: translate(`popupSettingsDataOffloadWarningText${suffix}`), + text: translate(`popupSettingsDataOffloadWarningText${localOnly ? 'LocalOnly' : ''}`), textConfirm: localOnly ? translate('popupSettingsDataKeepFiles') : translate('commonYes'), canCancel: localOnly, textCancel: translate('popupSettingsDataRemoveFiles'), diff --git a/src/ts/lib/util/data.ts b/src/ts/lib/util/data.ts index f8c7b0a5d5..5df269082f 100644 --- a/src/ts/lib/util/data.ts +++ b/src/ts/lib/util/data.ts @@ -981,6 +981,13 @@ class UtilData { return ret; }; + isLocalOnly (): boolean { + const { account } = authStore; + const { info } = account; + + return info.networkId == ''; + }; + }; export default new UtilData();