diff --git a/.github/workflows/update_wallet_env.yml b/.github/workflows/update_wallet_env.yml
index f02a69b70b..5f3d7f090e 100644
--- a/.github/workflows/update_wallet_env.yml
+++ b/.github/workflows/update_wallet_env.yml
@@ -19,7 +19,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           branch: 'chore-update-wallet-env/${{github.ref_name}}'
-          sha: '${{ github.event.create.head.sha }}'
+          sha: '${{ github.sha }}'
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a35aea95a9..14a324aac9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,77 @@
+# 0.116.2 (2024-05-29)
+
+### CKB Node & Light Client
+
+- [CKB@v0.116.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.116.1) was released on May. 11st, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.3.7](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.7) was released on Apr. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c`(at height `13,007,704`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3157)
+
+---
+
+## Bug fixes
+
+- 3179: Remove the display of the ledger firmware version because it causes the Nervos app to crash on the ledger device.(@yanguoyu)
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.116.1...v0.116.2
+
+# 0.116.1 (2024-05-28)
+
+### CKB Node & Light Client
+
+- [CKB@v0.116.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.116.1) was released on May. 11st, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.3.7](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.7) was released on Apr. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c`(at height `13,007,704`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3157)
+
+---
+
+## Bug fixes
+
+- 3173: Fix importing an account from a hardware wallet.(@yanguoyu)
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.116.0...v0.116.1
+
+# 0.116.0 (2024-05-24)
+
+### CKB Node & Light Client
+
+- [CKB@v0.116.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.116.1) was released on May. 11st, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.3.7](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.7) was released on Apr. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c`(at height `13,007,704`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3157)
+
+---
+
+[![Neuron@v0.116.0](https://github.com/Magickbase/neuron-public-issues/assets/7271329/ec10aa01-47fe-47a3-9636-3d4e86fc6c9b)](https://youtu.be/QXv8by2C8zU)
+
+YouTube: https://youtu.be/QXv8by2C8zU
+
+---
+
+## New features
+
+- 3134: Support 'replace-by-fee' nervos dao transactions and sudt transactions.(@devchenyan)
+- 3144: Reduce size of light client log in debug information and reveal start-block-number in log.(@yanguoyu)
+- 3064: Support locking window by pin code.(@yanguoyu)
+- 3131: Add detailed result for nervos dao transaction.(@devchenyan)
+
+## Bug fixes
+
+- 3121: Locate the first transaction on Explorer directly when users want to set the start-block-number for light client.(@yanguoyu)
+- 3101: Show migration instruction properly.(@devchenyan)
+- 3062: Migrate legacy ACP to active ACP account(@yanguoyu)
+- 3141: Fix some issues about light client synchronizaiton.(@yanguoyu)
+- 3120: Remove all sync data when start-block-number is set less than before.(@yanguoyu)
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.114.3...v0.116.0
+
 # 0.114.3 (2024-04-16)
 
 ### CKB Node & Light Client
diff --git a/compatible.json b/compatible.json
index 028ff3cb04..b2865b7a18 100644
--- a/compatible.json
+++ b/compatible.json
@@ -99,6 +99,22 @@
         "0.3",
         "0.2"
       ]
+    },
+    "0.116": {
+      "full": [
+        "0.116",
+        "0.115",
+        "0.114",
+        "0.113",
+        "0.112",
+        "0.111",
+        "0.110",
+        "0.109"
+      ],
+      "light": [
+        "0.3",
+        "0.2"
+      ]
     }
   }
 }
diff --git a/lerna.json b/lerna.json
index 0e77734cb4..42a9f9ef22 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.114.3",
+  "version": "0.116.2",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/package.json b/package.json
index 62c7a5ad1b..4a5cc5abac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.114.3",
+  "version": "0.116.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 5c6ce190e1..1319e32973 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.114.3",
+  "version": "0.116.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
index 5cdbc79812..66250d03b6 100644
--- a/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
+++ b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
@@ -198,7 +198,7 @@ const AmendSUDTSend = () => {
             </div>
             <div className={styles.rightFooter}>
               <div className={styles.actions}>
-                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                <Button type="submit" disabled={!!disabled} label={t('send.send')}>
                   {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
                 </Button>
               </div>
diff --git a/packages/neuron-ui/src/components/AmendSend/index.tsx b/packages/neuron-ui/src/components/AmendSend/index.tsx
index 92eb75675d..453eef097b 100644
--- a/packages/neuron-ui/src/components/AmendSend/index.tsx
+++ b/packages/neuron-ui/src/components/AmendSend/index.tsx
@@ -96,6 +96,15 @@ const AmendSend = () => {
     return ''
   }
 
+  const inputsCapacity = useMemo(() => {
+    if (transaction) {
+      return transaction.inputs.reduce((total, cur) => {
+        return total + BigInt(cur.capacity || '0')
+      }, BigInt(0))
+    }
+    return undefined
+  }, [transaction])
+
   const items: {
     address: string
     amount: string
@@ -103,21 +112,25 @@ const AmendSend = () => {
     isLastOutput: boolean
     output: State.DetailedOutput
   }[] = useMemo(() => {
-    if (transaction && transaction.outputs.length) {
+    if (transaction && transaction.outputs.length && inputsCapacity) {
       const lastOutputAddress = getLastOutputAddress(transaction.outputs)
       return transaction.outputs.map(output => {
         const address = scriptToAddress(output.lock, { isMainnet })
+        const capacity =
+          transaction.outputs.length === 1 && address === lastOutputAddress
+            ? (inputsCapacity - fee).toString()
+            : output.capacity
         return {
-          capacity: output.capacity,
+          capacity,
           address,
           output,
-          amount: shannonToCKBFormatter(output.capacity || '0'),
+          amount: shannonToCKBFormatter(capacity || '0'),
           isLastOutput: address === lastOutputAddress,
         }
       })
     }
     return []
-  }, [transaction?.outputs])
+  }, [transaction?.outputs, inputsCapacity, fee])
 
   const outputsCapacity = useMemo(() => {
     const outputList = items.length === 1 ? items : items.filter(item => !item.isLastOutput)
@@ -129,15 +142,15 @@ const AmendSend = () => {
   const totalAmount = shannonToCKBFormatter(outputsCapacity.toString())
 
   const lastOutputsCapacity = useMemo(() => {
-    if (transaction) {
-      const inputsCapacity = transaction.inputs.reduce((total, cur) => {
-        return total + BigInt(cur.capacity || '0')
-      }, BigInt(0))
+    if (inputsCapacity) {
+      if (items.length === 1) {
+        return BigInt(items[0].capacity || '0')
+      }
 
       return inputsCapacity - outputsCapacity - fee
     }
     return undefined
-  }, [transaction, fee, outputsCapacity])
+  }, [inputsCapacity, fee, outputsCapacity, items])
 
   useEffect(() => {
     if (transaction && lastOutputsCapacity !== undefined) {
@@ -237,7 +250,7 @@ const AmendSend = () => {
                 <span>{t('send.allow-use-sent-cell')}</span>
               </label>
               <div className={styles.actions}>
-                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                <Button type="submit" disabled={!!disabled} label={t('send.send')}>
                   {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
                 </Button>
               </div>
diff --git a/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx b/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
index 4a180ba15f..b31da32d3c 100644
--- a/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
+++ b/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
@@ -12,7 +12,7 @@ type FormattedTokenAmountProps = { item: State.Transaction; show: boolean; symbo
 type AmountProps = Omit<FormattedTokenAmountProps, 'isNeedCopy'> & {
   sudtAmount?: string
   isReceive: boolean
-  amount: string
+  amount?: string
   symbolClassName?: string
 }
 
@@ -30,18 +30,18 @@ const Amount = ({ sudtAmount, show, item, isReceive, amount, symbolClassName, sy
     </div>
   ) : (
     <div>
-      <span className={show ? styles.amount : ''} data-direction={isReceive ? 'receive' : 'send'}>
-        {amount}
+      <span className={show ? styles.amount : ''} data-direction={amount && (isReceive ? 'receive' : 'send')}>
+        {amount ?? '--'}
       </span>
-      &nbsp;{symbol}
+      &nbsp;{amount ? symbol : ''}
     </div>
   )
 }
 
 export const FormattedTokenAmount = ({ item, show, symbolClassName }: FormattedTokenAmountProps) => {
-  let amount = '--'
+  let amount: string | undefined
   let sudtAmount = ''
-  let copyText = amount
+  let copyText: string | undefined = amount
   let isReceive = false
   let symbol = ''
 
@@ -61,16 +61,22 @@ export const FormattedTokenAmount = ({ item, show, symbolClassName }: FormattedT
         isReceive = !sudtAmount.includes('-')
       }
     } else {
-      amount = show ? `${shannonToCKBFormatter(item.value, true)}` : `${HIDE_BALANCE}`
-      isReceive = !amount.includes('-')
+      amount = show
+        ? `${shannonToCKBFormatter(item.nervosDao ? item.daoCapacity ?? '--' : item.value, true)}`
+        : `${HIDE_BALANCE}`
+      isReceive = !amount?.includes('-')
       copyText = `${amount} CKB`
       symbol = 'CKB'
+      if (item.nervosDao && item.daoCapacity === undefined) {
+        amount = undefined
+        copyText = undefined
+      }
     }
   }
 
   const props = { sudtAmount, show, item, isReceive, amount, symbolClassName, symbol }
 
-  return show ? (
+  return show && copyText ? (
     <CopyZone content={copyText}>
       <Amount {...props} />
     </CopyZone>
diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index 6e1f19c2d3..f012415c87 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -126,7 +126,7 @@ const History = () => {
       sortable: true,
     },
     {
-      title: t('history.table.amount'),
+      title: t('history.table.asset'),
       dataIndex: 'amount',
       align: 'left',
       isBalance: true,
diff --git a/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx b/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx
index 008b1ba8cf..c48ddda7f3 100644
--- a/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx
+++ b/packages/neuron-ui/src/components/ImportHardware/detect-device.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Button from 'widgets/Button'
-import { getDevices, getDeviceFirmwareVersion, getDeviceCkbAppVersion, connectDevice } from 'services/remote'
+import { getDevices, getDeviceCkbAppVersion, connectDevice } from 'services/remote'
 import { isSuccessResponse, errorFormatter, useDidMount } from 'utils'
 import { ReactComponent as SuccessInfo } from 'widgets/Icons/SuccessInfo.svg'
 import { Error as ErrorIcon } from 'widgets/Icons/icon'
@@ -50,7 +50,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
   const [scanning, setScanning] = useState(true)
   const [error, setError] = useState('')
   const [appVersion, setAppVersion] = useState('')
-  const [firmwareVersion, setFirmwareVersion] = useState('')
 
   const findDevice = useCallback(async () => {
     setError('')
@@ -76,10 +75,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
           setScanning(false)
           throw new ConnectFailedException(errorFormatter(connectionRes.message, t))
         }
-        const firmwareVersionRes = await getDeviceFirmwareVersion(device.descriptor)
-        if (isSuccessResponse(firmwareVersionRes)) {
-          setFirmwareVersion(firmwareVersionRes.result!)
-        }
         const ckbVersionRes = await getDeviceCkbAppVersion(device.descriptor)
         if (isSuccessResponse(ckbVersionRes)) {
           setAppVersion(ckbVersionRes.result!)
@@ -117,9 +112,6 @@ const DetectDevice = ({ dispatch, model }: { dispatch: React.Dispatch<ActionType
         <h3 className={styles.model}>{productName}</h3>
         {errorMsg ? <Info isError msg={errorMsg} /> : null}
         {scanning ? <Info isWaiting={scanning} msg={t('import-hardware.waiting')} /> : null}
-        {firmwareVersion && !errorMsg && !scanning ? (
-          <Info msg={t('import-hardware.firmware-version', { version: firmwareVersion })} />
-        ) : null}
         {appVersion ? <Info msg={t('import-hardware.app-version', { version: appVersion })} /> : null}
       </section>
       <footer className={styles.dialogFooter}>
diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index 20853bdbca..d5a431f22c 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -79,16 +79,21 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
       }
     })
   }, [setEntities])
-  const updateConfig = useCallback(
+  const onUpdateConfig = useCallback((values: Partial<MultisigEntity> & { id: number }) => {
+    return updateMultisigConfig(values).then(res => {
+      if (isSuccessResponse(res)) {
+        setEntities(v => v.map(config => (res.result && config.id === res.result?.id ? res.result : config)))
+      } else {
+        throw new Error(typeof res.message === 'string' ? res.message : res.message.content!)
+      }
+    })
+  }, [])
+  const onUpdateConfigAlias = useCallback(
     (id: number) => (e: React.SyntheticEvent<unknown>) => {
       const { value } = e.target as HTMLInputElement
-      updateMultisigConfig({ id, alias: value || '' }).then(res => {
-        if (isSuccessResponse(res)) {
-          setEntities(v => v.map(config => (res.result && config.id === res.result?.id ? res.result : config)))
-        }
-      })
+      onUpdateConfig({ id, alias: value || '' })
     },
-    [setEntities]
+    [onUpdateConfig]
   )
   const deleteConfigById = useCallback(
     (id: number) => {
@@ -141,7 +146,8 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
   return {
     saveConfig,
     allConfigs,
-    updateConfig,
+    onUpdateConfigAlias,
+    onUpdateConfig,
     deleteConfigById,
     onImportConfig,
     configs,
@@ -365,3 +371,61 @@ export const useSubscription = ({
   }, [isLightClient, getAndSaveMultisigSyncProgress])
   return { multisigBanlances, multisigSyncProgress }
 }
+
+export const useCancelWithLightClient = () => {
+  const [isCloseWarningDialogShow, setIsCloseWarningDialogShow] = useState(false)
+  const onCancel = useCallback(() => {
+    setIsCloseWarningDialogShow(true)
+  }, [setIsCloseWarningDialogShow])
+  const onCancelCloseMultisigDialog = useCallback(() => {
+    setIsCloseWarningDialogShow(false)
+  }, [setIsCloseWarningDialogShow])
+  return {
+    isCloseWarningDialogShow,
+    onCancel,
+    onCancelCloseMultisigDialog,
+  }
+}
+
+export const useSetStartBlockNumber = ({
+  onUpdateConfig,
+}: {
+  onUpdateConfig: (v: Partial<MultisigEntity> & { id: number }) => Promise<void>
+}) => {
+  const [isSetStartBlockShown, setIsSetStartBlockShown] = useState(false)
+  const [editId, setEditId] = useState<number | undefined>()
+  const [address, setAddress] = useState<string | undefined>()
+  const [lastStartBlockNumber, setLastStartBlockNumber] = useState<number | undefined>()
+  const onConfirm = useCallback(
+    (startBlockNumber: number) => {
+      if (editId) {
+        return onUpdateConfig({
+          id: editId,
+          startBlockNumber,
+        }).then(() => {
+          setIsSetStartBlockShown(false)
+        })
+      }
+      return Promise.reject(new Error('The Edit multisig config is empty'))
+    },
+    [editId]
+  )
+  const openDialog = useCallback<React.MouseEventHandler<HTMLButtonElement>>(e => {
+    const { id, address: editAddress, startBlockNumber } = e.currentTarget.dataset
+    if (id) {
+      setEditId(+id)
+    }
+    setAddress(editAddress)
+    setLastStartBlockNumber(startBlockNumber ? +startBlockNumber : undefined)
+    setIsSetStartBlockShown(true)
+  }, [])
+  return {
+    openDialog,
+    closeDialog: useCallback(() => setIsSetStartBlockShown(false), []),
+    isSetStartBlockShown,
+    onConfirm,
+    address,
+    lastStartBlockNumber,
+    onCancel: useCallback(() => setIsSetStartBlockShown(false), []),
+  }
+}
diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index 262fbe8596..f0f3f4bbf0 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   useOnLocaleChange,
@@ -11,24 +11,39 @@ import { useState as useGlobalState } from 'states'
 import MultisigAddressCreateDialog from 'components/MultisigAddressCreateDialog'
 import MultisigAddressInfo from 'components/MultisigAddressInfo'
 import SendFromMultisigDialog from 'components/SendFromMultisigDialog'
-import { MultisigConfig } from 'services/remote'
+import { MultisigConfig, changeMultisigSyncStatus } from 'services/remote'
 import ApproveMultisigTxDialog from 'components/ApproveMultisigTxDialog'
 import Dialog from 'widgets/Dialog'
 import Table from 'widgets/Table'
 import Tooltip from 'widgets/Tooltip'
 import AlertDialog from 'widgets/AlertDialog'
-import { ReactComponent as AddSimple } from 'widgets/Icons/AddSimple.svg'
-import { ReactComponent as Details } from 'widgets/Icons/Details.svg'
-import { ReactComponent as Delete } from 'widgets/Icons/Delete.svg'
-import { ReactComponent as Confirm } from 'widgets/Icons/Confirm.svg'
-import { ReactComponent as Transfer } from 'widgets/Icons/Transfer.svg'
-import { ReactComponent as Upload } from 'widgets/Icons/Upload.svg'
-import { ReactComponent as Edit } from 'widgets/Icons/Edit.svg'
-import { Download, Search } from 'widgets/Icons/icon'
+import {
+  Download,
+  Search,
+  AddSimple,
+  Details,
+  Delete,
+  Confirm,
+  Transfer,
+  Upload,
+  Edit,
+  Confirming,
+} from 'widgets/Icons/icon'
+import AttentionCloseDialog from 'widgets/Icons/Attention.png'
 import { HIDE_BALANCE, NetworkType } from 'utils/const'
 import { onEnter } from 'utils/inputDevice'
 import getMultisigSignStatus from 'utils/getMultisigSignStatus'
-import { useSearch, useConfigManage, useExportConfig, useActions, useSubscription } from './hooks'
+import Button from 'widgets/Button'
+import SetStartBlockNumberDialog from 'components/SetStartBlockNumberDialog'
+import {
+  useSearch,
+  useConfigManage,
+  useExportConfig,
+  useActions,
+  useSubscription,
+  useCancelWithLightClient,
+  useSetStartBlockNumber,
+} from './hooks'
 
 import styles from './multisigAddress.module.scss'
 
@@ -58,7 +73,11 @@ const MultisigAddress = () => {
   useExitOnWalletChange()
   const {
     wallet: { id: walletId, addresses },
-    chain: { networkID },
+    chain: {
+      syncState: { bestKnownBlockNumber },
+      networkID,
+      connectionStatus,
+    },
     settings: { networks = [] },
   } = useGlobalState()
   const isMainnet = isMainnetUtil(networks, networkID)
@@ -67,11 +86,19 @@ const MultisigAddress = () => {
     [networks, networkID]
   )
   const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false)
-  const { allConfigs, saveConfig, updateConfig, deleteConfigById, onImportConfig, configs, onFilterConfig } =
-    useConfigManage({
-      walletId,
-      isMainnet,
-    })
+  const {
+    allConfigs,
+    saveConfig,
+    onUpdateConfig,
+    onUpdateConfigAlias,
+    deleteConfigById,
+    onImportConfig,
+    configs,
+    onFilterConfig,
+  } = useConfigManage({
+    walletId,
+    isMainnet,
+  })
   const { multisigBanlances, multisigSyncProgress } = useSubscription({
     walletId,
     isMainnet,
@@ -141,10 +168,39 @@ const MultisigAddress = () => {
   }, [multisigBanlances, sendAction.sendFromMultisig])
 
   const onBack = useGoBack()
+  const {
+    onCancel: onCancelWithLight,
+    isCloseWarningDialogShow,
+    onCancelCloseMultisigDialog,
+  } = useCancelWithLightClient()
+  const {
+    isSetStartBlockShown,
+    openDialog: openSetStartBlockNumber,
+    lastStartBlockNumber,
+    address,
+    onConfirm,
+    onCancel,
+  } = useSetStartBlockNumber({ onUpdateConfig })
+
+  useEffect(() => {
+    if (isLightClient) {
+      changeMultisigSyncStatus(true)
+    }
+    return () => {
+      if (isLightClient) {
+        changeMultisigSyncStatus(false)
+      }
+    }
+  }, [isLightClient])
 
   return (
     <div>
-      <Dialog show={showMainDialog} title={t('multisig-address.window-title')} onCancel={onBack} showFooter={false}>
+      <Dialog
+        show={showMainDialog}
+        title={t('multisig-address.window-title')}
+        onCancel={isLightClient ? onCancelWithLight : onBack}
+        showFooter={false}
+      >
         <div className={styles.container}>
           <div className={styles.head}>
             <div className={styles.searchBox}>
@@ -221,8 +277,8 @@ const MultisigAddress = () => {
                               <textarea
                                 className={styles.descInput}
                                 value={item.alias || ''}
-                                onChange={updateConfig(item.id)}
-                                onKeyDown={updateConfig(item.id)}
+                                onChange={onUpdateConfigAlias(item.id)}
+                                onKeyDown={onUpdateConfigAlias(item.id)}
                               />
                               <Edit />
                             </div>
@@ -261,7 +317,21 @@ const MultisigAddress = () => {
                   align: 'left',
                   hidden: !isLightClient,
                   render(_, __, item) {
-                    return <div>{multisigSyncProgress?.[item.fullPayload] ?? 0}</div>
+                    return (
+                      <div className={styles.syncBlock}>
+                        {connectionStatus === 'online' ? <Confirming className={styles.syncing} /> : null}
+                        {multisigSyncProgress?.[item.fullPayload] ?? 0}
+                        <Button
+                          type="text"
+                          onClick={openSetStartBlockNumber}
+                          data-id={item.id}
+                          data-address={item.fullPayload}
+                          data-start-block-number={item.startBlockNumber}
+                        >
+                          <Edit />
+                        </Button>
+                      </div>
+                    )
                   },
                 },
                 {
@@ -366,6 +436,23 @@ const MultisigAddress = () => {
         }}
       />
 
+      <Dialog
+        title={t('multisig-address.multi-details')}
+        show={isCloseWarningDialogShow}
+        onConfirm={onBack}
+        onCancel={onCancelCloseMultisigDialog}
+        confirmText={t('multisig-address.ok')}
+        contentClassName={styles.closeMutisigContent}
+        className={styles.closeMultisigDialog}
+        confirmProps={{ type: 'cancel', className: styles.confirmBtn }}
+      >
+        <img src={AttentionCloseDialog} alt="Synchronization Abort" />
+        <h4>Synchronization Abort</h4>
+        <p>
+          Leaving the current window will cause the multisig synchronization to be aborted, so please confirm to leave.
+        </p>
+      </Dialog>
+
       {sendAction.sendFromMultisig && sendAction.isDialogOpen ? (
         <SendFromMultisigDialog
           closeDialog={sendAction.closeDialog}
@@ -382,6 +469,17 @@ const MultisigAddress = () => {
           isMainnet={isMainnet}
         />
       ) : null}
+      {address ? (
+        <SetStartBlockNumberDialog
+          show={isSetStartBlockShown}
+          headerTipNumber={bestKnownBlockNumber}
+          initStartBlockNumber={lastStartBlockNumber}
+          isMainnet={isMainnet}
+          address={address}
+          onUpdateStartBlockNumber={onConfirm}
+          onCancel={onCancel}
+        />
+      ) : null}
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss b/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
index 02dd6dc9ea..7508e4f9a1 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
+++ b/packages/neuron-ui/src/components/MultisigAddress/multisigAddress.module.scss
@@ -1,4 +1,5 @@
 @import '../../styles/mixin.scss';
+@import '../../styles/animation.scss';
 
 .container {
   .head {
@@ -87,6 +88,12 @@
     color: var(--main-text-color);
 
     @include checkbox;
+
+    .syncBlock {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
   }
 
   .address {
@@ -180,18 +187,44 @@
   }
 }
 
-.dialog {
-  @include dialog-container;
-  padding: 30px 50px;
+.ok {
+  margin: 12px 0;
+  text-align: center;
 }
 
-.approveDialog {
-  @include dialog-container;
-  padding: 30px 50px;
-  max-width: 800px;
+.closeMultisigDialog {
+  width: 568px;
+
+  .closeMutisigContent {
+    text-align: center;
+    color: var(--main-text-color);
+
+    & > img {
+      width: 56px;
+      height: 56px;
+    }
+
+    & > h4 {
+      text-align: center;
+      font-size: 16px;
+      font-weight: 500;
+      margin: 12px 0 24px 0;
+    }
+  }
+
+  .confirmBtn {
+    &:hover {
+      color: var(--error-color) !important;
+      border-color: var(--error-color) !important;
+    }
+  }
 }
 
-.ok {
-  margin: 12px 0;
-  text-align: center;
+.syncing {
+  @include infinite-rotation;
+  margin-right: 4px;
+
+  path {
+    fill: var(--primary-color);
+  }
 }
diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
index 9b622beed7..58ee5342cd 100644
--- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
@@ -38,7 +38,7 @@ export interface DAORecordProps extends State.NervosDAORecord {
   depositEpoch: string // deposit epoch string
   currentEpoch: string // current epoch string
   withdrawCapacity: string | null // capacity that is available for withdraw
-  connectionStatus: 'online' | 'offline' | 'connecting' // connection status
+  connectionStatus: State.ConnectionStatus // connection status
   onClick: React.EventHandler<React.MouseEvent> // on action button click
   tipBlockTimestamp: number // tip block timestamp, used to calculate apc, dovetails with current epoch
   genesisBlockTimestamp: number | undefined // genesis block timestamp, used to calculate apc
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index 9ce1a0a94b..2aaf350574 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -268,7 +268,7 @@ const Overview = () => {
             },
           },
           {
-            title: t('overview.amount'),
+            title: t('overview.asset'),
             dataIndex: 'amount',
             align: 'left',
             isBalance: true,
diff --git a/packages/neuron-ui/src/components/PageContainer/hooks.ts b/packages/neuron-ui/src/components/PageContainer/hooks.ts
index ce87534fd6..f52b64a126 100644
--- a/packages/neuron-ui/src/components/PageContainer/hooks.ts
+++ b/packages/neuron-ui/src/components/PageContainer/hooks.ts
@@ -1,101 +1,38 @@
-import { TFunction } from 'i18next'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { importedWalletDialogShown } from 'services/localCache'
-import { isDark, openExternal, setTheme as setThemeAPI, updateWalletStartBlockNumber } from 'services/remote'
+import { isDark, setTheme as setThemeAPI, updateWalletStartBlockNumber } from 'services/remote'
 import { Migrate } from 'services/subjects'
-import { getExplorerUrl, isSuccessResponse } from 'utils'
-
-const waitConfirmTime = 5
-
-const useCountDown = (second: number) => {
-  const [countdown, setCountdown] = useState(0)
-  const countDecreaseIntervalRef = useRef<ReturnType<typeof setInterval>>()
-  const resetCountDown = useCallback(() => {
-    clearInterval(countDecreaseIntervalRef.current)
-    setCountdown(second)
-    const decrement = () => {
-      countDecreaseIntervalRef.current = setInterval(() => {
-        setCountdown(v => {
-          if (v > 0) {
-            return v - 1
-          }
-          clearInterval(countDecreaseIntervalRef.current)
-          return v
-        })
-      }, 1_000)
-    }
-    decrement()
-  }, [setCountdown, countDecreaseIntervalRef])
-  return {
-    countdown,
-    resetCountDown,
-  }
-}
+import { isSuccessResponse } from 'utils'
 
 export const useSetBlockNumber = ({
-  firstAddress,
   walletID,
-  isMainnet,
   isLightClient,
   isHomePage,
   initStartBlockNumber,
-  headerTipNumber,
-  t,
 }: {
-  firstAddress: string
   walletID: string
-  isMainnet: boolean
   isLightClient: boolean
   isHomePage?: boolean
   initStartBlockNumber?: number
-  headerTipNumber: number
-  t: TFunction
 }) => {
   const [isSetStartBlockShown, setIsSetStartBlockShown] = useState(false)
-  const [startBlockNumber, setStartBlockNumber] = useState('')
-  const [blockNumberErr, setBlockNumberErr] = useState('')
-  const isSetLessThanBefore = useMemo(
-    () => !!(startBlockNumber && initStartBlockNumber && +startBlockNumber < initStartBlockNumber),
-    [initStartBlockNumber, startBlockNumber]
-  )
-  const { countdown, resetCountDown } = useCountDown(waitConfirmTime)
-  const onChangeStartBlockNumber = useCallback(
-    (e: React.SyntheticEvent<HTMLInputElement>) => {
-      const { value } = e.currentTarget
-      const blockNumber = value.replaceAll(',', '')
-      if (Number.isNaN(+blockNumber)) {
-        return
-      }
-      setStartBlockNumber(+blockNumber > headerTipNumber ? headerTipNumber.toString() : blockNumber)
-      setBlockNumberErr(+blockNumber > headerTipNumber ? t('set-start-block-number.reset-to-header-tip-number') : '')
-      resetCountDown()
+  const onConfirm = useCallback(
+    (startBlockNumber: number) => {
+      return updateWalletStartBlockNumber({
+        id: walletID,
+        startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}`,
+      }).then(res => {
+        if (isSuccessResponse(res)) {
+          setIsSetStartBlockShown(false)
+        } else {
+          throw new Error(typeof res.message === 'string' ? res.message : res.message.content!)
+        }
+      })
     },
-    [resetCountDown, initStartBlockNumber, headerTipNumber, t]
+    [walletID]
   )
-  const onOpenAddressInExplorer = useCallback(() => {
-    const explorerUrl = getExplorerUrl(isMainnet)
-    openExternal(`${explorerUrl}/address/${firstAddress}?sort=time`)
-  }, [firstAddress, isMainnet])
-  const onViewBlock = useCallback(() => {
-    const explorerUrl = getExplorerUrl(isMainnet)
-    openExternal(`${explorerUrl}/block/${startBlockNumber}`)
-  }, [startBlockNumber, isMainnet])
-  const onConfirm = useCallback(() => {
-    updateWalletStartBlockNumber({
-      id: walletID,
-      startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}`,
-    }).then(res => {
-      if (isSuccessResponse(res)) {
-        setIsSetStartBlockShown(false)
-      } else {
-        setBlockNumberErr(typeof res.message === 'string' ? res.message : res.message.content!)
-      }
-    })
-  }, [startBlockNumber, walletID])
   const openDialog = useCallback(() => {
     setIsSetStartBlockShown(true)
-    setStartBlockNumber(initStartBlockNumber?.toString() ?? '')
-    setBlockNumberErr('')
   }, [initStartBlockNumber])
   useEffect(() => {
     if (isHomePage) {
@@ -110,14 +47,7 @@ export const useSetBlockNumber = ({
     openDialog,
     closeDialog: useCallback(() => setIsSetStartBlockShown(false), []),
     isSetStartBlockShown,
-    startBlockNumber,
-    onChangeStartBlockNumber,
-    onOpenAddressInExplorer,
-    onViewBlock,
     onConfirm,
-    blockNumberErr,
-    countdown,
-    isSetLessThanBefore,
   }
 }
 
diff --git a/packages/neuron-ui/src/components/PageContainer/index.tsx b/packages/neuron-ui/src/components/PageContainer/index.tsx
index 8a665470e2..d17f8b3649 100755
--- a/packages/neuron-ui/src/components/PageContainer/index.tsx
+++ b/packages/neuron-ui/src/components/PageContainer/index.tsx
@@ -6,9 +6,10 @@ import {
   isMainnet as isMainnetUtil,
   localNumberFormatter,
   getNetworkLabelI18nkey,
+  RoutePath,
 } from 'utils'
 import Alert from 'widgets/Alert'
-import { Attention, Close, NewTab } from 'widgets/Icons/icon'
+import { Close } from 'widgets/Icons/icon'
 import { ReactComponent as Sun } from 'widgets/Icons/Sun.svg'
 import { ReactComponent as Moon } from 'widgets/Icons/Moon.svg'
 import SyncStatusComponent from 'components/SyncStatus'
@@ -16,8 +17,7 @@ import { AppActions, useDispatch, useState as useGlobalState } from 'states'
 import { openExternal } from 'services/remote'
 import Tooltip from 'widgets/Tooltip'
 import { NetworkType } from 'utils/const'
-import Dialog from 'widgets/Dialog'
-import TextField from 'widgets/TextField'
+import SetStartBlockNumberDialog from 'components/SetStartBlockNumberDialog'
 
 import { useMigrate, useSetBlockNumber, useTheme } from './hooks'
 import styles from './pageContainer.module.scss'
@@ -84,28 +84,13 @@ const PageContainer: React.FC<ComponentProps> = props => {
     [isMainnet, validTarget]
   )
   const isMigrate = useMigrate()
-  const {
-    isSetStartBlockShown,
-    openDialog,
-    closeDialog,
-    onChangeStartBlockNumber,
-    startBlockNumber,
-    onOpenAddressInExplorer,
-    onViewBlock,
-    onConfirm,
-    countdown,
-    isSetLessThanBefore,
-    blockNumberErr,
-  } = useSetBlockNumber({
-    firstAddress: addresses[0]?.address,
-    isMainnet,
+  const { isSetStartBlockShown, openDialog, closeDialog, onConfirm } = useSetBlockNumber({
     isLightClient,
     walletID: id,
     isHomePage,
     initStartBlockNumber: walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined,
-    headerTipNumber: bestKnownBlockNumber,
-    t,
   })
+  const isOpenMultisigWithLight = isLightClient && window.location.href.includes(RoutePath.MultisigAddress)
   return (
     <div className={`${styles.page} ${className || ''}`}>
       <div className={styles.head}>
@@ -132,7 +117,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
           <div className={styles.syncStatus}>
             <SyncStatusComponent
               syncStatus={syncStatus}
-              connectionStatus={connectionStatus}
+              connectionStatus={isOpenMultisigWithLight ? 'pause' : connectionStatus}
               syncPercents={syncPercents}
               syncBlockNumbers={syncBlockNumbers}
               isLookingValidTarget={isLookingValidTarget}
@@ -154,48 +139,15 @@ const PageContainer: React.FC<ComponentProps> = props => {
         </Alert>
       )}
       <div className={styles.body}>{children}</div>
-      <Dialog
-        title={t('set-start-block-number.title')}
-        confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
+      <SetStartBlockNumberDialog
         show={isSetStartBlockShown}
+        headerTipNumber={bestKnownBlockNumber}
+        initStartBlockNumber={walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined}
+        isMainnet={isMainnet}
+        address={addresses[0]?.address}
+        onUpdateStartBlockNumber={onConfirm}
         onCancel={closeDialog}
-        onConfirm={onConfirm}
-        disabled={!startBlockNumber || !!countdown}
-        contentClassName={styles.setBlockContent}
-      >
-        <div className={styles.setBlockWarn}>
-          <Attention />
-          {t('set-start-block-number.warn')}
-        </div>
-        <div className={styles.content}>
-          <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
-          <TextField
-            field="startBlockNumber"
-            onChange={onChangeStartBlockNumber}
-            placeholder={t('set-start-block-number.input-place-holder')}
-            value={localNumberFormatter(startBlockNumber)}
-            error={blockNumberErr}
-            suffix={
-              startBlockNumber ? (
-                <button type="button" className={styles.viewAction} onClick={onViewBlock}>
-                  {t('set-start-block-number.view-block')}
-                  <NewTab />
-                </button>
-              ) : (
-                <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
-                  {t('set-start-block-number.locate-first-tx')}
-                  <NewTab />
-                </button>
-              )
-            }
-          />
-          {isSetLessThanBefore ? (
-            <Alert status="error" className={styles.errorMessage} withIcon={false}>
-              {t('set-start-block-number.set-less-than-before')}
-            </Alert>
-          ) : null}
-        </div>
-      </Dialog>
+      />
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
index 8c6fb0278a..d45835d52d 100755
--- a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
+++ b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
@@ -143,45 +143,3 @@
     color: var(--main-text-color);
   }
 }
-
-.setBlockContent {
-  padding: 0 0 20px 0;
-  overflow-y: auto;
-
-  .content {
-    padding: 0 16px 0 16px;
-  }
-  .startBlockTip {
-    font-weight: 400;
-    color: var(--secondary-text-color);
-  }
-
-  .setBlockWarn {
-    height: 32px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color: var(--warn-background-color);
-    color: var(--warn-text-color);
-    font-size: 12px;
-    font-weight: 500;
-
-    & > svg {
-      margin-right: 4px;
-    }
-  }
-}
-
-.viewAction {
-  border: none;
-  background-color: transparent;
-  cursor: pointer;
-  color: var(--primary-color);
-  display: flex;
-  align-items: center;
-
-  & > svg {
-    width: 12px;
-    height: 12px;
-  }
-}
diff --git a/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
new file mode 100644
index 0000000000..1549aed15c
--- /dev/null
+++ b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
@@ -0,0 +1,148 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { openExternal } from 'services/remote'
+import { getExplorerUrl, localNumberFormatter } from 'utils'
+import Dialog from 'widgets/Dialog'
+import { Attention, NewTab } from 'widgets/Icons/icon'
+import TextField from 'widgets/TextField'
+import Alert from 'widgets/Alert'
+import styles from './setStartBlockNumberDialog.module.scss'
+
+const SET_START_BLOCK_COUNTDOWN_SECOND = 5
+
+const useCountDown = (second: number) => {
+  const [countdown, setCountdown] = useState(0)
+  const countDecreaseIntervalRef = useRef<ReturnType<typeof setInterval>>()
+  const resetCountDown = useCallback(() => {
+    clearInterval(countDecreaseIntervalRef.current)
+    setCountdown(second)
+    const decrement = () => {
+      countDecreaseIntervalRef.current = setInterval(() => {
+        setCountdown(v => {
+          if (v > 0) {
+            return v - 1
+          }
+          clearInterval(countDecreaseIntervalRef.current)
+          return v
+        })
+      }, 1_000)
+    }
+    decrement()
+  }, [setCountdown, countDecreaseIntervalRef])
+  return {
+    countdown,
+    resetCountDown,
+  }
+}
+
+const SetStartBlockNumberDialog = ({
+  initStartBlockNumber,
+  headerTipNumber,
+  isMainnet,
+  address,
+  onUpdateStartBlockNumber,
+  onCancel,
+  show,
+}: {
+  initStartBlockNumber?: number
+  headerTipNumber: number
+  isMainnet: boolean
+  address: string
+  onUpdateStartBlockNumber: (blockNumber: number) => Promise<void>
+  onCancel: () => void
+  show: boolean
+}) => {
+  const [t] = useTranslation()
+  const [startBlockNumber, setStartBlockNumber] = useState<number | undefined>(undefined)
+  const [blockNumberErr, setBlockNumberErr] = useState('')
+  const isSetLessThanBefore = useMemo(
+    () =>
+      startBlockNumber !== undefined && initStartBlockNumber !== undefined && startBlockNumber < initStartBlockNumber,
+    [initStartBlockNumber, startBlockNumber]
+  )
+  const { countdown, resetCountDown } = useCountDown(SET_START_BLOCK_COUNTDOWN_SECOND)
+  const onChangeStartBlockNumber = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.currentTarget
+      const blockNumber = value.replaceAll(',', '')
+      if (Number.isNaN(+blockNumber)) {
+        return
+      }
+      setStartBlockNumber(
+        // eslint-disable-next-line no-nested-ternary
+        +blockNumber > headerTipNumber ? headerTipNumber : blockNumber === '' ? undefined : +blockNumber
+      )
+      setBlockNumberErr(+blockNumber > headerTipNumber ? t('set-start-block-number.reset-to-header-tip-number') : '')
+      resetCountDown()
+    },
+    [resetCountDown, headerTipNumber, t]
+  )
+  const onOpenAddressInExplorer = useCallback(() => {
+    const explorerUrl = getExplorerUrl(isMainnet)
+    openExternal(`${explorerUrl}/address/${address}?sort=time`)
+  }, [address, isMainnet])
+  const onViewBlock = useCallback(() => {
+    const explorerUrl = getExplorerUrl(isMainnet)
+    openExternal(`${explorerUrl}/block/${startBlockNumber}`)
+  }, [startBlockNumber, isMainnet])
+  const onConfirm = useCallback(() => {
+    if (startBlockNumber !== undefined) {
+      onUpdateStartBlockNumber(startBlockNumber).catch(res => {
+        setBlockNumberErr(typeof res.message === 'string' ? res.message : res.message.content!)
+      })
+    }
+  }, [startBlockNumber])
+  useEffect(() => {
+    if (show) {
+      setStartBlockNumber(initStartBlockNumber)
+    }
+  }, [show, initStartBlockNumber, setStartBlockNumber])
+  return (
+    <Dialog
+      title={t('set-start-block-number.title')}
+      confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
+      show={show}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      disabled={!startBlockNumber || !!countdown}
+      contentClassName={styles.setBlockContent}
+    >
+      <div className={styles.setBlockWarn}>
+        <Attention />
+        {t('set-start-block-number.warn')}
+      </div>
+      <div className={styles.content}>
+        <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
+        <TextField
+          field="startBlockNumber"
+          onChange={onChangeStartBlockNumber}
+          placeholder={t('set-start-block-number.input-place-holder')}
+          value={startBlockNumber === undefined ? '' : localNumberFormatter(startBlockNumber)}
+          error={blockNumberErr}
+          suffix={
+            startBlockNumber !== undefined ? (
+              <button type="button" className={styles.viewAction} onClick={onViewBlock}>
+                {t('set-start-block-number.view-block')}
+                <NewTab />
+              </button>
+            ) : (
+              <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
+                {t('set-start-block-number.locate-first-tx')}
+                <NewTab />
+              </button>
+            )
+          }
+        />
+        {isSetLessThanBefore ? (
+          <Alert status="error" className={styles.errorMessage} withIcon={false}>
+            {t('set-start-block-number.set-less-than-before')}
+          </Alert>
+        ) : null}
+      </div>
+    </Dialog>
+  )
+}
+
+SetStartBlockNumberDialog.displayName = 'SetStartBlockNumberDialog'
+
+export default SetStartBlockNumberDialog
diff --git a/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss
new file mode 100644
index 0000000000..3d00c0d236
--- /dev/null
+++ b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/setStartBlockNumberDialog.module.scss
@@ -0,0 +1,41 @@
+.setBlockContent {
+  padding: 0 0 20px 0;
+  overflow-y: auto;
+
+  .content {
+    padding: 0 16px 0 16px;
+  }
+  .startBlockTip {
+    font-weight: 400;
+    color: var(--secondary-text-color);
+  }
+
+  .setBlockWarn {
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--warn-background-color);
+    color: var(--warn-text-color);
+    font-size: 12px;
+    font-weight: 500;
+
+    & > svg {
+      margin-right: 4px;
+    }
+  }
+
+  .viewAction {
+    border: none;
+    background-color: transparent;
+    cursor: pointer;
+    color: var(--primary-color);
+    display: flex;
+    align-items: center;
+
+    & > svg {
+      width: 12px;
+      height: 12px;
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
index f0f9a69cb5..171aa745cb 100644
--- a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
+++ b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
@@ -493,7 +493,7 @@ const SpecialAssetList = () => {
                           label={t(`special-assets.${status}`)}
                           className={styles.actionBtn}
                           onClick={handleAction}
-                          disabled={btnDisabled}
+                          disabled={!!btnDisabled}
                         />
                       </Tooltip>
                     ) : (
@@ -505,7 +505,7 @@ const SpecialAssetList = () => {
                         label={t(`special-assets.${status}`)}
                         className={styles.actionBtn}
                         onClick={handleAction}
-                        disabled={btnDisabled}
+                        disabled={!!btnDisabled}
                       />
                     )}
                     <Button
diff --git a/packages/neuron-ui/src/components/SyncStatus/index.tsx b/packages/neuron-ui/src/components/SyncStatus/index.tsx
index d425869b0e..b6054af134 100644
--- a/packages/neuron-ui/src/components/SyncStatus/index.tsx
+++ b/packages/neuron-ui/src/components/SyncStatus/index.tsx
@@ -124,6 +124,10 @@ const SyncStatus = ({
     return <span>{t('navbar.connecting')}</span>
   }
 
+  if (ConnectionStatus.Pause === connectionStatus) {
+    return <span>{t('navbar.pause')}</span>
+  }
+
   if (ConnectionStatus.Offline === connectionStatus) {
     return (
       <span className={styles.redDot}>
diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
index 038ca40a31..8fd8c30dc5 100644
--- a/packages/neuron-ui/src/containers/Main/index.tsx
+++ b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -10,7 +10,7 @@ import RadioGroup from 'widgets/RadioGroup'
 import NetworkEditorDialog from 'components/NetworkEditorDialog'
 import { AddSimple } from 'widgets/Icons/icon'
 import DataPathDialog from 'widgets/DataPathDialog'
-import NoDiskSpaceWarn from 'widgets/Icons/NoDiskSpaceWarn.png'
+import NoDiskSpaceWarn from 'widgets/Icons/Attention.png'
 import MigrateCkbDataDialog from 'widgets/MigrateCkbDataDialog'
 import { keepScreenAwake } from 'services/localCache'
 import LockWindowDialog from 'components/GeneralSetting/LockWindowDialog'
@@ -37,6 +37,8 @@ const MainContent = () => {
     [network, networks]
   )
 
+  const isLightClientNetwork = network?.type === 2
+
   useSyncChainData({
     chainURL: network?.remote ?? '',
     dispatch,
@@ -98,6 +100,48 @@ const MainContent = () => {
     }
   }, [])
 
+  const dialogProps = (function getDialogProps() {
+    if (isLightClientNetwork) {
+      return {
+        onConfirm: onCloseSwitchNetwork,
+        children: t('main.external-node-detected-dialog.external-node-is-light'),
+      }
+    }
+    if (sameUrlNetworks.length) {
+      return {
+        onConfirm: onSwitchNetwork,
+        children: (
+          <>
+            <span className={styles.chooseNetworkTip}>
+              {t('main.external-node-detected-dialog.body-tips-with-network')}
+            </span>
+            <div className={styles.networks}>
+              <RadioGroup
+                onChange={onChangeSelected}
+                options={sameUrlNetworks.map(v => ({
+                  value: v.id,
+                  label: `${v.name} (${v.remote})`,
+                }))}
+                inputIdPrefix="main-switch"
+              />
+            </div>
+            <div className={styles.addNetwork}>
+              <Button type="text" onClick={onOpenEditorDialog}>
+                <AddSimple />
+                {t('main.external-node-detected-dialog.add-network')}
+              </Button>
+            </div>
+          </>
+        ),
+      }
+    }
+    return {
+      onConfirm: onOpenEditorDialog,
+      confirmText: t('main.external-node-detected-dialog.add-network'),
+      children: t('main.external-node-detected-dialog.body-tips-without-network'),
+    }
+  })()
+
   return (
     <div onContextMenu={onContextMenu}>
       <Outlet />
@@ -124,39 +168,13 @@ const MainContent = () => {
       <Dialog
         show={isSwitchNetworkShow}
         onCancel={onCloseSwitchNetwork}
-        onConfirm={sameUrlNetworks.length ? onSwitchNetwork : onOpenEditorDialog}
-        confirmText={sameUrlNetworks.length ? undefined : t('main.external-node-detected-dialog.add-network')}
+        onConfirm={dialogProps.onConfirm}
+        confirmText={dialogProps.confirmText}
         cancelText={t('main.external-node-detected-dialog.ignore-external-node')}
         title={t('main.external-node-detected-dialog.title')}
         className={styles.networkDialog}
       >
-        {sameUrlNetworks.length ? (
-          <span className={styles.chooseNetworkTip}>
-            {t('main.external-node-detected-dialog.body-tips-with-network')}
-          </span>
-        ) : (
-          t('main.external-node-detected-dialog.body-tips-without-network')
-        )}
-        {sameUrlNetworks.length ? (
-          <>
-            <div className={styles.networks}>
-              <RadioGroup
-                onChange={onChangeSelected}
-                options={sameUrlNetworks.map(v => ({
-                  value: v.id,
-                  label: `${v.name} (${v.remote})`,
-                }))}
-                inputIdPrefix="main-switch"
-              />
-            </div>
-            <div className={styles.addNetwork}>
-              <Button type="text" onClick={onOpenEditorDialog}>
-                <AddSimple />
-                {t('main.external-node-detected-dialog.add-network')}
-              </Button>
-            </div>
-          </>
-        ) : null}
+        {dialogProps.children}
       </Dialog>
       {showEditorDialog ? (
         <NetworkEditorDialog
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 111092eebd..ad0395e53d 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -21,6 +21,7 @@
       "special-assets": "Customized Assets",
       "sync-not-start": "Sync not started yet",
       "connecting": "Connecting",
+      "pause": "Sync paused",
       "experimental-functions": "Experimental",
       "s-udt": "Asset Accounts",
       "update-neuron-with-ckb": "The version of the CKB node does not match Neuron (v{{ version }}), which may cause compatibility issues. Please update to the latest version of Neuron.",
@@ -142,7 +143,7 @@
       "activity": "Activity",
       "datetime": "Date & Time",
       "status": "Status",
-      "amount": "Amount",
+      "asset": "Asset",
       "address": "Address",
       "sent": "Sent",
       "sending": "Sending",
@@ -313,7 +314,7 @@
         "name": "Wallet Name",
         "type": "Type",
         "balance": "Balance",
-        "amount": "Amount",
+        "asset": "Asset",
         "timestamp": "Time",
         "status": "Status",
         "operation": "Operation"
@@ -1212,7 +1213,8 @@
         "body-tips-without-network": "\"Internal Node\" is reserved for the built-in CKB node, please add a new network option for the external node.",
         "body-tips-with-network": "\"Internal Node\" is reserved for the built-in CKB node, please select from the following network options or add a new one for the external node.",
         "add-network": "Add Network",
-        "ignore-external-node": "Ignore external node"
+        "ignore-external-node": "Ignore external node",
+        "external-node-is-light": "Neuron does not support external light client nodes due to different security assumptions for light clients. Would you like to connect to the \"Light Client\" ?"
       },
       "no-disk-space-dialog": {
         "tip": "Due to insufficient disk space, synchronization has been stopped. <br /> Please allocate more disk space or migrate the data to another disk.",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 1b5f2a212d..a032e20bec 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -21,6 +21,7 @@
       "special-assets": "Activos personalizados",
       "sync-not-start": "Sincronización no iniciada aún",
       "connecting": "Conectando",
+      "pause": "Pausar sincronización",
       "experimental-functions": "Experimental",
       "s-udt": "Cuentas de activos",
       "update-neuron-with-ckb": "La versión del nodo de CKB no coincide con Neuron (v{{ version }}), lo que puede causar problemas de compatibilidad. Por favor actualice a la última versión de Neuron.",
@@ -135,7 +136,7 @@
       "activity": "Actividad",
       "datetime": "Fecha y Hora",
       "status": "Estado",
-      "amount": "Cantidad",
+      "asset": "Activos",
       "address": "Dirección",
       "sent": "Enviado",
       "sending": "Enviando",
@@ -305,7 +306,7 @@
         "name": "Nombre de la Billetera",
         "type": "Tipo",
         "balance": "Saldo",
-        "amount": "Cantidad",
+        "asset": "activos",
         "timestamp": "Tiempo",
         "status": "Estado",
         "operation": "Operación"
@@ -1192,7 +1193,8 @@
         "body-tips-without-network": "\"Internal Node\" está reservado para el nodo CKB incorporado, agregue una nueva opción de red para el nodo externo.",
         "body-tips-with-network": "\"Internal Node\" está reservado para el nodo CKB incorporado, seleccione una de las siguientes opciones de red o agregue una nueva para el nodo externo.",
         "add-network": "Agregar red",
-        "ignore-external-node": "Ignorar nodo externo"
+        "ignore-external-node": "Ignorar nodo externo",
+        "external-node-is-light": "Debido a las diferentes suposiciones de seguridad del cliente ligero, Neuron no admite nodos de cliente ligero externos. ¿Desea conectarse a un \"Light Client\" ?"
       },
       "no-disk-space-dialog": {
         "tip": "La sincronización se ha detenido debido a falta de espacio en disco. <br /> Asigne más espacio en disco o migre los datos a otro disco.",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 48bf1295f1..e38beafccc 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -21,6 +21,7 @@
       "special-assets": "Actifs personnalisés",
       "sync-not-start": "Synchronisation pas encore démarrée",
       "connecting": "Connexion",
+      "pause": "Pause synchronisation",
       "experimental-functions": "Expérimental",
       "s-udt": "Comptes d'actifs",
       "update-neuron-with-ckb": "La version du noeud CKB ne correspond pas à Neuron (v{{ version }}), ce qui peut entraîner des problèmes de compatibilité. Veuillez mettre à jour vers la dernière version de Neuron.",
@@ -142,7 +143,7 @@
       "activity": "Activité",
       "datetime": "Date et heure",
       "status": "Statut",
-      "amount": "Montant",
+      "asset": "actifs",
       "address": "Adresse",
       "sent": "Envoyé",
       "sending": "Envoi",
@@ -312,7 +313,7 @@
         "name": "Nom du Wallet",
         "type": "Type",
         "balance": "Solde",
-        "amount": "Montant",
+        "asset": "actifs",
         "timestamp": "Heure",
         "status": "Statut",
         "operation": "Opération"
@@ -1202,7 +1203,8 @@
         "body-tips-without-network": "\"Noeud interne\" est réservé au noeud CKB intégré, veuillez ajouter une nouvelle option réseau pour le noeud externe.",
         "body-tips-with-network": "\"Noeud interne\" est réservé au noeud CKB intégré, veuillez sélectionner parmi les options réseau suivantes ou en ajouter une nouvelle pour le noeud externe.",
         "add-network": "Ajouter un réseau",
-        "ignore-external-node": "Ignorer le noeud externe"
+        "ignore-external-node": "Ignorer le noeud externe",
+        "external-node-is-light": "En raison de différentes hypothèses de sécurité du client léger, Neuron ne prend pas en charge les nœuds clients légers externes. Voulez-vous vous connecter à un \"Light Client\" ?"
       },
       "no-disk-space-dialog": {
         "tip": "En raison d'un espace disque insuffisant, la synchronisation a été interrompue. <br /> Veuillez allouer plus d'espace disque ou migrer les données vers un autre disque.",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 70c7010253..712e024b59 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -21,6 +21,7 @@
       "special-assets": "自定義資產",
       "sync-not-start": "同步尚未開始",
       "connecting": "正在連接節點",
+      "pause": "同步暫停",
       "experimental-functions": "實驗性功能",
       "s-udt": "資產賬戶",
       "update-neuron-with-ckb": "CKB 節點版本與 Neuron (v{{ version }}) 不匹配，可能導致兼容性問題。請更新到最新版 Neuron。",
@@ -136,7 +137,7 @@
       "activity": "收支活動",
       "datetime": "時間",
       "status": "狀態",
-      "amount": "金額",
+      "asset": "資產",
       "address": "地址",
       "sent": "已發送",
       "sending": "正在發送",
@@ -308,7 +309,7 @@
         "name": "錢包名稱",
         "type": "類型",
         "balance": "余額",
-        "amount": "金額",
+        "asset": "資產",
         "timestamp": "時間",
         "status": "狀態",
         "operation": "操作"
@@ -1205,7 +1206,8 @@
         "body-tips-without-network": "\"Internal Node\" 僅用於連接內置節點，請添加新的網絡選項以連接外部節點。",
         "body-tips-with-network": "\"Internal Node\" 僅用於連接內置節點，請選擇以下網絡選項或添加新的網絡選項以連接外部節點。",
         "add-network": "添加網絡",
-        "ignore-external-node": "忽略外部節點"
+        "ignore-external-node": "忽略外部節點",
+        "external-node-is-light": "由於輕客戶端的安全假設不同，Neuron 不支持外部輕客戶端節點。您想連接到 \"Light Client\" 嗎？"
       },
       "no-disk-space-dialog": {
         "tip": "由於磁盤空間不足，同步已停止。 <br /> 請分配更多磁盤空間或將數據遷移到其他磁盤。",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 47efdf422e..b181a569f6 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -21,6 +21,7 @@
       "special-assets": "自定义资产",
       "sync-not-start": "同步尚未开始",
       "connecting": "正在连接节点",
+      "pause": "同步暂停",
       "experimental-functions": "实验性功能",
       "s-udt": "资产账户",
       "update-neuron-with-ckb": "CKB 节点版本与 Neuron (v{{ version }}) 不匹配，可能导致兼容性问题。请更新到最新版 Neuron。",
@@ -135,7 +136,7 @@
       "activity": "收支活动",
       "datetime": "时间",
       "status": "状态",
-      "amount": "金额",
+      "asset": "资产",
       "address": "地址",
       "sent": "已发送",
       "sending": "正在发送",
@@ -306,7 +307,7 @@
         "name": "钱包名称",
         "type": "类型",
         "balance": "余额",
-        "amount": "金额",
+        "asset": "资产",
         "timestamp": "时间",
         "status": "状态",
         "operation": "操作"
@@ -1204,7 +1205,8 @@
         "body-tips-without-network": "\"Internal Node\" 仅用于连接内置节点，请添加新的网络选项以连接外部节点。",
         "body-tips-with-network": "\"Internal Node\" 仅用于连接内置节点，请选择以下网络选项或添加新的网络选项以连接外部节点。",
         "add-network": "添加网络",
-        "ignore-external-node": "忽略外部节点"
+        "ignore-external-node": "忽略外部节点",
+        "external-node-is-light": "由于轻客户端的安全假设不同，Neuron 不支持外部轻客户端节点。您想连接到 \"Light Client\" 吗？"
       },
       "no-disk-space-dialog": {
         "tip": "由于磁盘空间不足，同步已停止。 <br /> 请分配更多磁盘空间或将数据迁移到其他磁盘。",
diff --git a/packages/neuron-ui/src/services/remote/hardware.ts b/packages/neuron-ui/src/services/remote/hardware.ts
index c0c1cf19d8..9a7f933ccc 100644
--- a/packages/neuron-ui/src/services/remote/hardware.ts
+++ b/packages/neuron-ui/src/services/remote/hardware.ts
@@ -32,7 +32,6 @@ export type Version = string
 
 export const getDevices = remoteApi<Model | null, DeviceInfo[]>('detect-device')
 export const getDeviceCkbAppVersion = remoteApi<Descriptor, Version>('get-device-ckb-app-version')
-export const getDeviceFirmwareVersion = remoteApi<Descriptor, Version>('get-device-firmware-version')
 export const getDeviceExtendedPublickey = remoteApi<void, ExtendedPublicKey>('get-device-extended-public-key')
 export const getDevicePublicKey = remoteApi<void, PublicKey>('get-device-public-key')
 export const connectDevice = remoteApi<DeviceInfo, void>('connect-device')
diff --git a/packages/neuron-ui/src/services/remote/multisig.ts b/packages/neuron-ui/src/services/remote/multisig.ts
index 5b5ce1579a..d9c4b48629 100644
--- a/packages/neuron-ui/src/services/remote/multisig.ts
+++ b/packages/neuron-ui/src/services/remote/multisig.ts
@@ -21,6 +21,7 @@ export type MultisigEntity = MultisigParams & {
   id?: number
   walletId: string
   alias?: string
+  startBlockNumber?: number
 }
 
 export type MultisigConfig = MultisigEntity & {
@@ -52,3 +53,4 @@ export const loadMultisigTxJson = remoteApi<string, OfflineSignJSON>('load-multi
 export const getMultisigSyncProgress = remoteApi<string[], { hash: string; localSavedBlockNumber: number }[]>(
   'get-sync-progress-by-addresses'
 )
+export const changeMultisigSyncStatus = remoteApi<boolean, void>('change-multisig-sync-status')
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 8640a2c384..c8cb6f0722 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -132,7 +132,6 @@ type Action =
   // Hardware Wallet
   | 'detect-device'
   | 'get-device-ckb-app-version'
-  | 'get-device-firmware-version'
   | 'get-device-public-key'
   | 'get-device-extended-public-key'
   | 'connect-device'
@@ -160,6 +159,7 @@ type Action =
   | 'get-hold-sudt-cell-capacity'
   | 'start-migrate'
   | 'get-sync-progress-by-addresses'
+  | 'change-multisig-sync-status'
   // spore
   | 'generate-transfer-spore-tx'
   // cell-manage
diff --git a/packages/neuron-ui/src/states/stateProvider/reducer.ts b/packages/neuron-ui/src/states/stateProvider/reducer.ts
index 2d64d0c029..801a9fe30c 100644
--- a/packages/neuron-ui/src/states/stateProvider/reducer.ts
+++ b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -328,7 +328,7 @@ export const reducer = produce((state: Draft<State.AppWithNeuronWallet>, action:
     }
     case AppActions.DismissNotification: {
       /**
-       * payload: timstamp
+       * payload: timestamp
        */
       state.app.showTopAlert =
         state.app.notifications.findIndex(message => message.timestamp === action.payload) ===
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 76ce82827b..2a237caef5 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -19,6 +19,7 @@ declare namespace State {
       data: string
     }
     assetAccountType?: 'CKB' | 'sUDT' | string
+    daoCapacity?: string
   }
 
   interface DetailedInput {
@@ -238,7 +239,7 @@ declare namespace State {
     balance: string
     addresses: Address[]
   }
-  type ConnectionStatus = 'online' | 'offline' | 'connecting'
+  type ConnectionStatus = 'online' | 'offline' | 'connecting' | 'pause'
 
   type SyncState = Readonly<{
     cacheTipBlockNumber: number
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index 647f421446..747c8398a5 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -2,6 +2,8 @@ export enum ConnectionStatus {
   Online = 'online',
   Offline = 'offline',
   Connecting = 'connecting',
+  // pasue by open multisig address with light client
+  Pause = 'pause',
 }
 
 export enum RoutePath {
diff --git a/packages/neuron-ui/src/widgets/Button/index.tsx b/packages/neuron-ui/src/widgets/Button/index.tsx
index 9de7ef9f19..9d4e6e276e 100644
--- a/packages/neuron-ui/src/widgets/Button/index.tsx
+++ b/packages/neuron-ui/src/widgets/Button/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { ButtonHTMLAttributes } from 'react'
 import Spinner from 'widgets/Spinner'
 import styles from './button.module.scss'
 
@@ -20,13 +20,9 @@ const Button = React.forwardRef(
     }: {
       type?: 'default' | 'cancel' | 'ok' | 'submit' | 'confirm' | 'primary' | 'reset' | 'text'
       label?: string
-      onClick?: any
-      disabled?: boolean
       className?: string
-      children?: React.ReactChild
       loading?: boolean
-      [key: string]: any
-    },
+    } & Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'type'>,
     ref: React.LegacyRef<HTMLButtonElement>
   ) => {
     const btnType = isNativeType(type) ? type : 'button'
diff --git a/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png b/packages/neuron-ui/src/widgets/Icons/Attention.png
similarity index 100%
rename from packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png
rename to packages/neuron-ui/src/widgets/Icons/Attention.png
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index 131b0387c6..21eabcb23a 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -59,6 +59,9 @@ import { ReactComponent as ImportKeystoreSvg } from './SoftWalletImportKeystore.
 import { ReactComponent as ImportHardwareSvg } from './HardWalletImport.svg'
 import { ReactComponent as DepositTimeSortSvg } from './DepositTimeSort.svg'
 import { ReactComponent as QuestionSvg } from './Question.svg'
+import { ReactComponent as DetailsSvg } from './Details.svg'
+import { ReactComponent as ConfirmSvg } from './Confirm.svg'
+import { ReactComponent as UploadSvg } from './Upload.svg'
 
 import styles from './icon.module.scss'
 
@@ -134,3 +137,6 @@ export const ImportKeystore = WrapSvg(ImportKeystoreSvg)
 export const ImportHardware = WrapSvg(ImportHardwareSvg)
 export const DepositTimeSort = WrapSvg(DepositTimeSortSvg)
 export const Question = WrapSvg(QuestionSvg)
+export const Details = WrapSvg(DetailsSvg)
+export const Confirm = WrapSvg(ConfirmSvg)
+export const Upload = WrapSvg(UploadSvg)
diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
index d323c05c7e..536c1b17ff 100644
--- a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
@@ -47,7 +47,7 @@ const MigrateCkbDataDialog = ({
     [currentPath, onConfirm]
   )
   const onActionClick = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
+    (e: React.MouseEvent<HTMLButtonElement>) => {
       if (e.currentTarget.dataset.syncType) {
         startSync(e.currentTarget.dataset.syncType)
       }
diff --git a/packages/neuron-wallet/.env b/packages/neuron-wallet/.env
index f32862920f..3c4d9296b8 100644
--- a/packages/neuron-wallet/.env
+++ b/packages/neuron-wallet/.env
@@ -117,5 +117,5 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
 MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
 
 # CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0x9443ad8da9172d484367bc5467988cba7a0c46028398309edfdda7d2d79be897'
-CKB_NODE_DATA_SIZE=53
+CKB_NODE_ASSUME_VALID_TARGET='0x6dd077b407d019a0bce0cbad8c34e69a524ae4b2599b9feda2c7491f3559d32c'
+CKB_NODE_DATA_SIZE=54
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 77479adeae..a5fd0c7891 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.114.3",
+  "version": "0.116.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -97,7 +97,7 @@
     "electron-builder": "24.9.1",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.6.0",
-    "neuron-ui": "0.114.3",
+    "neuron-ui": "0.116.2",
     "typescript": "5.3.3"
   }
 }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/index.ts b/packages/neuron-wallet/src/block-sync-renderer/index.ts
index cf690f014b..892c676618 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/index.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/index.ts
@@ -9,22 +9,20 @@ import DataUpdateSubject from '../models/subjects/data-update'
 import AddressCreatedSubject from '../models/subjects/address-created-subject'
 import WalletDeletedSubject from '../models/subjects/wallet-deleted-subject'
 import TxDbChangedSubject from '../models/subjects/tx-db-changed-subject'
-import { LumosCellQuery, LumosCell } from './sync/synchronizer'
+import { type Cell, type QueryOptions } from '@ckb-lumos/base'
 import { WorkerMessage, StartParams, QueryIndexerParams } from './task'
 import logger from '../utils/logger'
 import CommonUtils from '../utils/common'
 import queueWrapper from '../utils/queue'
 import env from '../env'
 import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
-import Multisig from '../services/multisig'
-import { SyncAddressType } from '../database/chain/entities/sync-progress'
-import { debounceTime } from 'rxjs/operators'
 import { TransactionPersistor } from '../services/tx'
 
 let network: Network | null
 let child: ChildProcess | null = null
 let requestId = 0
 let requests = new Map<number, Record<'resolve' | 'reject', (val?: unknown) => unknown>>()
+let isSyncMultisigWithLight = false
 
 export const killBlockSyncTask = async () => {
   const _child = child
@@ -88,7 +86,7 @@ export const switchToNetwork = async (newNetwork: Network, reconnected = false,
   await resetSyncTaskQueue.asyncPush(shouldSync)
 }
 
-export const queryIndexer = async (query: LumosCellQuery): Promise<LumosCell[]> => {
+export const queryIndexer = async (query: QueryOptions): Promise<Cell[]> => {
   const _child = child
   if (!_child) {
     return []
@@ -102,7 +100,7 @@ export const queryIndexer = async (query: LumosCellQuery): Promise<LumosCell[]>
   return registerRequest(_child, msg).catch(err => {
     logger.error(`Sync:\tfailed to register query indexer task`, err)
     return []
-  }) as Promise<LumosCell[]>
+  }) as Promise<Cell[]>
 }
 
 export const createBlockSyncTask = async () => {
@@ -177,8 +175,8 @@ export const createBlockSyncTask = async () => {
       genesisHash: network.genesisHash,
       url: network.remote,
       addressMetas,
-      indexerUrl: network.remote,
       nodeType: network.type,
+      syncMultisig: isSyncMultisigWithLight,
     }
     const msg: Required<WorkerMessage<StartParams>> = { type: 'call', channel: 'start', id: requestId++, message }
     return registerRequest(_child, msg).catch(err => {
@@ -200,17 +198,10 @@ export const registerRequest = (c: ChildProcess, msg: Required<WorkerMessage>) =
 
 AddressCreatedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
 WalletDeletedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
-MultisigConfigDbChangedSubject.getSubject()
-  .pipe(debounceTime(1000))
-  .subscribe(async () => {
-    if (!child) {
-      return
-    }
-    const appendScripts = await Multisig.getMultisigConfigForLight()
-    const msg: Required<
-      WorkerMessage<{ walletId: string; script: CKBComponents.Script; addressType: SyncAddressType }[]>
-    > = { type: 'call', channel: 'append_scripts', id: requestId++, message: appendScripts }
-    return registerRequest(child, msg).catch(err => {
-      logger.error(`Sync:\ffailed to append script to light client`, err)
-    })
-  })
+MultisigConfigDbChangedSubject.getSubject().subscribe(() => resetSyncTaskQueue.asyncPush(true))
+
+export async function changeMultisigSyncStatus(status: boolean) {
+  logger.info(`Sync:\t ${status ? 'start' : 'stop'} multisig sync`)
+  isSyncMultisigWithLight = status
+  await resetSyncTask(true)
+}
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
index 972d37e5f0..eecace1ccf 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
@@ -10,8 +10,8 @@ import IndexerCacheService from './indexer-cache-service'
 export default class FullSynchronizer extends Synchronizer {
   private rpcService: RpcService
 
-  constructor(addresses: Address[], nodeUrl: string, indexerUrl: string, nodeType: NetworkType) {
-    super({ addresses, nodeUrl, indexerUrl })
+  constructor(addresses: Address[], nodeUrl: string, nodeType: NetworkType) {
+    super({ addresses, nodeUrl })
     this.rpcService = new RpcService(nodeUrl, nodeType)
   }
 
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index f87dddf99b..fe89dabefb 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -4,7 +4,7 @@ import { Address } from '../../models/address'
 import AddressMeta from '../../database/address/meta'
 import { scheduler } from 'timers/promises'
 import SyncProgressService from '../../services/sync-progress'
-import { Synchronizer, AppendScript } from './synchronizer'
+import { Synchronizer } from './synchronizer'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { FetchTransactionReturnType, LightRPC, LightScriptFilter } from '../../utils/ckb-rpc'
 import Multisig from '../../services/multisig'
@@ -23,17 +23,15 @@ import NetworksService from '../../services/networks'
 import { getConnection } from '../../database/chain/connection'
 
 const unpackGroup = molecule.vector(blockchain.OutPoint)
+const THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET = 100_000
 
 export default class LightSynchronizer extends Synchronizer {
   private lightRpc: LightRPC
   private addressMetas: AddressMeta[]
+  private syncMultisig?: boolean
 
   constructor(addresses: Address[], nodeUrl: string) {
-    super({
-      addresses,
-      nodeUrl,
-      indexerUrl: nodeUrl,
-    })
+    super({ addresses, nodeUrl })
     this.lightRpc = new LightRPC(nodeUrl)
     this.addressMetas = addresses.map(address => AddressMeta.fromObject(address))
     // fetch some dep cell
@@ -87,7 +85,9 @@ export default class LightSynchronizer extends Synchronizer {
   private async synchronize() {
     const syncScripts = await this.upsertTxHashes()
     await this.updateSyncedBlockOfScripts(syncScripts)
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     const hasNextBlock = await this.notifyAndSyncNext(minSyncBlockNumber)
     if (!hasNextBlock) {
       await this.updateBlockStartNumber(minSyncBlockNumber)
@@ -171,20 +171,32 @@ export default class LightSynchronizer extends Synchronizer {
     await getConnection('light').manager.save(updatedSyncProgress, { chunk: 100 })
   }
 
-  private async initSyncProgress(appendScripts: AppendScript[] = []) {
-    if (!this.addressMetas.length && !appendScripts.length) {
+  private static async getWalletsSyncedMinBlockNumber() {
+    const walletMinBlockNumber = await SyncProgressService.getWalletMinLocalSavedBlockNumber()
+    const wallets = await WalletService.getInstance().getAll()
+    return wallets.reduce<Record<string, number>>(
+      (pre, cur) => ({
+        ...pre,
+        [cur.id]: Math.max(parseInt(cur.startBlockNumber ?? '0x0'), walletMinBlockNumber?.[cur.id] ?? 0),
+      }),
+      {}
+    )
+  }
+
+  private async initSyncProgress() {
+    if (!this.addressMetas.length) {
       return
     }
     const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
     const syncScripts = await this.lightRpc.getScripts()
     const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
-    const existSyncscripts: Record<string, LightScriptFilter> = {}
+    const existSyncScripts: Record<string, LightScriptFilter> = {}
     retainedSyncScripts.forEach(v => {
-      existSyncscripts[scriptToHash(v.script)] = v
+      existSyncScripts[scriptToHash(v.script)] = v
     })
+    const walletMinBlockNumber = await LightSynchronizer.getWalletsSyncedMinBlockNumber()
     const currentWalletId = WalletService.getInstance().getCurrent()?.id
     const allScripts = this.addressMetas
-      .filter(v => (currentWalletId ? v.walletId === currentWalletId : true))
       .map(addressMeta => {
         const lockScripts = [
           addressMeta.generateDefaultLockScript(),
@@ -198,56 +210,81 @@ export default class LightSynchronizer extends Synchronizer {
         }))
       })
       .flat()
-    const walletMinBlockNumber = await SyncProgressService.getWalletMinLocalSavedBlockNumber()
-    const wallets = await WalletService.getInstance().getAll()
-    const walletStartBlockMap = wallets.reduce<Record<string, string | undefined>>(
-      (pre, cur) => ({ ...pre, [cur.id]: cur.startBlockNumber }),
-      {}
-    )
-    const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
-    const addScripts = [
-      ...allScripts
-        .filter(
-          v =>
-            !existSyncscripts[scriptToHash(v.script)] ||
-            +existSyncscripts[scriptToHash(v.script)].blockNumber < +(walletStartBlockMap[v.walletId] ?? 0)
+      .filter(v => {
+        return (
+          !currentWalletId ||
+          v.walletId === currentWalletId ||
+          walletMinBlockNumber[v.walletId] >
+            walletMinBlockNumber[currentWalletId] - THRESHOLD_BLOCK_NUMBER_IN_DIFF_WALLET
         )
-        .map(v => {
-          const blockNumber = Math.max(
-            parseInt(walletStartBlockMap[v.walletId] ?? '0x0'),
-            walletMinBlockNumber?.[v.walletId] ?? 0
-          )
-          return {
-            ...v,
-            blockNumber: `0x${blockNumber.toString(16)}`,
-          }
-        }),
-      ...appendScripts
-        .filter(v => !existSyncscripts[scriptToHash(v.script)])
-        .map(v => ({
+      })
+    const addScripts = allScripts
+      .filter(v => {
+        const scriptHash = scriptToHash(v.script)
+        return (
+          !existSyncScripts[scriptHash] || +existSyncScripts[scriptHash].blockNumber < walletMinBlockNumber[v.walletId]
+        )
+      })
+      .map(v => {
+        return {
           ...v,
-          blockNumber: `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
-        })),
-    ]
+          blockNumber: `0x${walletMinBlockNumber[v.walletId].toString(16)}`,
+        }
+      })
     await this.lightRpc.setScripts(addScripts, 'partial')
-    const allScriptHashes = new Set([
-      ...allScripts.map(v => scriptToHash(v.script)),
-      ...appendScripts.map(v => scriptToHash(v.script)),
-    ])
+    const allScriptHashes = new Set(allScripts.map(v => scriptToHash(v.script)))
     const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
     await this.lightRpc.setScripts(deleteScript, 'delete')
     const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
     await SyncProgressService.initSyncProgress(addScripts)
     await SyncProgressService.updateSyncProgressFlag(walletIds)
+  }
+
+  private async initMultisigSyncProgress() {
+    const multisigScripts = await Multisig.getMultisigConfigForLight()
+    if (!multisigScripts.length) {
+      return
+    }
+    const existSyncArgses = await SyncProgressService.getExistingSyncArgses()
+    const syncScripts = await this.lightRpc.getScripts()
+    const retainedSyncScripts = syncScripts.filter(v => existSyncArgses.has(v.script.args))
+    const existSyncScripts: Record<string, LightScriptFilter> = {}
+    retainedSyncScripts.forEach(v => {
+      existSyncScripts[scriptToHash(v.script)] = v
+    })
+    const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
+    const addScripts = multisigScripts
+      .filter(v => {
+        const scriptHash = scriptToHash(v.script)
+        return (
+          !existSyncScripts[scriptToHash(v.script)] ||
+          +existSyncScripts[scriptHash].blockNumber < (v.startBlockNumber ?? 0)
+        )
+      })
+      .map(v => ({
+        ...v,
+        blockNumber: `0x${Math.max(
+          otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0,
+          v.startBlockNumber ?? 0
+        ).toString(16)}`,
+      }))
+    await this.lightRpc.setScripts(addScripts, 'partial')
+    const allScriptHashes = new Set(multisigScripts.map(v => scriptToHash(v.script)))
+    const deleteScript = retainedSyncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
+    await this.lightRpc.setScripts(deleteScript, 'delete')
+    await SyncProgressService.initSyncProgress(addScripts)
     await SyncProgressService.removeByHashesAndAddressType(
       SyncAddressType.Multisig,
-      appendScripts.map(v => scriptToHash(v.script))
+      multisigScripts.map(v => scriptToHash(v.script))
     )
   }
 
-  private async initSync() {
-    const appendScripts = await Multisig.getMultisigConfigForLight()
-    await this.initSyncProgress(appendScripts)
+  private async initSync(syncMultisig?: boolean) {
+    if (syncMultisig) {
+      await this.initMultisigSyncProgress()
+    } else {
+      await this.initSyncProgress()
+    }
     while (this.pollingIndexer) {
       await this.synchronize()
       await scheduler.wait(5000)
@@ -284,21 +321,18 @@ export default class LightSynchronizer extends Synchronizer {
     )
   }
 
-  public async connect() {
+  public async connect(syncMultisig?: boolean) {
     try {
       logger.info('LightConnector:\tconnect ...:')
       this.pollingIndexer = true
-      this.initSync()
+      this.syncMultisig = syncMultisig
+      this.initSync(syncMultisig)
     } catch (error) {
       logger.error(`Error connecting to Light: ${error.message}`)
       throw error
     }
   }
 
-  async appendScript(scripts: AppendScript[]) {
-    this.initSyncProgress(scripts)
-  }
-
   private async checkTxExist(txHashes: string[]) {
     const transactions = await this.lightRpc
       .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
@@ -308,7 +342,9 @@ export default class LightSynchronizer extends Synchronizer {
 
   async processTxsInNextBlockNumber() {
     const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     if (
       nextBlockNumber !== undefined &&
       txHashesInNextBlock.length &&
@@ -330,7 +366,9 @@ export default class LightSynchronizer extends Synchronizer {
     } else {
       return
     }
-    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber(
+      this.syncMultisig ? SyncAddressType.Multisig : undefined
+    )
     await this.updateBlockStartNumber(Math.min(parseInt(blockNumber), minCachedBlockNumber))
     this.processNextBlockNumber()
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
index 027bc14967..8eb2b923f3 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -17,10 +17,9 @@ import IndexerCacheService from './indexer-cache-service'
 import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import { ShouldInChildProcess } from '../../exceptions'
-import { AppendScript, BlockTips, Synchronizer } from './synchronizer'
+import { BlockTips, Synchronizer } from './synchronizer'
 import LightSynchronizer from './light-synchronizer'
 import { generateRPC } from '../../utils/ckb-rpc'
-import { BUNDLED_LIGHT_CKB_URL } from '../../utils/const'
 import { NetworkType } from '../../models/network'
 import WalletService from '../../services/wallets'
 
@@ -28,7 +27,6 @@ export default class Queue {
   #lockHashes: string[]
   #url: string // ckb node
   #nodeType: NetworkType
-  #indexerUrl: string
   #addresses: AddressInterface[]
   #rpcService: RpcService
   #indexerConnector: Synchronizer | undefined
@@ -38,15 +36,16 @@ export default class Queue {
   #multiSignBlake160s: string[]
   #anyoneCanPayLockHashes: string[]
   #assetAccountInfo: AssetAccountInfo
+  #syncMultisig: boolean
 
-  constructor(url: string, addresses: AddressInterface[], indexerUrl: string, nodeType: NetworkType) {
+  constructor(url: string, addresses: AddressInterface[], nodeType: NetworkType, syncMultisig: boolean) {
     this.#url = url
-    this.#indexerUrl = indexerUrl
     this.#addresses = addresses
     this.#rpcService = new RpcService(url, nodeType)
     this.#nodeType = nodeType
     this.#assetAccountInfo = new AssetAccountInfo()
     this.#lockHashes = AddressParser.batchToLockHash(this.#addresses.map(meta => meta.address))
+    this.#syncMultisig = syncMultisig
 
     const blake160s = this.#addresses.map(meta => meta.blake160)
     this.#lockArgsSet = new Set(
@@ -67,12 +66,12 @@ export default class Queue {
   start = async () => {
     logger.info('Queue:\tstart')
     try {
-      if (this.#url === BUNDLED_LIGHT_CKB_URL) {
+      if (this.#nodeType === NetworkType.Light) {
         this.#indexerConnector = new LightSynchronizer(this.#addresses, this.#url)
       } else {
-        this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#indexerUrl, this.#nodeType)
+        this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#nodeType)
       }
-      await this.#indexerConnector!.connect()
+      await this.#indexerConnector!.connect(this.#syncMultisig)
     } catch (error) {
       logger.error('Restarting child process due to error', error.message)
       if (process.send) {
@@ -122,10 +121,6 @@ export default class Queue {
     }
   }
 
-  async appendLightScript(scripts: AppendScript[]) {
-    await this.#indexerConnector?.appendScript(scripts)
-  }
-
   private async fetchTxsWithStatus(txHashes: string[]) {
     const rpc = generateRPC(this.#url, this.#nodeType)
     const txsWithStatus = await rpc
@@ -272,6 +267,7 @@ export default class Queue {
           indexerTipNumber: tip.indexerTipNumber,
           cacheTipNumber: tip.cacheTipNumber,
           timestamp: Date.now(),
+          syncMultisig: this.#syncMultisig,
         },
       })
     } else {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
index b8d1a789a2..ff9c576f8c 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
@@ -1,10 +1,9 @@
 import { Subject } from 'rxjs'
 import { queue, QueueObject } from 'async'
+import { type QueryOptions } from '@ckb-lumos/base'
 import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
-import { QueryOptions } from '@ckb-lumos/base'
 import AddressMeta from '../../database/address/meta'
 import { Address } from '../../models/address'
-import { SyncAddressType } from '../../database/chain/entities/sync-progress'
 import IndexerCacheService from './indexer-cache-service'
 import logger from '../../utils/logger'
 import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
@@ -14,41 +13,6 @@ export interface BlockTips {
   indexerTipNumber: number | undefined
 }
 
-export interface LumosCellQuery {
-  lock: CKBComponents.Script | null
-  type: CKBComponents.Script | null
-  data: string | null
-}
-
-export interface LumosCell {
-  blockHash: string
-  outPoint: {
-    txHash: string
-    index: string
-  }
-  cellOutput: {
-    capacity: string
-    lock: {
-      codeHash: string
-      args: string
-      hashType: string
-    }
-    type?: {
-      codeHash: string
-      args: string
-      hashType: string
-    }
-  }
-  data?: string
-}
-
-export interface AppendScript {
-  walletId: string
-  script: CKBComponents.Script
-  addressType: SyncAddressType
-  scriptType: CKBRPC.ScriptType
-}
-
 export abstract class Synchronizer {
   public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
   public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string }>()
@@ -57,19 +21,16 @@ export abstract class Synchronizer {
   protected processingBlockNumber?: string
   protected addressesByWalletId: Map<string, AddressMeta[]> = new Map()
   protected pollingIndexer: boolean = false
-  private indexerQueryQueue: QueueObject<LumosCellQuery> | undefined
+  private indexerQueryQueue: QueueObject<QueryOptions> | undefined
   protected _needGenerateAddress: boolean = false
 
-  abstract connect(): Promise<void>
+  abstract connect(syncMultisig?: boolean): Promise<void>
   abstract processTxsInNextBlockNumber(): Promise<void>
   protected abstract upsertTxHashes(): Promise<unknown>
   public abstract notifyCurrentBlockNumberProcessed(blockNumber: string): Promise<void>
-  async appendScript(_scripts: AppendScript[]) {
-    // do nothing
-  }
 
-  constructor({ addresses, nodeUrl, indexerUrl }: { addresses: Address[]; nodeUrl: string; indexerUrl: string }) {
-    this.indexer = new CkbIndexer(nodeUrl, indexerUrl)
+  constructor({ addresses, nodeUrl }: { addresses: Address[]; nodeUrl: string }) {
+    this.indexer = new CkbIndexer(nodeUrl)
     this.addressesByWalletId = addresses
       .map(address => AddressMeta.fromObject(address))
       .reduce((addressesByWalletId, addressMeta) => {
@@ -155,7 +116,7 @@ export abstract class Synchronizer {
     return false
   }
 
-  public async getLiveCellsByScript(query: LumosCellQuery) {
+  public async getLiveCellsByScript(query: QueryOptions) {
     return new Promise((resolve, reject) => {
       this.indexerQueryQueue!.push(query, (err: any, result: unknown) => {
         if (err) {
@@ -166,7 +127,7 @@ export abstract class Synchronizer {
     })
   }
 
-  private async collectLiveCellsByScript(query: LumosCellQuery) {
+  private async collectLiveCellsByScript(query: QueryOptions) {
     const { lock, type, data } = query
     if (!lock && !type) {
       throw new Error('at least one parameter is required')
diff --git a/packages/neuron-wallet/src/block-sync-renderer/task.ts b/packages/neuron-wallet/src/block-sync-renderer/task.ts
index e10291360e..124a781fdd 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/task.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/task.ts
@@ -1,4 +1,4 @@
-import type { LumosCellQuery } from './sync/synchronizer'
+import { type QueryOptions } from '@ckb-lumos/base'
 import initConnection from '../database/chain/ormconfig'
 import { register as registerTxStatusListener } from './tx-status-listener'
 import SyncQueue from './sync/queue'
@@ -21,7 +21,6 @@ export interface WorkerMessage<T = any> {
     | 'address-created'
     | 'indexer-error'
     | 'check-and-save-wallet-address'
-    | 'append_scripts'
   message: T
 }
 
@@ -31,11 +30,11 @@ export interface StartParams {
   genesisHash: string
   url: SyncQueueParams[0]
   addressMetas: SyncQueueParams[1]
-  indexerUrl: SyncQueueParams[2]
-  nodeType: SyncQueueParams[3]
+  nodeType: SyncQueueParams[2]
+  syncMultisig: SyncQueueParams[3]
 }
 
-export type QueryIndexerParams = LumosCellQuery
+export type QueryIndexerParams = QueryOptions
 
 export const listener = async ({ type, id, channel, message }: WorkerMessage) => {
   if (type === 'kill') {
@@ -63,7 +62,7 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
       try {
         await initConnection(message.genesisHash)
 
-        syncQueue = new SyncQueue(message.url, message.addressMetas, message.indexerUrl, message.nodeType)
+        syncQueue = new SyncQueue(message.url, message.addressMetas, message.nodeType, message.syncMultisig)
         syncQueue.start()
       } catch (err) {
         logger.error(`Block Sync Task:\t`, err)
@@ -93,12 +92,6 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
       }
       break
     }
-    case 'append_scripts': {
-      if (Array.isArray(message)) {
-        await syncQueue?.appendLightScript(message)
-      }
-      break
-    }
     default: {
       // ignore
     }
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index fa209b0887..911baa4d96 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -59,7 +59,7 @@ import startMonitor, { stopMonitor } from '../services/monitor'
 import { migrateCkbData } from '../services/ckb-runner'
 import NodeService from '../services/node'
 import SyncProgressService from '../services/sync-progress'
-import { resetSyncTaskQueue } from '../block-sync-renderer'
+import { changeMultisigSyncStatus, resetSyncTaskQueue } from '../block-sync-renderer'
 import DataUpdateSubject from '../models/subjects/data-update'
 import CellManagement from './cell-management'
 import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
@@ -836,10 +836,6 @@ export default class ApiController {
       return this.#hardwareController.getCkbAppVersion()
     })
 
-    handle('get-device-firmware-version', async () => {
-      return this.#hardwareController.getFirmwareVersion()
-    })
-
     handle('get-device-extended-public-key', async () => {
       return this.#hardwareController.getExtendedPublicKey()
     })
@@ -917,6 +913,13 @@ export default class ApiController {
       return this.#multisigController.loadMultisigTxJson(fullPayload)
     })
 
+    handle('change-multisig-sync-status', (_, status: boolean) => {
+      changeMultisigSyncStatus(status)
+      return {
+        status: ResponseCode.Success,
+      }
+    })
+
     //migrate
     handle('start-migrate', async () => {
       migrateCkbData()
diff --git a/packages/neuron-wallet/src/controllers/hardware.ts b/packages/neuron-wallet/src/controllers/hardware.ts
index 182381ba61..e8e9aa0cfa 100644
--- a/packages/neuron-wallet/src/controllers/hardware.ts
+++ b/packages/neuron-wallet/src/controllers/hardware.ts
@@ -38,16 +38,6 @@ export default class HardwareController {
     }
   }
 
-  public async getFirmwareVersion(): Promise<Controller.Response<string>> {
-    const device = HardwareWalletService.getInstance().getCurrent()!
-    const version = await device.getFirmwareVersion?.()
-
-    return {
-      status: ResponseCode.Success,
-      result: version,
-    }
-  }
-
   public async getExtendedPublicKey(): Promise<Controller.Response<ExtendedPublicKey>> {
     const device = HardwareWalletService.getInstance().getCurrent()!
     const pubkey = await device.getExtendedPublicKey()
diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index ea41a69bb1..9ba5bc5ac3 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -14,6 +14,10 @@ import Multisig from '../models/multisig'
 import SystemScriptInfo from '../models/system-script-info'
 import NetworksService from '../services/networks'
 import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
+import { NetworkType } from '../models/network'
+import MultisigConfigDbChangedSubject from '../models/subjects/multisig-config-db-changed-subject'
+import { LightRPC } from '../utils/ckb-rpc'
+import SyncProgressService from '../services/sync-progress'
 
 interface MultisigConfigOutput {
   multisig_configs: Record<
@@ -55,6 +59,23 @@ export default class MultisigController {
     }
   }
 
+  async resetMultisigSync(config: MultisigConfig, startBlockNumber: number) {
+    const network = NetworksService.getInstance().getCurrent()
+    const lightRpc = new LightRPC(network.remote)
+    const script = Multisig.getMultisigScript(config.blake160s, config.r, config.m, config.n)
+    await lightRpc.setScripts(
+      [
+        {
+          script,
+          blockNumber: `0x${startBlockNumber.toString(16)}`,
+          scriptType: 'lock' as CKBRPC.ScriptType,
+        },
+      ],
+      'partial'
+    )
+    SyncProgressService.resetMultisigSync(scriptToHash(script), startBlockNumber)
+  }
+
   async updateConfig(params: {
     id: number
     walletId?: string
@@ -63,8 +84,19 @@ export default class MultisigController {
     n?: number
     addresses?: string[]
     alias?: string
+    startBlockNumber?: number
   }) {
+    const config = await this.#multisigService.getMultisigConfigById(params.id)
     const result = await this.#multisigService.updateMultisigConfig(params)
+    const network = NetworksService.getInstance().getCurrent()
+    if (params.startBlockNumber && network.type === NetworkType.Light) {
+      if (config?.startBlockNumber !== undefined && config.startBlockNumber > params.startBlockNumber) {
+        // if set small than last, reset by set_script
+        this.resetMultisigSync(config, params.startBlockNumber)
+      }
+      // if it's light client, restart queue task
+      MultisigConfigDbChangedSubject.getSubject().next('UpdateStartBlockNumber')
+    }
     return {
       status: ResponseCode.Success,
       result,
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index 29bff5030e..db66030bfa 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -168,8 +168,8 @@ export default class WalletsController {
     const keystoreObject = Keystore.fromJson(keystore)
     const masterPrivateKey = keystoreObject.extendedPrivateKey(password)
     const masterKeychain = new Keychain(
-      Buffer.from(masterPrivateKey.privateKey, 'hex'),
-      Buffer.from(masterPrivateKey.chainCode, 'hex')
+      Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+      Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
     )
     const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
     const accountExtendedPublicKey = new AccountExtendedPublicKey(
diff --git a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
index 698be44a0f..3e62b73e5b 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -29,6 +29,9 @@ export default class MultisigConfig {
   @Column()
   lastestBlockNumber: string = ''
 
+  @Column()
+  startBlockNumber?: number
+
   public static fromModel(model: MultisigConfigModel): MultisigConfig {
     const multisigConfig = new MultisigConfig()
 
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
index 2d8469aff9..279acba979 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1651820157100-RemoveAddressesMultisigConfig.ts
@@ -8,7 +8,9 @@ export class RemoveAddressesMultisigConfig1651820157100 implements MigrationInte
     public async up(queryRunner: QueryRunner): Promise<any> {
       await queryRunner.renameColumn('multisig_config', 'addresses', 'blake160s')
       await queryRunner.dropColumn('multisig_config', 'fullpayload')
-      const configList = await queryRunner.manager.find(MultisigConfig)
+      // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+      // so it's better to use query to find the items
+      const configList: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
       const updated = configList.map(v => {
         v.blake160s = v.blake160s.map(v => addressToScript(v).args)
         return v
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
index e5dfeabc7e..3958f3e287 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1681360188494-AddTypeSyncProgress.ts
@@ -15,10 +15,9 @@ export class AddTypeSyncProgress1681360188494 implements MigrationInterface {
       default: SyncAddressType.Default,
     }))
     await queryRunner.createIndex("sync_progress", new TableIndex({ columnNames: ["addressType"] }))
-    const multisigConfigs = await queryRunner.connection
-      .getRepository(MultisigConfig)
-      .createQueryBuilder()
-      .getMany()
+    // after add a column for multisig_config here will throw exception if use `queryRunner.manager.find(MultisigConfig)`
+    // so it's better to use query to find the items
+    const multisigConfigs: MultisigConfig[] = await queryRunner.manager.query('select * from multisig_config')
     const scriptHashes = multisigConfigs.map(v => scriptToHash(Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n)))
     await queryRunner.query(`UPDATE sync_progress set addressType=1 where hash in (${scriptHashes.map(v => `'${v}'`).join(',')})`)
   }
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
index 4a6c4b78d8..7ef43299d1 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
@@ -1,21 +1,18 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+import {MigrationInterface, QueryRunner} from "typeorm";
 
 export class RenameSyncProgress1702781527414 implements MigrationInterface {
     name = 'RenameSyncProgress1702781527414'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.renameColumn('sync_progress', 'blockStartNumber', 'localSavedBlockNumber')
-        await queryRunner.renameColumn('sync_progress', 'blockEndNumber', 'syncedBlockNumber')
-        await queryRunner.addColumn('sync_progress', new TableColumn({
-          name: 'lightStartBlockNumber',
-          type: 'integer',
-          default: 0
-        }))
+        // the typeorm renameColumn will throw an exception about drop indexer when rename or add column
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockStartNumber" to "localSavedBlockNumber"') 
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "blockEndNumber" to "syncedBlockNumber"')
+        await queryRunner.query(`ALTER TABLE "sync_progress" ADD COLUMN "lightStartBlockNumber" integer DEFAULT 0;`)
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.renameColumn('sync_progress', 'localSavedBlockNumber', 'blockStartNumber')
-        await queryRunner.renameColumn('sync_progress', 'syncedBlockNumber', 'blockEndNumber')
-    }
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "localSavedBlockNumber" to "blockStartNumber"') 
+        await queryRunner.query('ALTER TABLE "sync_progress" RENAME "syncedBlockNumber" to "blockEndNumber"') 
+      }
 
 }
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
new file mode 100644
index 0000000000..c1bdb527c5
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1716539079505-AddStartBlockNumber.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddStartBlockNumber1716539079505 implements MigrationInterface {
+    name = 'AddStartBlockNumber1716539079505'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(`ALTER TABLE "multisig_config" ADD COLUMN "startBlockNumber" integer;`)
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(`ALTER TABLE "multisig_config" DROP COLUMN "startBlockNumber";`)
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index e49a21cad4..c3458375cd 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -68,6 +68,7 @@ import MultisigConfigSubscribe from './subscriber/multisig-config-subscriber'
 import TxDescriptionSubscribe from './subscriber/tx-description-subscriber'
 import SudtTokenInfoSubscribe from './subscriber/sudt-token-info-subscriber'
 import AssetAccountSubscribe from './subscriber/asset-account-subscriber'
+import { AddStartBlockNumber1716539079505 } from './migrations/1716539079505-AddStartBlockNumber'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 export type ConnectionName = 'light' | 'full'
@@ -184,6 +185,7 @@ const getConnectionOptions = (genesisBlockHash: string, connectionName: Connecti
       RenameSyncProgress1702781527414,
       RemoveAddressInIndexerCache1704357651876,
       AmendTransaction1709008125088,
+      AddStartBlockNumber1716539079505,
     ],
     subscribers: [
       AddressSubscribe,
diff --git a/packages/neuron-wallet/src/models/chain/live-cell.ts b/packages/neuron-wallet/src/models/chain/live-cell.ts
index c57fb25fed..9a7cda74a2 100644
--- a/packages/neuron-wallet/src/models/chain/live-cell.ts
+++ b/packages/neuron-wallet/src/models/chain/live-cell.ts
@@ -1,6 +1,6 @@
 import Script, { ScriptHashType } from './script'
 import OutPoint from './out-point'
-import { LumosCell } from '../../block-sync-renderer/sync/synchronizer'
+import { type Cell, type OutPoint as IOutPoint } from '@ckb-lumos/base'
 
 const LUMOS_HASH_TYPE_MAP: Record<string, ScriptHashType> = {
   type: ScriptHashType.Type,
@@ -8,6 +8,8 @@ const LUMOS_HASH_TYPE_MAP: Record<string, ScriptHashType> = {
   data: ScriptHashType.Data,
 }
 
+export type CellWithOutPoint = Cell & { outPoint: IOutPoint }
+
 export default class LiveCell {
   public txHash: string
   public outputIndex: string
@@ -54,7 +56,7 @@ export default class LiveCell {
     return undefined
   }
 
-  public static fromLumos(cell: LumosCell): LiveCell {
+  public static fromLumos(cell: CellWithOutPoint): LiveCell {
     const type = cell.cellOutput.type
       ? new Script(
           cell.cellOutput.type.codeHash,
diff --git a/packages/neuron-wallet/src/models/chain/transaction.ts b/packages/neuron-wallet/src/models/chain/transaction.ts
index 1f4a0d1223..a8942bb43c 100644
--- a/packages/neuron-wallet/src/models/chain/transaction.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction.ts
@@ -82,6 +82,8 @@ export default class Transaction {
   public signatures: Signatures = {}
   public assetAccountType?: AssetAccountType
 
+  public daoCapacity?: string
+
   constructor(
     version: string,
     cellDeps: CellDep[] = [],
@@ -106,7 +108,8 @@ export default class Transaction {
     sudtInfo?: SudtInfo,
     nftType?: NFTInfo,
     signatures: Signatures = {},
-    assetAccountType?: AssetAccountType
+    assetAccountType?: AssetAccountType,
+    daoCapacity?: string
   ) {
     this.cellDeps = cellDeps
     this.headerDeps = headerDeps
@@ -133,6 +136,7 @@ export default class Transaction {
     this.sudtInfo = sudtInfo
     this.nftInfo = nftType
     this.signatures = signatures
+    this.daoCapacity = daoCapacity
     TypeCheckerUtils.hashChecker(...this.headerDeps, this.blockHash)
     TypeCheckerUtils.numberChecker(
       this.version,
@@ -171,6 +175,7 @@ export default class Transaction {
     nftInfo,
     signatures = {},
     assetAccountType,
+    daoCapacity,
   }: {
     version: string
     cellDeps?: CellDep[]
@@ -196,6 +201,7 @@ export default class Transaction {
     nftInfo?: NFTInfo
     signatures?: Signatures
     assetAccountType?: AssetAccountType
+    daoCapacity?: string
   }): Transaction {
     return new Transaction(
       version,
@@ -226,7 +232,8 @@ export default class Transaction {
       sudtInfo,
       nftInfo,
       signatures,
-      assetAccountType
+      assetAccountType,
+      daoCapacity
     )
   }
 
diff --git a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
index fc8358a5e8..cbdfd63c1f 100644
--- a/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
+++ b/packages/neuron-wallet/src/models/subjects/multisig-config-db-changed-subject.ts
@@ -2,7 +2,7 @@ import { ReplaySubject } from 'rxjs'
 
 // subscribe this Subject to monitor any transaction table changes
 export class MultisigConfigDbChangedSubject {
-  private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove'>(100)
+  private static subject = new ReplaySubject<'AfterInsert' | 'AfterRemove' | 'UpdateStartBlockNumber'>(100)
 
   public static getSubject() {
     return MultisigConfigDbChangedSubject.subject
diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index 003800312d..5eae7a91ef 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -115,8 +115,12 @@ export const startCkbNode = async () => {
   listenPort = await getUsablePort(rpcPort >= listenPort ? rpcPort + 1 : listenPort)
 
   updateToml(path.join(SettingsService.getInstance().getNodeDataPath(), 'ckb.toml'), {
-    rpc: `listen_address = "127.0.0.1:${rpcPort}"`,
-    network: `listen_addresses = ["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+    rpc: {
+      listen_address: `"127.0.0.1:${rpcPort}"`,
+    },
+    network: {
+      listen_addresses: `["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+    },
   })
   const options = ['run', '-C', SettingsService.getInstance().getNodeDataPath(), '--indexer']
   const stdio: (StdioNull | StdioPipe)[] = ['ignore', 'pipe', 'pipe']
diff --git a/packages/neuron-wallet/src/services/hardware/hardware.ts b/packages/neuron-wallet/src/services/hardware/hardware.ts
index 9d28825752..fc0b1f9641 100644
--- a/packages/neuron-wallet/src/services/hardware/hardware.ts
+++ b/packages/neuron-wallet/src/services/hardware/hardware.ts
@@ -140,7 +140,6 @@ export abstract class Hardware {
   public abstract signMessage(path: string, messageHex: string): Promise<string>
   public abstract disconnect(): Promise<void>
   public abstract getAppVersion(): Promise<string>
-  public abstract getFirmwareVersion?(): Promise<string>
   public abstract signTransaction(
     walletID: string,
     tx: Transaction,
diff --git a/packages/neuron-wallet/src/services/hardware/ledger.ts b/packages/neuron-wallet/src/services/hardware/ledger.ts
index a3f6fca5eb..d22bb8713c 100644
--- a/packages/neuron-wallet/src/services/hardware/ledger.ts
+++ b/packages/neuron-wallet/src/services/hardware/ledger.ts
@@ -12,6 +12,20 @@ import logger from '../../utils/logger'
 import NetworksService from '../../services/networks'
 import { generateRPC } from '../../utils/ckb-rpc'
 
+const UNCOMPRESSED_KEY_LENGTH = 130
+const compressPublicKey = (key: string) => {
+  if (key.length !== UNCOMPRESSED_KEY_LENGTH) {
+    return key
+  }
+
+  const publicKey = Buffer.from(key, 'hex')
+  const compressedPublicKey = Buffer.alloc(33)
+    // '03' for odd value, '02' for even value
+    .fill(publicKey[64] & 1 ? '03' : '02', 0, 1, 'hex')
+    .fill(publicKey.subarray(1, 33), 1, 33)
+  return compressedPublicKey.toString('hex')
+}
+
 export default class Ledger extends Hardware {
   private ledgerCKB: LedgerCKB | null = null
   private transport: Transport | null = null
@@ -41,8 +55,9 @@ export default class Ledger extends Hardware {
 
   public async getExtendedPublicKey(): Promise<ExtendedPublicKey> {
     const { public_key, chain_code } = await this.ledgerCKB!.getWalletExtendedPublicKey(this.defaultPath)
+    // The ledger wallet's public key is unzipped, so zip it to 33 bytes https://en.bitcoin.it/wiki/BIP_0032 serializes the coordinate pair P
     return {
-      publicKey: public_key,
+      publicKey: compressPublicKey(public_key),
       chainCode: chain_code,
     }
   }
@@ -89,16 +104,6 @@ export default class Ledger extends Hardware {
     return conf!.version
   }
 
-  async getFirmwareVersion(): Promise<string> {
-    const res: Buffer = await this.transport!.send(0xe0, 0x01, 0x00, 0x00)!
-    const byteArray = [...res]
-    const data = byteArray.slice(0, byteArray.length - 2)
-    const versionLength = data[4]
-    const version = Buffer.from(data.slice(5, 5 + versionLength)).toString()
-
-    return version
-  }
-
   async getPublicKey(path: string) {
     const networkService = NetworksService.getInstance()
     const isTestnet = !networkService.isMainnet()
diff --git a/packages/neuron-wallet/src/services/light-runner.ts b/packages/neuron-wallet/src/services/light-runner.ts
index 1c05fbf38e..da93dd39d2 100644
--- a/packages/neuron-wallet/src/services/light-runner.ts
+++ b/packages/neuron-wallet/src/services/light-runner.ts
@@ -81,6 +81,7 @@ export class CKBLightRunner extends NodeRunner {
   protected binaryName: string = 'ckb-light-client'
   protected logStream: Map<string, fs.WriteStream> = new Map()
   protected _port: number = 9000
+  protected listenPort: number = 8118
 
   static getInstance(): CKBLightRunner {
     if (!CKBLightRunner.instance) {
@@ -117,13 +118,22 @@ export class CKBLightRunner extends NodeRunner {
 
   async updateConfig() {
     const usablePort = await getUsablePort(this._port)
+    const listenPort = await getUsablePort(usablePort >= this._port ? this.listenPort + 1 : this.listenPort)
     this._port = usablePort
+    this.listenPort = listenPort
     const storePath = path.join(SettingsService.getInstance().getNodeDataPath(), './store')
     const networkPath = path.join(SettingsService.getInstance().getNodeDataPath(), './network')
     updateToml(this.configFile, {
-      store: `path = "${this.platform() === 'win' ? storePath.replace(/\\/g, '\\\\') : storePath}"`,
-      network: `path = "${this.platform() === 'win' ? networkPath.replace(/\\/g, '\\\\') : networkPath}"`,
-      rpc: `listen_address = "127.0.0.1:${usablePort}"`,
+      store: {
+        path: `"${this.platform() === 'win' ? storePath.replace(/\\/g, '\\\\') : storePath}"`,
+      },
+      network: {
+        path: `"${this.platform() === 'win' ? networkPath.replace(/\\/g, '\\\\') : networkPath}"`,
+        listen_addresses: `["/ip4/0.0.0.0/tcp/${listenPort}"]`,
+      },
+      rpc: {
+        listen_address: `"127.0.0.1:${usablePort}"`,
+      },
     })
   }
 
diff --git a/packages/neuron-wallet/src/services/live-cell-service.ts b/packages/neuron-wallet/src/services/live-cell-service.ts
index 4b7766d3db..3fe38814a6 100644
--- a/packages/neuron-wallet/src/services/live-cell-service.ts
+++ b/packages/neuron-wallet/src/services/live-cell-service.ts
@@ -1,7 +1,7 @@
 import Script from '../models/chain/script'
-import LiveCell from '../models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../models/chain/live-cell'
 import { queryIndexer } from '../block-sync-renderer/index'
-import { LumosCell, LumosCellQuery } from '../block-sync-renderer/sync/synchronizer'
+import { type QueryOptions } from '@ckb-lumos/base'
 
 export default class LiveCellService {
   private static instance: LiveCellService
@@ -20,14 +20,14 @@ export default class LiveCellService {
     lock: Script | null,
     type: Script | null,
     data: string | null
-  ): Promise<LumosCell[]> {
+  ): Promise<CellWithOutPoint[]> {
     if (!lock && !type) {
       throw new Error('at least one parameter is required')
     }
 
-    const query: LumosCellQuery = { lock, type, data }
-    const liveCells: LumosCell[] = await queryIndexer(query)
-    return liveCells
+    const query = { lock, type, data } as QueryOptions
+    const liveCells = await queryIndexer(query)
+    return liveCells as CellWithOutPoint[]
   }
 
   public async getOneByLockScriptAndTypeScript(lock: Script | null, type: Script | null) {
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index 5f97cd3b3a..2f3da9467f 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -41,6 +41,7 @@ export default class MultisigService {
     n?: number
     blake160s?: string[]
     alias?: string
+    startBlockNumber?: number
   }) {
     const result = await getConnection()
       .getRepository(MultisigConfig)
@@ -52,19 +53,15 @@ export default class MultisigService {
     if (!result) {
       throw new MultisigConfigNotExistError()
     }
-    await getConnection()
-      .createQueryBuilder()
-      .update(MultisigConfig)
-      .set({
-        alias: params.alias ?? result.alias,
-        walletId: params.walletId ?? result.walletId,
-        r: params.r ?? result.r,
-        m: params.m ?? result.m,
-        n: params.n ?? result.n,
-        blake160s: params.blake160s ?? result.blake160s,
-      })
-      .where('id = :id', { id: params.id })
-      .execute()
+    await getConnection().getRepository(MultisigConfig).update(params.id, {
+      alias: params.alias,
+      walletId: params.walletId,
+      r: params.r,
+      m: params.m,
+      n: params.n,
+      blake160s: params.blake160s,
+      startBlockNumber: params.startBlockNumber,
+    })
     return { ...result, ...params }
   }
 
@@ -77,6 +74,16 @@ export default class MultisigService {
     return result
   }
 
+  async getMultisigConfigById(id: number) {
+    return getConnection()
+      .getRepository(MultisigConfig)
+      .createQueryBuilder()
+      .where({
+        id,
+      })
+      .getOne()
+  }
+
   async deleteConfig(id: number) {
     const config = await getConnection()
       .getRepository(MultisigConfig)
@@ -342,6 +349,7 @@ export default class MultisigService {
       script: Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n),
       addressType: SyncAddressType.Multisig,
       scriptType: 'lock' as CKBRPC.ScriptType,
+      startBlockNumber: v.startBlockNumber,
     }))
   }
 }
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
index d482390249..f836ba5e0e 100644
--- a/packages/neuron-wallet/src/services/settings.ts
+++ b/packages/neuron-wallet/src/services/settings.ts
@@ -88,7 +88,7 @@ export default class SettingsService extends Store {
 
   private generateEncryptString(str: string) {
     if (safeStorage.isEncryptionAvailable()) {
-      return safeStorage.encryptString(str).toString('utf-8')
+      return safeStorage.encryptString(str).toString('hex')
     }
     const hash = crypto.createHash('sha256')
     hash.update(str)
@@ -108,6 +108,9 @@ export default class SettingsService extends Store {
   }
 
   verifyLockWindowPassword(password: string) {
+    if (safeStorage.isEncryptionAvailable()) {
+      return safeStorage.decryptString(Buffer.from(this.lockWindowInfo.encryptedPassword!, 'hex')) === password
+    }
     const encryptedPassword = this.generateEncryptString(password)
     return SettingsService.getInstance().lockWindowInfo.encryptedPassword === encryptedPassword
   }
diff --git a/packages/neuron-wallet/src/services/sign-message.ts b/packages/neuron-wallet/src/services/sign-message.ts
index 8d3bfd562d..aeaf32dca7 100644
--- a/packages/neuron-wallet/src/services/sign-message.ts
+++ b/packages/neuron-wallet/src/services/sign-message.ts
@@ -6,6 +6,7 @@ import { ec as EC } from 'elliptic'
 import { AddressNotFound } from '../exceptions'
 import HardwareWalletService from './hardware'
 import AddressParser from '../models/address-parser'
+import { bytes } from '@ckb-lumos/codec'
 
 export default class SignMessage {
   static GENERATE_COUNT = 100
@@ -91,8 +92,8 @@ export default class SignMessage {
   private static getPrivateKey(wallet: Wallet, path: string, password: string): string {
     const masterPrivateKey = wallet.loadKeystore().extendedPrivateKey(password)
     const masterKeychain = new Keychain(
-      Buffer.from(masterPrivateKey.privateKey, 'hex'),
-      Buffer.from(masterPrivateKey.chainCode, 'hex')
+      Buffer.from(bytes.bytify(masterPrivateKey.privateKey)),
+      Buffer.from(bytes.bytify(masterPrivateKey.chainCode))
     )
 
     return `0x${masterKeychain.derivePath(path).privateKey.toString('hex')}`
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 54839896f2..1c46bdac31 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -86,15 +86,15 @@ export default class SyncProgressService {
     return result
   }
 
-  static async getCurrentWalletMinSyncedBlockNumber() {
+  static async getCurrentWalletMinSyncedBlockNumber(addressType: SyncAddressType = SyncAddressType.Default) {
     const currentWallet = WalletService.getInstance().getCurrent()
     const item = await getConnection()
       .getRepository(SyncProgress)
       .createQueryBuilder()
       .where({
         delete: false,
-        addressType: SyncAddressType.Default,
-        ...(currentWallet ? { walletId: currentWallet.id } : {}),
+        addressType,
+        ...(currentWallet && addressType === SyncAddressType.Default ? { walletId: currentWallet.id } : {}),
       })
       .orderBy('syncedBlockNumber', 'ASC')
       .getOne()
@@ -144,4 +144,17 @@ export default class SyncProgressService {
       addressType: SyncAddressType.Default,
     })
   }
+
+  static async resetMultisigSync(hash: string, startBlockNumber: number) {
+    await getConnection()
+      .createQueryBuilder()
+      .update(SyncProgress)
+      .set({
+        localSavedBlockNumber: startBlockNumber,
+        lightStartBlockNumber: startBlockNumber,
+        syncedBlockNumber: startBlockNumber,
+      })
+      .where({ hash })
+      .execute()
+  }
 }
diff --git a/packages/neuron-wallet/src/services/tx/transaction-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index eb5cf93dd3..8b43057ed9 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-service.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-service.ts
@@ -256,6 +256,7 @@ export class TransactionsService {
       .addSelect('input.transactionHash', 'transactionHash')
       .addSelect('input.outPointTxHash', 'outPointTxHash')
       .addSelect('input.outPointIndex', 'outPointIndex')
+      .addSelect('input.data', 'data')
       .where(
         `
         input.transactionHash IN (:...txHashes) AND
@@ -266,7 +267,13 @@ export class TransactionsService {
           walletId: params.walletID,
         }
       )
-      .getRawMany()
+      .getRawMany<{
+        capacity: string
+        transactionHash: string
+        outPointTxHash: string
+        outPointIndex: string
+        data: string
+      }>()
 
     const outputs = await connection
       .getRepository(OutputEntity)
@@ -284,7 +291,7 @@ export class TransactionsService {
           walletId: params.walletID,
         }
       )
-      .getRawMany()
+      .getRawMany<{ capacity: string; transactionHash: string; daoData: string }>()
 
     const assetAccountInputs = await connection
       .getRepository(InputEntity)
@@ -373,13 +380,17 @@ export class TransactionsService {
     ).filter(o => inputPreviousTxHashes.includes(o.txHash))
 
     const sums = new Map<string, bigint>()
-    const daoFlag = new Map<string, boolean>()
+    const daoInfo = new Map<string, { inputs: typeof inputs; outputs: typeof outputs }>()
     outputs.map(o => {
       const s = sums.get(o.transactionHash) || BigInt(0)
       sums.set(o.transactionHash, s + BigInt(o.capacity))
 
       if (o.daoData) {
-        daoFlag.set(o.transactionHash, true)
+        if (daoInfo.has(o.transactionHash)) {
+          daoInfo.get(o.transactionHash)!.outputs.push(o)
+        } else {
+          daoInfo.set(o.transactionHash, { inputs: [], outputs: [o] })
+        }
       }
     })
 
@@ -391,7 +402,11 @@ export class TransactionsService {
         return dc.txHash === i.outPointTxHash && dc.index === i.outPointIndex
       })
       if (result) {
-        daoFlag.set(i.transactionHash, true)
+        if (daoInfo.has(i.transactionHash)) {
+          daoInfo.get(i.transactionHash)!.inputs.push(i)
+        } else {
+          daoInfo.set(i.transactionHash, { inputs: [i], outputs: [] })
+        }
       }
     })
 
@@ -477,6 +492,16 @@ export class TransactionsService {
           nftInfo = { type: NFTType.Receive, data: receiveNFTCell.typeArgs! }
         }
 
+        const txDaoInfo = daoInfo.get(tx.hash)
+        let daoCapacity: string | undefined
+        if (txDaoInfo) {
+          if (txDaoInfo.inputs.length && !txDaoInfo.outputs.length) {
+            daoCapacity = txDaoInfo.inputs.reduce((pre, cur) => BigInt(cur.capacity) + pre, BigInt(value)).toString()
+          } else if (!txDaoInfo.inputs.length && txDaoInfo.outputs.length) {
+            daoCapacity = `-${txDaoInfo.outputs.reduce((pre, cur) => BigInt(cur.capacity) + pre, BigInt(0)).toString()}`
+          }
+        }
+
         return Transaction.fromObject({
           timestamp: tx.timestamp,
           value: value.toString(),
@@ -484,7 +509,7 @@ export class TransactionsService {
           version: tx.version,
           type: txType,
           assetAccountType: assetAccountType,
-          nervosDao: daoFlag.get(tx.hash!),
+          nervosDao: !!txDaoInfo,
           status: tx.status,
           description: tx.description,
           createdAt: tx.createdAt,
@@ -492,6 +517,7 @@ export class TransactionsService {
           blockNumber: tx.blockNumber,
           sudtInfo: sudtInfo,
           nftInfo: nftInfo,
+          daoCapacity,
         })
       })
     )
diff --git a/packages/neuron-wallet/src/utils/toml.ts b/packages/neuron-wallet/src/utils/toml.ts
index b0e724513f..97a57eef78 100644
--- a/packages/neuron-wallet/src/utils/toml.ts
+++ b/packages/neuron-wallet/src/utils/toml.ts
@@ -1,7 +1,11 @@
 import fs from 'fs'
 import path from 'path'
 
-export function updateToml(filePath: string, updateValue: Record<string, string>, newFilePath?: string) {
+export function updateToml(
+  filePath: string,
+  updateValue: Record<string, Record<string, string>>,
+  newFilePath?: string
+) {
   const values = fs.readFileSync(filePath).toString().split('\n')
   let field: string | undefined = undefined
   const newValues = values.map(v => {
@@ -14,9 +18,15 @@ export function updateToml(filePath: string, updateValue: Record<string, string>
       return v
     }
     if (field && updateValue[field]) {
-      const newLine = updateValue[field]
-      field = undefined
-      return newLine
+      const equalIndex = v.indexOf('=')
+      if (equalIndex !== -1) {
+        const stringBeforeEqual = v.slice(0, equalIndex)
+        const key = stringBeforeEqual.trim()
+        if (updateValue[field][key]) {
+          const newLine = `${stringBeforeEqual}= ${updateValue[field][key]}`
+          return newLine
+        }
+      }
     }
     return v
   })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
index b4f2cd19fd..b4af6a23a4 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
@@ -87,14 +87,12 @@ describe('unit tests for IndexerConnector', () => {
   })
 
   describe('#constructor', () => {
-    const STUB_URI = 'stub_uri'
-
     describe('when init with indexer folder path', () => {
       beforeEach(() => {
-        new stubbedFullSynchronizer([], nodeUrl, STUB_URI)
+        new stubbedFullSynchronizer([], nodeUrl)
       })
       it('inits lumos indexer with a node url and indexer folder path', () => {
-        expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+        expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
       })
     })
     describe('when init without indexer folder path', () => {
@@ -102,7 +100,7 @@ describe('unit tests for IndexerConnector', () => {
         new stubbedFullSynchronizer([], nodeUrl)
       })
       it('inits mercury indexer with a node url and a default port', () => {
-        expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+        expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
       })
     })
   })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
index 61da50c476..6f04520d7e 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
@@ -75,9 +75,9 @@ describe(`Create block sync task`, () => {
       message: {
         addressMetas: STUB_ADDRESS_METAS,
         genesisHash: STUB_NETWORK.genesisHash,
-        indexerUrl: STUB_NETWORK.remote,
         nodeType: NetworkType.Normal,
         url: STUB_NETWORK.remote,
+        syncMultisig: false,
       },
     })
   })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
index ccd7ee549e..0b8d0b9531 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
@@ -24,6 +24,7 @@ const schedulerWaitMock = jest.fn()
 const getMultisigConfigForLightMock = jest.fn()
 const walletGetCurrentMock = jest.fn()
 const walletGetAllMock = jest.fn()
+const updateBlockStartNumberMock = jest.fn()
 
 function mockReset() {
   getSyncStatusMock.mockReset()
@@ -46,6 +47,8 @@ function mockReset() {
   removeByHashesAndAddressType.mockReset()
   walletGetCurrentMock.mockReset()
   walletGetAllMock.mockReset()
+
+  updateBlockStartNumberMock.mockReset()
 }
 
 jest.mock('../../src/services/sync-progress', () => {
@@ -123,12 +126,15 @@ describe('test light synchronizer', () => {
       await connect.initSyncProgress()
       expect(getScriptsMock).toBeCalledTimes(0)
     })
-    it('append multisig script', async () => {
+    it('sync multisig config', async () => {
       getScriptsMock.mockResolvedValue([])
       const connect = new LightSynchronizer([], '')
       getOtherTypeSyncBlockNumberMock.mockResolvedValueOnce({})
+      getMultisigConfigForLightMock.mockResolvedValueOnce([
+        { walletId: 'walletId', script, addressType: 1, scriptType: 'lock' },
+      ])
       //@ts-ignore
-      await connect.initSyncProgress([{ walletId: 'walletId', script, addressType: 1, scriptType: 'lock' }])
+      await connect.initMultisigSyncProgress()
       expect(getScriptsMock).toBeCalledTimes(1)
       expect(setScriptsMock).toHaveBeenNthCalledWith(
         1,
@@ -138,6 +144,7 @@ describe('test light synchronizer', () => {
     })
     it('when syncing script in the local DB', async () => {
       getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
+      walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
       getExistingSyncArgsesMock.mockResolvedValue(new Set([script.args]))
       const addressMeta = AddressMeta.fromObject({
         walletId: 'walletId',
@@ -187,6 +194,7 @@ describe('test light synchronizer', () => {
     })
     it('when syncing script not in the local DB', async () => {
       getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
+      walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
       getExistingSyncArgsesMock.mockResolvedValue(new Set())
       const addressMeta = AddressMeta.fromObject({
         walletId: 'walletId',
@@ -256,6 +264,7 @@ describe('test light synchronizer', () => {
         addressType: 0,
         blake160: script.args,
       })
+      walletGetAllMock.mockReturnValue([{ id: 'walletId' }])
       getWalletMinLocalSavedBlockNumberMock.mockResolvedValue({ walletId: 170 })
       const connect = new LightSynchronizer([addressMeta], '')
       //@ts-ignore
@@ -367,6 +376,152 @@ describe('test light synchronizer', () => {
       )
       expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
     })
+    it('when other wallet min synced block number near the current wallet', async () => {
+      walletGetCurrentMock.mockReturnValue({ id: 'walletId1' })
+      walletGetAllMock.mockReturnValue([
+        { id: 'walletId1', startBlockNumber: '0xaa' },
+        { id: 'walletId2', startBlockNumber: '0xab' },
+      ])
+      const addressMeta1 = AddressMeta.fromObject({
+        walletId: 'walletId1',
+        address,
+        path: '',
+        addressIndex: 10,
+        addressType: 0,
+        blake160: script.args,
+      })
+      const script2: Script = {
+        args: '0x403f0d4e833b2a8d372772a63facaa310dfeef93',
+        codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
+        hashType: 'type',
+      }
+      const getScriptsResult = [{ script: script2, blockNumber: '0xaa', scriptType: 'lock' }]
+      getScriptsMock.mockResolvedValue(getScriptsResult)
+      getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+      const addressMeta2 = AddressMeta.fromObject({
+        walletId: 'walletId2',
+        address,
+        path: '',
+        addressIndex: 10,
+        addressType: 0,
+        blake160: script2.args,
+      })
+      const connect = new LightSynchronizer([addressMeta1, addressMeta2], '')
+      //@ts-ignore
+      await connect.initSyncProgress()
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [
+          ...[
+            addressMeta1.generateDefaultLockScript().toSDK(),
+            addressMeta1.generateACPLockScript().toSDK(),
+            addressMeta1.generateLegacyACPLockScript().toSDK(),
+          ].map(script => ({
+            script,
+            scriptType: 'lock',
+            walletId: addressMeta1.walletId,
+            blockNumber: '0xaa',
+          })),
+          ...[
+            addressMeta2.generateDefaultLockScript().toSDK(),
+            addressMeta2.generateACPLockScript().toSDK(),
+            addressMeta2.generateLegacyACPLockScript().toSDK(),
+          ].map(script => ({
+            script,
+            scriptType: 'lock',
+            walletId: addressMeta2.walletId,
+            blockNumber: '0xab',
+          })),
+        ],
+        'partial'
+      )
+      expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
+      expect(initSyncProgressMock).toBeCalledWith([
+        ...[
+          addressMeta1.generateDefaultLockScript().toSDK(),
+          addressMeta1.generateACPLockScript().toSDK(),
+          addressMeta1.generateLegacyACPLockScript().toSDK(),
+        ].map(script => ({
+          script,
+          scriptType: 'lock',
+          walletId: addressMeta1.walletId,
+          blockNumber: '0xaa',
+        })),
+        ...[
+          addressMeta2.generateDefaultLockScript().toSDK(),
+          addressMeta2.generateACPLockScript().toSDK(),
+          addressMeta2.generateLegacyACPLockScript().toSDK(),
+        ].map(script => ({
+          script,
+          scriptType: 'lock',
+          walletId: addressMeta2.walletId,
+          blockNumber: '0xab',
+        })),
+      ])
+      expect(updateSyncProgressFlagMock).toBeCalledWith(['walletId1', 'walletId2'])
+    })
+    it('when other wallet min synced block number bigger than the current wallet', async () => {
+      walletGetCurrentMock.mockReturnValue({ id: 'walletId1' })
+      walletGetAllMock.mockReturnValue([
+        { id: 'walletId1', startBlockNumber: '0xaaaa0' },
+        { id: 'walletId2', startBlockNumber: '0xab' },
+      ])
+      const addressMeta1 = AddressMeta.fromObject({
+        walletId: 'walletId1',
+        address,
+        path: '',
+        addressIndex: 10,
+        addressType: 0,
+        blake160: script.args,
+      })
+      const script2: Script = {
+        args: '0x403f0d4e833b2a8d372772a63facaa310dfeef93',
+        codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
+        hashType: 'type',
+      }
+      const getScriptsResult = [{ script: script2, blockNumber: '0xab', scriptType: 'lock' }]
+      getScriptsMock.mockResolvedValue(getScriptsResult)
+      getExistingSyncArgsesMock.mockResolvedValue(new Set([script2.args]))
+      const addressMeta2 = AddressMeta.fromObject({
+        walletId: 'walletId2',
+        address,
+        path: '',
+        addressIndex: 10,
+        addressType: 0,
+        blake160: script2.args,
+      })
+      const connect = new LightSynchronizer([addressMeta1, addressMeta2], '')
+      //@ts-ignore
+      await connect.initSyncProgress()
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [
+          addressMeta1.generateDefaultLockScript().toSDK(),
+          addressMeta1.generateACPLockScript().toSDK(),
+          addressMeta1.generateLegacyACPLockScript().toSDK(),
+        ].map(script => ({
+          script,
+          scriptType: 'lock',
+          walletId: addressMeta1.walletId,
+          blockNumber: '0xaaaa0',
+        })),
+        'partial'
+      )
+      expect(setScriptsMock).toHaveBeenLastCalledWith(getScriptsResult, 'delete')
+      expect(initSyncProgressMock).toBeCalledWith(
+        [
+          addressMeta1.generateDefaultLockScript().toSDK(),
+          addressMeta1.generateACPLockScript().toSDK(),
+          addressMeta1.generateLegacyACPLockScript().toSDK(),
+        ].map(script => ({
+          script,
+          scriptType: 'lock',
+          walletId: addressMeta1.walletId,
+          blockNumber: '0xaaaa0',
+        }))
+      )
+      expect(updateSyncProgressFlagMock).toBeCalledWith(['walletId1', 'walletId2'])
+    })
   })
 
   describe('test initSync', () => {
@@ -428,16 +583,10 @@ describe('test light synchronizer', () => {
   })
 
   describe('#notifyCurrentBlockNumberProcessed', () => {
-    const synchronizer = new LightSynchronizer([], '')
-    const updateBlockStartNumberMock = jest.fn()
-    beforeAll(() => {
+    it('last process block number finish', async () => {
+      const synchronizer = new LightSynchronizer([], '')
       // @ts-ignore private property
       synchronizer.updateBlockStartNumber = updateBlockStartNumberMock
-    })
-    beforeEach(() => {
-      updateBlockStartNumberMock.mockReset()
-    })
-    it('last process block number finish', async () => {
       // @ts-ignore private property
       synchronizer.processingBlockNumber = '0xaa'
       getCurrentWalletMinSyncedBlockNumberMock.mockResolvedValueOnce(100)
@@ -447,6 +596,9 @@ describe('test light synchronizer', () => {
       expect(updateBlockStartNumberMock).toBeCalledWith(100)
     })
     it('not last process block number finish', async () => {
+      const synchronizer = new LightSynchronizer([], '')
+      // @ts-ignore private property
+      synchronizer.updateBlockStartNumber = updateBlockStartNumberMock
       // @ts-ignore private property
       synchronizer.processingBlockNumber = undefined
       await synchronizer.notifyCurrentBlockNumberProcessed('0xaa')
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
index c3c1e7e325..9836446cf2 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
@@ -1,8 +1,9 @@
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 import { AddressType } from '@ckb-lumos/hd'
+import { QueryOptions, type Cell } from '@ckb-lumos/base'
 import { Address, AddressVersion } from '../../src/models/address'
 import SystemScriptInfo from '../../src/models/system-script-info'
-import { Synchronizer, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/synchronizer'
+import { Synchronizer } from '../../src/block-sync-renderer/sync/synchronizer'
 import AddressMeta from '../../src/database/address/meta'
 import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
 import { ScriptHashType } from '../../src/models/chain/script'
@@ -110,22 +111,18 @@ describe('unit tests for IndexerConnector', () => {
   })
 
   describe('#constructor', () => {
-    const STUB_URI = 'stub_uri'
-
     it('inits lumos indexer with a node url and indexer folder path', () => {
       new TestSynchronizer({
         addresses: [],
         nodeUrl,
-        indexerUrl: STUB_URI,
       })
-      expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+      expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl)
     })
 
     it('init with addresses', () => {
       const synchronizer = new TestSynchronizer({
         addresses: [addressObj1, addressObj2],
         nodeUrl,
-        indexerUrl: STUB_URI,
       })
       expect(synchronizer.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(
         AddressMeta.fromObject(addressObj1)
@@ -140,7 +137,6 @@ describe('unit tests for IndexerConnector', () => {
     const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
-      indexerUrl: '',
     })
     it('no cached tx', async () => {
       stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockResolvedValue([])
@@ -178,7 +174,6 @@ describe('unit tests for IndexerConnector', () => {
     const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
-      indexerUrl: '',
     })
     synchronizer.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
 
@@ -220,10 +215,11 @@ describe('unit tests for IndexerConnector', () => {
   })
 
   describe('#getLiveCellsByScript', () => {
-    let fakeCell1: LumosCell, fakeCell2: LumosCell
-    let cells: LumosCell[]
+    let fakeCell1: Cell, fakeCell2: Cell
+    let cells: Cell[]
 
     fakeCell1 = {
+      data: '0x',
       blockHash: '0x',
       outPoint: {
         txHash: '0x',
@@ -244,6 +240,7 @@ describe('unit tests for IndexerConnector', () => {
       },
     }
     fakeCell2 = {
+      data: '0x',
       blockHash: '0x',
       outPoint: {
         txHash: '0x',
@@ -257,7 +254,7 @@ describe('unit tests for IndexerConnector', () => {
           args: '0x2',
         },
         type: {
-          hashType: 'lock',
+          hashType: 'data',
           codeHash: '0xcode',
           args: '0x2',
         },
@@ -268,11 +265,10 @@ describe('unit tests for IndexerConnector', () => {
     const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
-      indexerUrl: '',
     })
 
     describe('when success', () => {
-      const query: LumosCellQuery = {
+      const query = {
         lock: {
           hashType: ScriptHashType.Data,
           codeHash: '0xcode',
@@ -283,7 +279,6 @@ describe('unit tests for IndexerConnector', () => {
           codeHash: '0xcode',
           args: '0x',
         },
-        data: null,
       }
 
       beforeEach(async () => {
@@ -298,14 +293,14 @@ describe('unit tests for IndexerConnector', () => {
       it('transform the query parameter', () => {
         expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
           lock: {
-            hashType: query.lock!.hashType,
-            codeHash: query.lock!.codeHash,
-            args: query.lock!.args,
+            hashType: query.lock.hashType,
+            codeHash: query.lock.codeHash,
+            args: query.lock.args,
           },
           type: {
-            hashType: query.type!.hashType,
-            codeHash: query.type!.codeHash,
-            args: query.type!.args,
+            hashType: query.type.hashType,
+            codeHash: query.type.codeHash,
+            args: query.type.args,
           },
           data: 'any',
         })
@@ -316,7 +311,7 @@ describe('unit tests for IndexerConnector', () => {
       })
     })
     describe('when handling concurrent requests', () => {
-      const query1: LumosCellQuery = {
+      const query1: QueryOptions = {
         lock: {
           hashType: ScriptHashType.Data,
           codeHash: '0xcode',
@@ -327,9 +322,8 @@ describe('unit tests for IndexerConnector', () => {
           codeHash: '0xcode',
           args: '0x1',
         },
-        data: null,
       }
-      const query2: LumosCellQuery = {
+      const query2: QueryOptions = {
         lock: {
           hashType: ScriptHashType.Type,
           codeHash: '0xcode',
@@ -340,7 +334,6 @@ describe('unit tests for IndexerConnector', () => {
           codeHash: '0xcode',
           args: '0x2',
         },
-        data: null,
       }
 
       const results: unknown[] = []
@@ -401,7 +394,7 @@ describe('unit tests for IndexerConnector', () => {
         it('throws error', async () => {
           let err
           try {
-            await synchronizer.getLiveCellsByScript({ lock: null, type: null, data: null })
+            await synchronizer.getLiveCellsByScript({})
           } catch (error) {
             err = error
           }
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
index 413e782d13..706f11482f 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/task.test.ts
@@ -6,7 +6,6 @@ const STUB_START_MESSAGE = {
     genesisHash: 'stub_genesis_hash',
     url: 'stub_url',
     addressMetas: 'stub_address_metas',
-    indexerUrl: 'stub_indexer_url',
     nodeType: 2,
   },
 }
@@ -71,8 +70,8 @@ describe(`Block Sync Task`, () => {
       expect(stubbedSyncQueue).toHaveBeenCalledWith(
         STUB_START_MESSAGE.message.url,
         STUB_START_MESSAGE.message.addressMetas,
-        STUB_START_MESSAGE.message.indexerUrl,
-        STUB_START_MESSAGE.message.nodeType
+        STUB_START_MESSAGE.message.nodeType,
+        undefined
       )
       expect(stubbedSyncQueueStart).toHaveBeenCalled()
     })
diff --git a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
index 84a9b97830..1bc5cba2fd 100644
--- a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
+++ b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
@@ -1,6 +1,5 @@
 import Script, { ScriptHashType } from '../../../src/models/chain/script'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
-import LiveCell from '../../../src/models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../../../src/models/chain/live-cell'
 
 describe('LiveCell Test', () => {
   const INITIAL_DATA = {
@@ -88,7 +87,7 @@ describe('LiveCell Test', () => {
   })
 
   describe('get cells from lumos cell', () => {
-    const LUMOS_CELL: LumosCell = {
+    const LUMOS_CELL: CellWithOutPoint = {
       blockHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
       outPoint: {
         txHash: INITIAL_DATA.txHash,
diff --git a/packages/neuron-wallet/tests/services/ckb-runner.test.ts b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
index 451d9b2462..067137a946 100644
--- a/packages/neuron-wallet/tests/services/ckb-runner.test.ts
+++ b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
@@ -255,8 +255,12 @@ describe('ckb runner', () => {
         expect(getNodeUrl()).toBe('http://127.0.0.1:8114')
         expect(getUsablePortMock).toHaveBeenLastCalledWith(8115)
         expect(updateTomlMock).toBeCalledWith(path.join('/chains/mainnet', 'ckb.toml'), {
-          rpc: `listen_address = "127.0.0.1:8114"`,
-          network: `listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]`,
+          rpc: {
+            listen_address: `"127.0.0.1:8114"`,
+          },
+          network: {
+            listen_addresses: `["/ip4/0.0.0.0/tcp/8115"]`,
+          },
         })
         const promise = stopCkbNode()
         stubbedCkb.emit('close')
@@ -270,8 +274,12 @@ describe('ckb runner', () => {
         expect(getNodeUrl()).toBe('http://127.0.0.1:8115')
         expect(getUsablePortMock).toHaveBeenLastCalledWith(8116)
         expect(updateTomlMock).toBeCalledWith(path.join('/chains/mainnet', 'ckb.toml'), {
-          rpc: `listen_address = "127.0.0.1:8115"`,
-          network: `listen_addresses = ["/ip4/0.0.0.0/tcp/8116"]`,
+          rpc: {
+            listen_address: `"127.0.0.1:8115"`,
+          },
+          network: {
+            listen_addresses: `["/ip4/0.0.0.0/tcp/8116"]`,
+          },
         })
         let promise = stopCkbNode()
         stubbedCkb.emit('close')
diff --git a/packages/neuron-wallet/tests/services/hardware/ledger.test.ts b/packages/neuron-wallet/tests/services/hardware/ledger.test.ts
new file mode 100644
index 0000000000..84ee4255f1
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/hardware/ledger.test.ts
@@ -0,0 +1,39 @@
+import Ledger from '../../../src/services/hardware/ledger'
+
+const getWalletExtendedPublicKeyMock = jest.fn()
+
+jest.mock('hw-app-ckb', () => {
+  return function () {
+    return {
+      getWalletExtendedPublicKey: getWalletExtendedPublicKeyMock,
+    }
+  }
+})
+
+jest.mock('@ledgerhq/hw-transport-node-hid', () => ({
+  open: jest.fn(),
+}))
+
+const pk =
+  '04d061e9c5891f579fd548cfd22ff29f5c642714cc7e7a9215f0071ef5a5723f691757b28e31be71f09f24673eed52348e58d53bcfd26f4d96ec6bf1489eab429d'
+const zipPk = '03d061e9c5891f579fd548cfd22ff29f5c642714cc7e7a9215f0071ef5a5723f69'
+
+describe('test for ledger', () => {
+  describe('test getExtendedPublicKey', () => {
+    it('if the return pk is unzip', async () => {
+      getWalletExtendedPublicKeyMock.mockResolvedValueOnce({ public_key: pk, chain_code: '0x' })
+      const ledger = new Ledger({} as any)
+      await ledger.connect()
+      const res = await ledger.getExtendedPublicKey()
+      expect(res.publicKey).toBe(zipPk)
+    })
+
+    it('if the return pk is zip', async () => {
+      getWalletExtendedPublicKeyMock.mockResolvedValueOnce({ public_key: zipPk, chain_code: '0x' })
+      const ledger = new Ledger({} as any)
+      await ledger.connect()
+      const res = await ledger.getExtendedPublicKey()
+      expect(res.publicKey).toBe(zipPk)
+    })
+  })
+})
diff --git a/packages/neuron-wallet/tests/services/light-runner.test.ts b/packages/neuron-wallet/tests/services/light-runner.test.ts
index a88ed7a1ec..1a2a2fe7ed 100644
--- a/packages/neuron-wallet/tests/services/light-runner.test.ts
+++ b/packages/neuron-wallet/tests/services/light-runner.test.ts
@@ -337,32 +337,46 @@ describe('test light runner', () => {
 
   describe('test update config', () => {
     it('port is used', async () => {
-      getUsablePortMock.mockResolvedValueOnce(9001)
+      getUsablePortMock.mockResolvedValueOnce(9001).mockResolvedValueOnce(8119)
       lightDataPathMock.mockReturnValue('lightDataPath')
       resolveMock.mockImplementation((...v: string[]) => v.join(''))
       joinMock.mockImplementation((...v: string[]) => v.join(''))
       await CKBLightRunner.getInstance().updateConfig()
       expect(CKBLightRunner.getInstance().port).toEqual(9001)
       expect(updateTomlMock).toHaveBeenCalledWith('lightDataPath./ckb_light.toml', {
-        store: `path = "lightDataPath./store"`,
-        network: `path = "lightDataPath./network"`,
-        rpc: `listen_address = "127.0.0.1:9001"`,
+        store: {
+          path: `"lightDataPath./store"`,
+        },
+        network: {
+          listen_addresses: '["/ip4/0.0.0.0/tcp/8119"]',
+          path: `"lightDataPath./network"`,
+        },
+        rpc: {
+          listen_address: `"127.0.0.1:9001"`,
+        },
       })
       //reset port
       getUsablePortMock.mockResolvedValueOnce(9000)
       await CKBLightRunner.getInstance().updateConfig()
     })
     it('port is not used', async () => {
-      getUsablePortMock.mockResolvedValueOnce(9000)
+      getUsablePortMock.mockResolvedValueOnce(9000).mockResolvedValueOnce(8118)
       lightDataPathMock.mockReturnValue('lightDataPath')
       resolveMock.mockImplementation((...v: string[]) => v.join(''))
       joinMock.mockImplementation((...v: string[]) => v.join(''))
       await CKBLightRunner.getInstance().updateConfig()
       expect(CKBLightRunner.getInstance().port).toEqual(9000)
       expect(updateTomlMock).toHaveBeenCalledWith('lightDataPath./ckb_light.toml', {
-        store: `path = "lightDataPath./store"`,
-        network: `path = "lightDataPath./network"`,
-        rpc: `listen_address = "127.0.0.1:9000"`,
+        store: {
+          path: `"lightDataPath./store"`,
+        },
+        network: {
+          listen_addresses: '["/ip4/0.0.0.0/tcp/8118"]',
+          path: `"lightDataPath./network"`,
+        },
+        rpc: {
+          listen_address: `"127.0.0.1:9000"`,
+        },
       })
     })
   })
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index 4f0e72fe7e..444c916b22 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -9,6 +9,7 @@ import SystemScriptInfo from '../../src/models/system-script-info'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 import { NetworkType } from '../../src/models/network'
+import { scheduler } from 'timers/promises'
 
 const [alice, bob, charlie] = keyInfos
 
@@ -30,6 +31,7 @@ jest.mock('../../src/services/networks', () => ({
     getCurrent: () => ({
       type: NetworkType.Normal,
     }),
+    isMainnet: jest.fn(),
   }),
 }))
 
@@ -45,6 +47,7 @@ describe('multisig service', () => {
   )
   const defaultMultisigConfig = MultisigConfig.fromModel(multisigConfigModel)
   defaultMultisigConfig.lastestBlockNumber = '0x0'
+  defaultMultisigConfig.startBlockNumber = 0
   const lock = {
     args: Multisig.hash(
       multisigConfigModel.blake160s,
@@ -97,6 +100,7 @@ describe('multisig service', () => {
     it('save success', async () => {
       const anotherConfig = MultisigConfig.fromModel(multisigConfigModel)
       anotherConfig.lastestBlockNumber = '0x0'
+      anotherConfig.startBlockNumber = 0
       anotherConfig.r = 2
       const res = await multisigService.saveMultisigConfig(anotherConfig)
       const count = await getConnection()
@@ -133,6 +137,26 @@ describe('multisig service', () => {
         .getOne()
       expect(config?.alias).toBe('newalisa')
     })
+    it('only update startBlockNumber and original data should not be change', async () => {
+      await multisigService.updateMultisigConfig({
+        id: multisigConfigModel.id!,
+        startBlockNumber: 256,
+      })
+      await scheduler.wait(2_000)
+      const config = await getConnection()
+        .getRepository(MultisigConfig)
+        .createQueryBuilder()
+        .where({
+          id: multisigConfigModel.id,
+        })
+        .getOne()
+      expect(config?.alias).toBe('alias')
+      expect(config?.startBlockNumber).toBe(256)
+      expect(config?.walletId).toBe(multisigConfigModel.walletId)
+      expect(config?.blake160s).toStrictEqual(multisigConfigModel.blake160s)
+      expect(config?.r).toBe(multisigConfigModel.r)
+      expect(config?.m).toBe(multisigConfigModel.m)
+    })
   })
 
   describe('test get config', () => {
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index c5217e5f11..c8ba7d414a 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -1,6 +1,6 @@
 import { when } from 'jest-when'
-import { since } from '@ckb-lumos/base'
 import { bytes } from '@ckb-lumos/codec'
+import { since } from '@ckb-lumos/base'
 import OutputEntity from '../../../src/database/chain/entities/output'
 import InputEntity from '../../../src/database/chain/entities/input'
 import TransactionEntity from '../../../src/database/chain/entities/transaction'
@@ -28,7 +28,7 @@ import {
   SudtAcpHaveDataError,
   TargetOutputNotFoundError,
 } from '../../../src/exceptions'
-import LiveCell from '../../../src/models/chain/live-cell'
+import LiveCell, { CellWithOutPoint } from '../../../src/models/chain/live-cell'
 import { keyInfos } from '../../setupAndTeardown/public-key-info.fixture'
 
 const randomHex = (length: number = 64): string => {
@@ -86,7 +86,6 @@ import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-
 import AssetAccount from '../../../src/models/asset-account'
 import MultisigConfigModel from '../../../src/models/multisig-config'
 import MultisigOutput from '../../../src/database/chain/entities/multisig-output'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
 import { closeConnection, getConnection, initConnection } from '../../setupAndTeardown'
 
 describe('TransactionGenerator', () => {
@@ -1097,8 +1096,8 @@ describe('TransactionGenerator', () => {
       tokenID: string | undefined = undefined,
       lockScript: Script = bobAnyoneCanPayLockScript,
       customData: string = '0x'
-    ): LumosCell => {
-      const liveCell: LumosCell = {
+    ): CellWithOutPoint => {
+      const liveCell: CellWithOutPoint = {
         blockHash: randomHex(),
         outPoint: {
           txHash: randomHex(),
@@ -1109,18 +1108,17 @@ describe('TransactionGenerator', () => {
           lock: {
             codeHash: lockScript.codeHash,
             args: lockScript.args,
-            hashType: lockScript.hashType.toString(),
+            hashType: lockScript.hashType,
           },
         },
         data: '0x',
       }
       if (tokenID) {
         const typeScript = assetAccountInfo.generateSudtScript(tokenID)
-        // @ts-ignore
         liveCell.cellOutput.type = {
           codeHash: typeScript.codeHash,
           args: typeScript.args,
-          hashType: typeScript.hashType.toString(),
+          hashType: typeScript.hashType,
         }
       }
       liveCell.data = amount ? BufferUtils.writeBigUInt128LE(BigInt(amount)) : '0x'
diff --git a/packages/neuron-wallet/tests/utils/toml/test.toml b/packages/neuron-wallet/tests/utils/toml/test.toml
index 7a693b7094..e5c6426928 100644
--- a/packages/neuron-wallet/tests/utils/toml/test.toml
+++ b/packages/neuron-wallet/tests/utils/toml/test.toml
@@ -17,6 +17,7 @@ log_to_stdout = true
 
 [network]
 network = 127
+listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]
 ### Specify the public and routable network addresses
 # public_addresses = []
 
diff --git a/packages/neuron-wallet/tests/utils/toml/toml.test.ts b/packages/neuron-wallet/tests/utils/toml/toml.test.ts
index 37ea295d0c..1184bcb430 100644
--- a/packages/neuron-wallet/tests/utils/toml/toml.test.ts
+++ b/packages/neuron-wallet/tests/utils/toml/toml.test.ts
@@ -27,41 +27,50 @@ describe('test toml', () => {
     resetMock()
   })
   describe('test update toml', () => {
-    it('update skip comment', () => {
+    it('update skip non exist key', () => {
       const tomlPath = path.resolve(__dirname, './test.toml')
       updateToml(tomlPath, {
-        network: 'network = 127',
+        network: {
+          network1: '127',
+        },
       })
-      expect(writeFileSyncMock).toBeCalledWith(
-        tomlPath,
-        fs.readFileSync(tomlPath).toString().replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
-      )
+      expect(writeFileSyncMock).toBeCalledWith(tomlPath, fs.readFileSync(tomlPath).toString())
     })
     it('update multi values with new file and dir exist', () => {
       const tomlPath = path.resolve(__dirname, './test.toml')
       existsSyncMock.mockReturnValue(true)
-      updateToml(tomlPath, { network: 'network = 127', rpc: 'rpc = 8116' }, path.resolve(__dirname, './new.toml'))
+      updateToml(
+        tomlPath,
+        { network: { network: '126', listen_addresses: 'test' }, rpc: { listen_address: 'listen_address' } },
+        path.resolve(__dirname, './new.toml')
+      )
       expect(writeFileSyncMock).toBeCalledWith(
         path.resolve(__dirname, './new.toml'),
         fs
           .readFileSync(tomlPath)
           .toString()
-          .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
-          .replace('listen_address = "127.0.0.1:8114"', 'rpc = 8116')
+          .replace('network = 127', 'network = 126')
+          .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'listen_addresses = test')
+          .replace('listen_address = "127.0.0.1:8114"', 'listen_address = listen_address')
       )
     })
     it('update multi values with new file and dir not exist', () => {
       const tomlPath = path.resolve(__dirname, './test.toml')
       existsSyncMock.mockReturnValue(false)
-      updateToml(tomlPath, { network: 'network = 127', rpc: 'rpc = 8116' }, path.resolve(__dirname, './new.toml'))
+      updateToml(
+        tomlPath,
+        { network: { network: '126', listen_addresses: 'test' }, rpc: { listen_address: 'listen_address' } },
+        path.resolve(__dirname, './new.toml')
+      )
       expect(mkdirSyncMock).toBeCalledWith(__dirname, { recursive: true })
       expect(writeFileSyncMock).toBeCalledWith(
         path.resolve(__dirname, './new.toml'),
         fs
           .readFileSync(tomlPath)
           .toString()
-          .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'network = 127')
-          .replace('listen_address = "127.0.0.1:8114"', 'rpc = 8116')
+          .replace('network = 127', 'network = 126')
+          .replace('listen_addresses = ["/ip4/0.0.0.0/tcp/8115"]', 'listen_addresses = test')
+          .replace('listen_address = "127.0.0.1:8114"', 'listen_address = listen_address')
       )
     })
   })