From 12dccc830e8297ae7b23149b73ff93f820b25884 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Wed, 20 Dec 2023 16:30:03 +0800
Subject: [PATCH 1/9] fix: issue 288

---
 .../broadcastTransaction.module.scss          |  42 ++++++
 .../components/BroadcastTransaction/index.tsx | 124 ++++++++++++++++++
 .../src/components/OfflineSign/index.tsx      |  60 ++++-----
 .../OfflineSign/offlineSign.module.scss       |  10 ++
 .../components/OfflineSignDialog/index.tsx    |   7 +-
 packages/neuron-ui/src/locales/en.json        |   7 +-
 packages/neuron-ui/src/locales/zh-tw.json     |   7 +-
 packages/neuron-ui/src/locales/zh.json        |   7 +-
 packages/neuron-ui/src/router.tsx             |   5 +
 packages/neuron-ui/src/utils/enums.ts         |   1 +
 .../neuron-wallet/src/controllers/app/menu.ts |  13 ++
 packages/neuron-wallet/src/locales/en.ts      |   1 +
 packages/neuron-wallet/src/locales/zh-tw.ts   |   1 +
 packages/neuron-wallet/src/locales/zh.ts      |   1 +
 14 files changed, 248 insertions(+), 38 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
 create mode 100644 packages/neuron-ui/src/components/BroadcastTransaction/index.tsx

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss b/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
new file mode 100644
index 0000000000..56ed207431
--- /dev/null
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
@@ -0,0 +1,42 @@
+.main {
+  tr {
+    td {
+      font-size: 14px;
+      line-height: 26px;
+      color: var(--main-text-color);
+      svg {
+        width: 14px;
+        height: 14px;
+        margin-right: 4px;
+        position: relative;
+        top: 2px;
+      }
+    }
+    .first {
+      padding-right: 24px;
+      color: var(--input-second-color);
+    }
+  }
+}
+
+.warningDialog {
+  width: 680px;
+  .content {
+    display: flex;
+    justify-content: center;
+    margin-top: 24px;
+    color: var(--main-text-color);
+  }
+}
+
+.textarea {
+  color: var(--main-text-color);
+  margin-top: 17px;
+  width: 648px;
+  height: 206px;
+  resize: none;
+  background: var(--secondary-background-color);
+  border: 1px solid var(--divide-line-color);
+  border-radius: 8px;
+  padding: 16px;
+}
diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
new file mode 100644
index 0000000000..b181829853
--- /dev/null
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -0,0 +1,124 @@
+import React, { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import { isSuccessResponse, RoutePath, useDidMount, useGoBack } from 'utils'
+import Dialog from 'widgets/Dialog'
+import AlertDialog from 'widgets/AlertDialog'
+import { useDispatch, useState as useGlobalState } from 'states'
+import { broadcastTransaction, getCurrentWallet, OfflineSignStatus } from 'services/remote'
+import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
+
+import styles from './broadcastTransaction.module.scss'
+
+const BroadcastTransaction = () => {
+  const {
+    app: { loadedTransaction = {} },
+  } = useGlobalState()
+
+  const [wallet, setWallet] = useState<State.Wallet | null>(null)
+  const [isBroadCasting, setIsBroadcasting] = useState(false)
+  const [t] = useTranslation()
+  const dispatch = useDispatch()
+  const [errMsg, setErrMsg] = useState('')
+
+  const { filePath, json } = loadedTransaction
+
+  const jsonContent = useMemo(() => {
+    return JSON.stringify(json, null, 2)
+  }, [json])
+
+  const signStatus: OfflineSignStatus = json.status
+
+  const isSigned = useMemo(() => signStatus === OfflineSignStatus.Signed, [signStatus])
+
+  const onBack = useGoBack()
+
+  const navigate = useNavigate()
+  const onBroadcast = useCallback(async () => {
+    setIsBroadcasting(true)
+    try {
+      const res = await broadcastTransaction({
+        ...json,
+        walletID: wallet!.id,
+      })
+      if (isSuccessResponse(res)) {
+        navigate(RoutePath.History)
+      } else {
+        setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
+      }
+    } finally {
+      setIsBroadcasting(false)
+    }
+  }, [wallet, json, navigate, dispatch])
+
+  useDidMount(() => {
+    getCurrentWallet().then(res => {
+      if (isSuccessResponse(res)) {
+        setWallet(res.result)
+      }
+    })
+  })
+
+  return (
+    <>
+      <Dialog
+        show={isSigned}
+        title={t('offline-sign.broadcast-transaction')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        confirmText={t('offline-sign.actions.broadcast')}
+        isLoading={isBroadCasting}
+        onConfirm={onBroadcast}
+      >
+        <div className={styles.main}>
+          <table>
+            <tbody>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.json-file')}</td>
+                <td>{filePath}</td>
+              </tr>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.status.label')}</td>
+                <td>{t('offline-sign.status.signed')}</td>
+              </tr>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.wallet')}</td>
+                <td>
+                  {wallet?.device ? <HardWalletIcon /> : null}
+                  <span>{wallet?.name ?? ''}</span>
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.content')}</td>
+              </tr>
+            </tbody>
+          </table>
+          <textarea disabled value={jsonContent} className={styles.textarea} />
+        </div>
+      </Dialog>
+
+      <Dialog
+        show={!isSigned}
+        className={styles.warningDialog}
+        title={t('offline-sign.import-unsigned-transaction')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        onConfirm={onBack}
+      >
+        <div className={styles.content}>{t('offline-sign.import-unsigned-transaction-detail')}</div>
+      </Dialog>
+
+      <AlertDialog
+        show={!!errMsg}
+        title={t('message-types.alert')}
+        message={errMsg}
+        type="failed"
+        onCancel={() => setErrMsg('')}
+      />
+    </>
+  )
+}
+
+BroadcastTransaction.displayName = 'BroadcastTransaction'
+
+export default BroadcastTransaction
diff --git a/packages/neuron-ui/src/components/OfflineSign/index.tsx b/packages/neuron-ui/src/components/OfflineSign/index.tsx
index 7caac8ee15..0f4014e3ae 100644
--- a/packages/neuron-ui/src/components/OfflineSign/index.tsx
+++ b/packages/neuron-ui/src/components/OfflineSign/index.tsx
@@ -1,11 +1,10 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useNavigate } from 'react-router-dom'
-import { isSuccessResponse, RoutePath, useDidMount, useGoBack } from 'utils'
+import { isSuccessResponse, useDidMount, useGoBack } from 'utils'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
-import { useDispatch, useState as useGlobalState } from 'states'
-import { broadcastTransaction, getCurrentWallet, OfflineSignStatus } from 'services/remote'
+import { useState as useGlobalState } from 'states'
+import { getCurrentWallet, OfflineSignStatus } from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 import OfflineSignDialog from '../OfflineSignDialog'
 
@@ -18,9 +17,7 @@ const OfflineSign = () => {
 
   const [wallet, setWallet] = useState<State.Wallet | null>(null)
   const [isSigning, setIsSigning] = useState(false)
-  const [isBroadCasting, setIsBroadcasting] = useState(false)
   const [t] = useTranslation()
-  const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
 
   const { filePath, json } = loadedTransaction
@@ -31,6 +28,8 @@ const OfflineSign = () => {
 
   const signStatus: OfflineSignStatus = json.status
 
+  const isSigned = useMemo(() => signStatus === OfflineSignStatus.Signed, [signStatus])
+
   const status = useMemo(() => {
     switch (signStatus) {
       case OfflineSignStatus.Unsigned:
@@ -48,24 +47,6 @@ const OfflineSign = () => {
     setIsSigning(true)
   }, [setIsSigning])
 
-  const navigate = useNavigate()
-  const onBroadcast = useCallback(async () => {
-    setIsBroadcasting(true)
-    try {
-      const res = await broadcastTransaction({
-        ...json,
-        walletID: wallet!.id,
-      })
-      if (isSuccessResponse(res)) {
-        navigate(RoutePath.History)
-      } else {
-        setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
-      }
-    } finally {
-      setIsBroadcasting(false)
-    }
-  }, [wallet, json, navigate, dispatch])
-
   useDidMount(() => {
     getCurrentWallet().then(res => {
       if (isSuccessResponse(res)) {
@@ -76,26 +57,29 @@ const OfflineSign = () => {
 
   const signDialogOnDismiss = useCallback(() => {
     setIsSigning(false)
-  }, [])
+  }, [setIsSigning])
 
   if (isSigning && wallet) {
     return (
-      <OfflineSignDialog isBroadcast={false} wallet={wallet} offlineSignJSON={json} onDismiss={signDialogOnDismiss} />
+      <OfflineSignDialog
+        isBroadcast={false}
+        wallet={wallet}
+        offlineSignJSON={json}
+        onDismiss={signDialogOnDismiss}
+        onCompleted={onBack}
+      />
     )
   }
 
   return (
     <>
       <Dialog
-        show={!isSigning}
+        show={!isSigned}
         title={t('offline-sign.title')}
         cancelText={t('offline-sign.actions.cancel')}
         onCancel={onBack}
-        confirmText={
-          signStatus === OfflineSignStatus.Signed ? t('offline-sign.actions.broadcast') : t('offline-sign.actions.sign')
-        }
-        isLoading={signStatus === OfflineSignStatus.Signed && isBroadCasting}
-        onConfirm={signStatus === OfflineSignStatus.Signed ? onBroadcast : onSign}
+        confirmText={t('offline-sign.actions.sign')}
+        onConfirm={onSign}
       >
         <div className={styles.main}>
           <table>
@@ -123,6 +107,18 @@ const OfflineSign = () => {
           <textarea disabled value={jsonContent} className={styles.textarea} />
         </div>
       </Dialog>
+
+      <Dialog
+        show={isSigned}
+        className={styles.warningDialog}
+        title={t('offline-sign.import-signed-transaction')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        onConfirm={onBack}
+      >
+        <div className={styles.content}>{t('offline-sign.import-signed-transaction-detail')}</div>
+      </Dialog>
+
       <AlertDialog
         show={!!errMsg}
         title={t('message-types.alert')}
diff --git a/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss b/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
index 003c3b161b..56ed207431 100644
--- a/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
+++ b/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
@@ -19,6 +19,16 @@
   }
 }
 
+.warningDialog {
+  width: 680px;
+  .content {
+    display: flex;
+    justify-content: center;
+    margin-top: 24px;
+    color: var(--main-text-color);
+  }
+}
+
 .textarea {
   color: var(--main-text-color);
   margin-top: 17px;
diff --git a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
index ee497aeb65..9f84f1c148 100644
--- a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
+++ b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
@@ -23,9 +23,10 @@ interface SignDialogProps {
   wallet: State.Wallet
   offlineSignJSON: OfflineSignJSON
   onDismiss: () => void
+  onCompleted: () => void
 }
 
-const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss }: SignDialogProps) => {
+const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss, onCompleted }: SignDialogProps) => {
   const {
     app: {
       send: { description },
@@ -65,8 +66,8 @@ const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss }:
       type: AppActions.UpdateLoadedTransaction,
       payload: res.result!,
     })
-    onDismiss()
-  }, [offlineSignJSON, dispatch, onDismiss, t, password, walletID])
+    onCompleted()
+  }, [offlineSignJSON, dispatch, onCompleted, t, password, walletID])
 
   const onSubmit = useCallback(
     async (e?: React.FormEvent) => {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 08c1ba3add..4be525fcbd 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -112,6 +112,8 @@
         "partially-signed": "Partially Signed",
         "signed": "Signed"
       },
+      "import-signed-transaction": "Import signed transaction",
+      "import-signed-transaction-detail": "You have imported a signed transaction, please confirm and try again.",
       "wallet": "Wallet:",
       "content": "Content:",
       "export": "Export Tx",
@@ -121,7 +123,10 @@
         "broadcast": "Broadcast",
         "sign": "Sign and export",
         "cancel": "Cancel"
-      }
+      },
+      "broadcast-transaction": "Broadcast Transaction",
+      "import-unsigned-transaction": "Import unsigned transaction",
+      "import-unsigned-transaction-detail": "You have imported a unsigned transaction, please confirm and try again."
     },
     "overview": {
       "date": "Date",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 66ecd3fc35..57274acf0e 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -106,6 +106,8 @@
         "partially-signed": "部分簽名",
         "signed": "已簽名"
       },
+      "import-signed-transaction": "導入已簽名交易",
+      "import-signed-transaction-detail": "您導入了一個已簽名交易，請確認並重試。",
       "wallet": "錢包：",
       "content": "內容：",
       "export": "導出交易",
@@ -115,7 +117,10 @@
         "broadcast": "廣播交易",
         "sign": "簽名並導出",
         "cancel": "取消"
-      }
+      },
+      "broadcast-transaction": "廣播交易",
+      "import-unsigned-transaction": "導入未簽名交易",
+      "import-unsigned-transaction-detail": "您導入了一個未簽名交易，請確認並重試。"
     },
     "overview": {
       "date": "時間",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 7d24c9dc24..12b13f9301 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -105,6 +105,8 @@
         "partially-signed": "部分签名",
         "signed": "已签名"
       },
+      "import-signed-transaction": "导入已签名交易",
+      "import-signed-transaction-detail": "您导入了一个已签名交易，请确认并重试。",
       "wallet": "钱包：",
       "content": "内容：",
       "export": "导出交易",
@@ -114,7 +116,10 @@
         "broadcast": "广播交易",
         "sign": "签名并导出",
         "cancel": "取消"
-      }
+      },
+      "broadcast-transaction": "广播交易",
+      "import-unsigned-transaction": "导入未签名",
+      "import-unsigned-transaction-detail": "您导入了一个未签名交易，请确认并重试。"
     },
     "overview": {
       "date": "时间",
diff --git a/packages/neuron-ui/src/router.tsx b/packages/neuron-ui/src/router.tsx
index 76114bd4f2..447f8dc008 100644
--- a/packages/neuron-ui/src/router.tsx
+++ b/packages/neuron-ui/src/router.tsx
@@ -22,6 +22,7 @@ import Settings from 'components/Settings'
 import SignAndVerify from 'components/SignAndVerify'
 import MultisigAddress from 'components/MultisigAddress'
 import CellManagement from 'components/CellManagement'
+import BroadcastTransaction from 'components/BroadcastTransaction'
 
 const toolsRouters = [
   {
@@ -36,6 +37,10 @@ const toolsRouters = [
     path: RoutePath.MultisigAddress,
     element: <MultisigAddress />,
   },
+  {
+    path: RoutePath.BroadcastTransaction,
+    element: <BroadcastTransaction />,
+  },
 ]
 
 const mainRouterConfig: RouteObject[] = [
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index ce71adb71e..92e918edb7 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -28,6 +28,7 @@ export enum RoutePath {
   OfflineSign = 'offline-sign',
   SignVerify = 'sign-verify',
   MultisigAddress = 'multisig-address',
+  BroadcastTransaction = 'broadcast-transaction',
 }
 
 export enum CapacityUnit {
diff --git a/packages/neuron-wallet/src/controllers/app/menu.ts b/packages/neuron-wallet/src/controllers/app/menu.ts
index 7c014bf087..235718d783 100644
--- a/packages/neuron-wallet/src/controllers/app/menu.ts
+++ b/packages/neuron-wallet/src/controllers/app/menu.ts
@@ -23,6 +23,7 @@ enum URL {
   ImportKeystore = '/keystore/import',
   ImportHardware = '/import-hardware',
   OfflineSign = 'offline-sign',
+  BroadcastTransaction = 'broadcast-transaction',
 }
 
 enum ExternalURL {
@@ -361,6 +362,18 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
           loadTransaction(URL.OfflineSign, json, filePath)
         },
       },
+      {
+        label: t('application-menu.tools.broadcast-transaction'),
+        enabled: hasCurrentWallet && !isXpubWallet,
+        click: async () => {
+          const result = await OfflineSignService.loadTransactionJSON()
+          if (!result) {
+            return
+          }
+          const { json, filePath } = result
+          loadTransaction(URL.BroadcastTransaction, json, filePath)
+        },
+      },
     ],
   }
 
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 2b919a62b2..1923d250c2 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': 'Multisig Addresses',
         'offline-sign': 'Offline sign',
         'clear-sync-data': 'Clear all synchronized data',
+        'broadcast-transaction': 'Broadcast Transaction',
       },
       window: {
         label: 'Window',
diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts
index 1c7d1d4ff1..84f19783df 100644
--- a/packages/neuron-wallet/src/locales/zh-tw.ts
+++ b/packages/neuron-wallet/src/locales/zh-tw.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': '多簽地址',
         'offline-sign': '離線簽名',
         'clear-sync-data': '清除所有同步數據',
+        'broadcast-transaction': '廣播交易',
       },
       window: {
         label: '視窗',
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index b1a62625c2..26b46ce5a7 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': '多签地址',
         'offline-sign': '离线签名',
         'clear-sync-data': '清除所有同步数据',
+        'broadcast-transaction': '广播交易',
       },
       window: {
         label: '窗口',

From 12c6c7c8b513365e06210876e7338e2b531b6395 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Mon, 1 Jan 2024 23:59:04 +0800
Subject: [PATCH 2/9] fix: broadcastTransaction

---
 .../components/BroadcastTransaction/index.tsx | 43 ++++++++++++++++---
 packages/neuron-ui/src/locales/en.json        |  9 ++--
 packages/neuron-ui/src/locales/zh-tw.json     |  3 +-
 packages/neuron-ui/src/locales/zh.json        |  3 +-
 .../neuron-ui/src/services/remote/offline.ts  |  3 +-
 .../src/services/remote/remoteApiWrapper.ts   |  1 +
 packages/neuron-wallet/src/controllers/api.ts |  6 ++-
 .../neuron-wallet/src/controllers/app/menu.ts |  2 +-
 .../src/controllers/offline-sign.ts           |  9 ++++
 .../src/services/transaction-sender.ts        |  6 ++-
 10 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index b181829853..c358932ea8 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -1,11 +1,17 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
-import { isSuccessResponse, RoutePath, useDidMount, useGoBack } from 'utils'
+import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useDidMount, useGoBack, getExplorerUrl } from 'utils'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import { useDispatch, useState as useGlobalState } from 'states'
-import { broadcastTransaction, getCurrentWallet, OfflineSignStatus } from 'services/remote'
+import {
+  broadcastTransactionOnly,
+  getCurrentWallet,
+  OfflineSignStatus,
+  openExternal,
+  getLiveCells,
+} from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 
 import styles from './broadcastTransaction.module.scss'
@@ -13,13 +19,17 @@ import styles from './broadcastTransaction.module.scss'
 const BroadcastTransaction = () => {
   const {
     app: { loadedTransaction = {} },
+    chain: { networkID },
+    settings: { networks },
   } = useGlobalState()
 
   const [wallet, setWallet] = useState<State.Wallet | null>(null)
   const [isBroadCasting, setIsBroadcasting] = useState(false)
+  const [broadCastedTxHash, setBroadCastedTxHash] = useState('')
   const [t] = useTranslation()
   const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
+  const isMainnet = isMainnetUtil(networks, networkID)
 
   const { filePath, json } = loadedTransaction
 
@@ -35,21 +45,38 @@ const BroadcastTransaction = () => {
 
   const navigate = useNavigate()
   const onBroadcast = useCallback(async () => {
+    if (broadCastedTxHash) {
+      openExternal(`${getExplorerUrl(isMainnet)}/transaction/${broadCastedTxHash}`)
+      return
+    }
+
     setIsBroadcasting(true)
+
     try {
-      const res = await broadcastTransaction({
+      const res = await broadcastTransactionOnly({
         ...json,
-        walletID: wallet!.id,
       })
       if (isSuccessResponse(res)) {
-        navigate(RoutePath.History)
+        getLiveCells().then(cellRes => {
+          if (isSuccessResponse(cellRes) && cellRes.result) {
+            const cellWithTransaction = cellRes.result.find(item => item.outPoint.txHash === res.result)
+
+            if (cellWithTransaction) {
+              navigate(RoutePath.History)
+            }
+          }
+
+          if (res.result) {
+            setBroadCastedTxHash(res.result)
+          }
+        })
       } else {
         setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
       }
     } finally {
       setIsBroadcasting(false)
     }
-  }, [wallet, json, navigate, dispatch])
+  }, [wallet, json, navigate, dispatch, broadCastedTxHash, setBroadCastedTxHash])
 
   useDidMount(() => {
     getCurrentWallet().then(res => {
@@ -66,7 +93,9 @@ const BroadcastTransaction = () => {
         title={t('offline-sign.broadcast-transaction')}
         cancelText={t('offline-sign.actions.cancel')}
         onCancel={onBack}
-        confirmText={t('offline-sign.actions.broadcast')}
+        confirmText={
+          broadCastedTxHash ? t('offline-sign.actions.view-in-explorer') : t('offline-sign.actions.broadcast')
+        }
         isLoading={isBroadCasting}
         onConfirm={onBroadcast}
       >
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 30b0fb9808..c15e055b21 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -112,7 +112,7 @@
         "partially-signed": "Partially Signed",
         "signed": "Signed"
       },
-      "import-signed-transaction": "Import signed transaction",
+      "import-signed-transaction": "Import a signed transaction",
       "import-signed-transaction-detail": "You have imported a signed transaction, please confirm and try again.",
       "wallet": "Wallet:",
       "content": "Content:",
@@ -122,11 +122,12 @@
       "actions": {
         "broadcast": "Broadcast",
         "sign": "Sign and export",
-        "cancel": "Cancel"
+        "cancel": "Cancel",
+        "view-in-explorer": "View in Explorer"
       },
       "broadcast-transaction": "Broadcast Transaction",
-      "import-unsigned-transaction": "Import unsigned transaction",
-      "import-unsigned-transaction-detail": "You have imported a unsigned transaction, please confirm and try again."
+      "import-unsigned-transaction": "Import an unsigned transaction",
+      "import-unsigned-transaction-detail": "You have imported an unsigned transaction, please confirm and try again."
     },
     "overview": {
       "date": "Date",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index b022365d86..1db20d0fb9 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -116,7 +116,8 @@
       "actions": {
         "broadcast": "廣播交易",
         "sign": "簽名並導出",
-        "cancel": "取消"
+        "cancel": "取消",
+        "view-in-explorer": "在瀏覽器中查看"
       },
       "broadcast-transaction": "廣播交易",
       "import-unsigned-transaction": "導入未簽名交易",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 7fc5c96b55..6179caff7c 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -115,7 +115,8 @@
       "actions": {
         "broadcast": "广播交易",
         "sign": "签名并导出",
-        "cancel": "取消"
+        "cancel": "取消",
+        "view-in-explorer": "在浏览器中查看"
       },
       "broadcast-transaction": "广播交易",
       "import-unsigned-transaction": "导入未签名",
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index 2860ab770d..7239493fdd 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -40,7 +40,8 @@ export type BroadcastProps = OfflineSignJSON & { walletID: string }
 
 export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-transaction-as-json')
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
-export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction-only')
+export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction')
+export const broadcastTransactionOnly = remoteApi<OfflineSignJSON, string>('broadcast-transaction-only')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
 )
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 3ca2ffdff6..994aef368e 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -132,6 +132,7 @@ type Action =
   // offline-signature
   | 'export-transaction-as-json'
   | 'sign-transaction-only'
+  | 'broadcast-transaction'
   | 'broadcast-transaction-only'
   | 'sign-and-export-transaction'
   | 'sign-and-broadcast-transaction'
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 0d92bb8294..11a1ebe6cc 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -764,10 +764,14 @@ export default class ApiController {
       return this.#offlineSignController.signTransaction(params)
     })
 
-    handle('broadcast-transaction-only', async (_, params) => {
+    handle('broadcast-transaction', async (_, params) => {
       return this.#offlineSignController.broadcastTransaction(params)
     })
 
+    handle('broadcast-transaction-only', async (_, params) => {
+      return this.#offlineSignController.broadcastTransactionOnly(params)
+    })
+
     handle('sign-and-export-transaction', async (_, params) => {
       return this.#offlineSignController.signAndExportTransaction({
         ...params,
diff --git a/packages/neuron-wallet/src/controllers/app/menu.ts b/packages/neuron-wallet/src/controllers/app/menu.ts
index 235718d783..2a2406b51b 100644
--- a/packages/neuron-wallet/src/controllers/app/menu.ts
+++ b/packages/neuron-wallet/src/controllers/app/menu.ts
@@ -364,7 +364,7 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
       },
       {
         label: t('application-menu.tools.broadcast-transaction'),
-        enabled: hasCurrentWallet && !isXpubWallet,
+        enabled: hasCurrentWallet,
         click: async () => {
           const result = await OfflineSignService.loadTransactionJSON()
           if (!result) {
diff --git a/packages/neuron-wallet/src/controllers/offline-sign.ts b/packages/neuron-wallet/src/controllers/offline-sign.ts
index 1ca40ba019..1ef3b361f0 100644
--- a/packages/neuron-wallet/src/controllers/offline-sign.ts
+++ b/packages/neuron-wallet/src/controllers/offline-sign.ts
@@ -196,4 +196,13 @@ export default class OfflineSignController {
       }
     }
   }
+
+  public async broadcastTransactionOnly({ transaction }: OfflineSignJSON) {
+    const tx = Transaction.fromObject(transaction)
+    const hash = await new TransactionSender().broadcastTx('', tx)
+    return {
+      status: ResponseCode.Success,
+      result: hash,
+    }
+  }
 }
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 9820c9c0e7..8a4ea19090 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -100,8 +100,10 @@ export default class TransactionSender {
     await TransactionPersistor.saveSentTx(tx, txHash)
     await MultisigService.saveSentMultisigOutput(tx)
 
-    const wallet = WalletService.getInstance().get(walletID)
-    await wallet.checkAndGenerateAddresses()
+    if (walletID) {
+      const wallet = WalletService.getInstance().get(walletID)
+      await wallet.checkAndGenerateAddresses()
+    }
     return txHash
   }
 

From 17cc1a7dc83073820d6fca41e61604185a45f1fb Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sat, 13 Jan 2024 17:15:33 +0800
Subject: [PATCH 3/9] fix: BroadcastTransaction

---
 .../components/BroadcastTransaction/index.tsx | 34 ++++++-------------
 packages/neuron-ui/src/locales/en.json        |  2 +-
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index c358932ea8..bae518efbc 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -1,17 +1,11 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
-import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useDidMount, useGoBack, getExplorerUrl } from 'utils'
+import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useGoBack, getExplorerUrl } from 'utils'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import { useDispatch, useState as useGlobalState } from 'states'
-import {
-  broadcastTransactionOnly,
-  getCurrentWallet,
-  OfflineSignStatus,
-  openExternal,
-  getLiveCells,
-} from 'services/remote'
+import { broadcastTransactionOnly, OfflineSignStatus, openExternal, getLiveCells } from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 
 import styles from './broadcastTransaction.module.scss'
@@ -21,11 +15,11 @@ const BroadcastTransaction = () => {
     app: { loadedTransaction = {} },
     chain: { networkID },
     settings: { networks },
+    wallet,
   } = useGlobalState()
 
-  const [wallet, setWallet] = useState<State.Wallet | null>(null)
-  const [isBroadCasting, setIsBroadcasting] = useState(false)
-  const [broadCastedTxHash, setBroadCastedTxHash] = useState('')
+  const [isBroadcasting, setIsBroadcasting] = useState(false)
+  const [broadcastedTxHash, setBroadCastedTxHash] = useState('')
   const [t] = useTranslation()
   const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
@@ -45,8 +39,8 @@ const BroadcastTransaction = () => {
 
   const navigate = useNavigate()
   const onBroadcast = useCallback(async () => {
-    if (broadCastedTxHash) {
-      openExternal(`${getExplorerUrl(isMainnet)}/transaction/${broadCastedTxHash}`)
+    if (broadcastedTxHash) {
+      openExternal(`${getExplorerUrl(isMainnet)}/transaction/${broadcastedTxHash}`)
       return
     }
 
@@ -76,15 +70,7 @@ const BroadcastTransaction = () => {
     } finally {
       setIsBroadcasting(false)
     }
-  }, [wallet, json, navigate, dispatch, broadCastedTxHash, setBroadCastedTxHash])
-
-  useDidMount(() => {
-    getCurrentWallet().then(res => {
-      if (isSuccessResponse(res)) {
-        setWallet(res.result)
-      }
-    })
-  })
+  }, [wallet, json, navigate, dispatch, broadcastedTxHash, setBroadCastedTxHash])
 
   return (
     <>
@@ -94,9 +80,9 @@ const BroadcastTransaction = () => {
         cancelText={t('offline-sign.actions.cancel')}
         onCancel={onBack}
         confirmText={
-          broadCastedTxHash ? t('offline-sign.actions.view-in-explorer') : t('offline-sign.actions.broadcast')
+          broadcastedTxHash ? t('offline-sign.actions.view-in-explorer') : t('offline-sign.actions.broadcast')
         }
-        isLoading={isBroadCasting}
+        isLoading={isBroadcasting}
         onConfirm={onBroadcast}
       >
         <div className={styles.main}>
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 6823fc1061..1b2c5ab4d0 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -126,7 +126,7 @@
         "view-in-explorer": "View in Explorer"
       },
       "broadcast-transaction": "Broadcast Transaction",
-      "import-unsigned-transaction": "Import an unsigned transaction",
+      "import-unsigned-transaction": "Import a transaction to sign",
       "import-unsigned-transaction-detail": "You have imported an unsigned transaction, please confirm and try again."
     },
     "overview": {

From 994dc94a8c482f85d6d9d9a3729ba3d14891b8c5 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sat, 13 Jan 2024 17:54:13 +0800
Subject: [PATCH 4/9] fix: French

---
 .../components/BroadcastTransaction/index.tsx |   2 +-
 packages/neuron-ui/src/locales/en.json        |   2 +-
 packages/neuron-ui/src/locales/fr.json        | 156 +++++++++---------
 packages/neuron-ui/src/locales/zh-tw.json     |   2 +-
 packages/neuron-ui/src/locales/zh.json        |   2 +-
 .../neuron-wallet/src/controllers/app/menu.ts |   1 -
 6 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index bae518efbc..bafa4640a3 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -115,7 +115,7 @@ const BroadcastTransaction = () => {
       <Dialog
         show={!isSigned}
         className={styles.warningDialog}
-        title={t('offline-sign.import-unsigned-transaction')}
+        title={t('offline-sign.import-transaction-to-sign')}
         cancelText={t('offline-sign.actions.cancel')}
         onCancel={onBack}
         onConfirm={onBack}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 1b2c5ab4d0..1b534c004e 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -126,7 +126,7 @@
         "view-in-explorer": "View in Explorer"
       },
       "broadcast-transaction": "Broadcast Transaction",
-      "import-unsigned-transaction": "Import a transaction to sign",
+      "import-transaction-to-sign": "Import a transaction to sign",
       "import-unsigned-transaction-detail": "You have imported an unsigned transaction, please confirm and try again."
     },
     "overview": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index e7445298cc..b1edd14209 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -53,27 +53,27 @@
         "finish": "fin de la création"
       },
       "errors": {
-        "multi-device" : "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté",
-        "device-not-found" : "Aucun appareil n'a été détecté. Veuillez connecter votre appareil.",
-        "ckb-app-not-found" : "L'application CKB ne s'ouvre pas. Veuillez ouvrir l'application CKB sur votre appareil."
-      },
-      "waiting" : "Waiting for CKB app...",
-      "abort" : "En attente de l'application CKB... Action annulée",
-      "app-version" : "CKB App v{{version}} en cours d'exécution",
-      "firmware-version" : "Firmware v{{version}} détecté",
-      "wallet-name" : "Nom du portefeuille",
-      "select-model" : "Select Model",
-      "other-device" : "Autres"
+        "multi-device": "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté",
+        "device-not-found": "Aucun appareil n'a été détecté. Veuillez connecter votre appareil.",
+        "ckb-app-not-found": "L'application CKB ne s'ouvre pas. Veuillez ouvrir l'application CKB sur votre appareil."
+      },
+      "waiting": "Waiting for CKB app...",
+      "abort": "En attente de l'application CKB... Action annulée",
+      "app-version": "CKB App v{{version}} en cours d'exécution",
+      "firmware-version": "Firmware v{{version}} détecté",
+      "wallet-name": "Nom du portefeuille",
+      "select-model": "Select Model",
+      "other-device": "Autres"
     },
     "hardware-sign": {
-      "annuler" : "Annuler",
-      "title" : "Signer via le portefeuille matériel",
-      "device" : "Appareil :",
-      "status" : {
-        "label" : "Status :",
-        "connect" : "Connecté, prêt à signer",
-        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
-        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+      "annuler": "Annuler",
+      "title": "Signer via le portefeuille matériel",
+      "device": "Appareil :",
+      "status": {
+        "label": "Status :",
+        "connect": "Connecté, prêt à signer",
+        "user-input": "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect": "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
       },
       "inputs": "Inputs(signing {{index}} of {{length}})",
       "outputs": "Outputs({{length}})",
@@ -90,10 +90,10 @@
       "verified": "Vérifié",
       "invalid": "Invalid",
       "status": {
-        "label" : "Status :",
-        "connect" : "Connecté, prêt pour la vérification",
-        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
-        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+        "label": "Status :",
+        "connect": "Connecté, prêt pour la vérification",
+        "user-input": "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect": "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
       },
       "actions": {
         "close": "Fermer",
@@ -102,7 +102,7 @@
         "verify": "Vérifier l'adresse",
         "finish": "Ok"
       }
-    },  
+    },
     "offline-sign": {
       "title": "Signature hors ligne",
       "json-file": "Fichier JSON :",
@@ -112,6 +112,8 @@
         "partially-signed": "Partiellement signé",
         "signed": "Signé"
       },
+      "import-signed-transaction": "Importer une transaction signée",
+      "import-signed-transaction-detail": "Vous avez importé une transaction signée, veuillez confirmer et essayer à nouveau.",
       "wallet": "Wallet :",
       "content": "Contenu :",
       "export": "Exporter Tx",
@@ -120,8 +122,12 @@
       "actions": {
         "broadcast": "Diffuser",
         "sign": "Signer et exporter",
-        "cancel": "Annuler"
-      }
+        "cancel": "Annuler",
+        "view-in-explorer": "Voir dans l'Explorateur"
+      },
+      "broadcast-transaction": "Diffuser la Transaction",
+      "import-transaction-to-sign": "Importer une transaction à signer",
+      "import-unsigned-transaction-detail": "Vous avez importé une transaction non signée, veuillez confirmer et essayer à nouveau."
     },
     "overview": {
       "date": "Date",
@@ -292,7 +298,7 @@
       "search": {
         "button": "Rechercher",
         "placeholder": "Rechercher le hash de transaction, l'adresse ou la date (aaaa-mm-jj)"
-     },
+      },
       "table": {
         "name": "Nom du Wallet",
         "type": "Type",
@@ -316,42 +322,42 @@
       "copy-address": "Copier l'adresse",
       "create": "Créer le compte d'actif {{name}}",
       "destroy": "Détruire le compte d'actif {{name}}"
-    },  
+    },
     "transaction": {
-        "window-title": "Transaction : {{hash}}",
-        "date": "Date",
-        "transaction-hash": "Hash de transaction",
-        "block-number": "Numéro de bloc",
-        "goBack": "Retour",
-        "index": "Index",
-        "address": "Adresse",
-        "income": "Revenu",
-        "amount": "Montant",
-        "inputs": "Entrées",
-        "outputs": "Sorties",
-        "cell-from-cellbase": "De cellbase",
-        "lock-script": "Script de verrouillage",
-        "lock-script-title": "Informations sur l'adresse",
-        "deprecated-address-format": "Adresse au format obsolète"
-      },
-      "addresses": {
-        "title": "Carnet d'adresses",
-        "addresses": "Adresses",
-        "type": "Type",
-        "address": "Adresse",
-        "identifier": "Identifiant",
-        "description": "Description",
-        "balance": "Solde",
-        "transactions": "TXs",
-        "receiving-address": "Réception",
-        "change-address": "Changement",
-        "copy-address": "Copier l'adresse",
-        "request-payment": "Demander un paiement",
-        "view-on-explorer": "Voir sur l'explorateur",
-        "default-description": "Aucun",
-        "all-address": "Toutes"
+      "window-title": "Transaction : {{hash}}",
+      "date": "Date",
+      "transaction-hash": "Hash de transaction",
+      "block-number": "Numéro de bloc",
+      "goBack": "Retour",
+      "index": "Index",
+      "address": "Adresse",
+      "income": "Revenu",
+      "amount": "Montant",
+      "inputs": "Entrées",
+      "outputs": "Sorties",
+      "cell-from-cellbase": "De cellbase",
+      "lock-script": "Script de verrouillage",
+      "lock-script-title": "Informations sur l'adresse",
+      "deprecated-address-format": "Adresse au format obsolète"
     },
-    "settings":{
+    "addresses": {
+      "title": "Carnet d'adresses",
+      "addresses": "Adresses",
+      "type": "Type",
+      "address": "Adresse",
+      "identifier": "Identifiant",
+      "description": "Description",
+      "balance": "Solde",
+      "transactions": "TXs",
+      "receiving-address": "Réception",
+      "change-address": "Changement",
+      "copy-address": "Copier l'adresse",
+      "request-payment": "Demander un paiement",
+      "view-on-explorer": "Voir sur l'explorateur",
+      "default-description": "Aucun",
+      "all-address": "Toutes"
+    },
+    "settings": {
       "title": {
         "normal": "Paramètres",
         "mac": "Préférences"
@@ -387,17 +393,17 @@
         }
       },
       "network": {
-       "online": "En ligne",
-       "offline": "Hors ligne",
-       "add-network": "Ajouter un réseau",
-       "remove-network": "Supprimer le réseau",
-       "remove-network-msg": "Êtes-vous sûr de vouloir supprimer le réseau sélectionné ?",
+        "online": "En ligne",
+        "offline": "Hors ligne",
+        "add-network": "Ajouter un réseau",
+        "remove-network": "Supprimer le réseau",
+        "remove-network-msg": "Êtes-vous sûr de vouloir supprimer le réseau sélectionné ?",
         "edit-network": {
-         "title": "Modifier le réseau",
-         "rpc-url": "URL RPC",
-         "name": "Nom du réseau",
-         "input-rpc": "Veuillez entrer rpc",
-         "input-network": "Veuillez entrer le nom" 
+          "title": "Modifier le réseau",
+          "rpc-url": "URL RPC",
+          "name": "Nom du réseau",
+          "input-rpc": "Veuillez entrer rpc",
+          "input-network": "Veuillez entrer le nom"
         },
         "edit-success": "Modification réussie du réseau",
         "mainnet": "Mainnet",
@@ -406,8 +412,8 @@
         "lightMainnet": "Mainnet léger",
         "devnet": "Devnet",
         "switch-network-type": "Basculer vers {{type}}"
-      },  
-        "locale": {
+      },
+      "locale": {
         "en": "Anglais",
         "en-US": "Anglais (États-Unis)",
         "zh": "中文(简体)",
@@ -433,7 +439,7 @@
         "disabled-set-path": "Lorsque le noeud CKB est démarré manuellement, la configuration du chemin du noeud CKB ne prend pas effet.",
         "ckb-node-storage": "Stockage du noeud CKB"
       }
-    },    
+    },
     "password-request": {
       "wallet-not-found": "Le Wallet n'a pas été trouvé",
       "password": "Entrez le mot de passe",
@@ -503,7 +509,7 @@
     "qrcode": {
       "copy": "Copier l'image",
       "save": "Enregistrer l'image"
-    },  
+    },
     "common": {
       "or": "ou",
       "ok": "Ok",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 6ef9d37b54..4e6661f29f 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -120,7 +120,7 @@
         "view-in-explorer": "在瀏覽器中查看"
       },
       "broadcast-transaction": "廣播交易",
-      "import-unsigned-transaction": "導入未簽名交易",
+      "import-transaction-to-sign": "導入一筆交易以簽名",
       "import-unsigned-transaction-detail": "您導入了一個未簽名交易，請確認並重試。"
     },
     "overview": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 7965d1d2bf..97bc83b891 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -119,7 +119,7 @@
         "view-in-explorer": "在浏览器中查看"
       },
       "broadcast-transaction": "广播交易",
-      "import-unsigned-transaction": "导入未签名",
+      "import-transaction-to-sign": "导入一笔交易以签名",
       "import-unsigned-transaction-detail": "您导入了一个未签名交易，请确认并重试。"
     },
     "overview": {
diff --git a/packages/neuron-wallet/src/controllers/app/menu.ts b/packages/neuron-wallet/src/controllers/app/menu.ts
index 2a2406b51b..24ae895113 100644
--- a/packages/neuron-wallet/src/controllers/app/menu.ts
+++ b/packages/neuron-wallet/src/controllers/app/menu.ts
@@ -364,7 +364,6 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
       },
       {
         label: t('application-menu.tools.broadcast-transaction'),
-        enabled: hasCurrentWallet,
         click: async () => {
           const result = await OfflineSignService.loadTransactionJSON()
           if (!result) {

From b2457519bdaadf0357ebb92bb27c1d99da85c6d3 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sat, 13 Jan 2024 20:20:41 +0800
Subject: [PATCH 5/9] fix: broadcastTransactionOnly

---
 .../components/BroadcastTransaction/index.tsx | 45 ++++++++++--------
 .../neuron-ui/src/services/remote/offline.ts  | 11 ++++-
 .../src/controllers/offline-sign.ts           | 46 ++++++++++++++++---
 .../neuron-wallet/src/models/offline-sign.ts  |  9 ++++
 .../src/services/asset-account-service.ts     |  2 +-
 5 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index bafa4640a3..383d25efb8 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -5,7 +5,7 @@ import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useGoBack, ge
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import { useDispatch, useState as useGlobalState } from 'states'
-import { broadcastTransactionOnly, OfflineSignStatus, openExternal, getLiveCells } from 'services/remote'
+import { broadcastTransactionOnly, OfflineSignStatus, openExternal, getTransactionList } from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 
 import styles from './broadcastTransaction.module.scss'
@@ -19,7 +19,7 @@ const BroadcastTransaction = () => {
   } = useGlobalState()
 
   const [isBroadcasting, setIsBroadcasting] = useState(false)
-  const [broadcastedTxHash, setBroadCastedTxHash] = useState('')
+  const [broadcastedTxHash, setBroadCastedTxHash] = useState<string | null>('')
   const [t] = useTranslation()
   const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
@@ -46,29 +46,34 @@ const BroadcastTransaction = () => {
 
     setIsBroadcasting(true)
 
-    try {
-      const res = await broadcastTransactionOnly({
-        ...json,
-      })
-      if (isSuccessResponse(res)) {
-        getLiveCells().then(cellRes => {
-          if (isSuccessResponse(cellRes) && cellRes.result) {
-            const cellWithTransaction = cellRes.result.find(item => item.outPoint.txHash === res.result)
-
-            if (cellWithTransaction) {
-              navigate(RoutePath.History)
-            }
-          }
+    const res = await broadcastTransactionOnly({
+      ...json,
+    })
+
+    setIsBroadcasting(false)
+
+    if (isSuccessResponse(res)) {
+      if (!wallet?.id) {
+        setBroadCastedTxHash(res.result)
+        return
+      }
 
-          if (res.result) {
+      if (res.result) {
+        getTransactionList({
+          walletID: wallet.id,
+          pageNo: 1,
+          pageSize: 1,
+          keywords: res.result,
+        }).then(txRes => {
+          if (isSuccessResponse(txRes) && txRes.result.items.length) {
+            navigate(RoutePath.History)
+          } else {
             setBroadCastedTxHash(res.result)
           }
         })
-      } else {
-        setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
       }
-    } finally {
-      setIsBroadcasting(false)
+    } else {
+      setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
     }
   }, [wallet, json, navigate, dispatch, broadcastedTxHash, setBroadCastedTxHash])
 
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index 7239493fdd..5ef264228c 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -34,6 +34,15 @@ export interface OfflineSignJSON {
   multisig_configs?: MultisigConfigs
 }
 
+export interface SignedTransaction {
+  transaction: State.GeneratedTx
+  status: OfflineSignStatus.Signed
+  type: OfflineSignType
+  description?: string
+  asset_account?: Pick<Controller.SUDTAccount, 'symbol' | 'tokenName' | 'accountName' | 'decimal' | 'tokenID'>
+  multisig_configs?: MultisigConfigs
+}
+
 export type SignProps = OfflineSignJSON & { walletID: string; password: string; multisigConfig?: MultisigEntity }
 
 export type BroadcastProps = OfflineSignJSON & { walletID: string }
@@ -41,7 +50,7 @@ export type BroadcastProps = OfflineSignJSON & { walletID: string }
 export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-transaction-as-json')
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
 export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction')
-export const broadcastTransactionOnly = remoteApi<OfflineSignJSON, string>('broadcast-transaction-only')
+export const broadcastTransactionOnly = remoteApi<SignedTransaction, string>('broadcast-transaction-only')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
 )
diff --git a/packages/neuron-wallet/src/controllers/offline-sign.ts b/packages/neuron-wallet/src/controllers/offline-sign.ts
index 1ef3b361f0..50756bb8da 100644
--- a/packages/neuron-wallet/src/controllers/offline-sign.ts
+++ b/packages/neuron-wallet/src/controllers/offline-sign.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { dialog } from 'electron'
 import { t } from 'i18next'
 import { ResponseCode } from '../utils/const'
-import OfflineSign, { SignType, OfflineSignJSON, SignStatus } from '../models/offline-sign'
+import OfflineSign, { SignType, OfflineSignJSON, SignStatus, SignedTransaction } from '../models/offline-sign'
 import TransactionSender from '../services/transaction-sender'
 import Transaction from '../models/chain/transaction'
 import AssetAccountController from './asset-account'
@@ -197,12 +197,46 @@ export default class OfflineSignController {
     }
   }
 
-  public async broadcastTransactionOnly({ transaction }: OfflineSignJSON) {
+  public async broadcastTransactionOnly({
+    transaction,
+    type,
+    asset_account: assetAccount,
+    description,
+  }: SignedTransaction) {
     const tx = Transaction.fromObject(transaction)
-    const hash = await new TransactionSender().broadcastTx('', tx)
-    return {
-      status: ResponseCode.Success,
-      result: hash,
+    switch (type) {
+      case SignType.CreateSUDTAccount: {
+        return new AssetAccountController().sendCreateTx(
+          {
+            walletID: '',
+            assetAccount: assetAccount!,
+            tx,
+            password: '',
+          },
+          true
+        )
+      }
+      case SignType.SendSUDT: {
+        return new AnyoneCanPayController().sendTx(
+          {
+            walletID: '',
+            tx,
+            password: '',
+          },
+          true
+        )
+      }
+      default: {
+        return new WalletsController().sendTx(
+          {
+            walletID: '',
+            tx,
+            password: '',
+            description,
+          },
+          true
+        )
+      }
     }
   }
 }
diff --git a/packages/neuron-wallet/src/models/offline-sign.ts b/packages/neuron-wallet/src/models/offline-sign.ts
index 2fd73a0d93..4bb4946ae8 100644
--- a/packages/neuron-wallet/src/models/offline-sign.ts
+++ b/packages/neuron-wallet/src/models/offline-sign.ts
@@ -46,6 +46,15 @@ export interface OfflineSignJSON {
   multisig_configs?: MultisigConfigs
 }
 
+export interface SignedTransaction {
+  transaction: Transaction
+  status: SignStatus.Signed
+  type: SignType
+  description?: string
+  asset_account?: AssetAccount
+  multisig_configs?: MultisigConfigs
+}
+
 export default class OfflineSign implements OfflineSignProps {
   public transaction: Transaction
   public assetAccount?: AssetAccount
diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
index 7e076a4310..1fa719a0c9 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -341,7 +341,7 @@ export default class AssetAccountService {
       [assetAccount.tokenID, assetAccount.blake160]
     )
 
-    if (exists[0].exist === 1) {
+    if (exists[0].exist === 1 && walletID) {
       // For hardware wallet in ckb asset account:
       // 1. If a ckb account has been created, another one cannot be created;
       // 2. If a ckb account has been destroyed, ckb account can be created.

From 91fbcf73ac67596ed3e3d9244568999bdb120bc2 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sun, 14 Jan 2024 01:45:43 +0800
Subject: [PATCH 6/9] fix: comments

---
 .../src/components/BroadcastTransaction/index.tsx      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index 383d25efb8..45083447a8 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -19,7 +19,7 @@ const BroadcastTransaction = () => {
   } = useGlobalState()
 
   const [isBroadcasting, setIsBroadcasting] = useState(false)
-  const [broadcastedTxHash, setBroadCastedTxHash] = useState<string | null>('')
+  const [broadcastedTxHash, setBroadcastedTxHash] = useState<string | null>('')
   const [t] = useTranslation()
   const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
@@ -54,7 +54,7 @@ const BroadcastTransaction = () => {
 
     if (isSuccessResponse(res)) {
       if (!wallet?.id) {
-        setBroadCastedTxHash(res.result)
+        setBroadcastedTxHash(res.result)
         return
       }
 
@@ -62,20 +62,20 @@ const BroadcastTransaction = () => {
         getTransactionList({
           walletID: wallet.id,
           pageNo: 1,
-          pageSize: 1,
+          pageSize: 10,
           keywords: res.result,
         }).then(txRes => {
           if (isSuccessResponse(txRes) && txRes.result.items.length) {
             navigate(RoutePath.History)
           } else {
-            setBroadCastedTxHash(res.result)
+            setBroadcastedTxHash(res.result)
           }
         })
       }
     } else {
       setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
     }
-  }, [wallet, json, navigate, dispatch, broadcastedTxHash, setBroadCastedTxHash])
+  }, [wallet, json, navigate, dispatch, broadcastedTxHash, setBroadcastedTxHash])
 
   return (
     <>

From d8416fd9b9776107649e2ed8ae6ada96b9e482a0 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sun, 14 Jan 2024 10:58:23 +0800
Subject: [PATCH 7/9] fix: broadcastSignedTransaction

---
 .../components/BroadcastTransaction/index.tsx |  4 +-
 .../neuron-ui/src/services/remote/offline.ts  | 13 ++----
 .../src/services/remote/remoteApiWrapper.ts   |  2 +-
 packages/neuron-wallet/src/controllers/api.ts |  4 +-
 .../src/controllers/offline-sign.ts           | 45 +------------------
 .../neuron-wallet/src/models/offline-sign.ts  |  9 ----
 6 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index 45083447a8..c807147633 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -5,7 +5,7 @@ import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useGoBack, ge
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import { useDispatch, useState as useGlobalState } from 'states'
-import { broadcastTransactionOnly, OfflineSignStatus, openExternal, getTransactionList } from 'services/remote'
+import { broadcastSignedTransaction, OfflineSignStatus, openExternal, getTransactionList } from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 
 import styles from './broadcastTransaction.module.scss'
@@ -46,7 +46,7 @@ const BroadcastTransaction = () => {
 
     setIsBroadcasting(true)
 
-    const res = await broadcastTransactionOnly({
+    const res = await broadcastSignedTransaction({
       ...json,
     })
 
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index 5ef264228c..ca91db2187 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -34,23 +34,16 @@ export interface OfflineSignJSON {
   multisig_configs?: MultisigConfigs
 }
 
-export interface SignedTransaction {
-  transaction: State.GeneratedTx
-  status: OfflineSignStatus.Signed
-  type: OfflineSignType
-  description?: string
-  asset_account?: Pick<Controller.SUDTAccount, 'symbol' | 'tokenName' | 'accountName' | 'decimal' | 'tokenID'>
-  multisig_configs?: MultisigConfigs
-}
-
 export type SignProps = OfflineSignJSON & { walletID: string; password: string; multisigConfig?: MultisigEntity }
 
 export type BroadcastProps = OfflineSignJSON & { walletID: string }
 
+export type SignedTransaction = OfflineSignJSON & { status: OfflineSignStatus.Signed }
+
 export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-transaction-as-json')
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
 export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction')
-export const broadcastTransactionOnly = remoteApi<SignedTransaction, string>('broadcast-transaction-only')
+export const broadcastSignedTransaction = remoteApi<SignedTransaction, string>('broadcast-signed-transaction')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
 )
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 994aef368e..9ccc527c39 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -133,7 +133,7 @@ type Action =
   | 'export-transaction-as-json'
   | 'sign-transaction-only'
   | 'broadcast-transaction'
-  | 'broadcast-transaction-only'
+  | 'broadcast-signed-transaction'
   | 'sign-and-export-transaction'
   | 'sign-and-broadcast-transaction'
   // nft
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 11a1ebe6cc..4c36e1747e 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -768,8 +768,8 @@ export default class ApiController {
       return this.#offlineSignController.broadcastTransaction(params)
     })
 
-    handle('broadcast-transaction-only', async (_, params) => {
-      return this.#offlineSignController.broadcastTransactionOnly(params)
+    handle('broadcast-signed-transaction', async (_, params) => {
+      return this.#offlineSignController.broadcastTransaction({ ...params, walletID: '' })
     })
 
     handle('sign-and-export-transaction', async (_, params) => {
diff --git a/packages/neuron-wallet/src/controllers/offline-sign.ts b/packages/neuron-wallet/src/controllers/offline-sign.ts
index 50756bb8da..1ca40ba019 100644
--- a/packages/neuron-wallet/src/controllers/offline-sign.ts
+++ b/packages/neuron-wallet/src/controllers/offline-sign.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { dialog } from 'electron'
 import { t } from 'i18next'
 import { ResponseCode } from '../utils/const'
-import OfflineSign, { SignType, OfflineSignJSON, SignStatus, SignedTransaction } from '../models/offline-sign'
+import OfflineSign, { SignType, OfflineSignJSON, SignStatus } from '../models/offline-sign'
 import TransactionSender from '../services/transaction-sender'
 import Transaction from '../models/chain/transaction'
 import AssetAccountController from './asset-account'
@@ -196,47 +196,4 @@ export default class OfflineSignController {
       }
     }
   }
-
-  public async broadcastTransactionOnly({
-    transaction,
-    type,
-    asset_account: assetAccount,
-    description,
-  }: SignedTransaction) {
-    const tx = Transaction.fromObject(transaction)
-    switch (type) {
-      case SignType.CreateSUDTAccount: {
-        return new AssetAccountController().sendCreateTx(
-          {
-            walletID: '',
-            assetAccount: assetAccount!,
-            tx,
-            password: '',
-          },
-          true
-        )
-      }
-      case SignType.SendSUDT: {
-        return new AnyoneCanPayController().sendTx(
-          {
-            walletID: '',
-            tx,
-            password: '',
-          },
-          true
-        )
-      }
-      default: {
-        return new WalletsController().sendTx(
-          {
-            walletID: '',
-            tx,
-            password: '',
-            description,
-          },
-          true
-        )
-      }
-    }
-  }
 }
diff --git a/packages/neuron-wallet/src/models/offline-sign.ts b/packages/neuron-wallet/src/models/offline-sign.ts
index 4bb4946ae8..2fd73a0d93 100644
--- a/packages/neuron-wallet/src/models/offline-sign.ts
+++ b/packages/neuron-wallet/src/models/offline-sign.ts
@@ -46,15 +46,6 @@ export interface OfflineSignJSON {
   multisig_configs?: MultisigConfigs
 }
 
-export interface SignedTransaction {
-  transaction: Transaction
-  status: SignStatus.Signed
-  type: SignType
-  description?: string
-  asset_account?: AssetAccount
-  multisig_configs?: MultisigConfigs
-}
-
 export default class OfflineSign implements OfflineSignProps {
   public transaction: Transaction
   public assetAccount?: AssetAccount

From 7030d9d9d595ab3f3971e51bbbf6bd5febb771a2 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Sun, 14 Jan 2024 11:43:31 +0800
Subject: [PATCH 8/9] fix

---
 packages/neuron-ui/src/services/remote/offline.ts          | 2 +-
 packages/neuron-ui/src/services/remote/remoteApiWrapper.ts | 2 +-
 packages/neuron-wallet/src/controllers/api.ts              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index ca91db2187..1743cd2a46 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -42,7 +42,7 @@ export type SignedTransaction = OfflineSignJSON & { status: OfflineSignStatus.Si
 
 export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-transaction-as-json')
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
-export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction')
+export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction-only')
 export const broadcastSignedTransaction = remoteApi<SignedTransaction, string>('broadcast-signed-transaction')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 9ccc527c39..fab480aac8 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -132,7 +132,7 @@ type Action =
   // offline-signature
   | 'export-transaction-as-json'
   | 'sign-transaction-only'
-  | 'broadcast-transaction'
+  | 'broadcast-transaction-only'
   | 'broadcast-signed-transaction'
   | 'sign-and-export-transaction'
   | 'sign-and-broadcast-transaction'
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 4c36e1747e..0e5de01f0b 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -764,7 +764,7 @@ export default class ApiController {
       return this.#offlineSignController.signTransaction(params)
     })
 
-    handle('broadcast-transaction', async (_, params) => {
+    handle('broadcast-transaction-only', async (_, params) => {
       return this.#offlineSignController.broadcastTransaction(params)
     })
 

From 2068f3d1eca3e239f55141ee1626b2979259a169 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Tue, 16 Jan 2024 21:50:17 +0800
Subject: [PATCH 9/9] feat: remove Wallet field

---
 .../src/components/BroadcastTransaction/index.tsx         | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
index c807147633..ccc1da482c 100644
--- a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -6,7 +6,6 @@ import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import { useDispatch, useState as useGlobalState } from 'states'
 import { broadcastSignedTransaction, OfflineSignStatus, openExternal, getTransactionList } from 'services/remote'
-import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 
 import styles from './broadcastTransaction.module.scss'
 
@@ -101,13 +100,6 @@ const BroadcastTransaction = () => {
                 <td className={styles.first}>{t('offline-sign.status.label')}</td>
                 <td>{t('offline-sign.status.signed')}</td>
               </tr>
-              <tr>
-                <td className={styles.first}>{t('offline-sign.wallet')}</td>
-                <td>
-                  {wallet?.device ? <HardWalletIcon /> : null}
-                  <span>{wallet?.name ?? ''}</span>
-                </td>
-              </tr>
               <tr>
                 <td className={styles.first}>{t('offline-sign.content')}</td>
               </tr>