fix: Fix network type label (#2811)

* fix: Fix network type label

* fix: Confirm should be default onOK

* fix: Extract getNetworkLabelI18nkey to utils

packages/neuron-ui/src/components/NetworkSetting/index.tsx

@@ -9,7 +9,7 @@ import Toast from 'widgets/Toast'
 import { chainState } from 'states'
 import { setCurrentNetwork, deleteNetwork } from 'services/remote'
 import RadioGroup from 'widgets/RadioGroup'
-import { useOnWindowResize, useToggleChoiceGroupBorder } from 'utils'
+import { useOnWindowResize, useToggleChoiceGroupBorder, getNetworkLabelI18nkey } from 'utils'
 import { LIGHT_CLIENT_TESTNET } from 'utils/const'
 import styles from './networkSetting.module.scss'
 
@@ -87,7 +87,7 @@ const NetworkSetting = ({ chain = chainState, settings: { networks = [] } }: Sta
           label: (
             <div className={styles.networkLabel}>
               <p>{`${network.name} (${network.remote})`}</p>
-              <div className={styles.tag}>{network.chain}</div>
+              <div className={styles.tag}>{t(getNetworkLabelI18nkey(network.chain))}</div>
             </div>
           ),
           suffix: (

packages/neuron-ui/src/components/PageContainer/index.tsx

@@ -1,6 +1,12 @@
 import React, { FC, PropsWithChildren, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { ErrorCode, getExplorerUrl, isMainnet as isMainnetUtil, localNumberFormatter } from 'utils'
+import {
+  ErrorCode,
+  getExplorerUrl,
+  isMainnet as isMainnetUtil,
+  localNumberFormatter,
+  getNetworkLabelI18nkey,
+} from 'utils'
 import Alert from 'widgets/Alert'
 import { Close, NewTab } from 'widgets/Icons/icon'
 import { ReactComponent as Sun } from 'widgets/Icons/Sun.svg'
@@ -25,20 +31,6 @@ const PageHeadNotice = ({ notice }: { notice: State.PageNotice }) => {
   )
 }
 
-const getNetworkTypeLabel = (type: 'ckb' | 'ckb_testnet' | 'ckb_dev' | string) => {
-  switch (type) {
-    case 'ckb': {
-      return 'settings.network.mainnet'
-    }
-    case 'ckb_testnet': {
-      return 'settings.network.testnet'
-    }
-    default: {
-      return 'settings.network.devnet'
-    }
-  }
-}
-
 type ComponentProps = {
   head: React.ReactNode
   notice?: State.PageNotice
@@ -70,7 +62,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
     () => networks.find(n => n.id === networkID)?.type === LIGHT_NETWORK_TYPE,
     [networkID, networks]
   )
-  const netWorkTypeLabel = useMemo(() => (network ? getNetworkTypeLabel(network.chain) : ''), [network])
+  const netWorkTypeLabel = useMemo(() => (network ? getNetworkLabelI18nkey(network.chain) : ''), [network])
   const [syncPercents, syncBlockNumbers] = useMemo(() => {
     const bestBlockNumber = Math.max(cacheTipBlockNumber, bestKnownBlockNumber)
     return [

packages/neuron-ui/src/utils/getNetworkLabel.ts

@@ -0,0 +1,20 @@
+import { LIGHT_CLIENT_TESTNET } from './const'
+
+export const getNetworkLabelI18nkey = (type: 'ckb' | 'ckb_testnet' | 'ckb_dev' | string) => {
+  switch (type) {
+    case 'ckb': {
+      return 'settings.network.mainnet'
+    }
+    case 'ckb_testnet': {
+      return 'settings.network.testnet'
+    }
+    case LIGHT_CLIENT_TESTNET: {
+      return 'settings.network.lightTestnet'
+    }
+    default: {
+      return 'settings.network.devnet'
+    }
+  }
+}
+
+export default getNetworkLabelI18nkey

packages/neuron-ui/src/utils/index.ts

@@ -25,5 +25,6 @@ export * from './getSyncLeftTime'
 export * from './baseActions'
 export * from './getSUDTAmount'
 export * from './multisig'
+export * from './getNetworkLabel'
 
 export { CONSTANTS }

packages/neuron-ui/src/widgets/AlertDialog/index.tsx

@@ -51,7 +51,7 @@ const AlertDialog = ({
           v === 'cancel' ? (
             <Button type="cancel" onClick={onCancel} label={t('common.cancel')} />
           ) : (
-            <Button type="confirm" onClick={onCancel || onOk} label={t('common.confirm')} />
+            <Button type="confirm" onClick={onOk || onCancel} label={t('common.confirm')} />
           )
         )}
       </div>