diff --git a/packages/neuron-ui/src/components/AddressBook/addressBook.module.scss b/packages/neuron-ui/src/components/AddressBook/addressBook.module.scss
index c6f6a9d5d6..118ab0d4b2 100644
--- a/packages/neuron-ui/src/components/AddressBook/addressBook.module.scss
+++ b/packages/neuron-ui/src/components/AddressBook/addressBook.module.scss
@@ -132,6 +132,7 @@
     height: 56px;
     line-height: 56px;
     min-width: 100px;
+    max-width: 200px;
     .descTips {
       @media screen and (max-width: 1400px) {
         transform: translateX(-70%) !important;
@@ -165,47 +166,6 @@
       transform: translateX(-40%) !important;
     }
   }
-
-  .descTipRoot {
-    position: relative;
-    width: 208px;
-    .autoHeight {
-      width: 100%;
-      height: 100%;
-      position: absolute;
-
-      & > svg {
-        position: absolute;
-        right: 0;
-        bottom: 8px;
-      }
-    }
-    .descInput {
-      border: none;
-      word-break: break-word;
-      resize: none;
-      width: 100%;
-      height: 100%;
-      line-height: 24px;
-      background-color: transparent;
-      color: var(--main-text-color);
-      caret-color: #000000;
-      pointer-events: none;
-
-      @media (prefers-color-scheme: dark) {
-        caret-color: #fff;
-      }
-    }
-    & > .hidden {
-      word-break: break-word;
-      white-space: break-spaces;
-      visibility: hidden;
-      min-width: 100px;
-      min-height: 24px;
-      padding: 2px;
-      line-height: 24px;
-    }
-  }
 }
 
 @media screen and (max-width: 1330px) {
diff --git a/packages/neuron-ui/src/components/AddressBook/index.tsx b/packages/neuron-ui/src/components/AddressBook/index.tsx
index 02a9c597ba..5bcd15bd13 100644
--- a/packages/neuron-ui/src/components/AddressBook/index.tsx
+++ b/packages/neuron-ui/src/components/AddressBook/index.tsx
@@ -3,11 +3,12 @@ import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState, useDispatch } from 'states'
 import Dialog from 'widgets/Dialog'
 import CopyZone from 'widgets/CopyZone'
-import { Copy, Edit } from 'widgets/Icons/icon'
+import { Copy } from 'widgets/Icons/icon'
 import Table, { TableProps, SortType } from 'widgets/Table'
 import { shannonToCKBFormatter, useLocalDescription } from 'utils'
 import { HIDE_BALANCE } from 'utils/const'
 import Tooltip from 'widgets/Tooltip'
+import ShowOrEditDesc from 'widgets/ShowOrEditDesc'
 import styles from './addressBook.module.scss'
 
 enum TabIdx {
@@ -42,8 +43,7 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
   }, [tabIdx, addresses])
 
   const dispatch = useDispatch()
-  const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionFieldBlur, onDescriptionSelected } =
-    useLocalDescription('address', walletId, dispatch, 'textarea')
+  const { onChangeEditStatus, onSubmitDescription } = useLocalDescription('address', walletId, dispatch)
 
   const columns = useMemo<TableProps<State.Address>['columns']>(
     () => [
@@ -87,32 +87,15 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
         dataIndex: 'description',
         align: 'center',
         render(description: string, _idx, item) {
-          const isSelected = localDescription.key === item.address
           return (
             <Tooltip
               tip={
-                <div className={styles.descTipRoot}>
-                  <div className={styles.autoHeight}>
-                    <textarea
-                      className={styles.descInput}
-                      data-is-selected={isSelected}
-                      data-description-key={item.address}
-                      value={isSelected ? localDescription.description : description}
-                      onChange={onDescriptionChange}
-                      onKeyDown={onDescriptionPress}
-                      onBlur={onDescriptionFieldBlur}
-                    />
-                    <Edit
-                      data-description-key={item.address}
-                      data-description-value={item.description}
-                      onClick={onDescriptionSelected}
-                    />
-                  </div>
-                  <div className={styles.hidden}>
-                    {isSelected ? localDescription.description : description}
-                    <Edit />
-                  </div>
-                </div>
+                <ShowOrEditDesc
+                  description={description}
+                  descKey={item.address}
+                  onSubmitDescription={onSubmitDescription}
+                  onChangeEditStatus={onChangeEditStatus}
+                />
               }
               showTriangle
               isTriggerNextToChild
@@ -167,7 +150,7 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
         },
       },
     ],
-    [t, localDescription]
+    [t]
   )
 
   return (
diff --git a/packages/neuron-ui/src/components/CellManage/cellManage.module.scss b/packages/neuron-ui/src/components/CellManage/cellManage.module.scss
new file mode 100644
index 0000000000..a25b7b670b
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManage/cellManage.module.scss
@@ -0,0 +1,234 @@
+@use 'sass:color';
+@import '../../styles/mixin.scss';
+
+.head {
+  display: flex;
+
+  .balance {
+    font-size: 14px;
+    margin-left: 14px;
+    display: flex;
+    align-items: center;
+
+    &::before {
+      content: '';
+      width: 1px;
+      height: 12px;
+      background-color: var(--border-color);
+    }
+
+    & > svg {
+      margin: 0 8px;
+      cursor: pointer;
+      path {
+        fill: currentColor;
+      }
+    }
+  }
+}
+
+.tableHead {
+  padding: 18px 0 16px 16px;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.container {
+  margin: 20px 0;
+}
+
+.lockedWithTip {
+  display: flex;
+  align-items: center;
+
+  .lockedTip {
+    margin-left: 4px;
+    g,
+    path {
+      fill: var(--main-text-color);
+    }
+  }
+}
+
+.actions {
+  & > svg {
+    &[data-disabled='true'] {
+      cursor: not-allowed;
+      opacity: 50%;
+    }
+    margin-right: 16px;
+  }
+}
+
+.cellDetailDialog {
+  width: 680px;
+
+  .section {
+    margin-bottom: 20px;
+
+    .txHash {
+      padding: 10px 0 10px 16px;
+      border-radius: 8px;
+      display: flex;
+      background-color: var(--input-disabled-color);
+      p {
+        font-family: 'JetBrains Mono';
+        font-size: 14px;
+        font-weight: 400;
+        color: var(--main-text-color);
+      }
+      .cellActions {
+        width: 80px;
+        display: flex;
+        align-items: center;
+        justify-content: space-evenly;
+        flex-shrink: 0;
+
+        & > svg {
+          cursor: pointer;
+          width: 16px;
+          height: 16px;
+        }
+      }
+    }
+
+    .title {
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+      color: var(--secondary-text-color);
+      margin: 0 0 8px 0;
+    }
+
+    & > pre {
+      border: 1px solid var(--lock-info-title-border);
+      border-radius: 12px;
+      padding: 16px;
+      font-family: 'JetBrains Mono';
+      line-height: 18px;
+      overflow-y: auto;
+      margin: 0;
+      color: var(--main-text-color);
+    }
+
+    .capacity {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .capacityDetail {
+        font-weight: 400;
+        color: var(--main-text-color);
+      }
+    }
+
+    .slider {
+      width: 648px;
+      height: 8px;
+      border-radius: 8px;
+      background-color: var(--process-background-color);
+      position: relative;
+
+      & > div {
+        position: absolute;
+        left: 0;
+        top: 0;
+        height: 100%;
+        border-radius: 8px;
+        background-color: var(--primary-color);
+      }
+    }
+  }
+
+  .notice {
+    @include dialog-copy-animation;
+  }
+}
+
+.description {
+  height: 56px;
+  line-height: 56px;
+  min-width: 100px;
+
+  .descText {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    cursor: pointer;
+  }
+}
+
+.table {
+  position: relative;
+  @include checkbox;
+
+  .multiActions {
+    position: absolute;
+    bottom: 24px;
+    left: 50%;
+    transform: translateX(-50%);
+    padding: 12px 40px 12px 40px;
+    border-radius: 40px;
+    background-color: var(--secondary-background-color);
+    box-shadow: 0px 8px 16px 4px var(--divide-line-color);
+    display: flex;
+    justify-content: space-evenly;
+    column-gap: 56px;
+
+    & > button {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      border: none;
+      background-color: transparent;
+      color: var(--secondary-text-color);
+      column-gap: 2px;
+      cursor: pointer;
+
+      & > svg {
+        width: 20px;
+        height: 20px;
+      }
+    }
+  }
+}
+
+.consumeNotice {
+  color: var(--main-text-color);
+  padding: 0 24px;
+  font-size: 14px;
+  font-weight: 400;
+}
+
+.lockCell {
+  width: 648px;
+  text-align: center;
+
+  .cellsCapacity {
+    text-align: center;
+    color: var(--main-text-color);
+    font-size: 16px;
+    font-weight: 500;
+    margin: 0;
+  }
+
+  .passwordInput {
+    margin-top: 12px;
+  }
+
+  .canNotUse {
+    display: inline-flex;
+    align-items: center;
+    background: color-mix(in srgb, #fc8800 5%, var(--warn-background-color));
+    border: 1px solid #fc880033;
+    border-radius: 4px;
+    color: var(--warn-text-color);
+    font-size: 12px;
+    text-align: center;
+    padding: 8px 36px;
+
+    & > svg {
+      margin-right: 4px;
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/components/CellManage/hooks.ts b/packages/neuron-ui/src/components/CellManage/hooks.ts
new file mode 100644
index 0000000000..3cd5a610b3
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManage/hooks.ts
@@ -0,0 +1,389 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+import {
+  openExternal,
+  getLiveCells,
+  updateLiveCellsLocalInfo,
+  updateLiveCellsLockStatus as updateLiveCellsLockStatusAPI,
+} from 'services/remote'
+import { AppActions, useDispatch } from 'states'
+import {
+  LockScriptType,
+  RoutePath,
+  TypeScriptType,
+  calculateUsedCapacity,
+  getExplorerUrl,
+  isSuccessResponse,
+  outPointToStr,
+} from 'utils'
+import { SortType } from 'widgets/Table'
+
+const cellTypeOrder: Record<string, number> = {
+  [TypeScriptType.SUDT]: 1,
+  [TypeScriptType.NFT]: 2,
+  [TypeScriptType.Unknown]: 3,
+}
+
+const getLockStatusAndReason = (item: State.LiveCellWithLocalInfo) => {
+  if (item.locked) {
+    return {
+      locked: true,
+    }
+  }
+  let lockedReason = ''
+  if (item.typeScriptType) {
+    switch (item.typeScriptType) {
+      case TypeScriptType.NFT:
+      case TypeScriptType.NFTClass:
+      case TypeScriptType.NFTIssuer:
+      case TypeScriptType.Unknown:
+        lockedReason = 'cell-manage.locked-reason.operate-in-special-assets'
+        break
+      case TypeScriptType.SUDT:
+        lockedReason = 'cell-manage.locked-reason.operate-in-assets-account'
+        break
+      case TypeScriptType.DAO:
+        lockedReason = 'cell-manage.locked-reason.operate-in-dao'
+        break
+      default:
+        break
+    }
+  } else {
+    switch (item.lockScriptType) {
+      case LockScriptType.Cheque:
+      case LockScriptType.ANYONE_CAN_PAY:
+      case LockScriptType.MULTI_LOCK_TIME:
+        lockedReason = 'cell-manage.locked-reason.operate-in-special-assets'
+        break
+      case LockScriptType.MULTISIG:
+        lockedReason = 'cell-manage.locked-reason.operate-in-multisig'
+        break
+      default:
+        break
+    }
+  }
+  return {
+    locked: !!lockedReason,
+    lockedReason,
+  }
+}
+
+const getCellType = (item: State.LiveCellWithLocalInfo) => {
+  if (item.typeScriptType) {
+    switch (item.typeScriptType) {
+      case TypeScriptType.NFT:
+      case TypeScriptType.SUDT:
+      case TypeScriptType.Unknown:
+        return item.typeScriptType
+      default:
+        break
+    }
+  }
+  return item.lockScriptType === LockScriptType.Unknown ? LockScriptType.Unknown : 'CKB'
+}
+
+const sortFunctions: Record<
+  string,
+  (a: State.LiveCellWithLocalInfo, b: State.LiveCellWithLocalInfo, type: SortType) => number
+> = {
+  timestamp: (a, b, orderDirection) =>
+    orderDirection === SortType.Increase ? +a.timestamp - +b.timestamp : +b.timestamp - +a.timestamp,
+  capacity: (a, b, orderDirection) =>
+    orderDirection === SortType.Increase ? +a.capacity - +b.capacity : +b.capacity - +a.capacity,
+  locked: (a, b, orderDirection) => {
+    const aLockedNum = a.locked ? 1 : 0
+    const bLockedNum = b.locked ? 1 : 0
+    return orderDirection === SortType.Increase ? aLockedNum - bLockedNum : bLockedNum - aLockedNum
+  },
+  cellType: (a, b, orderDirection) => {
+    const aOrderNumer = a.typeScriptType ? cellTypeOrder[a.typeScriptType] ?? 0 : 0
+    const bOrderNumer = b.typeScriptType ? cellTypeOrder[b.typeScriptType] ?? 0 : 0
+    return orderDirection === SortType.Increase ? aOrderNumer - bOrderNumer : bOrderNumer - aOrderNumer
+  },
+}
+
+type KeyOfLiveCellWithLocalInfo = keyof State.LiveCellWithLocalInfo
+
+export const useLiveCells = () => {
+  const [sortInfo, setSortInfo] = useState<{ key: KeyOfLiveCellWithLocalInfo; type: SortType } | undefined>()
+  const onSorted = useCallback((key?: KeyOfLiveCellWithLocalInfo, type?: SortType) => {
+    if (key && type) {
+      setSortInfo({ key, type })
+    } else {
+      setSortInfo(undefined)
+    }
+  }, [])
+  const [liveCells, setLiveCells] = useState<State.LiveCellWithLocalInfo[]>([])
+  const sortedLiveCells = useMemo(() => {
+    if (sortInfo && sortFunctions[sortInfo.key]) {
+      const sorted = [...liveCells]
+      return sorted.sort((a, b) => sortFunctions[sortInfo.key](a, b, sortInfo.type))
+    }
+    return liveCells
+  }, [sortInfo, liveCells])
+  useEffect(() => {
+    getLiveCells().then(res => {
+      if (isSuccessResponse(res) && res.result) {
+        setLiveCells(res.result.map(v => ({ ...v, ...getLockStatusAndReason(v), cellType: getCellType(v) })))
+      }
+    })
+  }, [])
+
+  const updateLiveCell = useCallback((params: State.UpdateLiveCellLocalInfo) => {
+    updateLiveCellsLocalInfo(params).then(res => {
+      if (isSuccessResponse(res)) {
+        setLiveCells(cells =>
+          cells.map(v => {
+            if (v.outPoint.txHash === params.outPoint.txHash && v.outPoint.index === params.outPoint.index) {
+              return {
+                ...v,
+                description: params.description ?? v.description,
+                locked: params.locked ?? v.locked,
+              }
+            }
+            return v
+          })
+        )
+      }
+    })
+  }, [])
+
+  const updateLiveCellsLockStatus = useCallback((params: State.UpdateLiveCellsLockStatus) => {
+    return updateLiveCellsLockStatusAPI(params).then(res => {
+      if (isSuccessResponse(res)) {
+        const outPointSet = new Set(params.outPoints.map(outPointToStr))
+        setLiveCells(cells =>
+          cells.map(v => {
+            if (outPointSet.has(outPointToStr(v.outPoint))) {
+              return {
+                ...v,
+                locked: params.locked,
+              }
+            }
+            return v
+          })
+        )
+      } else {
+        throw new Error(typeof res.message === 'string' ? res.message : res.message.content)
+      }
+    })
+  }, [])
+
+  return {
+    liveCells: sortedLiveCells,
+    updateLiveCell,
+    onSorted,
+    updateLiveCellsLockStatus,
+  }
+}
+
+export enum Actions {
+  View = 'view',
+  Lock = 'lock',
+  Unlock = 'unlock',
+  Consume = 'consume',
+}
+
+export const useAction = ({
+  liveCells,
+  currentPageLiveCells,
+  updateLiveCellsLockStatus,
+  selectedOutPoints,
+  resetPassword,
+  setError,
+  password,
+}: {
+  liveCells: State.LiveCellWithLocalInfo[]
+  currentPageLiveCells: State.LiveCellWithLocalInfo[]
+  updateLiveCellsLockStatus: (params: State.UpdateLiveCellsLockStatus) => Promise<void>
+  selectedOutPoints: Set<string>
+  resetPassword: () => void
+  setError: (error: string) => void
+  password: string
+}) => {
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const [action, setAction] = useState<undefined | Actions>()
+  const [operateCells, setOperateCells] = useState<State.LiveCellWithLocalInfo[]>([])
+  const [loading, setLoading] = useState(false)
+  const onClickTableRow = useCallback((_, item: State.LiveCellWithLocalInfo) => {
+    setAction(Actions.View)
+    setOperateCells([item])
+  }, [])
+  const onOpenActionDialog = useCallback(
+    (e: React.SyntheticEvent<SVGSVGElement, MouseEvent>) => {
+      e.stopPropagation()
+      const { action: curAction, index } = e.currentTarget.dataset as { action: Actions; index: string }
+      if (!curAction || index === undefined || !currentPageLiveCells[+index]) return
+      const operateCell = currentPageLiveCells[+index]
+      setOperateCells([operateCell])
+      setAction(curAction)
+      resetPassword()
+    },
+    [currentPageLiveCells, setOperateCells, dispatch, navigate]
+  )
+  const onMultiAction = useCallback(
+    (e: React.SyntheticEvent<HTMLButtonElement, MouseEvent>) => {
+      e.stopPropagation()
+      const { action: curAction } = e.currentTarget.dataset as { action: Actions }
+      if (!curAction || !selectedOutPoints.size) return
+      setOperateCells(liveCells.filter(v => selectedOutPoints.has(outPointToStr(v.outPoint))))
+      setAction(curAction)
+      resetPassword()
+    },
+    [liveCells, selectedOutPoints, setOperateCells, dispatch, navigate]
+  )
+  const onActionConfirm = useCallback(() => {
+    switch (action) {
+      case 'lock':
+      case 'unlock':
+        setLoading(true)
+        updateLiveCellsLockStatus({
+          outPoints: operateCells.map(v => v.outPoint),
+          lockScripts: operateCells.map(v => v.lock),
+          locked: action === 'lock',
+          password,
+        })
+          .then(() => {
+            setOperateCells([])
+            setAction(undefined)
+          })
+          .catch((err: Error) => {
+            setError(err.message)
+          })
+          .finally(() => {
+            setLoading(false)
+          })
+        break
+      case 'consume':
+        dispatch({
+          type: AppActions.UpdateConsumeOutPoints,
+          payload: operateCells.map(v => v.outPoint),
+        })
+        navigate(RoutePath.Send)
+        break
+      default:
+        break
+    }
+  }, [action, operateCells, dispatch, navigate, password])
+  const onActionCancel = useCallback(() => {
+    setAction(undefined)
+    setOperateCells([])
+  }, [])
+  return {
+    action,
+    loading,
+    operateCells,
+    onOpenActionDialog,
+    onActionConfirm,
+    onClickTableRow,
+    onActionCancel,
+    onMultiAction,
+  }
+}
+
+export const useSelect = (liveCells: State.LiveCellWithLocalInfo[]) => {
+  const [selectedOutPoints, setSelectOutPoints] = useState(new Set<string>())
+  const allCanSelectOutPoints = useMemo(
+    () => new Set(liveCells.filter(v => !v.lockedReason).map(v => outPointToStr(v.outPoint))),
+    [liveCells]
+  )
+  const onSelectAll = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      if (e.target.checked) {
+        setSelectOutPoints(allCanSelectOutPoints)
+      } else {
+        setSelectOutPoints(new Set())
+      }
+    },
+    [allCanSelectOutPoints]
+  )
+  const onSelect = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    e.stopPropagation()
+    const { txHash, index } = e.target.dataset
+    if (txHash && index) {
+      if (e.target.checked) {
+        setSelectOutPoints(v => new Set([...v, outPointToStr({ txHash, index })]))
+      } else {
+        setSelectOutPoints(v => {
+          const newSelects = new Set([...v])
+          newSelects.delete(outPointToStr({ txHash, index }))
+          return newSelects
+        })
+      }
+    }
+  }, [])
+  return {
+    selectedOutPoints,
+    onSelect,
+    onSelectAll,
+    isAllSelected: selectedOutPoints.size === allCanSelectOutPoints.size && !!allCanSelectOutPoints.size,
+  }
+}
+
+export const useViewCell = ({ isMainnet, viewCell }: { isMainnet: boolean; viewCell: State.LiveCellWithLocalInfo }) => {
+  const onViewDetail = useCallback(
+    (e: React.SyntheticEvent<SVGSVGElement, MouseEvent>) => {
+      const {
+        dataset: { txHash },
+      } = e.currentTarget
+      if (!txHash) {
+        return
+      }
+      const explorerUrl = getExplorerUrl(isMainnet)
+      openExternal(`${explorerUrl}/transaction/${txHash}`)
+    },
+    [isMainnet]
+  )
+  const rawLock = `{
+  "code_hash": "${viewCell?.lock.codeHash}"
+  "hash_type": "${viewCell?.lock.hashType}"
+  "args": "${viewCell?.lock.args}"
+}`
+  const rawType = viewCell?.type
+    ? `{
+  "code_hash": "${viewCell.type.codeHash}"
+  "hash_type": "${viewCell.type.hashType}"
+  "args": "${viewCell.type.args}"
+}`
+    : `{
+  "null"
+}`
+  const rawData = `{
+  "data": "${viewCell?.data ?? '0x'}"
+}`
+  const usedCapacity = useMemo(() => {
+    if (!viewCell) {
+      return 0
+    }
+    return calculateUsedCapacity(viewCell)
+  }, [viewCell])
+  return {
+    onViewDetail,
+    rawData,
+    rawLock,
+    rawType,
+    usedCapacity,
+  }
+}
+
+export const usePassword = () => {
+  const [password, setPassword] = useState('')
+  const [error, setError] = useState('')
+  const onPasswordChange = useCallback((e: React.SyntheticEvent<HTMLInputElement>) => {
+    const { value } = e.target as HTMLInputElement
+    setPassword(value)
+    setError('')
+  }, [])
+  const resetPassword = useCallback(() => {
+    setPassword('')
+    setError('')
+  }, [])
+  return {
+    password,
+    error,
+    setError,
+    onPasswordChange,
+    resetPassword,
+  }
+}
diff --git a/packages/neuron-ui/src/components/CellManage/index.tsx b/packages/neuron-ui/src/components/CellManage/index.tsx
new file mode 100644
index 0000000000..59508587ee
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManage/index.tsx
@@ -0,0 +1,388 @@
+import React, { useCallback, useMemo, useState } from 'react'
+import { Attention, Consume, Copy, DetailIcon, EyesClose, EyesOpen, LockCell, NewTab, UnLock } from 'widgets/Icons/icon'
+import PageContainer from 'components/PageContainer'
+import { useTranslation } from 'react-i18next'
+import Breadcrum from 'widgets/Breadcrum'
+import Table, { TableProps } from 'widgets/Table'
+import Pagination from 'widgets/Pagination'
+import { useState as useGlobalState } from 'states'
+import {
+  shannonToCKBFormatter,
+  uniformTimeFormatter,
+  usePagination,
+  isMainnet as isMainnetUtil,
+  useCopy,
+  clsx,
+  outPointToStr,
+} from 'utils'
+import { HIDE_BALANCE } from 'utils/const'
+import Tooltip from 'widgets/Tooltip'
+import Dialog from 'widgets/Dialog'
+import Alert from 'widgets/Alert'
+import ShowOrEditDesc from 'widgets/ShowOrEditDesc'
+import { TFunction } from 'i18next'
+import TextField from 'widgets/TextField'
+import { Actions, useAction, useLiveCells, usePassword, useSelect, useViewCell } from './hooks'
+import styles from './cellManage.module.scss'
+
+const getColumns = ({
+  updateLiveCell,
+  t,
+  onAction,
+  isAllSelected,
+  selectedOutPoints,
+  onSelectAll,
+  onSelect,
+}: {
+  updateLiveCell: (params: State.UpdateLiveCellLocalInfo) => void
+  t: TFunction
+  onAction: (e: React.SyntheticEvent<SVGSVGElement, MouseEvent>) => void
+  isAllSelected: boolean
+  selectedOutPoints: Set<string>
+  onSelectAll: (e: React.ChangeEvent<HTMLInputElement>) => void
+  onSelect: (e: React.ChangeEvent<HTMLInputElement>) => void
+}): TableProps<State.LiveCellWithLocalInfo>['columns'] => {
+  return [
+    {
+      dataIndex: 'select',
+      width: '40px',
+      title: (
+        <label htmlFor="cell-manage-select-all">
+          <input
+            type="checkbox"
+            id="cell-manage-select-all"
+            onChange={onSelectAll}
+            checked={isAllSelected}
+            data-some-checked={!!selectedOutPoints.size && !isAllSelected}
+          />
+          <span />
+        </label>
+      ),
+      render(_, __, item) {
+        return (
+          <label htmlFor={outPointToStr(item.outPoint)} onClick={e => e.stopPropagation()} role="presentation">
+            <input
+              id={outPointToStr(item.outPoint)}
+              data-tx-hash={item.outPoint.txHash}
+              data-index={item.outPoint.index}
+              type="checkbox"
+              onChange={onSelect}
+              checked={selectedOutPoints.has(outPointToStr(item.outPoint))}
+              disabled={!!item.lockedReason}
+            />
+            <span />
+          </label>
+        )
+      },
+    },
+    {
+      dataIndex: 'timestamp',
+      title: t('cell-manage.table.head.date'),
+      render(v: string) {
+        if (+v) {
+          const time = uniformTimeFormatter(v)
+          return time.split(' ')[0]
+        }
+        return 'none'
+      },
+      sortable: true,
+    },
+    {
+      dataIndex: 'cellType',
+      title: t('cell-manage.table.head.type'),
+      sortable: true,
+    },
+    {
+      dataIndex: 'capacity',
+      title: t('cell-manage.table.head.balance'),
+      width: '200px',
+      isBalance: true,
+      render(capacity: string, _: number, __: State.LiveCellWithLocalInfo, show: boolean) {
+        return <div>{show ? shannonToCKBFormatter(capacity || '0') : HIDE_BALANCE} CKB</div>
+      },
+      sortable: true,
+    },
+    {
+      dataIndex: 'locked',
+      title: t('cell-manage.table.head.status'),
+      render(_, __, item: State.LiveCellWithLocalInfo) {
+        const { locked, lockedReason } = item
+        if (locked) {
+          return (
+            <div className={styles.lockedWithTip}>
+              {t('cell-manage.table.locked')}
+              {lockedReason ? (
+                <Tooltip tip={t(lockedReason)} className={styles.lockedTip} placement="top" showTriangle>
+                  <Attention />
+                </Tooltip>
+              ) : null}
+            </div>
+          )
+        }
+        return t('cell-manage.table.unlocked')
+      },
+      sortable: true,
+    },
+    {
+      dataIndex: 'description',
+      title: t('cell-manage.table.head.description'),
+      align: 'center',
+      render(description: string, __, item) {
+        return (
+          <Tooltip
+            tip={
+              <ShowOrEditDesc
+                description={description}
+                descKey={`${item.outPoint.txHash}_${item.outPoint.index}`}
+                onSubmitDescription={({ description: newDesc }) => {
+                  updateLiveCell({ outPoint: item.outPoint, description: newDesc })
+                }}
+              />
+            }
+            showTriangle
+            isTriggerNextToChild
+            className={styles.description}
+            tipClassName={styles.descTips}
+          >
+            <div className={styles.descText}>{description || t('cell-manage.table.default-description')}</div>
+          </Tooltip>
+        )
+      },
+    },
+    {
+      dataIndex: 'action',
+      title: t('cell-manage.table.head.action'),
+      render(_, index, item) {
+        const { locked, lockedReason } = item
+        return (
+          <div className={styles.actions}>
+            <DetailIcon onClick={onAction} data-action={Actions.View} data-index={index} />
+            {locked ? (
+              <UnLock
+                data-disabled={!!lockedReason}
+                onClick={onAction}
+                data-action={Actions.Unlock}
+                data-index={index}
+              />
+            ) : (
+              <LockCell
+                data-disabled={!!lockedReason}
+                onClick={onAction}
+                data-action={Actions.Lock}
+                data-index={index}
+              />
+            )}
+            <Consume
+              data-disabled={!!lockedReason}
+              onClick={onAction}
+              data-action={Actions.Consume}
+              data-index={index}
+            />
+          </div>
+        )
+      },
+    },
+  ]
+}
+
+const CellManage = () => {
+  const {
+    wallet: { balance = '' },
+    chain: { networkID },
+    settings: { networks },
+  } = useGlobalState()
+  const isMainnet = isMainnetUtil(networks, networkID)
+  const [t] = useTranslation()
+  const breadPages = useMemo(() => [{ label: t('cell-manage.title') }], [t])
+  const [showBalance, setShowBalance] = useState(true)
+  const onChangeShowBalance = useCallback(() => setShowBalance(v => !v), [])
+  const { liveCells, updateLiveCell, onSorted, updateLiveCellsLockStatus } = useLiveCells()
+  const { pageNo, pageSize, onPageChange } = usePagination()
+  const currentPageLiveCells = useMemo(() => {
+    return liveCells.slice(pageSize * (pageNo - 1), pageSize * pageNo)
+  }, [pageNo, pageSize, liveCells])
+  const { onSelect, onSelectAll, isAllSelected, selectedOutPoints } = useSelect(liveCells)
+  const { password, error, onPasswordChange, setError, resetPassword } = usePassword()
+  const {
+    action,
+    operateCells,
+    onClickTableRow,
+    onActionCancel,
+    onActionConfirm,
+    onOpenActionDialog,
+    onMultiAction,
+    loading,
+  } = useAction({
+    liveCells,
+    currentPageLiveCells,
+    updateLiveCellsLockStatus,
+    selectedOutPoints,
+    setError,
+    resetPassword,
+    password,
+  })
+  const columns = useMemo(
+    () =>
+      getColumns({
+        updateLiveCell,
+        t,
+        onAction: onOpenActionDialog,
+        onSelect,
+        onSelectAll,
+        isAllSelected,
+        selectedOutPoints,
+      }),
+    [updateLiveCell, t, onOpenActionDialog, onSelect, onSelectAll, isAllSelected, selectedOutPoints]
+  )
+  const { copied, onCopy, copyTimes } = useCopy()
+  const { onViewDetail, rawData, rawLock, rawType, usedCapacity } = useViewCell({
+    viewCell: operateCells[0],
+    isMainnet,
+  })
+  const totalCapacity = useMemo(
+    () => shannonToCKBFormatter(operateCells.reduce((pre, cur) => pre + BigInt(cur.capacity), BigInt(0)).toString()),
+    [operateCells]
+  )
+  return (
+    <PageContainer
+      head={
+        <div className={styles.head}>
+          <Breadcrum pages={breadPages} showBackIcon />
+          <div className={styles.balance}>
+            {showBalance ? <EyesClose onClick={onChangeShowBalance} /> : <EyesOpen onClick={onChangeShowBalance} />}
+            <span>{t('cell-manage.wallet-balance')}</span>
+            &nbsp;&nbsp;
+            {`${showBalance ? shannonToCKBFormatter(balance) : HIDE_BALANCE} CKB`}
+          </div>
+        </div>
+      }
+    >
+      <div className={styles.table}>
+        <Table
+          head={<div className={styles.tableHead}>Live Cells</div>}
+          columns={columns}
+          dataSource={currentPageLiveCells}
+          onRowClick={onClickTableRow}
+          onSorted={onSorted}
+        />
+        {selectedOutPoints.size ? (
+          <div className={styles.multiActions}>
+            <button type="button" onClick={onMultiAction} data-action={Actions.Lock}>
+              <LockCell />
+              {t('cell-manage.lock')}
+            </button>
+            <button type="button" onClick={onMultiAction} data-action={Actions.Unlock}>
+              <UnLock />
+              {t('cell-manage.unlock')}
+            </button>
+            <button type="button" onClick={onMultiAction} data-action={Actions.Consume}>
+              <Consume />
+              {t('cell-manage.consume')}
+            </button>
+          </div>
+        ) : null}
+      </div>
+      <Pagination
+        className={styles.container}
+        count={liveCells.length}
+        pageSize={pageSize}
+        pageNo={pageNo}
+        onChange={onPageChange}
+      />
+      <Dialog
+        show={action === Actions.View}
+        title={t('cell-manage.cell-detail-dialog.title')}
+        onCancel={onActionCancel}
+        showFooter={false}
+        className={styles.cellDetailDialog}
+      >
+        <section className={styles.section}>
+          <h6 className={styles.title}>OutPoint.TxHash</h6>
+          <div className={styles.txHash}>
+            <p>{operateCells[0]?.outPoint.txHash}</p>
+            <div className={styles.cellActions}>
+              <Copy onClick={() => onCopy(operateCells[0]!.outPoint.txHash)} />
+              <NewTab onClick={onViewDetail} data-tx-hash={operateCells[0]?.outPoint.txHash} />
+            </div>
+          </div>
+        </section>
+        <section className={styles.section}>
+          <h6 className={styles.title}>Lock Script</h6>
+          <pre>{rawLock}</pre>
+        </section>
+        <section className={styles.section}>
+          <h6 className={styles.title}>Type Script</h6>
+          <pre>{rawType}</pre>
+        </section>
+        <section className={styles.section}>
+          <h6 className={styles.title}>{t('cell-manage.cell-detail-dialog.data')}</h6>
+          <pre>{rawData}</pre>
+        </section>
+        {copied ? (
+          <Alert status="success" className={styles.notice} key={copyTimes.toString()}>
+            {t('common.copied')}
+          </Alert>
+        ) : null}
+        <section className={styles.section}>
+          <h6 className={clsx(styles.title, styles.capacity)}>
+            {t('cell-manage.cell-detail-dialog.capacity-used')}
+            <div className={styles.capacityDetail}>
+              {t('cell-manage.cell-detail-dialog.total')}
+              &nbsp;{shannonToCKBFormatter(operateCells[0]?.capacity ?? '')} CKB ，
+              {t('cell-manage.cell-detail-dialog.used')}
+              &nbsp;{usedCapacity} CKB
+            </div>
+          </h6>
+          <div className={styles.slider}>
+            <div
+              style={{ width: `${(100 * usedCapacity) / +shannonToCKBFormatter(operateCells[0]?.capacity ?? '')}%` }}
+            />
+          </div>
+        </section>
+      </Dialog>
+      <Dialog
+        show={action === Actions.Lock || action === Actions.Unlock}
+        title={t(`cell-manage.cell-${action}-dialog.title`)}
+        onCancel={onActionCancel}
+        onConfirm={onActionConfirm}
+        className={styles.lockCell}
+        disabled={!password || !!error}
+        isLoading={loading}
+      >
+        <p className={styles.cellsCapacity}>
+          {t(`cell-manage.cell-${action}-dialog.capacity`, { capacity: totalCapacity })}
+        </p>
+        <TextField
+          className={styles.passwordInput}
+          placeholder={t('cell-manage.password-placeholder')}
+          width="100%"
+          label={t('cell-manage.enter-password')}
+          value={password}
+          field="password"
+          type="password"
+          title={t('cell-manage.enter-password')}
+          onChange={onPasswordChange}
+          autoFocus
+          error={error}
+        />
+        {action === Actions.Lock ? (
+          <span className={styles.canNotUse}>
+            <Attention />
+            {t('cell-manage.cell-lock-dialog.locked-cell-can-not-use')}
+          </span>
+        ) : null}
+      </Dialog>
+      <Dialog
+        show={action === Actions.Consume}
+        title={t('cell-manage.cell-consume-dialog.title')}
+        onCancel={onActionCancel}
+        onConfirm={onActionConfirm}
+      >
+        <span className={styles.consumeNotice}>{t('cell-manage.cell-consume-dialog.warn-consume')}</span>
+      </Dialog>
+    </PageContainer>
+  )
+}
+
+CellManage.displayName = 'CellManage'
+export default CellManage
diff --git a/packages/neuron-ui/src/components/History/RowExtend.tsx b/packages/neuron-ui/src/components/History/RowExtend.tsx
index 40e926ec9c..800557d238 100644
--- a/packages/neuron-ui/src/components/History/RowExtend.tsx
+++ b/packages/neuron-ui/src/components/History/RowExtend.tsx
@@ -6,10 +6,9 @@ import { clsx, getExplorerUrl, localNumberFormatter, RoutePath, useLocalDescript
 import { TableProps } from 'widgets/Table'
 import { useNavigate } from 'react-router-dom'
 import { ExplorerIcon, Copy, DetailIcon } from 'widgets/Icons/icon'
-import { ReactComponent as Edit } from 'widgets/Icons/Edit.svg'
-
-import Tooltip from 'widgets/Tooltip'
 import { useTranslation } from 'react-i18next'
+import ShowOrEditDesc from 'widgets/ShowOrEditDesc'
+import Tooltip from 'widgets/Tooltip'
 import styles from './history.module.scss'
 
 type RowExtendProps = {
@@ -25,8 +24,7 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   const navigate = useNavigate()
   const [t] = useTranslation()
 
-  const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionFieldBlur, onDescriptionSelected } =
-    useLocalDescription('transaction', id, dispatch, 'textarea')
+  const { onChangeEditStatus, onSubmitDescription } = useLocalDescription('transaction', id, dispatch)
 
   const onActionBtnClick = useCallback(
     (e: React.SyntheticEvent<HTMLButtonElement>) => {
@@ -53,7 +51,6 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   const { blockNumber, hash, description } = column
   const confirmations = blockNumber ? 1 + bestBlockNumber - +blockNumber : 0
   const confirmationsLabel = confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
-  const isSelected = localDescription.key === column.hash
   const onCopy = useCallback(() => {
     window.navigator.clipboard.writeText(hash)
     showPageNotice('common.copied')(dispatch)
@@ -72,32 +69,15 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
               <div className={styles.infoBlockTitle}>{t('history.description')}</div>
               <Tooltip
                 tip={
-                  <div className={styles.descTipRoot}>
-                    <div className={styles.autoHeight}>
-                      <textarea
-                        className={styles.descInput}
-                        data-is-selected={isSelected}
-                        data-description-key={column.hash}
-                        value={isSelected ? localDescription.description : description}
-                        onChange={onDescriptionChange}
-                        onKeyDown={onDescriptionPress}
-                        onBlur={onDescriptionFieldBlur}
-                      />
-                      <Edit
-                        data-description-key={column.hash}
-                        data-description-value={column.description}
-                        onClick={onDescriptionSelected}
-                      />
-                    </div>
-                    <div className={styles.hidden}>
-                      {isSelected ? localDescription.description : description}
-                      <Edit />
-                    </div>
-                  </div>
+                  <ShowOrEditDesc
+                    onChangeEditStatus={onChangeEditStatus}
+                    onSubmitDescription={onSubmitDescription}
+                    description={description}
+                    descKey={column.hash}
+                  />
                 }
                 showTriangle
                 isTriggerNextToChild
-                className={styles.description}
               >
                 <div className={styles.descText}>{description || t('addresses.default-description')}</div>
               </Tooltip>
diff --git a/packages/neuron-ui/src/components/History/history.module.scss b/packages/neuron-ui/src/components/History/history.module.scss
index f1ee7cad4f..c86a261ce2 100644
--- a/packages/neuron-ui/src/components/History/history.module.scss
+++ b/packages/neuron-ui/src/components/History/history.module.scss
@@ -190,45 +190,6 @@ body {
   }
 }
 
-.descTipRoot {
-  position: relative;
-  .autoHeight {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-
-    & > svg {
-      position: absolute;
-      right: 0;
-      bottom: 8px;
-      cursor: pointer;
-    }
-  }
-  .descInput {
-    border: none;
-    word-break: break-word;
-    resize: none;
-    width: 100%;
-    height: 100%;
-    line-height: 24px;
-    background-color: transparent;
-    color: var(--main-text-color);
-    caret-color: #000000;
-    @media (prefers-color-scheme: dark) {
-      caret-color: #fff;
-    }
-  }
-  & > .hidden {
-    word-break: break-word;
-    white-space: break-spaces;
-    visibility: hidden;
-    min-width: 100px;
-    min-height: 24px;
-    padding: 2px;
-    line-height: 24px;
-  }
-}
-
 .container {
   margin: 20px 0;
 }
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss b/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
index 7dd87eed16..c3242948b3 100644
--- a/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
@@ -42,15 +42,6 @@
   }
 }
 
-.goBack {
-  margin-right: 8px;
-  cursor: pointer;
-
-  & path {
-    stroke: var(--main-text-color);
-  }
-}
-
 .address {
   font-family: 'JetBrains Mono';
   display: flex;
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
index dd7da563f3..0f3e938a1b 100644
--- a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
@@ -11,8 +11,9 @@ import AlertDialog from 'widgets/AlertDialog'
 import Tabs from 'widgets/Tabs'
 import Table from 'widgets/Table'
 import CopyZone from 'widgets/CopyZone'
-import { BalanceHide, BalanceShow, Copy, GoBack } from 'widgets/Icons/icon'
+import { BalanceHide, BalanceShow, Copy } from 'widgets/Icons/icon'
 import Tooltip from 'widgets/Tooltip'
+import Breadcrum from 'widgets/Breadcrum'
 
 import {
   ErrorCode,
@@ -247,18 +248,15 @@ const HistoryDetailPage = () => {
     },
   ]
 
+  const breadPages = useMemo(() => [{ label: t('history.title-detail') }], [t])
+
   return (
     <PageContainer
       onContextMenu={e => {
         e.stopPropagation()
         e.preventDefault()
       }}
-      head={
-        <div>
-          <GoBack className={styles.goBack} onClick={() => navigate(-1)} />
-          <span className={styles.breadcrumbNav}>{`${t('history.title-detail')}`}</span>
-        </div>
-      }
+      head={<Breadcrum pages={breadPages} showBackIcon />}
       notice={pageNotice}
     >
       <div className={styles.basicInfoWrap}>
diff --git a/packages/neuron-ui/src/components/NervosDAODetail/index.tsx b/packages/neuron-ui/src/components/NervosDAODetail/index.tsx
index 2d2e4b2495..6fc9fd8a53 100644
--- a/packages/neuron-ui/src/components/NervosDAODetail/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAODetail/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useCallback, useEffect, useState } from 'react'
+import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState, transactionState, useDispatch, showPageNotice } from 'states'
 import {
@@ -9,18 +9,18 @@ import {
   ErrorCode,
   localNumberFormatter,
   uniformTimeFormatter,
-  useGoBack,
 } from 'utils'
 import { currentWallet as currentWalletCache } from 'services/localCache'
 import { getTransaction } from 'services/remote'
-import PageContainer, { Breadcrumbs } from 'components/PageContainer'
+import PageContainer from 'components/PageContainer'
 import { useParams } from 'react-router-dom'
 
 import Tabs, { VariantProps } from 'widgets/Tabs'
 import { onEnter } from 'utils/inputDevice'
-import { Copy, GoBack, BalanceHide, BalanceShow } from 'widgets/Icons/icon'
+import { Copy, BalanceHide, BalanceShow } from 'widgets/Icons/icon'
 import CopyZone from 'widgets/CopyZone'
 import { HIDE_BALANCE } from 'utils/const'
+import Breadcrum from 'widgets/Breadcrum'
 import styles from './nervosDAODetail.module.scss'
 import hooks from './hooks'
 import CellsCard from './CellsCard'
@@ -144,20 +144,10 @@ const NervosDAODetail = () => {
   const { depositOutPoint } = useParams<{ depositOutPoint: string }>()
   const daoRecord = records.find(record => getRecordKey(record) === depositOutPoint)
   const hash = daoRecord?.depositOutPoint?.txHash ?? daoRecord?.outPoint.txHash
-  const onBack = useGoBack()
+  const breadPages = useMemo(() => [{ label: t('nervos-dao-detail.tx-detail') }], [t])
 
   return (
-    <PageContainer
-      head={
-        <Breadcrumbs>
-          <>
-            <GoBack className={styles.goBack} onClick={onBack} />
-            <span>{t('nervos-dao-detail.tx-detail')}</span>
-          </>
-        </Breadcrumbs>
-      }
-      notice={pageNotice}
-    >
+    <PageContainer head={<Breadcrum pages={breadPages} showBackIcon />} notice={pageNotice}>
       {hash && (
         <Tabs
           Variant={TabsVariantWithTxTypes}
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index ff24b3c12a..8f07003881 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -2,9 +2,16 @@ import React, { useCallback, useMemo, useEffect, useState } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
 import { Trans, useTranslation } from 'react-i18next'
 import { useState as useGlobalState, useDispatch, updateTransactionList } from 'states'
-
-import { shannonToCKBFormatter, uniformTimeFormatter, backToTop, CONSTANTS, RoutePath, useFirstLoadWallet } from 'utils'
-
+import {
+  shannonToCKBFormatter,
+  uniformTimeFormatter,
+  backToTop,
+  CONSTANTS,
+  RoutePath,
+  useFirstLoadWallet,
+  clsx,
+  isSuccessResponse,
+} from 'utils'
 import { UANTokenName } from 'components/UANDisplay'
 import PageContainer from 'components/PageContainer'
 import TransactionStatusWrap from 'components/TransactionStatusWrap'
@@ -13,10 +20,20 @@ import Receive from 'components/Receive'
 import AddressBook from 'components/AddressBook'
 import Table from 'widgets/Table'
 import Button from 'widgets/Button'
-import { ArrowNext, EyesClose, EyesOpen, OverviewSend, OverviewReceive, Addressbook } from 'widgets/Icons/icon'
+import {
+  ArrowNext,
+  EyesClose,
+  EyesOpen,
+  OverviewSend,
+  OverviewReceive,
+  Addressbook,
+  CellManage,
+  Lock,
+} from 'widgets/Icons/icon'
 import BalanceSyncIcon from 'components/BalanceSyncingIcon'
 import CopyZone from 'widgets/CopyZone'
 import { HIDE_BALANCE } from 'utils/const'
+import { getLockedBalance } from 'services/remote/cellManage'
 import styles from './overview.module.scss'
 
 const { PAGE_SIZE, CONFIRMATION_THRESHOLD } = CONSTANTS
@@ -194,6 +211,17 @@ const Overview = () => {
     setShowBalance(v => !v)
   }, [setShowBalance])
 
+  const gotoCellManage = useCallback(() => {
+    navigate(`${RoutePath.Overview}/${RoutePath.CellManage}`)
+  }, [])
+  const [lockedBalance, setLockedBalance] = useState('0')
+  useEffect(() => {
+    getLockedBalance().then(res => {
+      if (isSuccessResponse(res) && res.result) {
+        setLockedBalance(res.result)
+      }
+    })
+  }, [])
   return (
     <PageContainer head={t('navbar.overview')} notice={pageNotice} isHomePage>
       <div className={styles.topContainer}>
@@ -217,11 +245,31 @@ const Overview = () => {
             <span className={styles.balanceUnit}>CKB</span>
             <BalanceSyncIcon connectionStatus={connectionStatus} syncStatus={syncStatus} />
             <div className={styles.items}>
+              <button className={styles.button} type="button" onClick={gotoCellManage}>
+                <Lock />
+                <span className={styles.lockedTitle}>{t('overview.locked-balance')}&nbsp;:</span>
+                {showBalance ? (
+                  <CopyZone content={shannonToCKBFormatter(balance, false, '')}>
+                    <span className={styles.lockedBalance}>{shannonToCKBFormatter(lockedBalance)}</span>
+                  </CopyZone>
+                ) : (
+                  <span className={styles.lockedBalance}>{HIDE_BALANCE}</span>
+                )}
+                <span className={styles.lockedUnit}>CKB</span>
+                <ArrowNext className={styles.arrowNext} />
+              </button>
               {isSingleAddress ? null : (
-                <Button className={styles.addressBook} onClick={() => setShowAddressBook(true)}>
+                <button
+                  className={clsx(styles.button, styles.icon)}
+                  type="button"
+                  onClick={() => setShowAddressBook(true)}
+                >
                   <Addressbook />
-                </Button>
+                </button>
               )}
+              <button className={clsx(styles.button, styles.icon)} type="button" onClick={gotoCellManage}>
+                <CellManage />
+              </button>
             </div>
           </div>
           <div className={styles.actions}>
diff --git a/packages/neuron-ui/src/components/Overview/overview.module.scss b/packages/neuron-ui/src/components/Overview/overview.module.scss
index cdb40e0be4..5633c78e32 100644
--- a/packages/neuron-ui/src/components/Overview/overview.module.scss
+++ b/packages/neuron-ui/src/components/Overview/overview.module.scss
@@ -55,22 +55,48 @@
         display: flex;
         gap: 8px;
         margin-top: 26px;
-        .addressBook {
+        .button {
           min-width: 0;
-          width: 40px;
           height: 40px;
-          background: var(--secondary-background-color);
+          border-radius: 24px;
+          background-color: var(--secondary-background-color);
           border: 1px solid var(--table-head-border-color);
-          border-radius: 50%;
+          color: var(--main-text-color);
           display: flex;
           justify-content: center;
           align-items: center;
+          padding: 10px 16px;
           cursor: pointer;
-          svg {
-            g,
-            path {
-              fill: var(--main-text-color);
-            }
+          &.icon {
+            width: 40px;
+            padding: 0;
+            justify-content: center;
+          }
+        }
+
+        .lockedTitle {
+          font-family: PingFang SC;
+          font-size: 14px;
+          font-weight: 500;
+          letter-spacing: 0px;
+          margin-left: 4px;
+        }
+
+        .lockedBalance {
+          font-family: 'D-DIN-PRO';
+          font-weight: 500;
+          font-size: 16px;
+        }
+
+        .lockedUnit {
+          font-size: 12px;
+          margin-right: 2px;
+        }
+
+        .arrowNext {
+          path {
+            stroke-width: 1px;
+            stroke: var(--main-text-color);
           }
         }
       }
diff --git a/packages/neuron-ui/src/components/Send/hooks.ts b/packages/neuron-ui/src/components/Send/hooks.ts
index 00506eb9d7..3eaeae2b22 100644
--- a/packages/neuron-ui/src/components/Send/hooks.ts
+++ b/packages/neuron-ui/src/components/Send/hooks.ts
@@ -49,6 +49,7 @@ const updateTransactionWith =
     isMainnet,
     dispatch,
     t,
+    consumeOutPoints,
   }: {
     walletID: string
     price: string
@@ -59,6 +60,7 @@ const updateTransactionWith =
     isMainnet: boolean
     dispatch: StateDispatch
     t: TFunction
+    consumeOutPoints?: CKBComponents.OutPoint[]
   }) => {
     const { value: type } = Object.getOwnPropertyDescriptor(generator, 'type')!
     if (items.length === 1 && items[0].amount === undefined) {
@@ -81,6 +83,7 @@ const updateTransactionWith =
           date: item.date,
         })),
         feeRate: price,
+        consumeOutPoints,
       }
       return generator(realParams)
         .then((res: any) => {
@@ -158,7 +161,8 @@ const useOnTransactionChange = (
   isSendMax: boolean,
   setTotalAmount: (val: string) => void,
   setErrorMessage: (val: string) => void,
-  t: TFunction
+  t: TFunction,
+  consumeOutPoints?: CKBComponents.OutPoint[]
 ) => {
   useEffect(() => {
     clearTimeout(generateTxTimer)
@@ -181,9 +185,10 @@ const useOnTransactionChange = (
         isMainnet,
         dispatch,
         t,
+        consumeOutPoints,
       })
     }, 300)
-  }, [walletID, items, price, isSendMax, dispatch, setTotalAmount, setErrorMessage, t, isMainnet])
+  }, [walletID, items, price, isSendMax, dispatch, setTotalAmount, setErrorMessage, t, isMainnet, consumeOutPoints])
 }
 
 const useOnSubmit = (items: Readonly<State.Output[]>, isMainnet: boolean, dispatch: StateDispatch) =>
@@ -322,7 +327,8 @@ export const useInitialize = (
   sending: boolean,
   isMainnet: boolean,
   dispatch: React.Dispatch<any>,
-  t: TFunction
+  t: TFunction,
+  consumeOutPoints?: CKBComponents.OutPoint[]
 ) => {
   const fee = useMemo(() => calculateFee(generatedTx), [generatedTx])
 
@@ -366,12 +372,13 @@ export const useInitialize = (
       isMainnet,
       dispatch,
       t,
+      consumeOutPoints,
     }).then(tx => {
       if (!tx) {
         updateIsSendMax(false)
       }
     })
-  }, [walletID, updateTransactionOutput, price, items, dispatch, t, isMainnet, updateIsSendMax])
+  }, [walletID, updateTransactionOutput, price, items, dispatch, t, isMainnet, updateIsSendMax, consumeOutPoints])
 
   const onSendMaxClick = useCallback(() => {
     if (!isSendMax) {
diff --git a/packages/neuron-ui/src/components/Send/index.tsx b/packages/neuron-ui/src/components/Send/index.tsx
index c5e0205607..d98b2b12bc 100644
--- a/packages/neuron-ui/src/components/Send/index.tsx
+++ b/packages/neuron-ui/src/components/Send/index.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useCallback } from 'react'
+import React, { useState, useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { List } from 'office-ui-fabric-react'
-import { useState as useGlobalState, useDispatch, appState } from 'states'
+import { useState as useGlobalState, useDispatch, appState, AppActions } from 'states'
 import SendMetaInfo from 'components/SendMetaInfo'
 import SendFieldset from 'components/SendFieldset'
 import PageContainer from 'components/PageContainer'
@@ -57,6 +57,7 @@ const Send = () => {
     wallet: { id: walletID = '', balance = '', device },
     chain: { networkID, connectionStatus },
     settings: { networks = [] },
+    consumeOutPoints,
   } = useGlobalState()
   const dispatch = useDispatch()
   const { t } = useTranslation()
@@ -81,7 +82,17 @@ const Send = () => {
     setErrorMessage,
     isSendMax,
     onSendMaxClick: handleSendMaxClick,
-  } = useInitialize(walletID, send.outputs, send.generatedTx, send.price, sending, isMainnet, dispatch, t)
+  } = useInitialize(
+    walletID,
+    send.outputs,
+    send.generatedTx,
+    send.price,
+    sending,
+    isMainnet,
+    dispatch,
+    t,
+    consumeOutPoints
+  )
 
   const [locktimeIndex, setLocktimeIndex] = useState<number>(-1)
 
@@ -116,7 +127,8 @@ const Send = () => {
     isSendMax,
     setTotalAmount,
     setErrorMessage,
-    t
+    t,
+    consumeOutPoints
   )
 
   let errorMessageUnderTotal = errorMessage
@@ -153,6 +165,14 @@ const Send = () => {
     return false
   })()
 
+  useEffect(() => {
+    return () => {
+      dispatch({
+        type: AppActions.UpdateConsumeOutPoints,
+      })
+    }
+  }, [])
+
   return (
     <PageContainer head={<SendHeader balance={balance} />}>
       <form onSubmit={handleSubmit} data-wallet-id={walletID} data-status={disabled ? 'not-ready' : 'ready'}>
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 4af0e2bc4c..6278dbc0bb 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -147,7 +147,8 @@
       "wallet-ready": "Wallet is ready, welcome",
       "send": "Send",
       "receive": "Receive",
-      "locked": "Locked Amount"
+      "locked": "Locked Amount",
+      "locked-balance": "Locked Balance"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "Welcome to Neuron",
@@ -1136,6 +1137,54 @@
       "input-place-holder": "Please enter the start sync block number, eg: 10,100,101",
       "locate-first-tx": "Locate the first transaction",
       "view-block": "View the block"
+    },
+    "cell-manage": {
+      "title": "Cell Manage",
+      "wallet-balance": "Wallet Balance",
+      "table": {
+        "head": {
+          "date": "Date",
+          "type": "Type",
+          "balance": "Balance",
+          "status": "Status",
+          "description": "Description",
+          "action": "Operation"
+        },
+        "locked": "Locked",
+        "unlocked": "Unlocked",
+        "default-description": "None"
+      },
+      "cell-detail-dialog": {
+        "title": "Cell Detail",
+        "capacity-used": "Used Capacity",
+        "data": "Data",
+        "total": "Total",
+        "used": "Used"
+      },
+      "locked-reason": {
+        "operate-in-special-assets": "Please use in special assets page",
+        "operate-in-assets-account": "Please use in assets account page",
+        "operate-in-dao": "Please use in Nervos DAO page",
+        "operate-in-multisig": "Please use in multisig page"
+      },
+      "cell-lock-dialog": {
+        "title": "Lock Cell",
+        "capacity": "Lock selected Cell {{capacity}} CKB",
+        "locked-cell-can-not-use": "Warn, locked Cells can not use"
+      },
+      "cell-unlock-dialog": {
+        "title": "Unlock Cell",
+        "capacity": "Unlock selected Cell {{capacity}} CKB"
+      },
+      "cell-consume-dialog": {
+        "title": "Consume Cell",
+        "warn-consume": "Consume cell will not keep any data and use all of the ckb, please ensure that no important data needs to be retained"
+      },
+      "enter-password": "Enter Password",
+      "password-placeholder": "Please input wallet password",
+      "lock": "Lock",
+      "unlock": "Unlock",
+      "consume": "Consume"
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index c965ac67f1..3d274ccff7 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -141,7 +141,8 @@
       "wallet-ready": "錢包準備完成，歡迎使用",
       "send": "轉賬",
       "receive": "收款",
-      "locked": "已鎖定餘額"
+      "locked": "已鎖定餘額",
+      "locked-balance": "已鎖定余額"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "歡迎使用 Neuron",
@@ -1107,6 +1108,54 @@
       "input-place-holder": "輸入同步起始區塊高度，例如：10,100,101",
       "locate-first-tx": "定位第一筆交易",
       "view-block": "查看區塊"
+    },
+    "cell-manage": {
+      "title": "Cell管理",
+      "wallet-balance": "錢包余額",
+      "table": {
+        "head": {
+          "date": "日期",
+          "type": "類型",
+          "balance": "金額",
+          "status": "狀態",
+          "description": "備註",
+          "action": "操作"
+        },
+        "locked": "鎖定",
+        "unlocked": "解鎖",
+        "default-description": "無"
+      },
+      "cell-detail-dialog": {
+        "title": "Cell詳情",
+        "capacity-used": "容量使用",
+        "data": "數據",
+        "total": "總量",
+        "used": "已用"
+      },
+      "locked-reason": {
+        "operate-in-special-assets": "請在自定義資產操作",
+        "operate-in-assets-account": "請在資產賬戶操作",
+        "operate-in-dao": "請在 Nervos DAO 操作",
+        "operate-in-multisig": "請在多簽地址操作"
+      },
+      "cell-lock-dialog": {
+        "title": "鎖定 Cell",
+        "capacity": "鎖定所選 Cell {{capacity}} CKB",
+        "locked-cell-can-not-use": "請註意, 鎖定的 Cells 不能花費"
+      },
+      "cell-unlock-dialog": {
+        "title": "解鎖 Cell",
+        "capacity": "解鎖所選 Cell {{capacity}} CKB"
+      },
+      "cell-consume-dialog": {
+        "title": "消耗 Cell",
+        "warn-consume": "消耗Cell不會保留任何數據，並將花費全部的CKB，請確保沒有重要數據需要保留。"
+      },
+      "enter-password": "輸入密碼",
+      "password-placeholder": "請輸入錢包密碼",
+      "lock": "鎖定",
+      "unlock": "解鎖",
+      "consume": "消耗"
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index d9f7b3f354..f283eb99e3 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -140,7 +140,8 @@
       "wallet-ready": "钱包准备完成，欢迎使用",
       "send": "转账",
       "receive": "收款",
-      "locked": "已锁定余额"
+      "locked": "已锁定余额",
+      "locked-balance": "已锁定余额"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "欢迎使用 Neuron",
@@ -1130,6 +1131,54 @@
       "input-place-holder": "输入同步起始区块高度，例如：10,100,101",
       "locate-first-tx": "定位第一笔交易",
       "view-block": "查看区块"
+    },
+    "cell-manage": {
+      "title": "Cell管理",
+      "wallet-balance": "钱包余额",
+      "table": {
+        "head": {
+          "date": "日期",
+          "type": "类型",
+          "balance": "金额",
+          "status": "状态",
+          "description": "备注",
+          "action": "操作"
+        },
+        "locked": "锁定",
+        "unlocked": "解锁",
+        "default-description": "无"
+      },
+      "cell-detail-dialog": {
+        "title": "Cell详情",
+        "capacity-used": "容量使用",
+        "data": "数据",
+        "total": "总量",
+        "used": "已用"
+      },
+      "locked-reason": {
+        "operate-in-special-assets": "请在自定义资产操作",
+        "operate-in-assets-account": "请在资产账户操作",
+        "operate-in-dao": "请在 Nervos DAO 操作",
+        "operate-in-multisig": "请在多签地址操作"
+      },
+      "cell-lock-dialog": {
+        "title": "锁定 Cell",
+        "capacity": "锁定所选 Cell {{capacity}} CKB",
+        "locked-cell-can-not-use": "请注意, 锁定的 Cells 不能花费"
+      },
+      "cell-unlock-dialog": {
+        "title": "解锁 Cell",
+        "capacity": "解锁所选 Cell {{capacity}} CKB"
+      },
+      "cell-consume-dialog": {
+        "title": "消耗 Cell",
+        "warn-consume": "消耗Cell不会保留任何数据，并将花费全部的CKB，请确保没有重要数据需要保留。"
+      },
+      "enter-password": "输入密码",
+      "password-placeholder": "请输入钱包密码",
+      "lock": "锁定",
+      "unlock": "解锁",
+      "consume": "消耗"
     }
   }
 }
diff --git a/packages/neuron-ui/src/router.tsx b/packages/neuron-ui/src/router.tsx
index 68525b4d32..b37ba7ba07 100644
--- a/packages/neuron-ui/src/router.tsx
+++ b/packages/neuron-ui/src/router.tsx
@@ -21,6 +21,7 @@ import OfflineSign from 'components/OfflineSign'
 import Settings from 'components/Settings'
 import SignAndVerify from 'components/SignAndVerify'
 import MultisigAddress from 'components/MultisigAddress'
+import CellManage from 'components/CellManage'
 
 const toolsRouters = [
   {
@@ -65,6 +66,16 @@ const mainRouterConfig: RouteObject[] = [
             ),
             children: [...toolsRouters],
           },
+          {
+            path: RoutePath.CellManage,
+            element: (
+              <>
+                <CellManage />
+                <Outlet />
+              </>
+            ),
+            children: [...toolsRouters],
+          },
           {
             path: ':hash',
             element: (
diff --git a/packages/neuron-ui/src/services/remote/cellManage.ts b/packages/neuron-ui/src/services/remote/cellManage.ts
new file mode 100644
index 0000000000..de511c68a6
--- /dev/null
+++ b/packages/neuron-ui/src/services/remote/cellManage.ts
@@ -0,0 +1,12 @@
+import { remoteApi } from './remoteApiWrapper'
+
+export const getLiveCells = remoteApi<void, Omit<State.LiveCellWithLocalInfo, 'lockedReason' | 'cellType'>[]>(
+  'get-live-cells'
+)
+export const updateLiveCellsLocalInfo = remoteApi<State.UpdateLiveCellLocalInfo, void>('update-live-cell-local-info')
+
+export const getLockedBalance = remoteApi<void, string>('get-locked-balance')
+
+export const updateLiveCellsLockStatus = remoteApi<State.UpdateLiveCellsLockStatus, void>(
+  'update-live-cells-lock-status'
+)
diff --git a/packages/neuron-ui/src/services/remote/index.ts b/packages/neuron-ui/src/services/remote/index.ts
index a52afbbd8a..6d839a5fcf 100644
--- a/packages/neuron-ui/src/services/remote/index.ts
+++ b/packages/neuron-ui/src/services/remote/index.ts
@@ -14,6 +14,7 @@ export * from './hardware'
 export * from './offline'
 export * from './nft'
 export * from './multisig'
+export * from './cellManage'
 
 const REMOTE_MODULE_NOT_FOUND =
   'The remote module is not found, please make sure the UI is running inside the Electron App'
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index d8f798b382..a6f9e76a22 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -151,6 +151,10 @@ type Action =
   | 'get-hold-sudt-cell-capacity'
   | 'start-migrate'
   | 'get-sync-progress-by-addresses'
+  | 'get-live-cells'
+  | 'update-live-cell-local-info'
+  | 'get-locked-balance'
+  | 'update-live-cells-lock-status'
 
 export const remoteApi =
   <P = any, R = any>(action: Action) =>
diff --git a/packages/neuron-ui/src/states/stateProvider/reducer.ts b/packages/neuron-ui/src/states/stateProvider/reducer.ts
index 74a316aab5..c256a67f2a 100644
--- a/packages/neuron-ui/src/states/stateProvider/reducer.ts
+++ b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -65,6 +65,9 @@ export enum AppActions {
   GetFeeRateStats = 'getFeeRateStats',
   UpdateCountDown = 'updateCountDown',
   SignVerify = 'signVerify',
+
+  // Cell manage
+  UpdateConsumeOutPoints = 'UpdateConsumeOutPoints',
 }
 
 export type StateAction =
@@ -116,6 +119,7 @@ export type StateAction =
   | { type: NeuronWalletActions.UpdateAppUpdaterStatus; payload: State.AppUpdater }
   | { type: NeuronWalletActions.GetSUDTAccountList; payload: Controller.GetSUDTAccountList.Response }
   | { type: AppActions.SignVerify; payload: string }
+  | { type: AppActions.UpdateConsumeOutPoints; payload?: CKBComponents.OutPoint[] }
 
 export type StateDispatch = React.Dispatch<StateAction> // TODO: add type of payload
 
@@ -409,6 +413,11 @@ export const reducer = produce((state: Draft<State.AppWithNeuronWallet>, action:
       break
     }
 
+    case AppActions.UpdateConsumeOutPoints: {
+      state.consumeOutPoints = action.payload
+      break
+    }
+
     default: {
       break
     }
diff --git a/packages/neuron-ui/src/styles/theme.scss b/packages/neuron-ui/src/styles/theme.scss
index 59a1de24ea..1421495687 100644
--- a/packages/neuron-ui/src/styles/theme.scss
+++ b/packages/neuron-ui/src/styles/theme.scss
@@ -34,7 +34,6 @@ body {
   --main-pagination-text-color: #666666;
   --warn-text-color: #f68c2a;
   --warn-background-color: #fff6eb;
-  --warn-background-color: #fff6eb;
   --svg-fill-color: #ffffff;
   --lock-info-title-border: #e5e5e5;
   --script-tag-background-color: #eafbf6;
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index f9473e036b..ef3e9f314b 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -331,6 +331,55 @@ declare namespace State {
     updater: AppUpdater
     sUDTAccounts: SUDTAccount[]
     experimental: Experimental | null
+    consumeOutPoints?: CKBComponents.OutPoint[]
+  }
+
+  enum LockScriptType {
+    SECP256K1 = 'SECP256K1',
+    ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+    MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+    MULTISIG = 'MULTISIG',
+    Cheque = 'Cheque',
+    Unknown = 'Unknown',
+  }
+
+  enum TypeScriptType {
+    DAO = 'DAO',
+    NFT = 'NFT',
+    NFTClass = 'NFTClass',
+    NFTIssuer = 'NFTIssuer',
+    SUDT = 'SUDT',
+    Unknown = 'Unknown',
+  }
+
+  interface LiveCellWithLocalInfoAPI {
+    capacity: CKBComponents.Capacity
+    outPoint: CKBComponents.OutPoint
+    lock: CKBComponents.Script
+    type?: CKBComponents.Script
+    data?: CKBComponents.Bytes
+    timestamp: string
+    description?: string
+    lockScriptType: LockScriptType
+    typeScriptType?: TypeScriptType
+    locked?: boolean
+  }
+  interface LiveCellWithLocalInfo extends LiveCellWithLocalInfoAPI {
+    lockedReason?: string
+    cellType?: 'CKB' | 'SUDT' | 'NFT' | 'Unknown'
+  }
+
+  interface UpdateLiveCellLocalInfo {
+    outPoint: CKBComponents.OutPoint
+    description?: string
+    locked?: boolean
+  }
+
+  interface UpdateLiveCellsLockStatus {
+    outPoints: CKBComponents.OutPoint[]
+    lockScripts: CKBComponents.Script[]
+    locked: boolean
+    password: string
   }
 }
 
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 31ee5e7d11..012dd89cac 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -78,6 +78,7 @@ declare namespace Controller {
       capacity: string
     }[]
     feeRate: string
+    consumeOutPoints?: CKBComponents.OutPoint[]
   }
 
   type GenerateSendingAllTransactionParams = GenerateTransactionParams
diff --git a/packages/neuron-ui/src/utils/calculateUsedCapacity.ts b/packages/neuron-ui/src/utils/calculateUsedCapacity.ts
new file mode 100644
index 0000000000..ba91cf77f6
--- /dev/null
+++ b/packages/neuron-ui/src/utils/calculateUsedCapacity.ts
@@ -0,0 +1,12 @@
+const CODE_HASH_LENGTH = 32
+const HASH_TYPE_LENGTH = 1
+const CAPACITY_LENGTH = 8
+
+export const calculateUsedCapacity = (cell: CKBComponents.Cell & { data?: CKBComponents.Bytes }) => {
+  const lockUsed = CODE_HASH_LENGTH + HASH_TYPE_LENGTH + cell.lock.args.slice(2).length / 2
+  const typeUsed = cell?.type ? CODE_HASH_LENGTH + HASH_TYPE_LENGTH + cell.type.args.slice(2).length / 2 : 0
+  const dataUsed = cell.data ? cell.data.slice(2).length / 2 : 0
+  return lockUsed + typeUsed + dataUsed + CAPACITY_LENGTH
+}
+
+export default calculateUsedCapacity
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index c94cb77f7b..51b7f09aff 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -7,6 +7,7 @@ export enum ConnectionStatus {
 export enum RoutePath {
   Launch = '/',
   Overview = '/overview',
+  CellManage = 'cellManage',
   WalletWizard = '/wizard/',
   Wallet = '/wallet',
   Send = '/send',
@@ -218,3 +219,21 @@ export enum SendType {
   unknowNewCell = 'unknowNewCell',
   sendCKB = 'sendCKB',
 }
+
+export enum LockScriptType {
+  SECP256K1 = 'SECP256K1',
+  ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+  MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+  MULTISIG = 'MULTISIG',
+  Cheque = 'Cheque',
+  Unknown = 'Unknown',
+}
+
+export enum TypeScriptType {
+  DAO = 'DAO',
+  NFT = 'NFT',
+  NFTClass = 'NFTClass',
+  NFTIssuer = 'NFTIssuer',
+  SUDT = 'SUDT',
+  Unknown = 'Unknown',
+}
diff --git a/packages/neuron-ui/src/utils/hooks/index.ts b/packages/neuron-ui/src/utils/hooks/index.ts
index 261674a879..24355c2870 100644
--- a/packages/neuron-ui/src/utils/hooks/index.ts
+++ b/packages/neuron-ui/src/utils/hooks/index.ts
@@ -37,10 +37,9 @@ export const useGoBack = () => {
   }, [navigate])
 }
 
-export const useLocalDescription = (
-  type: 'address' | 'transaction',
-  walletID: string,
-  dispatch: StateDispatch,
+export const useDescription = (
+  onSubmitDescription: (param: { key: string; description: string }) => void,
+  onChangeEditStatus?: (isEditing: boolean) => void,
   inputType = 'input'
 ) => {
   const [localDescription, setLocalDescription] = useState<{ description: string; key: string }>({
@@ -50,37 +49,16 @@ export const useLocalDescription = (
 
   const submitDescription = useCallback(
     (key: string, originDesc: string) => {
+      onChangeEditStatus?.(false)
       if ((key && key !== localDescription.key) || localDescription.description === originDesc) {
-        dispatch({
-          type: AppActions.ToggleIsAllowedToFetchList,
-          payload: true,
-        })
         setLocalDescription({ key: '', description: '' })
       } else {
-        dispatch({
-          type: AppActions.ToggleIsAllowedToFetchList,
-          payload: true,
-        })
-        if (localDescription.key && type === 'transaction') {
-          updateTransactionDescription({
-            walletID,
-            hash: localDescription.key,
-            description: localDescription.description,
-          })(dispatch)
-        }
-        if (localDescription.key && type === 'address') {
-          updateAddressDescription({
-            walletID,
-            address: localDescription.key,
-            description: localDescription.description,
-          })(dispatch)
-        }
+        onSubmitDescription(localDescription)
         setLocalDescription({ key: '', description: '' })
       }
     },
-    [type, walletID, localDescription, dispatch]
+    [localDescription, onChangeEditStatus]
   )
-
   const onDescriptionFieldBlur = useCallback(
     (e: any) => {
       const { descriptionKey: key, descriptionValue: originDesc } = e.target.dataset
@@ -121,11 +99,9 @@ export const useLocalDescription = (
       const {
         dataset: { descriptionKey: key, descriptionValue: originDesc = '' },
       } = e.currentTarget
+      e.stopPropagation()
       if (key) {
-        dispatch({
-          type: AppActions.ToggleIsAllowedToFetchList,
-          payload: false,
-        })
+        onChangeEditStatus?.(true)
         setLocalDescription({ key, description: originDesc })
         try {
           const input = document.querySelector<HTMLInputElement>(`${inputType}[data-description-key="${key}"]`)
@@ -138,7 +114,7 @@ export const useLocalDescription = (
         }
       }
     },
-    [setLocalDescription, dispatch]
+    [setLocalDescription]
   )
   return {
     localDescription,
@@ -149,6 +125,48 @@ export const useLocalDescription = (
   }
 }
 
+export const useLocalDescription = (type: 'address' | 'transaction', walletID: string, dispatch: StateDispatch) => {
+  const onSubmitDescription = useCallback(
+    (localDescription: { key: string; description: string }) => {
+      if (!localDescription.key) {
+        return
+      }
+      switch (type) {
+        case 'transaction':
+          updateTransactionDescription({
+            walletID,
+            hash: localDescription.key,
+            description: localDescription.description,
+          })(dispatch)
+          break
+        case 'address':
+          updateAddressDescription({
+            walletID,
+            address: localDescription.key,
+            description: localDescription.description,
+          })(dispatch)
+          break
+        default:
+          break
+      }
+    },
+    [type, walletID, dispatch]
+  )
+  const onChangeEditStatus = useCallback(
+    (isEditing: boolean) => {
+      dispatch({
+        type: AppActions.ToggleIsAllowedToFetchList,
+        payload: !isEditing,
+      })
+    },
+    [dispatch]
+  )
+  return {
+    onSubmitDescription,
+    onChangeEditStatus,
+  }
+}
+
 export const useCalculateEpochs = ({ depositEpoch, currentEpoch }: { depositEpoch: string; currentEpoch: string }) =>
   useMemo(() => {
     const depositEpochInfo = epochParser(depositEpoch)
@@ -530,3 +548,20 @@ export const useCopy = () => {
     copyTimes,
   }
 }
+
+export const usePagination = (pagination?: { pageSize?: number; onPageChange?: (pageNo: number) => void }) => {
+  const [pageNo, setPageNo] = useState(1)
+  const pageSize = useMemo(() => pagination?.pageSize ?? 10, [pagination])
+  const onPageChange = useCallback(
+    (page: number) => {
+      setPageNo(page)
+      pagination?.onPageChange?.(page)
+    },
+    [pagination]
+  )
+  return {
+    pageNo,
+    pageSize,
+    onPageChange,
+  }
+}
diff --git a/packages/neuron-ui/src/utils/index.ts b/packages/neuron-ui/src/utils/index.ts
index 07219b0443..eb762f388d 100644
--- a/packages/neuron-ui/src/utils/index.ts
+++ b/packages/neuron-ui/src/utils/index.ts
@@ -26,5 +26,7 @@ export * from './baseActions'
 export * from './getSUDTAmount'
 export * from './multisig'
 export * from './getNetworkLabel'
+export * from './calculateUsedCapacity'
+export * from './outPointTransform'
 
 export { CONSTANTS }
diff --git a/packages/neuron-ui/src/utils/outPointTransform.ts b/packages/neuron-ui/src/utils/outPointTransform.ts
new file mode 100644
index 0000000000..14d745ecff
--- /dev/null
+++ b/packages/neuron-ui/src/utils/outPointTransform.ts
@@ -0,0 +1,11 @@
+export const outPointToStr = (value: CKBComponents.OutPoint): string => {
+  return `${value.txHash}_${value.index}`
+}
+
+export const strToOutPoint = (value: string): CKBComponents.OutPoint => {
+  const [txHash, index] = value.split('_')
+  return {
+    txHash,
+    index,
+  }
+}
diff --git a/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss b/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
index 3445069b17..c4d4dac300 100644
--- a/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
+++ b/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
@@ -5,7 +5,6 @@
   color: var(--input-second-color);
   font-weight: 500;
   font-size: 20px;
-  line-height: 28px;
   .page {
     margin-right: 4px;
     &:not(:last-child):after {
@@ -19,4 +18,12 @@
       color: var(--main-text-color);
     }
   }
+  .goBack {
+    margin-right: 8px;
+    cursor: pointer;
+
+    & path {
+      stroke: var(--main-text-color);
+    }
+  }
 }
diff --git a/packages/neuron-ui/src/widgets/Breadcrum/index.tsx b/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
index 2636711eba..92f948bc55 100644
--- a/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
+++ b/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
@@ -1,17 +1,20 @@
 import React, { useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
+import { GoBack } from 'widgets/Icons/icon'
+import { useGoBack } from 'utils'
 import styles from './breadcrum.module.scss'
 
 export interface Page {
   label: string
-  link: string
+  link?: string
 }
 
 export interface BreadcumProps {
   pages: Page[]
+  showBackIcon?: boolean
 }
 
-const Breadcrum = ({ pages = [] }: BreadcumProps) => {
+const Breadcrum = ({ pages = [], showBackIcon }: BreadcumProps) => {
   const navigate = useNavigate()
   const onClick = useCallback(
     (e: React.MouseEvent) => {
@@ -24,9 +27,11 @@ const Breadcrum = ({ pages = [] }: BreadcumProps) => {
     },
     [navigate]
   )
+  const goBack = useGoBack()
 
   return (
     <div className={styles.container}>
+      {showBackIcon ? <GoBack className={styles.goBack} onClick={goBack} /> : null}
       {pages.map(page => (
         <span
           className={styles.page}
diff --git a/packages/neuron-ui/src/widgets/Icons/CellManage.svg b/packages/neuron-ui/src/widgets/Icons/CellManage.svg
new file mode 100644
index 0000000000..0267c25ba6
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/CellManage.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.76465 3.84846C9.48963 3.54807 9.99961 2.83359 9.99961 2C9.99961 0.895431 9.10418 0 7.99961 0C6.89504 0 5.99961 0.895431 5.99961 2C5.99961 2.83389 6.50996 3.54858 7.23535 3.84878V5.21551C5.39178 5.57219 3.99961 7.19481 3.99961 9.14258C3.99961 9.6966 4.11225 10.2243 4.31586 10.7041L2.88081 12.1391C2.65347 12.0493 2.40574 12 2.14648 12C1.04191 12 0.146484 12.8954 0.146484 14C0.146484 15.1046 1.04191 16 2.14648 16C3.25105 16 4.14648 15.1046 4.14648 14C4.14648 13.7097 4.08465 13.4339 3.97344 13.185L5.17932 11.9791C5.90253 12.6982 6.89918 13.1426 7.99961 13.1426C9.03686 13.1426 9.98189 12.7478 10.6926 12.1003L11.8129 13.2205C11.7112 13.4603 11.6549 13.724 11.6549 14.0009C11.6549 15.1055 12.5503 16.0009 13.6549 16.0009C14.7595 16.0009 15.6549 15.1055 15.6549 14.0009C15.6549 12.8964 14.7595 12.0009 13.6549 12.0009C13.3758 12.0009 13.1101 12.0581 12.8688 12.1613L11.5983 10.8909C11.8554 10.3627 11.9996 9.76948 11.9996 9.14258C11.9996 7.19508 10.6078 5.57265 8.76465 5.21566V3.84846ZM8.75743 2C8.75743 2.41853 8.41814 2.75781 7.99961 2.75781C7.58108 2.75781 7.2418 2.41853 7.2418 2C7.2418 1.58147 7.58108 1.24219 7.99961 1.24219C8.41814 1.24219 8.75743 1.58147 8.75743 2ZM7.99961 11.4668C9.28378 11.4668 10.3248 10.4258 10.3248 9.1416C10.3248 7.85743 9.28378 6.81641 7.99961 6.81641C6.71544 6.81641 5.67442 7.85743 5.67442 9.1416C5.67442 10.4258 6.71544 11.4668 7.99961 11.4668ZM13.6549 14.7763C14.0831 14.7763 14.4303 14.4292 14.4303 14.0009C14.4303 13.5727 14.0831 13.2255 13.6549 13.2255C13.2267 13.2255 12.8795 13.5727 12.8795 14.0009C12.8795 14.4292 13.2267 14.7763 13.6549 14.7763ZM2.14648 14.792C2.58389 14.792 2.93848 14.4374 2.93848 14C2.93848 13.5626 2.58389 13.208 2.14648 13.208C1.70908 13.208 1.35449 13.5626 1.35449 14C1.35449 14.4374 1.70908 14.792 2.14648 14.792Z" fill="#333333"/>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/Consume.svg b/packages/neuron-ui/src/widgets/Icons/Consume.svg
new file mode 100644
index 0000000000..45ccfe536c
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Consume.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_22441_10640)">
+<path d="M12.25 2.22C11.1012 1.59438 9.5925 1.25 8 1.25C6.4075 1.25 4.89875 1.59438 3.75 2.22C2.46063 2.92438 1.75 3.91125 1.75 5V11C1.75 12.0887 2.46063 13.0756 3.75 13.78C4.89687 14.405 6.40562 14.75 8 14.75C9.59438 14.75 11.1012 14.4056 12.25 13.78C13.5413 13.0756 14.25 12.0887 14.25 11V5C14.25 3.91125 13.5394 2.92438 12.25 2.22ZM12.75 8C12.75 9.0625 10.7994 10.25 8 10.25C5.20062 10.25 3.25 9.0625 3.25 8V7.47125C3.4111 7.58291 3.578 7.68598 3.75 7.78C4.89687 8.405 6.40562 8.75 8 8.75C9.59438 8.75 11.1012 8.40563 12.25 7.78C12.422 7.68598 12.5889 7.58291 12.75 7.47125V8ZM8 2.75C10.7994 2.75 12.75 3.9375 12.75 5C12.75 6.0625 10.7994 7.25 8 7.25C5.20062 7.25 3.25 6.0625 3.25 5C3.25 3.9375 5.20062 2.75 8 2.75ZM8 13.25C5.20062 13.25 3.25 12.0625 3.25 11V10.4712C3.4111 10.5829 3.578 10.686 3.75 10.78C4.89687 11.405 6.40562 11.75 8 11.75C9.59438 11.75 11.1012 11.4056 12.25 10.78C12.422 10.686 12.5889 10.5829 12.75 10.4712V11C12.75 12.0625 10.7994 13.25 8 13.25Z" fill="#8DA394"/>
+</g>
+<defs>
+<clipPath id="clip0_22441_10640">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/Lock.svg b/packages/neuron-ui/src/widgets/Icons/Lock.svg
new file mode 100644
index 0000000000..3961f1153a
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Lock.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.318 5.86952H12.2527V4.80421C12.2527 2.4508 10.3449 0.542969 7.99146 0.542969C5.63804 0.542969 3.73023 2.45081 3.73023 4.80421V5.86952H2.66485C2.07653 5.86952 1.59961 6.34645 1.59961 6.93477V14.392C1.59961 14.9803 2.07653 15.4572 2.66485 15.4572H13.318C13.9063 15.4572 14.3832 14.9803 14.3832 14.392V6.93477C14.3832 6.34646 13.9063 5.86952 13.318 5.86952ZM4.79554 4.80421C4.79554 3.03914 6.22641 1.60828 7.99147 1.60828C9.75654 1.60828 11.1874 3.03915 11.1874 4.80421V5.86952H4.79554V4.80421ZM13.318 13.8637C13.318 14.1555 13.0815 14.392 12.7897 14.392H3.19329C2.90148 14.392 2.66493 14.1555 2.66493 13.8637V7.4632C2.66493 7.17139 2.90148 6.93484 3.19329 6.93484H12.7897C13.0815 6.93484 13.318 7.17139 13.318 7.4632V13.8637ZM7.99147 8.00014C6.81476 8.00014 5.86086 8.95406 5.86086 10.1308C5.86086 11.1235 6.53985 11.9577 7.45879 12.1943V12.7983C7.45879 13.0901 7.69534 13.3267 7.98715 13.3267H7.99574C8.28755 13.3267 8.5241 13.0901 8.5241 12.7983V12.1943C9.44307 11.9577 10.1221 11.1236 10.1221 10.1308C10.1221 8.95405 9.16817 8.00014 7.99147 8.00014ZM7.99147 11.1961C7.40312 11.1961 6.92616 10.7191 6.92616 10.1308C6.92616 9.54241 7.40312 9.06545 7.99147 9.06545C8.57983 9.06545 9.05678 9.54241 9.05678 10.1308C9.05678 10.7191 8.57983 11.1961 7.99147 11.1961Z" fill="#333333"/>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/LockCell.svg b/packages/neuron-ui/src/widgets/Icons/LockCell.svg
new file mode 100644
index 0000000000..4e86c09e48
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/LockCell.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_22441_10085)">
+<path d="M13 5.5H11.25V4.25C11.25 3.38805 10.9076 2.5614 10.2981 1.9519C9.6886 1.34241 8.86195 1 8 1C7.13805 1 6.3114 1.34241 5.7019 1.9519C5.09241 2.5614 4.75 3.38805 4.75 4.25V5.5H3C2.66848 5.5 2.35054 5.6317 2.11612 5.86612C1.8817 6.10054 1.75 6.41848 1.75 6.75V13.75C1.75 14.0815 1.8817 14.3995 2.11612 14.6339C2.35054 14.8683 2.66848 15 3 15H13C13.3315 15 13.6495 14.8683 13.8839 14.6339C14.1183 14.3995 14.25 14.0815 14.25 13.75V6.75C14.25 6.41848 14.1183 6.10054 13.8839 5.86612C13.6495 5.6317 13.3315 5.5 13 5.5ZM6.25 4.25C6.25 3.78587 6.43437 3.34075 6.76256 3.01256C7.09075 2.68437 7.53587 2.5 8 2.5C8.46413 2.5 8.90925 2.68437 9.23744 3.01256C9.56563 3.34075 9.75 3.78587 9.75 4.25V5.5H6.25V4.25ZM12.75 13.5H3.25V7H12.75V13.5ZM9 10.25C9 10.4478 8.94135 10.6411 8.83147 10.8056C8.72159 10.97 8.56541 11.0982 8.38268 11.1739C8.19996 11.2496 7.99889 11.2694 7.80491 11.2308C7.61093 11.1922 7.43275 11.097 7.29289 10.9571C7.15304 10.8173 7.0578 10.6391 7.01921 10.4451C6.98063 10.2511 7.00043 10.05 7.07612 9.86732C7.15181 9.68459 7.27998 9.52841 7.44443 9.41853C7.60888 9.30865 7.80222 9.25 8 9.25C8.26522 9.25 8.51957 9.35536 8.70711 9.54289C8.89464 9.73043 9 9.98478 9 10.25Z" fill="#8DA394"/>
+</g>
+<defs>
+<clipPath id="clip0_22441_10085">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/Unlock.svg b/packages/neuron-ui/src/widgets/Icons/Unlock.svg
new file mode 100644
index 0000000000..06cc570010
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Unlock.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_22441_10637)">
+<path d="M13 5.5H6.25V4.25C6.25 3.78587 6.43437 3.34075 6.76256 3.01256C7.09075 2.68437 7.53587 2.5 8 2.5C8.84438 2.5 9.60313 3.10125 9.765 3.89937C9.78462 3.9959 9.82305 4.08761 9.87811 4.16928C9.93317 4.25094 10.0038 4.32097 10.0859 4.37535C10.168 4.42973 10.2601 4.4674 10.3567 4.48621C10.4534 4.50503 10.5529 4.50462 10.6494 4.485C10.7459 4.46538 10.8376 4.42695 10.9193 4.37189C11.0009 4.31683 11.071 4.24622 11.1253 4.1641C11.1797 4.08198 11.2174 3.98995 11.2362 3.89327C11.255 3.79659 11.2546 3.69715 11.235 3.60063C10.9294 2.09375 9.56875 1 8 1C7.13835 1.00099 6.31228 1.34372 5.703 1.953C5.09372 2.56228 4.75099 3.38835 4.75 4.25V5.5H3C2.66848 5.5 2.35054 5.6317 2.11612 5.86612C1.8817 6.10054 1.75 6.41848 1.75 6.75V13.75C1.75 14.0815 1.8817 14.3995 2.11612 14.6339C2.35054 14.8683 2.66848 15 3 15H13C13.3315 15 13.6495 14.8683 13.8839 14.6339C14.1183 14.3995 14.25 14.0815 14.25 13.75V6.75C14.25 6.41848 14.1183 6.10054 13.8839 5.86612C13.6495 5.6317 13.3315 5.5 13 5.5ZM12.75 13.5H3.25V7H12.75V13.5ZM7.25 11.6038V12C7.25 12.1989 7.32902 12.3897 7.46967 12.5303C7.61032 12.671 7.80109 12.75 8 12.75C8.19891 12.75 8.38968 12.671 8.53033 12.5303C8.67098 12.3897 8.75 12.1989 8.75 12V11.6038C9.18027 11.4297 9.5366 11.1114 9.75794 10.7035C9.97927 10.2955 10.0518 9.82326 9.96317 9.36767C9.87451 8.91208 9.63016 8.50151 9.27199 8.20632C8.91382 7.91113 8.46414 7.7497 8 7.7497C7.53586 7.7497 7.08618 7.91113 6.72801 8.20632C6.36984 8.50151 6.12548 8.91208 6.03683 9.36767C5.94817 9.82326 6.02073 10.2955 6.24206 10.7035C6.4634 11.1114 6.81973 11.4297 7.25 11.6038ZM8 9.25C8.09889 9.25 8.19556 9.27932 8.27779 9.33426C8.36001 9.38921 8.4241 9.4673 8.46194 9.55866C8.49978 9.65002 8.50969 9.75056 8.49039 9.84755C8.4711 9.94454 8.42348 10.0336 8.35355 10.1036C8.28363 10.1735 8.19454 10.2211 8.09755 10.2404C8.00056 10.2597 7.90002 10.2498 7.80866 10.2119C7.7173 10.1741 7.63921 10.11 7.58427 10.0278C7.52932 9.94556 7.5 9.84889 7.5 9.75C7.5 9.61739 7.55268 9.49021 7.64645 9.39645C7.74021 9.30268 7.86739 9.25 8 9.25Z" fill="#8DA394"/>
+</g>
+<defs>
+<clipPath id="clip0_22441_10637">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.module.scss b/packages/neuron-ui/src/widgets/Icons/icon.module.scss
index ec0093bb7c..a64c62ec1d 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.module.scss
+++ b/packages/neuron-ui/src/widgets/Icons/icon.module.scss
@@ -54,3 +54,9 @@ $activity-color: #1b73b3;
     fill: #999;
   }
 }
+
+.withTheme {
+  path[fill] {
+    fill: var(--main-text-color);
+  }
+}
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index b05e00b7cf..ffa9fa92b0 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -44,6 +44,11 @@ import { ReactComponent as OverviewSendSvg } from './OverviewSend.svg'
 import { ReactComponent as OverviewReceiveSvg } from './OverviewReceive.svg'
 import { ReactComponent as AddressbookSvg } from './Addressbook.svg'
 import { ReactComponent as AddSvg } from './Add.svg'
+import { ReactComponent as CellManageSvg } from './CellManage.svg'
+import { ReactComponent as LockSvg } from './Lock.svg'
+import { ReactComponent as LockCellSvg } from './LockCell.svg'
+import { ReactComponent as UnLockSvg } from './Unlock.svg'
+import { ReactComponent as ConsumeSvg } from './Consume.svg'
 
 import styles from './icon.module.scss'
 
@@ -102,5 +107,10 @@ export const Sort = WrapSvg(SortSvg)
 export const Edit = WrapSvg(EditSvg)
 export const OverviewSend = WrapSvg(OverviewSendSvg)
 export const OverviewReceive = WrapSvg(OverviewReceiveSvg)
-export const Addressbook = WrapSvg(AddressbookSvg)
+export const Addressbook = WrapSvg(AddressbookSvg, styles.withTheme)
 export const Add = WrapSvg(AddSvg)
+export const CellManage = WrapSvg(CellManageSvg, styles.withTheme)
+export const Lock = WrapSvg(LockSvg, styles.withTheme)
+export const LockCell = WrapSvg(LockCellSvg)
+export const UnLock = WrapSvg(UnLockSvg)
+export const Consume = WrapSvg(ConsumeSvg)
diff --git a/packages/neuron-ui/src/widgets/Pagination/index.tsx b/packages/neuron-ui/src/widgets/Pagination/index.tsx
index 9a9e1d9764..08e6dffbe3 100644
--- a/packages/neuron-ui/src/widgets/Pagination/index.tsx
+++ b/packages/neuron-ui/src/widgets/Pagination/index.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import { getPageNoList } from 'utils'
+import { clsx, getPageNoList } from 'utils'
 import { ArrowEnd, ArrowNext } from 'widgets/Icons/icon'
 
 import styles from './pagination.module.scss'
@@ -12,9 +12,10 @@ export interface PaginationProps {
   pageNo: number
   pageSize: number
   onChange: (page: number) => void
+  className?: string
 }
 
-const Pagination = ({ count, pageNo, onChange, pageSize }: PaginationProps) => {
+const Pagination = ({ count, pageNo, onChange, pageSize, className }: PaginationProps) => {
   const [t] = useTranslation()
   const pageCount = Math.ceil(count / pageSize)
   const pageNoList = getPageNoList(pageNo, pageCount)
@@ -45,7 +46,7 @@ const Pagination = ({ count, pageNo, onChange, pageSize }: PaginationProps) => {
   const disableToEnd = pageNo >= pageCount
 
   return (
-    <div role="presentation" className={styles.container} onClick={handlePageNoClick}>
+    <div role="presentation" className={clsx(styles.container, className)} onClick={handlePageNoClick}>
       <div className={styles.range}>{range}</div>
       <div className={styles.navigator} role="navigation" aria-label="pagination">
         <div className={styles.arrowBlock}>
diff --git a/packages/neuron-ui/src/widgets/ShowOrEditDesc/index.tsx b/packages/neuron-ui/src/widgets/ShowOrEditDesc/index.tsx
new file mode 100644
index 0000000000..bab46ba3dc
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/ShowOrEditDesc/index.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+import { useDescription } from 'utils'
+import { Edit } from 'widgets/Icons/icon'
+import styles from './showOrEditDesc.module.scss'
+
+interface ShowOrEditDescProps {
+  onSubmitDescription: (param: { key: string; description: string }) => void
+  onChangeEditStatus?: (isEditing: boolean) => void
+  description?: string
+  descKey: string
+}
+
+const ShowOrEditDesc = (props: ShowOrEditDescProps) => {
+  const { onSubmitDescription, onChangeEditStatus, description, descKey } = props
+  const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionFieldBlur, onDescriptionSelected } =
+    useDescription(onSubmitDescription, onChangeEditStatus, 'textarea')
+  const isSelected = localDescription.key === descKey
+  return (
+    <div className={styles.descTipRoot}>
+      <div className={styles.autoHeight}>
+        <textarea
+          className={styles.descInput}
+          data-is-selected={isSelected}
+          data-description-key={descKey}
+          value={isSelected ? localDescription.description : description}
+          onChange={onDescriptionChange}
+          onKeyDown={onDescriptionPress}
+          onBlur={onDescriptionFieldBlur}
+          onClick={e => e.stopPropagation()}
+        />
+        <Edit data-description-key={descKey} data-description-value={description} onClick={onDescriptionSelected} />
+      </div>
+      <div className={styles.hidden}>
+        {isSelected ? localDescription.description : description}
+        <Edit />
+      </div>
+    </div>
+  )
+}
+
+ShowOrEditDesc.displayName = 'ShowOrEditDesc'
+export default React.memo(ShowOrEditDesc)
diff --git a/packages/neuron-ui/src/widgets/ShowOrEditDesc/showOrEditDesc.module.scss b/packages/neuron-ui/src/widgets/ShowOrEditDesc/showOrEditDesc.module.scss
new file mode 100644
index 0000000000..c4abba9d29
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/ShowOrEditDesc/showOrEditDesc.module.scss
@@ -0,0 +1,38 @@
+.descTipRoot {
+  position: relative;
+  width: 200px;
+  .autoHeight {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    & > svg {
+      position: absolute;
+      right: 0;
+      bottom: 8px;
+    }
+  }
+  .descInput {
+    border: none;
+    word-break: break-word;
+    resize: none;
+    width: 100%;
+    height: 100%;
+    line-height: 24px;
+    background-color: transparent;
+    color: var(--main-text-color);
+    caret-color: #000000;
+    @media (prefers-color-scheme: dark) {
+      caret-color: #fff;
+    }
+  }
+  & > .hidden {
+    word-break: break-word;
+    white-space: break-spaces;
+    visibility: hidden;
+    min-width: 100px;
+    min-height: 24px;
+    padding: 2px;
+    line-height: 24px;
+  }
+}
diff --git a/packages/neuron-ui/src/widgets/Table/index.tsx b/packages/neuron-ui/src/widgets/Table/index.tsx
index 58bd44a745..596e821a67 100755
--- a/packages/neuron-ui/src/widgets/Table/index.tsx
+++ b/packages/neuron-ui/src/widgets/Table/index.tsx
@@ -24,6 +24,7 @@ export type TableProps<T> = {
     className?: string
     tdClassName?: string
     hidden?: boolean
+    sortable?: boolean
     sorter?: (a: T, b: T, type: SortType) => number
   }[]
   dataKey?: string
@@ -36,6 +37,7 @@ export type TableProps<T> = {
   rowExtendRender?: (v: T, idx: number) => React.ReactNode
   expandedRow?: number | null
   hasHoverTrBg?: boolean
+  onSorted?: (key?: keyof T, type?: SortType) => void
 }
 
 const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
@@ -52,6 +54,7 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
     rowExtendRender,
     expandedRow,
     hasHoverTrBg = true,
+    onSorted,
   } = props
   const [showBalance, setShowBalance] = useState(true)
   const onClickBalanceIcon = useCallback(() => {
@@ -80,18 +83,20 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
   const handleSort = useCallback(
     (e: React.MouseEvent<SVGSVGElement>) => {
       const { dataset } = e.currentTarget
-      const { index, type } = dataset as { index: string; type: SortType }
+      const { index, type, columnKey } = dataset as { index: string; type: SortType; columnKey: string }
       const currentIndex = Number(index)
 
       if (sortIndex === currentIndex && sortType === type) {
         setSortIndex(-1)
+        onSorted?.()
         return
       }
 
+      onSorted?.(columnKey, type)
       setSortIndex(currentIndex)
       setSortType(type)
     },
-    [sortIndex, sortType, setSortIndex, setSortType]
+    [sortIndex, sortType, setSortIndex, setSortType, onSorted]
   )
 
   return (
@@ -108,7 +113,18 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
           <tr>
             {columnList.map(
               (
-                { title, dataIndex, key, isBalance, align, width, minWidth, className: headClassName, sorter },
+                {
+                  title,
+                  dataIndex,
+                  key,
+                  isBalance,
+                  align,
+                  width,
+                  minWidth,
+                  className: headClassName,
+                  sorter,
+                  sortable,
+                },
                 index
               ) => {
                 return (
@@ -134,16 +150,18 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
                       ) : (
                         title
                       )}
-                      {sorter ? (
+                      {sorter || sortable ? (
                         <div className={styles.sorter}>
                           <Sort
                             data-index={index}
+                            data-column-key={key || dataIndex}
                             data-type={SortType.Increase}
                             onClick={handleSort}
                             data-active={sortIndex === index && sortType === SortType.Increase}
                           />
                           <Sort
                             data-index={index}
+                            data-column-key={key || dataIndex}
                             data-type={SortType.Decrease}
                             onClick={handleSort}
                             data-active={sortIndex === index && sortType === SortType.Decrease}
diff --git a/packages/neuron-ui/src/widgets/Table/table.module.scss b/packages/neuron-ui/src/widgets/Table/table.module.scss
index c39a8aefd1..eb9fc5d35d 100755
--- a/packages/neuron-ui/src/widgets/Table/table.module.scss
+++ b/packages/neuron-ui/src/widgets/Table/table.module.scss
@@ -34,7 +34,7 @@ $head-height: 52px;
       border-top: 1px solid var(--table-head-border-color);
       border-bottom: 1px solid var(--table-head-border-color);
 
-      & > .headWithBalance {
+      .headWithBalance {
         display: flex;
         align-items: center;
       }
diff --git a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
index e81b8664e9..4e77a25c16 100644
--- a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
+++ b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
@@ -3,7 +3,7 @@
   position: absolute;
   background: var(--third-background-color);
   color: var(--main-text-color);
-  box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0px 2px 10px 2px #e5e5e5;
   padding: 8px 16px;
   border-radius: 8px;
   font-style: normal;
@@ -12,6 +12,9 @@
   line-height: 20px;
   z-index: 300;
   white-space: nowrap;
+  @media (prefers-color-scheme: dark) {
+    box-shadow: none;
+  }
 }
 
 @mixin left($class) {
@@ -180,6 +183,7 @@ $placements: left, right, top, bottom, left-top, right-top, left-bottom, right-b
 
   .triangle {
     display: none;
+    z-index: 310;
   }
 
   & > * {
@@ -234,9 +238,11 @@ $placements: left, right, top, bottom, left-top, right-top, left-bottom, right-b
           .triangle {
             top: calc(100% + 4px);
             transform: translateY(50%) rotate(45deg);
-            right: inherit;
           }
         }
+        &[data-placement='top'] .triangle {
+          bottom: calc(100% + 12px);
+        }
       }
     }
   }
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index f54ed36331..f1a9c08c27 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -62,6 +62,7 @@ import NodeService from '../services/node'
 import SyncProgressService from '../services/sync-progress'
 import { resetSyncTaskQueue } from '../block-sync-renderer'
 import DataUpdateSubject from '../models/subjects/data-update'
+import CellManage from './cell-manage'
 
 export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet' | 'migrate-acp'
 // Handle channel messages from renderer process and user actions.
@@ -396,7 +397,13 @@ export default class ApiController {
       'generate-tx',
       async (
         _,
-        params: { walletID: string; items: { address: string; capacity: string }[]; fee: string; feeRate: string }
+        params: {
+          walletID: string
+          items: { address: string; capacity: string }[]
+          fee: string
+          feeRate: string
+          consumeOutPoints?: CKBComponents.OutPoint[]
+        }
       ) => {
         return this.#walletsController.generateTx(params)
       }
@@ -406,7 +413,13 @@ export default class ApiController {
       'generate-send-all-tx',
       async (
         _,
-        params: { walletID: string; items: { address: string; capacity: string }[]; fee: string; feeRate: string }
+        params: {
+          walletID: string
+          items: { address: string; capacity: string }[]
+          fee: string
+          feeRate: string
+          consumeOutPoints: CKBComponents.OutPoint[]
+        }
       ) => {
         return this.#walletsController.generateSendingAllTx(params)
       }
@@ -811,6 +824,54 @@ export default class ApiController {
         status: ResponseCode.Success,
       }
     })
+
+    // cell manager
+    handle('get-live-cells', async () => {
+      return {
+        result: await CellManage.getLiveCells(),
+        status: ResponseCode.Success,
+      }
+    })
+
+    handle(
+      'update-live-cell-local-info',
+      async (_, params: { outPoint: CKBComponents.OutPoint; description?: string; locked?: boolean }) => {
+        return {
+          result: await CellManage.updateLiveCellLocalInfo(params.outPoint, params.locked, params.description),
+          status: ResponseCode.Success,
+        }
+      }
+    )
+
+    handle(
+      'update-live-cells-lock-status',
+      async (
+        _,
+        params: {
+          outPoints: CKBComponents.OutPoint[]
+          locked: boolean
+          password: string
+          lockScripts: CKBComponents.Script[]
+        }
+      ) => {
+        return {
+          result: await CellManage.updateLiveCellsLockStatus(
+            params.outPoints,
+            params.locked,
+            params.lockScripts,
+            params.password
+          ),
+          status: ResponseCode.Success,
+        }
+      }
+    )
+
+    handle('get-locked-balance', async () => {
+      return {
+        result: await CellManage.getLockedBalance(),
+        status: ResponseCode.Success,
+      }
+    })
   }
 
   // Register handler, warp and serialize API response
diff --git a/packages/neuron-wallet/src/controllers/asset-account.ts b/packages/neuron-wallet/src/controllers/asset-account.ts
index a9b55a147f..3c2300a0d7 100644
--- a/packages/neuron-wallet/src/controllers/asset-account.ts
+++ b/packages/neuron-wallet/src/controllers/asset-account.ts
@@ -14,6 +14,7 @@ import CommandSubject from '../models/subjects/command'
 import SyncApiController, { SyncStatus } from './sync-api'
 import { TransactionGenerator } from '../services/tx'
 import OutPoint from '../models/chain/out-point'
+import SudtTokenInfoService from '../services/sudt-token-info'
 
 export interface GenerateCreateAssetAccountTxParams {
   walletID: string
@@ -190,7 +191,7 @@ export default class AssetAccountController {
   }
 
   public async getTokenInfoList() {
-    const result = await AssetAccountService.getTokenInfoList()
+    const result = await SudtTokenInfoService.getAllSudtTokenInfo()
     return {
       status: ResponseCode.Success,
       result,
diff --git a/packages/neuron-wallet/src/controllers/cell-manage.ts b/packages/neuron-wallet/src/controllers/cell-manage.ts
new file mode 100644
index 0000000000..097f4845d7
--- /dev/null
+++ b/packages/neuron-wallet/src/controllers/cell-manage.ts
@@ -0,0 +1,83 @@
+import { outPointTransformer } from '../database/chain/entities/cell-local-info'
+import Output from '../models/chain/output'
+import CellsService, { LockScriptType, TypeScriptType } from '../services/cells'
+import WalletService from '../services/wallets'
+import CellLocalInfoService from '../services/cell-local-info'
+import { AddressNotFound, CurrentWalletNotSet } from '../exceptions'
+import AddressService from '../services/addresses'
+import { scriptToAddress } from '../utils/scriptAndAddress'
+import SignMessage from '../services/sign-message'
+import NetworksService from '../services/networks'
+
+export default class CellManage {
+  static async getLiveCells() {
+    const currentWallet = WalletService.getInstance().getCurrent()
+    if (!currentWallet) throw new CurrentWalletNotSet()
+    const liveCells = await CellsService.getLiveCells(currentWallet.id)
+    const outPoints = liveCells
+      .filter((v): v is Output & { outPoint: CKBComponents.OutPoint } => !!v.outPoint)
+      .map(v => v.outPoint)
+    const cellLocalInfoMap = await CellLocalInfoService.getCellLocalInfoMap(outPoints)
+    return liveCells
+      .map<
+        Pick<Output, 'capacity' | 'outPoint' | 'lock' | 'type' | 'timestamp'> & {
+          lockScriptType: LockScriptType
+          typeScriptType?: TypeScriptType
+          description?: string
+          locked?: boolean
+        }
+      >(v => {
+        const result = {
+          capacity: v.capacity,
+          outPoint: v.outPoint,
+          lock: v.lock,
+          type: v.type,
+          data: v.data,
+          timestamp: v.timestamp,
+          lockScriptType: CellsService.getCellLockType(v),
+          typeScriptType: CellsService.getCellTypeType(v),
+        }
+        if (!v.outPoint) {
+          return result
+        }
+        const outPointKey = outPointTransformer.to(v.outPoint)
+        return {
+          ...result,
+          description: cellLocalInfoMap[outPointKey]?.description,
+          locked: cellLocalInfoMap[outPointKey]?.locked,
+        }
+      })
+      .sort((a, b) => +(b.timestamp ?? 0) - +(a.timestamp ?? 0))
+  }
+
+  static updateLiveCellLocalInfo(outPoint: CKBComponents.OutPoint, locked?: boolean, description?: string) {
+    return CellLocalInfoService.saveCellLocalInfo(outPoint, locked, description)
+  }
+
+  static async updateLiveCellsLockStatus(
+    outPoints: CKBComponents.OutPoint[],
+    locked: boolean,
+    lockScripts: CKBComponents.Script[],
+    password: string
+  ) {
+    // check wallet password
+    const currentWallet = WalletService.getInstance().getCurrent()
+    if (!currentWallet) throw new CurrentWalletNotSet()
+    const addresses = new Set((await AddressService.getAddressesByWalletId(currentWallet.id)).map(v => v.address))
+    const isMainnet = NetworksService.getInstance().isMainnet()
+    if (!lockScripts.every(v => addresses.has(scriptToAddress(v, isMainnet)))) throw new AddressNotFound()
+    await SignMessage.sign(currentWallet.id, scriptToAddress(lockScripts[0], isMainnet), password, 'verify password')
+    return CellLocalInfoService.updateLiveCellLockStatus(outPoints, locked)
+  }
+
+  static async getLockedBalance() {
+    const currentWallet = WalletService.getInstance().getCurrent()
+    if (!currentWallet) throw new CurrentWalletNotSet()
+    const lockedCells = await CellLocalInfoService.getLockedCells(currentWallet.id)
+    let lockedBalance = BigInt(0)
+    lockedCells.forEach(v => {
+      lockedBalance += BigInt(v.capacity)
+    })
+    return lockedBalance.toString()
+  }
+}
diff --git a/packages/neuron-wallet/src/controllers/sudt.ts b/packages/neuron-wallet/src/controllers/sudt.ts
index 508385cb11..7b9813c497 100644
--- a/packages/neuron-wallet/src/controllers/sudt.ts
+++ b/packages/neuron-wallet/src/controllers/sudt.ts
@@ -5,11 +5,11 @@ import Script, { ScriptHashType } from '../models/chain/script'
 import parseSUDTTokenInfo from '../utils/parse_sudt_token_info'
 import { ResponseCode } from '../utils/const'
 import { SudtTokenInfo } from '../models/chain/transaction'
-import AssetAccountService from '../services/asset-account-service'
+import SudtTokenInfoService from '../services/sudt-token-info'
 
 export default class SUDTController {
   public async getSUDTTokenInfo(params: { tokenID: string }): Promise<Controller.Response<SudtTokenInfo>> {
-    const tokenList = await AssetAccountService.getTokenInfoList()
+    const tokenList = await SudtTokenInfoService.getAllSudtTokenInfo()
     const sudtInfo = tokenList.find(sudtInfo => sudtInfo.tokenID === params.tokenID)
     if (sudtInfo) {
       return {
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index be7cc8a78c..4aea5e549d 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -457,6 +457,7 @@ export default class WalletsController {
     items: { address: string; capacity: string; date?: string }[]
     fee: string
     feeRate: string
+    consumeOutPoints?: CKBComponents.OutPoint[]
   }) {
     if (!params) {
       throw new IsRequired('Parameters')
@@ -468,7 +469,8 @@ export default class WalletsController {
       params.walletID,
       params.items,
       params.fee,
-      params.feeRate
+      params.feeRate,
+      params.consumeOutPoints
     )
     return {
       status: ResponseCode.Success,
@@ -481,6 +483,7 @@ export default class WalletsController {
     items: { address: string; capacity: string; date?: string }[]
     fee: string
     feeRate: string
+    consumeOutPoints?: CKBComponents.OutPoint[]
   }) {
     if (!params) {
       throw new IsRequired('Parameters')
@@ -492,7 +495,8 @@ export default class WalletsController {
       params.walletID,
       params.items,
       params.fee,
-      params.feeRate
+      params.feeRate,
+      params.consumeOutPoints
     )
     return {
       status: ResponseCode.Success,
diff --git a/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts b/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
new file mode 100644
index 0000000000..871cb12bb5
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
@@ -0,0 +1,35 @@
+import { Entity, PrimaryColumn, Column } from 'typeorm'
+
+export const outPointTransformer = {
+  to(value: CKBComponents.OutPoint) {
+    return `${value.txHash}_${value.index}`
+  },
+  from(value: string): CKBComponents.OutPoint {
+    const [txHash, index] = value.split('_')
+    return {
+      txHash,
+      index,
+    }
+  },
+}
+
+@Entity()
+export default class CellLocalInfo {
+  @PrimaryColumn({
+    type: 'varchar',
+    transformer: outPointTransformer,
+  })
+  outPoint!: CKBComponents.OutPoint
+
+  @Column({
+    type: 'boolean',
+    default: false,
+  })
+  locked?: boolean
+
+  @Column({
+    type: 'varchar',
+    nullable: true,
+  })
+  description?: string
+}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts b/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
new file mode 100644
index 0000000000..d3701fba6e
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class CreateCellLocalInfo1694228328076 implements MigrationInterface {
+    name = 'CreateCellLocalInfo1694228328076'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "cell_local_info" ("outPoint" varchar PRIMARY KEY NOT NULL, "locked" boolean NOT NULL DEFAULT false, "description" varchar)`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP TABLE "cell_local_info"`);
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 5a2a9440aa..ef932ac0e3 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -19,6 +19,7 @@ import MultisigConfig from './entities/multisig-config'
 import MultisigOutput from './entities/multisig-output'
 import SyncProgress from './entities/sync-progress'
 import TxLock from './entities/tx-lock'
+import CellLocalInfo from './entities/cell-local-info'
 
 import { InitMigration1566959757554 } from './migrations/1566959757554-InitMigration'
 import { AddTypeAndHasData1567144517514 } from './migrations/1567144517514-AddTypeAndHasData'
@@ -55,6 +56,7 @@ import { AddTypeSyncProgress1681360188494 } from './migrations/1681360188494-Add
 import { TxLock1684488676083 } from './migrations/1684488676083-TxLock'
 import { ResetSyncProgressPrimaryKey1690361215400 } from './migrations/1690361215400-ResetSyncProgressPrimaryKey'
 import { TxLockAddArgs1694746034975 } from './migrations/1694746034975-TxLockAddArgs'
+import { CreateCellLocalInfo1694228328076 } from './migrations/1694228328076-CreateCellLocalInfo'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -89,6 +91,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       MultisigOutput,
       SyncProgress,
       TxLock,
+      CellLocalInfo,
     ],
     migrations: [
       InitMigration1566959757554,
@@ -126,6 +129,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       TxLock1684488676083,
       ResetSyncProgressPrimaryKey1690361215400,
       TxLockAddArgs1694746034975,
+      CreateCellLocalInfo1694228328076,
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/src/models/asset-account-info.ts b/packages/neuron-wallet/src/models/asset-account-info.ts
index af97883dad..51cd405378 100644
--- a/packages/neuron-wallet/src/models/asset-account-info.ts
+++ b/packages/neuron-wallet/src/models/asset-account-info.ts
@@ -222,10 +222,6 @@ export default class AssetAccountInfo {
     return this.nftInfo
   }
 
-  public getAcpCodeHash(): string {
-    return this.anyoneCanPayInfo.codeHash
-  }
-
   public getSudtCodeHash(): string {
     return this.sudt.codeHash
   }
diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
index a7a7c2b43b..7e076a4310 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -1,11 +1,10 @@
-import { getConnection, In, Not } from 'typeorm'
+import { getConnection, In } from 'typeorm'
 import BufferUtils from '../utils/buffer'
 import OutputEntity from '../database/chain/entities/output'
 import Transaction, { TransactionStatus } from '../models/chain/transaction'
 import AssetAccountInfo from '../models/asset-account-info'
 import { OutputStatus } from '../models/chain/output'
 import AssetAccount from '../models/asset-account'
-import SudtTokenInfoEntity from '../database/chain/entities/sudt-token-info'
 import AssetAccountEntity from '../database/chain/entities/asset-account'
 import { CapacityNotEnoughForChange } from '../exceptions'
 import CellsService from '../services/cells'
@@ -16,6 +15,7 @@ import OutPoint from '../models/chain/out-point'
 import SystemScriptInfo from '../models/system-script-info'
 import Input from '../models/chain/input'
 import { MIN_CELL_CAPACITY } from '../utils/const'
+import SudtTokenInfoService from './sudt-token-info'
 
 export default class AssetAccountService {
   private static async getACPCells(publicKeyHash: string, tokenId: string = 'CKBytes') {
@@ -248,14 +248,7 @@ export default class AssetAccountService {
     const tokenName = isCKB ? 'CKBytes' : ''
     const assetAccount = new AssetAccount(tokenID, symbol, '', tokenName, decimal, '0', blake160)
     const assetAccountEntity = AssetAccountEntity.fromModel(assetAccount)
-    const sudtTokenInfoEntity = assetAccountEntity.sudtTokenInfo
-    await getConnection()
-      .createQueryBuilder()
-      .insert()
-      .into(SudtTokenInfoEntity)
-      .values(sudtTokenInfoEntity)
-      .onConflict(`("tokenID") DO NOTHING`)
-      .execute()
+    await SudtTokenInfoService.insertSudtTokenInfo(assetAccountEntity.sudtTokenInfo)
     const existAccountAccount = await getConnection()
       .getRepository(AssetAccountEntity)
       .createQueryBuilder()
@@ -417,20 +410,6 @@ export default class AssetAccountService {
     return getConnection().manager.save([assetAccount.sudtTokenInfo, assetAccount])
   }
 
-  public static getTokenInfoList() {
-    const repo = getConnection().getRepository(SudtTokenInfoEntity)
-    return repo
-      .find({
-        where: {
-          tokenID: Not(''),
-          tokenName: Not(''),
-          symbol: Not(''),
-          decimal: Not(''),
-        },
-      })
-      .then(list => list.map(item => item.toModel()))
-  }
-
   public static async generateCreateChequeTx(
     walletID: string,
     accountId: number,
diff --git a/packages/neuron-wallet/src/services/cell-local-info.ts b/packages/neuron-wallet/src/services/cell-local-info.ts
new file mode 100644
index 0000000000..3468009691
--- /dev/null
+++ b/packages/neuron-wallet/src/services/cell-local-info.ts
@@ -0,0 +1,65 @@
+import { getConnection } from 'typeorm'
+import CellLocalInfo, { outPointTransformer } from '../database/chain/entities/cell-local-info'
+import CellsService from './cells'
+
+export default class CellLocalInfoService {
+  static async getCellLocalInfoMap(outPoints: CKBComponents.OutPoint[]) {
+    const cellLocalInfos = await getConnection()
+      .getRepository(CellLocalInfo)
+      .createQueryBuilder()
+      .where('outPoint IN (:...outPoints)', { outPoints: outPoints.map(v => `${v.txHash}_${v.index}`) })
+      .getMany()
+    const result: Record<string, CellLocalInfo> = {}
+    cellLocalInfos.forEach(v => {
+      result[outPointTransformer.to(v.outPoint)] = v
+    })
+    return result
+  }
+
+  static async updateOrInsertCellLocalInfo(cellLocalInfos: CellLocalInfo | CellLocalInfo[]) {
+    await getConnection()
+      .getRepository(CellLocalInfo)
+      .createQueryBuilder()
+      .insert()
+      .orUpdate(['locked', 'description'], ['outPoint'])
+      .values(cellLocalInfos)
+      .execute()
+  }
+
+  static async saveCellLocalInfo(outPoint: CKBComponents.OutPoint, locked?: boolean, description?: string) {
+    const cellLocalInfo: CellLocalInfo =
+      (await getConnection().getRepository(CellLocalInfo).findOne({ where: { outPoint } })) ?? new CellLocalInfo()
+    cellLocalInfo.outPoint = outPoint
+    cellLocalInfo.locked = locked ?? cellLocalInfo.locked
+    cellLocalInfo.description = description ?? cellLocalInfo.description
+    await CellLocalInfoService.updateOrInsertCellLocalInfo(cellLocalInfo)
+  }
+
+  static async updateLiveCellLockStatus(outPoints: CKBComponents.OutPoint[], locked: boolean) {
+    const cellLocalInfos: CellLocalInfo[] = outPoints.map(v => {
+      const tmp = new CellLocalInfo()
+      tmp.outPoint = v
+      tmp.locked = locked
+      return tmp
+    })
+    await CellLocalInfoService.updateOrInsertCellLocalInfo(cellLocalInfos)
+  }
+
+  static async getLockedOutPoints(outPoints: CKBComponents.OutPoint[]) {
+    const lockedOutPoints = outPoints.map(v => outPointTransformer.to(v))
+    const lockedCells = await getConnection()
+      .getRepository(CellLocalInfo)
+      .createQueryBuilder()
+      .where('outPoint IN (:...lockedOutPoints)', { lockedOutPoints })
+      .andWhere({ locked: true })
+      .getMany()
+    return new Set(lockedCells.map(v => outPointTransformer.to(v.outPoint)))
+  }
+
+  static async getLockedCells(walletId: string) {
+    const liveCells = await CellsService.getLiveCells(walletId)
+    const outPoints = liveCells.filter(v => !!v.outPoint).map(v => v.outPoint!)
+    const lockedOutPointSet = await CellLocalInfoService.getLockedOutPoints(outPoints)
+    return liveCells.filter(v => v.outPoint && lockedOutPointSet.has(outPointTransformer.to(v.outPoint)))
+  }
+}
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index c998d6dfe5..ec7ab65604 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -1,4 +1,4 @@
-import { getConnection, In } from 'typeorm'
+import { Brackets, getConnection, In } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
 import {
@@ -30,7 +30,10 @@ import AssetAccountInfo from '../models/asset-account-info'
 import NFT from '../models/nft'
 import MultisigConfigModel from '../models/multisig-config'
 import MultisigOutput from '../database/chain/entities/multisig-output'
-import { MIN_CELL_CAPACITY } from '../utils/const'
+import { LOCKTIME_ARGS_LENGTH, MIN_CELL_CAPACITY } from '../utils/const'
+import HdPublicKeyInfo from '../database/chain/entities/hd-public-key-info'
+import CellLocalInfoService from './cell-local-info'
+import { outPointTransformer } from '../database/chain/entities/cell-local-info'
 
 export interface PaginationResult<T = any> {
   totalCount: number
@@ -51,6 +54,24 @@ export enum CustomizedType {
   Unknown = 'Unknown',
 }
 
+export enum LockScriptType {
+  SECP256K1 = 'SECP256K1',
+  ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+  MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+  MULTISIG = 'MULTISIG',
+  Cheque = CustomizedLock.Cheque,
+  Unknown = CustomizedType.Unknown,
+}
+
+export enum TypeScriptType {
+  DAO = 'DAO',
+  NFT = CustomizedType.NFT,
+  NFTClass = CustomizedType.NFTClass,
+  NFTIssuer = CustomizedType.NFTIssuer,
+  SUDT = CustomizedType.SUDT,
+  Unknown = CustomizedType.Unknown,
+}
+
 export default class CellsService {
   private static ANYONE_CAN_PAY_CKB_CELL_MIN = BigInt(61 * 10 ** 8)
   private static ANYONE_CAN_PAY_SUDT_CELL_MIN = BigInt(142 * 10 ** 8)
@@ -263,7 +284,6 @@ export default class CellsService {
     const nftIssuerCodehash = assetAccountInfo.getNftIssuerInfo().codeHash
     const nftClassCodehash = assetAccountInfo.getNftClassInfo().codeHash
     const nftCodehash = assetAccountInfo.getNftInfo().codeHash
-    const acpCodehash = assetAccountInfo.getAcpCodeHash()
     const sudtCodehash = assetAccountInfo.getSudtCodeHash()
     const secp256k1LockHashes = [...blake160Hashes].map(blake160 =>
       SystemScriptInfo.generateSecpScript(blake160).computeHash()
@@ -338,7 +358,7 @@ export default class CellsService {
         )
       }
 
-      if (o.hasData && o.typeCodeHash === sudtCodehash && o.lockCodeHash === acpCodehash) {
+      if (o.hasData && o.typeCodeHash === sudtCodehash && o.lockCodeHash === assetAccountInfo.anyoneCanPayCodeHash) {
         return false
       }
 
@@ -438,6 +458,56 @@ export default class CellsService {
     return cellEntity
   }
 
+  public static getLiveCells = async (walletId: string) => {
+    const hdPublicKeyInfos = await getConnection()
+      .getRepository(HdPublicKeyInfo)
+      .createQueryBuilder()
+      .where({ walletId })
+      .getMany()
+    const blake160s = hdPublicKeyInfos.map(v => v.publicKeyInBlake160)
+    const multisigArgs = hdPublicKeyInfos.map(v => Multisig.hash([v.publicKeyInBlake160]))
+    // find all outputs except cheque
+    const outputs = await getConnection()
+      .getRepository(OutputEntity)
+      .createQueryBuilder('output')
+      .leftJoinAndSelect('output.transaction', 'tx')
+      .where({
+        status: In([OutputStatus.Live, OutputStatus.Sent]),
+      })
+      .andWhere(
+        new Brackets(qb => {
+          qb.where({ lockArgs: In(blake160s) }).orWhere({ multiSignBlake160: In(multisigArgs) })
+        })
+      )
+      .getMany()
+    const currentWalletCheque = await CellsService.getChequeLiveCells(blake160s)
+    return outputs.concat(currentWalletCheque).map(v => v.toModel())
+  }
+
+  private static getChequeLiveCells = async (blake160s: string[]) => {
+    const assetAccountInfo = new AssetAccountInfo()
+    const chequeLockCodeHash = assetAccountInfo.getChequeInfo().codeHash
+    // find cheque
+    const allChequeOutputs = await getConnection()
+      .getRepository(OutputEntity)
+      .createQueryBuilder('output')
+      .leftJoinAndSelect('output.transaction', 'tx')
+      .where({
+        status: In([OutputStatus.Live, OutputStatus.Sent]),
+        lockCodeHash: chequeLockCodeHash,
+      })
+      .getMany()
+    const secp256k1LockHashes = blake160s.map(blake160 => SystemScriptInfo.generateSecpScript(blake160).computeHash())
+    return allChequeOutputs.filter(v => {
+      const receiverLockHash = v.lockArgs.slice(0, 42)
+      const senderLockHash = v.lockArgs.slice(42)
+      return (
+        secp256k1LockHashes.find(hash => hash.includes(receiverLockHash)) ||
+        secp256k1LockHashes.find(hash => hash.includes(senderLockHash))
+      )
+    })
+  }
+
   private static getLiveOrSentCellByWalletId = async (
     walletId: string,
     lockClass: {
@@ -445,7 +515,7 @@ export default class CellsService {
       hashType: ScriptHashType
     }
   ) => {
-    return await getConnection()
+    const outputs = await getConnection()
       .getRepository(OutputEntity)
       .createQueryBuilder('output')
       .where(
@@ -469,6 +539,23 @@ export default class CellsService {
         }
       )
       .getMany()
+    const lockedOutPointSet = await CellLocalInfoService.getLockedOutPoints(outputs.map(v => v.outPoint()))
+    return outputs.filter(v => v.outPoint && !lockedOutPointSet.has(outPointTransformer.to(v.outPoint())))
+  }
+
+  private static getLiveOrSendCellByOutPoints = async (consumeOutPoints: CKBComponents.OutPoint[]) => {
+    const outputs = await getConnection()
+      .getRepository(OutputEntity)
+      .createQueryBuilder('output')
+      .where({
+        status: In([OutputStatus.Live, OutputStatus.Sent]),
+        outPointTxHash: In(consumeOutPoints.map(v => v.txHash)),
+      })
+      .getMany()
+    return outputs.filter(
+      v =>
+        !!consumeOutPoints.find(outPoint => outPoint.txHash === v.outPointTxHash && outPoint.index === v.outPointIndex)
+    )
   }
 
   private static getLiveOrSentCellByLockArgsMultisigOutput = async (lockClass: {
@@ -519,7 +606,8 @@ export default class CellsService {
       codeHash: string
       hashType: ScriptHashType
     } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
-    multisigConfigs: MultisigConfigModel[] = []
+    multisigConfigs: MultisigConfigModel[] = [],
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<{
     inputs: Input[]
     capacities: string
@@ -542,7 +630,9 @@ export default class CellsService {
 
     // only live cells, skip which has data or type
     const cellEntities: (OutputEntity | MultisigOutput)[] = await (walletId
-      ? CellsService.getLiveOrSentCellByWalletId(walletId, lockClass)
+      ? consumeOutPoints?.length
+        ? CellsService.getLiveOrSendCellByOutPoints(consumeOutPoints)
+        : CellsService.getLiveOrSentCellByWalletId(walletId, lockClass)
       : CellsService.getLiveOrSentCellByLockArgsMultisigOutput(lockClass))
 
     const liveCells = cellEntities.filter(c => c.status === OutputStatus.Live)
@@ -674,15 +764,21 @@ export default class CellsService {
       codeHash: string
       hashType: ScriptHashType
       args?: string
-    } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type }
+    } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<Input[]> => {
-    const cellEntities: (OutputEntity | MultisigOutput)[] = await (!lockClass.args
-      ? CellsService.getLiveOrSentCellByWalletId(walletId, lockClass)
-      : CellsService.getLiveOrSentCellByLockArgsMultisigOutput({
-          codeHash: lockClass.codeHash,
-          hashType: lockClass.hashType,
-          lockArgs: [lockClass.args],
-        }))
+    let cellEntities: (OutputEntity | MultisigOutput)[] = []
+    if (consumeOutPoints?.length) {
+      cellEntities = await CellsService.getLiveOrSendCellByOutPoints(consumeOutPoints)
+    } else if (lockClass.args) {
+      cellEntities = await CellsService.getLiveOrSentCellByLockArgsMultisigOutput({
+        codeHash: lockClass.codeHash,
+        hashType: lockClass.hashType,
+        lockArgs: [lockClass.args],
+      })
+    } else {
+      cellEntities = await CellsService.getLiveOrSentCellByWalletId(walletId, lockClass)
+    }
 
     const inputs: Input[] = cellEntities
       .filter(v => v.status === OutputStatus.Live)
@@ -1032,27 +1128,6 @@ export default class CellsService {
     }
   }
 
-  public static allBlake160s = async (): Promise<string[]> => {
-    const outputEntities = await getConnection().getRepository(OutputEntity).createQueryBuilder('output').getMany()
-    const blake160s: string[] = outputEntities
-      .map(output => {
-        const lock = output.lockScript()
-        if (!lock) {
-          return undefined
-        }
-        const { args } = lock
-        if (!args) {
-          return undefined
-        }
-        return args
-      })
-      .filter(blake160 => !!blake160) as string[]
-
-    const uniqueBlake160s = [...new Set(blake160s)]
-
-    return uniqueBlake160s
-  }
-
   public static async gatherLegacyACPInputs(walletId: string) {
     const assetAccountInfo = new AssetAccountInfo()
     const legacyACPScriptInfo = assetAccountInfo.getLegacyAnyoneCanPayInfo()
@@ -1185,4 +1260,43 @@ export default class CellsService {
 
     return balances
   }
+
+  public static getCellLockType(output: CKBComponents.CellOutput): LockScriptType {
+    const assetAccountInfo = new AssetAccountInfo()
+    switch (output.lock.codeHash) {
+      case assetAccountInfo.getChequeInfo().codeHash:
+        return LockScriptType.Cheque
+      case SystemScriptInfo.MULTI_SIGN_CODE_HASH:
+        if (output.lock.args.length === LOCKTIME_ARGS_LENGTH) {
+          return LockScriptType.MULTI_LOCK_TIME
+        }
+        return LockScriptType.MULTISIG
+      case assetAccountInfo.anyoneCanPayCodeHash:
+        return LockScriptType.ANYONE_CAN_PAY
+      case SystemScriptInfo.SECP_CODE_HASH:
+        return LockScriptType.SECP256K1
+      default:
+        return LockScriptType.Unknown
+    }
+  }
+
+  public static getCellTypeType(output: CKBComponents.CellOutput): TypeScriptType | undefined {
+    const assetAccountInfo = new AssetAccountInfo()
+    if (output.type) {
+      switch (output.type.codeHash) {
+        case assetAccountInfo.getNftInfo().codeHash:
+          return TypeScriptType.NFT
+        case assetAccountInfo.getNftIssuerInfo().codeHash:
+          return TypeScriptType.NFTIssuer
+        case assetAccountInfo.getNftClassInfo().codeHash:
+          return TypeScriptType.NFTClass
+        case assetAccountInfo.getSudtCodeHash():
+          return TypeScriptType.SUDT
+        case SystemScriptInfo.DAO_CODE_HASH:
+          return TypeScriptType.DAO
+        default:
+          return TypeScriptType.Unknown
+      }
+    }
+  }
 }
diff --git a/packages/neuron-wallet/src/services/sudt-token-info.ts b/packages/neuron-wallet/src/services/sudt-token-info.ts
new file mode 100644
index 0000000000..7efaf074aa
--- /dev/null
+++ b/packages/neuron-wallet/src/services/sudt-token-info.ts
@@ -0,0 +1,57 @@
+import { In, Not, getConnection } from 'typeorm'
+import SudtTokenInfoEntity from '../database/chain/entities/sudt-token-info'
+
+export default class SudtTokenInfoService {
+  static async findSudtTokenInfoByArgs(typeArgsList: string[]) {
+    const sudtTokenInfoList = await getConnection()
+      .getRepository(SudtTokenInfoEntity)
+      .find({
+        where: {
+          tokenID: In(typeArgsList),
+          tokenName: Not(''),
+          symbol: Not(''),
+          decimal: Not(''),
+        },
+      })
+    return sudtTokenInfoList.map(item => item.toModel())
+  }
+
+  static async getAllSudtTokenInfo() {
+    const sudtTokenInfoList = await getConnection()
+      .getRepository(SudtTokenInfoEntity)
+      .find({
+        where: {
+          tokenID: Not(''),
+          tokenName: Not(''),
+          symbol: Not(''),
+          decimal: Not(''),
+        },
+      })
+    return sudtTokenInfoList.map(item => item.toModel())
+  }
+
+  static async insertSudtTokenInfo(sudtTokenInfoEntity: SudtTokenInfoEntity) {
+    await getConnection()
+      .createQueryBuilder()
+      .insert()
+      .into(SudtTokenInfoEntity)
+      .values(sudtTokenInfoEntity)
+      .orIgnore(`("tokenID") DO NOTHING`)
+      .execute()
+  }
+
+  static getSudtTokenInfo(typeArgs: string, walletId: string) {
+    return getConnection()
+      .getRepository(SudtTokenInfoEntity)
+      .createQueryBuilder('info')
+      .leftJoinAndSelect('info.assetAccounts', 'aa')
+      .where(
+        `info.tokenID = :typeArgs AND aa.blake160 IN (select publicKeyInBlake160 from hd_public_key_info where walletId = :walletId)`,
+        {
+          typeArgs,
+          walletId,
+        }
+      )
+      .getOne()
+  }
+}
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 893fb90a9a..67bc24c0c9 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -429,7 +429,8 @@ export default class TransactionSender {
     walletID: string = '',
     items: TargetOutput[] = [],
     fee: string = '0',
-    feeRate: string = '0'
+    feeRate: string = '0',
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<Transaction> => {
     const targetOutputs = items.map(item => ({
       ...item,
@@ -444,7 +445,10 @@ export default class TransactionSender {
         targetOutputs,
         changeAddress,
         fee,
-        feeRate
+        feeRate,
+        undefined,
+        undefined,
+        consumeOutPoints
       )
 
       return tx
@@ -460,14 +464,22 @@ export default class TransactionSender {
     walletID: string = '',
     items: TargetOutput[] = [],
     fee: string = '0',
-    feeRate: string = '0'
+    feeRate: string = '0',
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<Transaction> => {
     const targetOutputs = items.map(item => ({
       ...item,
       capacity: BigInt(item.capacity).toString(),
     }))
 
-    const tx: Transaction = await TransactionGenerator.generateSendingAllTx(walletID, targetOutputs, fee, feeRate)
+    const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
+      walletID,
+      targetOutputs,
+      fee,
+      feeRate,
+      undefined,
+      consumeOutPoints
+    )
 
     return tx
   }
diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
index 711fffb03b..53693f812f 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -155,7 +155,8 @@ export class TransactionGenerator {
       codeHash: string
       hashType: ScriptHashType
     } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
-    multisigConfig?: MultisigConfigModel
+    multisigConfig?: MultisigConfigModel,
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<Transaction> => {
     let cellDep: CellDep
     if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
@@ -214,7 +215,8 @@ export class TransactionGenerator {
       TransactionGenerator.CHANGE_OUTPUT_DATA_SIZE,
       undefined,
       lockClass,
-      multisigConfig ? [multisigConfig] : []
+      multisigConfig ? [multisigConfig] : [],
+      consumeOutPoints
     )
     const finalFeeInt = BigInt(finalFee)
     tx.inputs = inputs
@@ -241,7 +243,8 @@ export class TransactionGenerator {
     targetOutputs: TargetOutput[],
     fee: string = '0',
     feeRate: string = '0',
-    multisigConfig?: MultisigConfigModel
+    multisigConfig?: MultisigConfigModel,
+    consumeOutPoints?: CKBComponents.OutPoint[]
   ): Promise<Transaction> => {
     let cellDep: CellDep
     if (multisigConfig) {
@@ -263,7 +266,8 @@ export class TransactionGenerator {
         ? Script.fromSDK(
             Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n)
           )
-        : undefined
+        : undefined,
+      consumeOutPoints
     )
 
     if (allInputs.length === 0) {
diff --git a/packages/neuron-wallet/src/services/tx/transaction-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index c38d3a3e03..ea7a1956d2 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-service.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-service.ts
@@ -14,12 +14,12 @@ import AddressParser from '../../models/address-parser'
 import AssetAccountInfo from '../../models/asset-account-info'
 import BufferUtils from '../../utils/buffer'
 import AssetAccountEntity from '../../database/chain/entities/asset-account'
-import SudtTokenInfoEntity from '../../database/chain/entities/sudt-token-info'
 import exportTransactions from '../../utils/export-history'
 import RpcService from '../rpc-service'
 import NetworksService from '../networks'
 import Script from '../../models/chain/script'
 import Input from '../../models/chain/input'
+import SudtTokenInfoService from '../sudt-token-info'
 
 export interface TransactionsByAddressesParam {
   pageNo: number
@@ -424,18 +424,7 @@ export class TransactionsService {
             .reduce((result, c) => result + c, BigInt(0))
 
           const amount = outputAmount - inputAmount
-          const tokenInfo = await getConnection()
-            .getRepository(SudtTokenInfoEntity)
-            .createQueryBuilder('info')
-            .leftJoinAndSelect('info.assetAccounts', 'aa')
-            .where(
-              `info.tokenID = :typeArgs AND aa.blake160 IN (select publicKeyInBlake160 from hd_public_key_info where walletId = :walletId)`,
-              {
-                typeArgs,
-                walletId: params.walletID,
-              }
-            )
-            .getOne()
+          const tokenInfo = await SudtTokenInfoService.getSudtTokenInfo(typeArgs, params.walletID)
 
           if (tokenInfo) {
             sudtInfo = {
diff --git a/packages/neuron-wallet/src/utils/const.ts b/packages/neuron-wallet/src/utils/const.ts
index 45f147c7d0..cf8eb74a7e 100644
--- a/packages/neuron-wallet/src/utils/const.ts
+++ b/packages/neuron-wallet/src/utils/const.ts
@@ -10,6 +10,7 @@ export const MIN_SUDT_CAPACITY = 142 * 10 ** 8
 export const MIN_CELL_CAPACITY = 61 * 10 ** 8
 export const START_WITHOUT_INDEXER = -4
 export const DEFAULT_ARGS_LENGTH = 42
+export const LOCKTIME_ARGS_LENGTH = 58
 export const CHEQUE_ARGS_LENGTH = 82
 
 export enum ResponseCode {
diff --git a/packages/neuron-wallet/tests/controllers/cell-manage.test.ts b/packages/neuron-wallet/tests/controllers/cell-manage.test.ts
new file mode 100644
index 0000000000..8a65a0dbae
--- /dev/null
+++ b/packages/neuron-wallet/tests/controllers/cell-manage.test.ts
@@ -0,0 +1,171 @@
+import CellManage from '../../src/controllers/cell-manage'
+import { outPointTransformer } from '../../src/database/chain/entities/cell-local-info'
+import { AddressNotFound, CurrentWalletNotSet } from '../../src/exceptions'
+import OutPoint from '../../src/models/chain/out-point'
+import Output from '../../src/models/chain/output'
+import { ScriptHashType } from '../../src/models/chain/script'
+import { scriptToAddress } from '../../src/utils/scriptAndAddress'
+
+const getCurrentWalletMock = jest.fn()
+const getLiveCellsMock = jest.fn()
+const getCellLocalInfoMapMock = jest.fn()
+const getCellLockTypeMock = jest.fn()
+const getCellTypeTypeMock = jest.fn()
+const isMainnetMock = jest.fn()
+const getAddressesByWalletIdMock = jest.fn()
+const updateLiveCellLockStatusMock = jest.fn()
+const signMock = jest.fn()
+const getLockedCellsMock = jest.fn()
+
+function resetMocks() {
+  getCurrentWalletMock.mockReset()
+  getLiveCellsMock.mockReset()
+  getCellLocalInfoMapMock.mockReset()
+  isMainnetMock.mockReset()
+  getAddressesByWalletIdMock.mockReset()
+  updateLiveCellLockStatusMock.mockReset()
+  signMock.mockReset()
+  getLockedCellsMock.mockReset()
+}
+
+jest.mock('../../src/services/wallets', () => ({
+  getInstance() {
+    return {
+      getCurrent: getCurrentWalletMock,
+    }
+  },
+}))
+
+jest.mock('../../src/services/networks', () => ({
+  getInstance() {
+    return {
+      isMainnet: isMainnetMock,
+    }
+  },
+}))
+
+jest.mock('../../src/services/cells', () => ({
+  getLiveCells: () => getLiveCellsMock(),
+  getCellLockType: () => getCellLockTypeMock,
+  getCellTypeType: () => getCellTypeTypeMock(),
+}))
+
+jest.mock('../../src/services/addresses', () => ({
+  getAddressesByWalletId: () => getAddressesByWalletIdMock(),
+}))
+
+jest.mock('../../src/services/sign-message', () => ({
+  sign: (walletID: string, address: string, password: string, message: string) =>
+    signMock(walletID, address, password, message),
+}))
+
+jest.mock('../../src/services/cell-local-info', () => ({
+  getCellLocalInfoMap: (outPoints: CKBComponents.OutPoint[]) => getCellLocalInfoMapMock(outPoints),
+  updateLiveCellLockStatus: (outPoints: CKBComponents.OutPoint[], locked: boolean) =>
+    updateLiveCellLockStatusMock(outPoints, locked),
+  getLockedCells: () => getLockedCellsMock(),
+}))
+
+const secp256k1CodeHash = '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8'
+function createOutput(
+  capacity: string = '6100000000',
+  lockArgs: string = '0x36c329ed630d6ce750712a477543672adab57f4c'
+) {
+  return Output.fromSDK({
+    capacity,
+    lock: {
+      codeHash: secp256k1CodeHash,
+      hashType: ScriptHashType.Type,
+      args: lockArgs,
+    },
+  })
+}
+describe('CellManage', () => {
+  beforeEach(() => {
+    resetMocks()
+  })
+  describe('getLiveCells', () => {
+    it('no current wallet', async () => {
+      getCurrentWalletMock.mockReturnValue(undefined)
+      await expect(CellManage.getLiveCells()).rejects.toThrow(new CurrentWalletNotSet())
+    })
+    it('outpoint is null', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLiveCellsMock.mockResolvedValueOnce([createOutput()])
+      await CellManage.getLiveCells()
+      expect(getCellLocalInfoMapMock).toBeCalledWith([])
+    })
+    it('outpoint is null and order by timestamp', async () => {
+      const output1 = createOutput()
+      output1.timestamp = '12'
+      const output2 = createOutput()
+      output2.timestamp = '13'
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLiveCellsMock.mockResolvedValueOnce([output1, output2])
+      const res = await CellManage.getLiveCells()
+      expect(getCellLocalInfoMapMock).toBeCalledWith([])
+      expect(res[0].timestamp).toBe(output2.timestamp)
+    })
+    it('outpoint is not null', async () => {
+      const output1 = createOutput()
+      output1.timestamp = '12'
+      output1.outPoint = new OutPoint(`0x${'00'.repeat(32)}`, '0')
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLiveCellsMock.mockResolvedValueOnce([output1])
+      getCellLocalInfoMapMock.mockResolvedValueOnce({
+        [outPointTransformer.to(output1.outPoint)]: { description: 'description', locked: true },
+      })
+      const res = await CellManage.getLiveCells()
+      expect(res[0].description).toBe('description')
+      expect(res[0].locked).toBeTruthy()
+    })
+  })
+
+  describe('updateLiveCellsLockStatus', () => {
+    it('no current wallet', async () => {
+      getCurrentWalletMock.mockReturnValue(undefined)
+      await expect(CellManage.updateLiveCellsLockStatus([], true, [], '')).rejects.toThrow(new CurrentWalletNotSet())
+    })
+    it('address not found', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getAddressesByWalletIdMock.mockResolvedValueOnce([])
+      await expect(
+        CellManage.updateLiveCellsLockStatus(
+          [],
+          true,
+          [
+            {
+              codeHash: secp256k1CodeHash,
+              hashType: ScriptHashType.Type,
+              args: `0x${'0'.repeat(40)}`,
+            },
+          ],
+          ''
+        )
+      ).rejects.toThrow(new AddressNotFound())
+    })
+    it('update success', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      isMainnetMock.mockReturnValue(false)
+      const lockScript = { codeHash: secp256k1CodeHash, hashType: ScriptHashType.Type, args: `0x${'0'.repeat(40)}` }
+      const address = scriptToAddress(lockScript, false)
+      getAddressesByWalletIdMock.mockResolvedValueOnce([{ address }])
+      const outPoints = [new OutPoint(`0x${'00'.repeat(32)}`, '0')]
+      await CellManage.updateLiveCellsLockStatus(outPoints, true, [lockScript], 'password')
+      expect(signMock).toBeCalledWith('walletId1', address, 'password', 'verify password')
+      expect(updateLiveCellLockStatusMock).toBeCalledWith(outPoints, true)
+    })
+  })
+
+  describe('getLockedBalance', () => {
+    it('no current wallet', async () => {
+      getCurrentWalletMock.mockReturnValue(undefined)
+      await expect(CellManage.getLockedBalance()).rejects.toThrow(new CurrentWalletNotSet())
+    })
+    it('success', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLockedCellsMock.mockResolvedValueOnce([{ capacity: '6100000000' }, { capacity: '6100000000' }])
+      expect(await CellManage.getLockedBalance()).toBe('12200000000')
+    })
+  })
+})
diff --git a/packages/neuron-wallet/tests/controllers/sudt.test.ts b/packages/neuron-wallet/tests/controllers/sudt.test.ts
index f079c52175..a6d3b04c8d 100644
--- a/packages/neuron-wallet/tests/controllers/sudt.test.ts
+++ b/packages/neuron-wallet/tests/controllers/sudt.test.ts
@@ -4,11 +4,11 @@ import { ResponseCode } from '../../src/utils/const'
 
 describe('SUDTController', () => {
   const stubbedGetOneByLockScriptAndTypeScript = jest.fn()
-  const stubbedGetTokenInfoList = jest.fn()
+  const stubbedGetAllSudtTokenInfo = jest.fn()
 
   const resetMocks = () => {
     stubbedGetOneByLockScriptAndTypeScript.mockReset()
-    stubbedGetTokenInfoList.mockReset()
+    stubbedGetAllSudtTokenInfo.mockReset()
   }
 
   jest.doMock('../../src/services/live-cell-service', () => {
@@ -18,9 +18,9 @@ describe('SUDTController', () => {
       }),
     }
   })
-  jest.doMock('../../src/services/asset-account-service', () => {
+  jest.doMock('../../src/services/sudt-token-info', () => {
     return {
-      getTokenInfoList: stubbedGetTokenInfoList,
+      getAllSudtTokenInfo: stubbedGetAllSudtTokenInfo,
     }
   })
   const SUDTController = require('../../src/controllers/sudt').default
@@ -38,7 +38,7 @@ describe('SUDTController', () => {
       decimal: '8',
     }
     beforeEach(async () => {
-      stubbedGetTokenInfoList.mockReturnValue([testTokenInfo])
+      stubbedGetAllSudtTokenInfo.mockReturnValue([testTokenInfo])
     })
 
     it('getSUDTTokenInfo from token list success', async () => {
@@ -69,7 +69,7 @@ describe('SUDTController', () => {
       '0x080a456972632d320a455432'
     )
     beforeEach(async () => {
-      stubbedGetTokenInfoList.mockReturnValue([])
+      stubbedGetAllSudtTokenInfo.mockReturnValue([])
       stubbedGetOneByLockScriptAndTypeScript.mockReturnValue(testLiveCell)
     })
 
@@ -86,7 +86,7 @@ describe('SUDTController', () => {
   describe('get sudtInfo null', () => {
     const testTokenID = '0x45496bbe3525c3fc1b8a26b5c00d1238870422deab092567b8bb45d61cda1abd'
     beforeEach(async () => {
-      stubbedGetTokenInfoList.mockReturnValue([])
+      stubbedGetAllSudtTokenInfo.mockReturnValue([])
     })
     it('getSUDTTokenInfo from live cell data parse', async () => {
       const sudtController = new SUDTController()
diff --git a/packages/neuron-wallet/tests/services/asset-account-service.test.ts b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
index 0178c0311b..14da05c9ba 100644
--- a/packages/neuron-wallet/tests/services/asset-account-service.test.ts
+++ b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
@@ -894,48 +894,6 @@ describe('AssetAccountService', () => {
     })
   })
 
-  describe('Test Token Info List', () => {
-    beforeEach(async () => {
-      const tokens = [
-        {
-          tokenID: 'CKBytes',
-          symbol: 'ckb',
-          tokenName: 'ckb',
-          decimal: '0',
-        },
-        {
-          tokenID: tokenID,
-          symbol: 'udt',
-          tokenName: 'udt',
-          decimal: '0',
-        },
-        {
-          tokenID: 'invalid token info',
-          symbol: '',
-          tokenName: '',
-          decimal: '',
-        },
-      ]
-      const repo = getConnection().getRepository(SudtTokenInfoEntity)
-      await repo.save(tokens)
-    })
-
-    it('Get token info list', async () => {
-      const list = await AssetAccountService.getTokenInfoList()
-      expect(list.length).toEqual(2)
-      expect(list.find((item: any) => item.tokenID === 'CKBytes')).toBeTruthy()
-      expect(list.find((item: any) => item.tokenID === tokenID)).toBeTruthy()
-    })
-
-    it('Filter invalid token info out', async () => {
-      const repo = getConnection().getRepository(SudtTokenInfoEntity)
-      const count = await repo.count()
-      expect(count).toBe(3)
-      const list = await AssetAccountService.getTokenInfoList()
-      expect(list).toHaveLength(2)
-    })
-  })
-
   describe('#generateCreateChequeTx', () => {
     let fakeAssetAccount: AssetAccountEntity
     const receiverAddress = 'receiver address'
diff --git a/packages/neuron-wallet/tests/services/cell-local-info.test.ts b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
new file mode 100644
index 0000000000..08667c047f
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
@@ -0,0 +1,159 @@
+import { getConnection } from 'typeorm'
+import CellLocalInfoService from '../../src/services/cell-local-info'
+import { closeConnection, initConnection } from '../setupAndTeardown'
+import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
+
+const outPoints = [
+  {
+    txHash: `0x${'00'.repeat(32)}`,
+    index: '0',
+  },
+  {
+    txHash: `0x${'00'.repeat(32)}`,
+    index: '1',
+  },
+]
+
+const createCellLocalInfo = (outPoint: CKBComponents.OutPoint, locked?: boolean, description?: string) => {
+  const cellLocalInfo = new CellLocalInfo()
+  cellLocalInfo.outPoint = outPoint
+  cellLocalInfo.locked = locked
+  cellLocalInfo.description = description
+  return cellLocalInfo
+}
+
+const getLiveCellsMock = jest.fn()
+
+function resetMocks() {
+  getLiveCellsMock.mockReset()
+}
+
+jest.mock('../../src/services/cells', () => ({
+  getLiveCells: () => getLiveCellsMock(),
+}))
+
+describe('CellLocalInfoService', () => {
+  beforeAll(async () => {
+    await initConnection()
+  })
+  afterAll(async () => {
+    await closeConnection()
+  })
+  beforeEach(async () => {
+    resetMocks()
+    const connection = getConnection()
+    await connection.synchronize(true)
+  })
+  describe('getCellLocalInfoMap', () => {
+    const cellLocalInfo = createCellLocalInfo(outPoints[0], false, '')
+    beforeEach(async () => {
+      await getConnection().getRepository(CellLocalInfo).createQueryBuilder().insert().values(cellLocalInfo).execute()
+    })
+    it('param is empty array', async () => {
+      await expect(CellLocalInfoService.getCellLocalInfoMap([])).resolves.toStrictEqual({})
+    })
+    it('cannot find the outpoint', async () => {
+      await expect(CellLocalInfoService.getCellLocalInfoMap([outPoints[1]])).resolves.toStrictEqual({})
+    })
+    it('find the outpoint', async () => {
+      await expect(CellLocalInfoService.getCellLocalInfoMap([outPoints[0]])).resolves.toStrictEqual({
+        [`${outPoints[0].txHash}_${outPoints[0].index}`]: cellLocalInfo,
+      })
+    })
+  })
+
+  describe('updateOrInsertCellLocalInfo', () => {
+    it('insert entity', async () => {
+      const cellLocalInfo = createCellLocalInfo(outPoints[0], false, '')
+      await CellLocalInfoService.updateOrInsertCellLocalInfo(cellLocalInfo)
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(1)
+    })
+    it('insert entities', async () => {
+      const cellLocalInfo1 = createCellLocalInfo(outPoints[0], false, '')
+      const cellLocalInfo2 = createCellLocalInfo(outPoints[1], true, '')
+      await CellLocalInfoService.updateOrInsertCellLocalInfo([cellLocalInfo1, cellLocalInfo2])
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(2)
+    })
+    it('update entity', async () => {
+      const cellLocalInfo1 = createCellLocalInfo(outPoints[0], false, '')
+      await CellLocalInfoService.updateOrInsertCellLocalInfo(cellLocalInfo1)
+      cellLocalInfo1.locked = true
+      cellLocalInfo1.description = 'desc'
+      await CellLocalInfoService.updateOrInsertCellLocalInfo(cellLocalInfo1)
+      const res = await getConnection().getRepository(CellLocalInfo).find()
+      expect(res).toHaveLength(1)
+      expect(res[0].locked).toBeTruthy()
+      expect(res[0].description).toBe('desc')
+    })
+  })
+
+  describe('saveCellLocalInfo', () => {
+    it('insert entity', async () => {
+      await CellLocalInfoService.saveCellLocalInfo(outPoints[0])
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(1)
+    })
+    it('update entity', async () => {
+      await CellLocalInfoService.saveCellLocalInfo(outPoints[0])
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(1)
+      await CellLocalInfoService.saveCellLocalInfo(outPoints[0], true, 'desc')
+      const res = await getConnection().getRepository(CellLocalInfo).find()
+      expect(res).toHaveLength(1)
+      expect(res[0].locked).toBeTruthy()
+      expect(res[0].description).toBe('desc')
+    })
+  })
+
+  describe('updateLiveCellLockStatus', () => {
+    it('create new entity', async () => {
+      await CellLocalInfoService.updateLiveCellLockStatus(outPoints, true)
+      await expect(getConnection().getRepository(CellLocalInfo).find({ locked: true })).resolves.toHaveLength(2)
+    })
+    it('update entity locked', async () => {
+      await CellLocalInfoService.updateLiveCellLockStatus(outPoints, true)
+      await expect(getConnection().getRepository(CellLocalInfo).find({ locked: true })).resolves.toHaveLength(2)
+      await CellLocalInfoService.updateLiveCellLockStatus(outPoints, false)
+      await expect(getConnection().getRepository(CellLocalInfo).find({ locked: false })).resolves.toHaveLength(2)
+    })
+  })
+
+  describe('getLockedOutPoints', () => {
+    beforeEach(async () => {
+      const cellLocalInfo1 = createCellLocalInfo(outPoints[0], true)
+      const cellLocalInfo2 = createCellLocalInfo(outPoints[1], false)
+      await getConnection()
+        .getRepository(CellLocalInfo)
+        .createQueryBuilder()
+        .insert()
+        .values([cellLocalInfo1, cellLocalInfo2])
+        .execute()
+    })
+    it('outpoint is emtpy', async () => {
+      await expect(CellLocalInfoService.getLockedOutPoints([])).resolves.toStrictEqual(new Set())
+    })
+    it('no locked outpoint', async () => {
+      await expect(CellLocalInfoService.getLockedOutPoints([outPoints[1]])).resolves.toStrictEqual(new Set())
+    })
+    it('find locked outpoint', async () => {
+      await expect(CellLocalInfoService.getLockedOutPoints(outPoints)).resolves.toStrictEqual(
+        new Set([`${outPoints[0].txHash}_${outPoints[0].index}`])
+      )
+    })
+  })
+
+  describe('getLockedCells', () => {
+    it('getLiveCells return without outPoint', async () => {
+      getLiveCellsMock.mockResolvedValueOnce([{}])
+      await expect(CellLocalInfoService.getLockedCells('')).resolves.toHaveLength(0)
+    })
+    it('no locked cell', async () => {
+      getLiveCellsMock.mockResolvedValueOnce([{ outPoint: outPoints[0] }])
+      await expect(CellLocalInfoService.getLockedCells('')).resolves.toHaveLength(0)
+    })
+    it('exist locked cell', async () => {
+      const cellLocalInfo = createCellLocalInfo(outPoints[0], true)
+      await getConnection().getRepository(CellLocalInfo).createQueryBuilder().insert().values(cellLocalInfo).execute()
+      getLiveCellsMock.mockResolvedValueOnce([{ outPoint: outPoints[0] }])
+      await expect(CellLocalInfoService.getLockedCells('')).resolves.toHaveLength(1)
+    })
+  })
+})
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index c78edf09df..8bdd5408c1 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -4,7 +4,7 @@ import { bytes } from '@ckb-lumos/codec'
 import { initConnection } from '../../src/database/chain/ormconfig'
 import OutputEntity from '../../src/database/chain/entities/output'
 import { OutputStatus } from '../../src/models/chain/output'
-import CellsService, { CustomizedLock, CustomizedType } from '../../src/services/cells'
+import CellsService, { CustomizedLock, CustomizedType, LockScriptType, TypeScriptType } from '../../src/services/cells'
 import { CapacityNotEnough, CapacityNotEnoughForChange, LiveCapacityNotEnough } from '../../src/exceptions/wallet'
 import TransactionEntity from '../../src/database/chain/entities/transaction'
 import TransactionSize from '../../src/models/transaction-size'
@@ -24,6 +24,7 @@ import MultisigOutput from '../../src/database/chain/entities/multisig-output'
 import { MultisigConfigNeedError, TransactionInputParameterMiss } from '../../src/exceptions'
 import LiveCell from '../../src/models/chain/live-cell'
 import BufferUtils from '../../src/utils/buffer'
+import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
 
 const randomHex = (length: number = 64): string => {
   const str: string = Array.from({ length })
@@ -163,6 +164,14 @@ describe('CellsService', () => {
     return cell
   }
 
+  const createCellLocalInfo = (outPoint: CKBComponents.OutPoint, locked?: boolean, description?: string) => {
+    const cellLocalInfo = new CellLocalInfo()
+    cellLocalInfo.outPoint = outPoint
+    cellLocalInfo.locked = locked
+    cellLocalInfo.description = description
+    return cellLocalInfo
+  }
+
   const createMultisigCell = async (capacity: string, status: OutputStatus, who: any) => {
     const multisigCell = new MultisigOutput()
     multisigCell.capacity = capacity
@@ -196,13 +205,6 @@ describe('CellsService', () => {
     expect(cell).toBeUndefined()
   })
 
-  it('allBlake160s', async () => {
-    await createCell('1000', OutputStatus.Sent, false, null)
-    await createCell('1000', OutputStatus.Sent, false, null)
-    const blake160s = await CellsService.allBlake160s()
-    expect(blake160s).toEqual([bob.blake160])
-  })
-
   describe('#getBalanceByWalletId', () => {
     const createCells = async () => {
       const cells: OutputEntity[] = [
@@ -331,6 +333,56 @@ describe('CellsService', () => {
       expect(error).toBeInstanceOf(CapacityNotEnough)
     })
 
+    it(`live cell is enough but locked`, async () => {
+      const output = await createCell(toShannon('5000'), OutputStatus.Live, false, null)
+      await getConnection()
+        .getRepository(CellLocalInfo)
+        .createQueryBuilder()
+        .insert()
+        .values(createCellLocalInfo(output.outPoint(), true))
+        .execute()
+      await expect(CellsService.gatherInputs(toShannon('6000'), bob.walletId)).rejects.toThrow(new CapacityNotEnough())
+    })
+
+    describe(`gather by consume outpoint`, () => {
+      it('consume output cell is not enough', async () => {
+        const output = await createCell(toShannon('5000'), OutputStatus.Live, false, null)
+        await expect(
+          CellsService.gatherInputs(
+            toShannon('6000'),
+            bob.walletId,
+            '0',
+            '0',
+            0,
+            0,
+            0,
+            undefined,
+            undefined,
+            undefined,
+            [output.outPoint()]
+          )
+        ).rejects.toThrow(new CapacityNotEnough())
+      })
+
+      it('consume output cell is enough', async () => {
+        const output = await createCell(toShannon('5000'), OutputStatus.Live, false, null)
+        const result = await CellsService.gatherInputs(
+          toShannon('4000'),
+          bob.walletId,
+          '0',
+          '0',
+          0,
+          0,
+          0,
+          undefined,
+          undefined,
+          undefined,
+          [output.outPoint()]
+        )
+        expect(result.capacities).toEqual('500000000000')
+      })
+    })
+
     it(`bob's and alice's cells`, async () => {
       await createCells()
       await createCell(toShannon('5000'), OutputStatus.Live, false, null, alice)
@@ -716,6 +768,53 @@ describe('CellsService', () => {
         expect(inputs).toHaveLength(0)
       })
     })
+    describe('gather with outpoint', () => {
+      it(`all live cells are locked`, async () => {
+        const output = await createCell(toShannon('5000'), OutputStatus.Live, false, null, charlie)
+        await getConnection()
+          .getRepository(CellLocalInfo)
+          .createQueryBuilder()
+          .insert()
+          .values(createCellLocalInfo(output.outPoint(), true))
+          .execute()
+        await expect(CellsService.gatherAllInputs(charlie.walletId)).resolves.toHaveLength(0)
+      })
+
+      it(`gather the live cell not locked`, async () => {
+        await createCell(toShannon('100'), OutputStatus.Live, false, null, charlie)
+        const output = await createCell(toShannon('5000'), OutputStatus.Live, false, null, charlie)
+        await getConnection()
+          .getRepository(CellLocalInfo)
+          .createQueryBuilder()
+          .insert()
+          .values(createCellLocalInfo(output.outPoint(), true))
+          .execute()
+        const result = await CellsService.gatherAllInputs(charlie.walletId)
+        expect(result).toHaveLength(1)
+        expect(result[0].capacity).toBe('10000000000')
+      })
+
+      describe(`gather by consume outpoint`, () => {
+        it('consume output cell is not exist', async () => {
+          await createCell(toShannon('5000'), OutputStatus.Live, false, null, charlie)
+          await expect(
+            CellsService.gatherAllInputs(charlie.walletId, undefined, [{ txHash: randomHex(), index: '0' }])
+          ).resolves.toHaveLength(0)
+        })
+
+        it('consume output cell is exist', async () => {
+          const output1 = await createCell(toShannon('100'), OutputStatus.Live, false, null, charlie)
+          const output2 = await createCell(toShannon('100'), OutputStatus.Live, false, null, charlie)
+          const result = await CellsService.gatherAllInputs(charlie.walletId, undefined, [
+            output1.outPoint(),
+            output2.outPoint(),
+          ])
+          expect(result).toHaveLength(2)
+          expect(result[0].capacity).toBe('10000000000')
+          expect(result[1].capacity).toBe('10000000000')
+        })
+      })
+    })
   })
 
   describe('#getDaoCells', () => {
@@ -1535,4 +1634,180 @@ describe('CellsService', () => {
       })
     })
   })
+
+  describe('getLiveCells', () => {
+    it('no live cell', async () => {
+      await createCell('61', OutputStatus.Dead, false, null)
+      await expect(CellsService.getLiveCells(bob.walletId)).resolves.toHaveLength(0)
+    })
+    it('find secp256k1 output cell', async () => {
+      await createCell('61', OutputStatus.Live, false, null)
+      await expect(CellsService.getLiveCells(bob.walletId)).resolves.toHaveLength(1)
+    })
+    it('find secp256k1 output cell with data', async () => {
+      await createCell('61', OutputStatus.Live, true, null)
+      await expect(CellsService.getLiveCells(bob.walletId)).resolves.toHaveLength(1)
+    })
+    it('find secp256k1 output cell with type', async () => {
+      await createCell('61', OutputStatus.Live, false, typeScript)
+      await expect(CellsService.getLiveCells(bob.walletId)).resolves.toHaveLength(1)
+    })
+    it('find multisig time lock output cell', async () => {
+      await createCell(
+        '61',
+        OutputStatus.Sent,
+        false,
+        SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.blake160, +10, '0x7080291000049'))
+      )
+      await expect(CellsService.getLiveCells(bob.walletId)).resolves.toHaveLength(1)
+    })
+  })
+
+  describe('getChequeLiveCells', () => {
+    const assetAccountInfo = new AssetAccountInfo()
+    const bobDefaultLock = SystemScriptInfo.generateSecpScript(bob.blake160)
+    const receiverChequeLock = assetAccountInfo.generateChequeScript(
+      bobDefaultLock.computeHash(),
+      bytes.hexify(Buffer.alloc(20))
+    )
+    const senderChequeLock = assetAccountInfo.generateChequeScript(
+      bytes.hexify(Buffer.alloc(20)),
+      bobDefaultLock.computeHash()
+    )
+    it('find by send', async () => {
+      await createCell('61', OutputStatus.Live, false, null, { lockScript: senderChequeLock })
+      //@ts-ignore private-method
+      await expect(CellsService.getChequeLiveCells([bob.blake160])).resolves.toHaveLength(1)
+    })
+    it('find by receive', async () => {
+      await createCell('61', OutputStatus.Live, false, null, { lockScript: receiverChequeLock })
+      //@ts-ignore private-method
+      await expect(CellsService.getChequeLiveCells([bob.blake160])).resolves.toHaveLength(1)
+    })
+  })
+
+  describe('getCellLockType', () => {
+    const assetAccountInfo = new AssetAccountInfo()
+    const bobDefaultLock = SystemScriptInfo.generateSecpScript(bob.lockScript.args)
+    it('Cheque', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: assetAccountInfo.generateChequeScript(bobDefaultLock.computeHash(), bytes.hexify(Buffer.alloc(20))),
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.Cheque)
+    })
+    it('MULTI_LOCK_TIME', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: SystemScriptInfo.generateMultiSignScript(new Multisig().args(bob.blake160, +10, '0x7080291000049')),
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.MULTI_LOCK_TIME)
+    })
+    it('MULTI_LOCK', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: Multisig.getMultisigScript([bob.blake160], 1, 1, 1),
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.MULTISIG)
+    })
+    it('ANYONE_CAN_PAY', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: assetAccountInfo.generateAnyoneCanPayScript('0x'),
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.ANYONE_CAN_PAY)
+    })
+    it('SECP256K1', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.SECP256K1)
+    })
+    it('Unknown', () => {
+      const unknowScript = Script.fromObject(bob.lockScript)
+      unknowScript.codeHash = `0x${'00'.repeat(32)}`
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: unknowScript,
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptType.Unknown)
+    })
+  })
+
+  describe('getCellTypeType', () => {
+    const assetAccountInfo = new AssetAccountInfo()
+    it('no type script', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBeUndefined()
+    })
+    it('dao type script', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: SystemScriptInfo.generateDaoScript(),
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.DAO)
+    })
+    it('NFT type script', () => {
+      const typeScript = new Script(
+        assetAccountInfo.getNftInfo().codeHash,
+        '0x',
+        assetAccountInfo.getNftInfo().hashType
+      )
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: typeScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.NFT)
+    })
+    it('NFTIssuer type script', () => {
+      const typeScript = new Script(
+        assetAccountInfo.getNftIssuerInfo().codeHash,
+        '0x',
+        assetAccountInfo.getNftIssuerInfo().hashType
+      )
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: typeScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.NFTIssuer)
+    })
+    it('NFTClass type script', () => {
+      const typeScript = new Script(
+        assetAccountInfo.getNftClassInfo().codeHash,
+        '0x',
+        assetAccountInfo.getNftClassInfo().hashType
+      )
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: typeScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.NFTClass)
+    })
+    it('SUDT type script', () => {
+      const typeScript = assetAccountInfo.generateSudtScript('0x')
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: typeScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.SUDT)
+    })
+    it('Unknown type script', () => {
+      const typeScript = new Script(`0x${'00'.repeat(32)}`, '0x', ScriptHashType.Type)
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+        type: typeScript,
+      })
+      expect(CellsService.getCellTypeType(output)).toBe(TypeScriptType.Unknown)
+    })
+  })
 })
diff --git a/packages/neuron-wallet/tests/services/sudt-token-info.test.ts b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
new file mode 100644
index 0000000000..07e8da5a09
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
@@ -0,0 +1,184 @@
+import { getConnection } from 'typeorm'
+import SudtTokenInfoEntity from '../../src/database/chain/entities/sudt-token-info'
+import SudtTokenInfoService from '../../src/services/sudt-token-info'
+import { closeConnection, initConnection } from '../setupAndTeardown'
+import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
+import AssetAccountEntity from '../../src/database/chain/entities/asset-account'
+import accounts from '../setupAndTeardown/accounts.fixture'
+
+const defaultTokenId = '0x' + '0'.repeat(64)
+
+const createSudtTokenInfoEntity = ({
+  tokenID,
+  symbol,
+  tokenName,
+  decimal,
+}: {
+  tokenID: string
+  symbol: string
+  tokenName: string
+  decimal: string
+}) => {
+  const entity = new SudtTokenInfoEntity()
+  entity.tokenID = tokenID
+  entity.symbol = symbol
+  entity.tokenName = tokenName
+  entity.decimal = decimal
+  return entity
+}
+describe('sudt token info service', () => {
+  beforeAll(async () => {
+    await initConnection()
+  })
+  afterAll(async () => {
+    await closeConnection()
+  })
+  beforeEach(async () => {
+    const connection = getConnection()
+    await connection.synchronize(true)
+  })
+
+  describe('findSudtTokenInfoByArgs', () => {
+    beforeEach(async () => {
+      const tokens = [
+        {
+          tokenID: 'CKBytes',
+          symbol: 'ckb',
+          tokenName: 'ckb',
+          decimal: '0',
+        },
+        {
+          tokenID: defaultTokenId,
+          symbol: 'udt',
+          tokenName: 'udt',
+          decimal: '0',
+        },
+        {
+          tokenID: 'invalid token info',
+          symbol: '',
+          tokenName: '',
+          decimal: '',
+        },
+      ]
+      const repo = getConnection().getRepository(SudtTokenInfoEntity)
+      await repo.save(tokens)
+    })
+
+    it('find with empty', async () => {
+      await expect(SudtTokenInfoService.findSudtTokenInfoByArgs([])).resolves.toHaveLength(0)
+    })
+    it('can not find', async () => {
+      await expect(SudtTokenInfoService.findSudtTokenInfoByArgs(['uknownargs'])).resolves.toHaveLength(0)
+    })
+    it('find success', async () => {
+      await expect(SudtTokenInfoService.findSudtTokenInfoByArgs([defaultTokenId, 'CKBytes'])).resolves.toHaveLength(2)
+    })
+  })
+
+  describe('getAllSudtTokenInfo', () => {
+    beforeEach(async () => {
+      const tokens = [
+        {
+          tokenID: 'CKBytes',
+          symbol: 'ckb',
+          tokenName: 'ckb',
+          decimal: '0',
+        },
+        {
+          tokenID: defaultTokenId,
+          symbol: 'udt',
+          tokenName: 'udt',
+          decimal: '0',
+        },
+        {
+          tokenID: 'invalid token info',
+          symbol: '',
+          tokenName: '',
+          decimal: '',
+        },
+      ]
+      const repo = getConnection().getRepository(SudtTokenInfoEntity)
+      await repo.save(tokens)
+    })
+
+    it('Get token info list', async () => {
+      const list = await SudtTokenInfoService.getAllSudtTokenInfo()
+      expect(list.length).toEqual(2)
+      expect(list.find((item: any) => item.tokenID === 'CKBytes')).toBeTruthy()
+      expect(list.find((item: any) => item.tokenID === defaultTokenId)).toBeTruthy()
+    })
+
+    it('Filter invalid token info out', async () => {
+      const repo = getConnection().getRepository(SudtTokenInfoEntity)
+      const count = await repo.count()
+      expect(count).toBe(3)
+      const list = await SudtTokenInfoService.getAllSudtTokenInfo()
+      expect(list).toHaveLength(2)
+    })
+  })
+
+  describe('insertSudtTokenInfo', () => {
+    it('insert success', async () => {
+      const token = {
+        tokenID: 'CKBytes',
+        symbol: 'ckb',
+        tokenName: 'ckb',
+        decimal: '0',
+      }
+      await SudtTokenInfoService.insertSudtTokenInfo(createSudtTokenInfoEntity(token))
+      const repo = getConnection().getRepository(SudtTokenInfoEntity)
+      await expect(repo.find()).resolves.toHaveLength(1)
+    })
+    it('if conflict will not update', async () => {
+      const token = {
+        tokenID: 'CKBytes',
+        symbol: 'ckb',
+        tokenName: 'ckb',
+        decimal: '0',
+      }
+      await SudtTokenInfoService.insertSudtTokenInfo(createSudtTokenInfoEntity(token))
+      await SudtTokenInfoService.insertSudtTokenInfo(
+        createSudtTokenInfoEntity({
+          ...token,
+          tokenName: 'new_ckb',
+        })
+      )
+      const repo = getConnection().getRepository(SudtTokenInfoEntity)
+      const result = await repo.find()
+      expect(result).toHaveLength(1)
+      expect(result[0].tokenName).toBe('ckb')
+    })
+  })
+
+  describe('getSudtTokenInfo', () => {
+    const walletId = 'walletId'
+    const [assetAccount] = accounts
+    beforeEach(async () => {
+      const keyEntitity = HdPublicKeyInfo.fromObject({
+        walletId: 'walletId',
+        publicKeyInBlake160: assetAccount.blake160,
+        addressType: 0,
+        addressIndex: 0,
+      })
+      await getConnection().manager.save(keyEntitity)
+    })
+
+    it('no token info', async () => {
+      await expect(SudtTokenInfoService.getSudtTokenInfo('0x', walletId)).resolves.toBeUndefined()
+    })
+
+    it('token info not match', async () => {
+      const entity = AssetAccountEntity.fromModel(assetAccount)
+      await getConnection().manager.save([entity.sudtTokenInfo, entity])
+      await expect(SudtTokenInfoService.getSudtTokenInfo(`0x${'00'.repeat(20)}`, walletId)).resolves.toBeUndefined()
+    })
+
+    it('match token info', async () => {
+      const entity = AssetAccountEntity.fromModel(assetAccount)
+      await getConnection().manager.save([entity.sudtTokenInfo, entity])
+      const result = await SudtTokenInfoService.getSudtTokenInfo(assetAccount.tokenID, walletId)
+      expect(result).toBeDefined()
+      expect(result?.assetAccounts).toHaveLength(1)
+    })
+  })
+})
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
index 38d05acf02..a24d534500 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -587,7 +587,10 @@ describe('TransactionSender Test', () => {
             ],
             fakeAddress1,
             fee,
-            feeRate
+            feeRate,
+            undefined,
+            undefined,
+            undefined
           )
         })
       })
@@ -621,7 +624,9 @@ describe('TransactionSender Test', () => {
             { address: '1', capacity: '1' },
           ],
           fee,
-          feeRate
+          feeRate,
+          undefined,
+          undefined
         )
       })
     })
diff --git a/packages/neuron-wallet/tests/setup.ts b/packages/neuron-wallet/tests/setup.ts
index 31d93d52b0..ea5257611b 100644
--- a/packages/neuron-wallet/tests/setup.ts
+++ b/packages/neuron-wallet/tests/setup.ts
@@ -81,6 +81,14 @@ jest.mock('dotenv', () => ({
     process.env.SECP256K1_CODE_HASH = systemScripts.SECP256K1_BLAKE160.CODE_HASH
     process.env.DAO_CODE_HASH = systemScripts.DAO.CODE_HASH
     process.env.MULTISIG_CODE_HASH = systemScripts.SECP256K1_BLAKE160_MULTISIG.CODE_HASH
+
+    process.env.TESTNET_NFT_SCRIPT_CODEHASH = '0xb1837b5ad01a88558731953062d1f5cb547adf89ece01e8934a9f0aeed2d959f'
+    process.env.TESTNET_NFT_SCRIPT_HASH_TYPE = 'type'
+    process.env.TESTNET_NFT_CLASS_SCRIPT_CODEHASH = '0x095b8c0b4e51a45f953acd1fcd1e39489f2675b4bc94e7af27bb38958790e3fc'
+    process.env.TESTNET_NFT_CLASS_SCRIPT_HASH_TYPE = 'type'
+    process.env.TESTNET_NFT_ISSUER_SCRIPT_CODEHASH =
+      '0xb59879b6ea6fff985223117fa499ce84f8cfb028c4ffdfdf5d3ec19e905a11ed'
+    process.env.TESTNET_NFT_ISSUER_SCRIPT_HASH_TYPE = 'type'
   },
 }))