From 08f2948ea6768432e205dd0af6c5f7299c7edee5 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Wed, 22 Nov 2023 21:46:26 +0800
Subject: [PATCH 01/68] fix: Issue of create mutisig address

---
 packages/neuron-ui/src/components/MultisigAddress/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index e8f61a250c..fdfd91c33a 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -7,7 +7,7 @@ import {
   useExitOnWalletChange,
   useGoBack,
 } from 'utils'
-import { useState as useGlobalState, withProvider } from 'states'
+import { useState as useGlobalState } from 'states'
 import MultisigAddressCreateDialog from 'components/MultisigAddressCreateDialog'
 import MultisigAddressInfo from 'components/MultisigAddressInfo'
 import SendFromMultisigDialog from 'components/SendFromMultisigDialog'
@@ -387,4 +387,4 @@ const MultisigAddress = () => {
 
 MultisigAddress.displayName = 'MultisigAddress'
 
-export default withProvider(MultisigAddress)
+export default MultisigAddress

From 6dc256395412fe64b967bd5704675bfecdff01cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 24 Nov 2023 17:12:34 +0800
Subject: [PATCH 02/68] feat: Cell manage (#2859)

* feat: Cell manage

* fix: Fix bugs of issue 298(1, 2, 3, 4, 5, 6)

* fix: Disable lock or unlock when all of the selected status is same.

Others optimize
1. rename `type` to `Category`
2. delete `walletId` in the `getSudtTokenInfo` function.

* fix: Add left join to add assetAccounts field.

* fix: Show the tips for locked cells.

* fix: Send max for consume appointed cells.

* fix: Show claim in Customized Assets if the lock time is reached.

* fix: Use filter option to get live and sent cell.

* fix: fix conversation

1. Better name cellManagement.
2. Move transformer to CellLocalInfo entity.
3. Use `UpdateCellLocalInfo` to replace multi params.

* fix: Fix test case

* fix: Adapt Spore for cell management.

* fix: Hide the balance when use consume cell
---
 .../AddressBook/addressBook.module.scss       |  42 +-
 .../src/components/AddressBook/index.tsx      |  37 +-
 .../CellManagement/cellManagement.module.scss | 238 ++++++++++
 .../src/components/CellManagement/hooks.ts    | 419 +++++++++++++++++
 .../src/components/CellManagement/index.tsx   | 431 ++++++++++++++++++
 .../src/components/History/RowExtend.tsx      |  38 +-
 .../components/History/history.module.scss    |  39 --
 .../historyDetailPage.module.scss             |   9 -
 .../components/HistoryDetailPage/index.tsx    |  12 +-
 .../src/components/NervosDAODetail/index.tsx  |  22 +-
 .../src/components/Overview/index.tsx         |  61 ++-
 .../components/Overview/overview.module.scss  |  44 +-
 .../neuron-ui/src/components/Send/hooks.ts    |  15 +-
 .../neuron-ui/src/components/Send/index.tsx   |  57 ++-
 packages/neuron-ui/src/locales/en.json        |  52 ++-
 packages/neuron-ui/src/locales/zh-tw.json     |  52 ++-
 packages/neuron-ui/src/locales/zh.json        |  52 ++-
 packages/neuron-ui/src/router.tsx             |  11 +
 .../src/services/remote/cellManage.ts         |  12 +
 .../neuron-ui/src/services/remote/index.ts    |   1 +
 .../src/services/remote/remoteApiWrapper.ts   |   5 +
 .../src/states/stateProvider/reducer.ts       |  10 +
 packages/neuron-ui/src/styles/theme.scss      |   1 -
 packages/neuron-ui/src/types/App/index.d.ts   |  50 ++
 .../neuron-ui/src/types/Controller/index.d.ts |   1 +
 .../src/utils/calculateUsedCapacity.ts        |  12 +
 packages/neuron-ui/src/utils/enums.ts         |  20 +
 packages/neuron-ui/src/utils/hooks/index.ts   | 101 ++--
 packages/neuron-ui/src/utils/index.ts         |   2 +
 .../neuron-ui/src/utils/outPointTransform.ts  |  11 +
 packages/neuron-ui/src/utils/parsers.ts       |  25 +-
 .../widgets/Breadcrum/breadcrum.module.scss   |   9 +-
 .../neuron-ui/src/widgets/Breadcrum/index.tsx |   9 +-
 .../src/widgets/Icons/CellManage.svg          |   3 +
 .../neuron-ui/src/widgets/Icons/Consume.svg   |  10 +
 packages/neuron-ui/src/widgets/Icons/Lock.svg |   3 +
 .../neuron-ui/src/widgets/Icons/LockCell.svg  |  10 +
 .../neuron-ui/src/widgets/Icons/Unlock.svg    |  10 +
 .../src/widgets/Icons/icon.module.scss        |   6 +
 packages/neuron-ui/src/widgets/Icons/icon.tsx |  12 +-
 .../src/widgets/Pagination/index.tsx          |   7 +-
 .../src/widgets/ShowOrEditDesc/index.tsx      |  42 ++
 .../ShowOrEditDesc/showOrEditDesc.module.scss |  38 ++
 .../neuron-ui/src/widgets/Table/index.tsx     |  57 ++-
 .../src/widgets/Tooltip/tooltip.module.scss   |  10 +-
 packages/neuron-wallet/src/controllers/api.ts |  63 ++-
 .../src/controllers/asset-account.ts          |   3 +-
 .../src/controllers/cell-management.ts        |  84 ++++
 .../neuron-wallet/src/controllers/sudt.ts     |   4 +-
 .../neuron-wallet/src/controllers/wallets.ts  |   8 +-
 .../chain/entities/cell-local-info.ts         |  44 ++
 .../1694228328076-CreateCellLocalInfo.ts      |  14 +
 .../src/database/chain/ormconfig.ts           |   4 +
 .../src/services/asset-account-service.ts     |  27 +-
 .../src/services/cell-local-info.ts           |  67 +++
 packages/neuron-wallet/src/services/cells.ts  | 237 +++++++---
 .../src/services/sudt-token-info.ts           |  53 +++
 .../src/services/transaction-sender.ts        |  20 +-
 .../src/services/tx/transaction-generator.ts  |  12 +-
 .../src/services/tx/transaction-service.ts    |  15 +-
 packages/neuron-wallet/src/utils/const.ts     |   1 +
 .../tests/controllers/cell-management.test.ts | 174 +++++++
 .../tests/controllers/sudt.test.ts            |  14 +-
 .../services/asset-account-service.test.ts    |  42 --
 .../tests/services/cell-local-info.test.ts    | 178 ++++++++
 .../tests/services/cells.test.ts              | 297 +++++++++++-
 .../tests/services/sudt-token-info.test.ts    | 183 ++++++++
 .../services/tx/transaction-sender.test.ts    |   9 +-
 packages/neuron-wallet/tests/setup.ts         |  15 +
 69 files changed, 3241 insertions(+), 435 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
 create mode 100644 packages/neuron-ui/src/components/CellManagement/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/CellManagement/index.tsx
 create mode 100644 packages/neuron-ui/src/services/remote/cellManage.ts
 create mode 100644 packages/neuron-ui/src/utils/calculateUsedCapacity.ts
 create mode 100644 packages/neuron-ui/src/utils/outPointTransform.ts
 create mode 100644 packages/neuron-ui/src/widgets/Icons/CellManage.svg
 create mode 100644 packages/neuron-ui/src/widgets/Icons/Consume.svg
 create mode 100644 packages/neuron-ui/src/widgets/Icons/Lock.svg
 create mode 100644 packages/neuron-ui/src/widgets/Icons/LockCell.svg
 create mode 100644 packages/neuron-ui/src/widgets/Icons/Unlock.svg
 create mode 100644 packages/neuron-ui/src/widgets/ShowOrEditDesc/index.tsx
 create mode 100644 packages/neuron-ui/src/widgets/ShowOrEditDesc/showOrEditDesc.module.scss
 create mode 100644 packages/neuron-wallet/src/controllers/cell-management.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
 create mode 100644 packages/neuron-wallet/src/services/cell-local-info.ts
 create mode 100644 packages/neuron-wallet/src/services/sudt-token-info.ts
 create mode 100644 packages/neuron-wallet/tests/controllers/cell-management.test.ts
 create mode 100644 packages/neuron-wallet/tests/services/cell-local-info.test.ts
 create mode 100644 packages/neuron-wallet/tests/services/sudt-token-info.test.ts

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/CellManagement/cellManagement.module.scss b/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
new file mode 100644
index 0000000000..14ed375b5a
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
@@ -0,0 +1,238 @@
+@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 {
+    cursor: pointer;
+    &[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 {
+    @include text-overflow-ellipsis;
+    max-width: calc(100vw - 1050px);
+    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;
+      &[disabled] {
+        cursor: not-allowed;
+        opacity: 50%;
+      }
+
+      & > 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/CellManagement/hooks.ts b/packages/neuron-ui/src/components/CellManagement/hooks.ts
new file mode 100644
index 0000000000..6dca24e92f
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManagement/hooks.ts
@@ -0,0 +1,419 @@
+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 {
+  LockScriptCategory,
+  RoutePath,
+  TypeScriptCategory,
+  calculateUsedCapacity,
+  getExplorerUrl,
+  isSuccessResponse,
+  outPointToStr,
+} from 'utils'
+import { SortType } from 'widgets/Table'
+
+const cellTypeOrder: Record<string, number> = {
+  [TypeScriptCategory.SUDT]: 1,
+  [TypeScriptCategory.NFT]: 2,
+  [TypeScriptCategory.Spore]: 3,
+  [TypeScriptCategory.Unknown]: 4,
+}
+
+const getLockStatusAndReason = (item: State.LiveCellWithLocalInfo) => {
+  if (item.locked) {
+    return {
+      locked: true,
+    }
+  }
+  let lockedReason: { key: string; params?: Record<string, any> } | undefined
+  if (item.typeScriptType) {
+    switch (item.typeScriptType) {
+      case TypeScriptCategory.NFT:
+      case TypeScriptCategory.NFTClass:
+      case TypeScriptCategory.NFTIssuer:
+        lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'NTF' } }
+        break
+      case TypeScriptCategory.Spore:
+        lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'Spore' } }
+        break
+      case TypeScriptCategory.SUDT:
+        lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'SUDT' } }
+        break
+      case TypeScriptCategory.DAO:
+        lockedReason = { key: 'cell-manage.locked-reason.NFT-SUDT-DAO', params: { type: 'Nervos DAO' } }
+        break
+      case TypeScriptCategory.Unknown:
+        lockedReason = { key: 'cell-manage.locked-reason.Unknown' }
+        break
+      default:
+        break
+    }
+  } else {
+    switch (item.lockScriptType) {
+      case LockScriptCategory.Cheque:
+        lockedReason = { key: 'cell-manage.locked-reason.cheque-acp-multisig', params: { type: 'Cheque' } }
+        break
+      case LockScriptCategory.ANYONE_CAN_PAY:
+        lockedReason = { key: 'cell-manage.locked-reason.cheque-acp-multisig', params: { type: 'Acp' } }
+        break
+      case LockScriptCategory.MULTISIG:
+        lockedReason = { key: 'cell-manage.locked-reason.cheque-acp-multisig', params: { type: 'Multisig' } }
+        break
+      case LockScriptCategory.MULTI_LOCK_TIME:
+        lockedReason = { key: 'cell-manage.locked-reason.multi-locktime' }
+        break
+      default:
+        break
+    }
+  }
+  return {
+    locked: !!lockedReason,
+    lockedReason,
+  }
+}
+
+const getCellType = (item: State.LiveCellWithLocalInfo) => {
+  if (item.typeScriptType) {
+    switch (item.typeScriptType) {
+      case TypeScriptCategory.NFT:
+      case TypeScriptCategory.SUDT:
+      case TypeScriptCategory.Spore:
+      case TypeScriptCategory.Unknown:
+        return item.typeScriptType
+      default:
+        break
+    }
+  }
+  return item.lockScriptType === LockScriptCategory.Unknown ? LockScriptCategory.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 aOrderNum = a.typeScriptType ? cellTypeOrder[a.typeScriptType] ?? 0 : 0
+    const bOrderNum = b.typeScriptType ? cellTypeOrder[b.typeScriptType] ?? 0 : 0
+    return orderDirection === SortType.Increase ? aOrderNum - bOrderNum : bOrderNum - aOrderNum
+  },
+}
+
+type KeyOfLiveCellWithLocalInfo = keyof State.LiveCellWithLocalInfo
+
+export const useLiveCells = ({
+  initSortInfo,
+}: {
+  initSortInfo?: {
+    key: KeyOfLiveCellWithLocalInfo
+    direction: SortType
+  }
+}) => {
+  const [sortInfo, setSortInfo] = useState<{ key: KeyOfLiveCellWithLocalInfo; direction: SortType } | undefined>(
+    initSortInfo
+  )
+  const onSorted = useCallback((key?: KeyOfLiveCellWithLocalInfo, direction?: SortType) => {
+    if (key && direction) {
+      setSortInfo({ key, direction })
+    } 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.direction))
+    }
+    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,
+    sortInfo,
+  }
+}
+
+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 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.UpdateConsumeCells,
+          payload: operateCells.map(v => ({ outPoint: v.outPoint, capacity: v.capacity })),
+        })
+        navigate(`${RoutePath.Send}?isSendMax=true`)
+        break
+      default:
+        break
+    }
+  }, [action, operateCells, dispatch, navigate, password])
+  const onActionCancel = useCallback(() => {
+    setAction(undefined)
+    setOperateCells([])
+  }, [])
+  return {
+    action,
+    loading,
+    operateCells,
+    onOpenActionDialog,
+    onActionConfirm,
+    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 allLockedOutPoints = useMemo(
+    () => new Set(liveCells.filter(v => !v.lockedReason && v.locked).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
+        })
+      }
+    }
+  }, [])
+  const hasSelectLocked = useMemo(
+    () => [...selectedOutPoints].some(v => allLockedOutPoints.has(v)),
+    [selectedOutPoints, allLockedOutPoints]
+  )
+  const isAllLocked = useMemo(
+    () => [...selectedOutPoints].every(v => allLockedOutPoints.has(v)),
+    [selectedOutPoints, allLockedOutPoints]
+  )
+  return {
+    selectedOutPoints,
+    onSelect,
+    onSelectAll,
+    isAllSelected: selectedOutPoints.size === allCanSelectOutPoints.size && !!allCanSelectOutPoints.size,
+    hasSelectLocked,
+    isAllLocked,
+  }
+}
+
+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/CellManagement/index.tsx b/packages/neuron-ui/src/components/CellManagement/index.tsx
new file mode 100644
index 0000000000..62769ac99a
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellManagement/index.tsx
@@ -0,0 +1,431 @@
+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, SortType } from 'widgets/Table'
+import Pagination from 'widgets/Pagination'
+import { useState as useGlobalState } from 'states'
+import {
+  shannonToCKBFormatter,
+  uniformTimeFormatter,
+  usePagination,
+  isMainnet as isMainnetUtil,
+  useCopy,
+  clsx,
+  outPointToStr,
+  LockScriptCategory,
+  getLockTimestamp,
+} 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 { useSearchParams } from 'react-router-dom'
+import { Actions, useAction, useLiveCells, usePassword, useSelect, useViewCell } from './hooks'
+import styles from './cellManagement.module.scss'
+
+const getColumns = ({
+  updateLiveCell,
+  t,
+  onAction,
+  isAllSelected,
+  selectedOutPoints,
+  onSelectAll,
+  onSelect,
+  epoch,
+  bestKnownBlockTimestamp,
+}: {
+  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
+  epoch: string
+  bestKnownBlockTimestamp: number
+}): 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) {
+          let params = lockedReason?.params
+          let i18nKey = lockedReason?.key
+          if (item.lockScriptType === LockScriptCategory.MULTI_LOCK_TIME) {
+            if (bestKnownBlockTimestamp) {
+              const { hasReached, lockTimestamp } = getLockTimestamp({
+                lockArgs: item.lock.args,
+                epoch,
+                bestKnownBlockTimestamp,
+              })
+              if (hasReached) {
+                i18nKey = 'cell-manage.locked-reason.multi-locktime-reached'
+              } else {
+                const targetTime = new Date(lockTimestamp)
+                params = {
+                  time: `${targetTime.getFullYear()}-${targetTime.getMonth() + 1}-${targetTime.getDate()}`,
+                }
+              }
+            } else {
+              params = { time: '--' }
+            }
+          }
+          return (
+            <div className={styles.lockedWithTip}>
+              {t('cell-manage.table.locked')}
+              {lockedReason ? (
+                <Tooltip tip={t(i18nKey!, params)} 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={!!locked}
+              onClick={locked ? undefined : onAction}
+              data-action={Actions.Consume}
+              data-index={index}
+            />
+          </div>
+        )
+      },
+    },
+  ]
+}
+
+const CellManagement = () => {
+  const {
+    app: { epoch },
+    wallet: { balance = '' },
+    chain: {
+      networkID,
+      syncState: { bestKnownBlockTimestamp },
+    },
+    settings: { networks },
+  } = useGlobalState()
+  const isMainnet = isMainnetUtil(networks, networkID)
+  const [t] = useTranslation()
+  const [searchParams] = useSearchParams()
+  const breadPages = useMemo(() => [{ label: t('cell-manage.title') }], [t])
+  const [showBalance, setShowBalance] = useState(true)
+  const onChangeShowBalance = useCallback(() => setShowBalance(v => !v), [])
+  const initSortInfo = searchParams.get('order')
+    ? {
+        key: searchParams.get('order') as keyof State.LiveCellWithLocalInfo,
+        direction: SortType.Decrease,
+      }
+    : undefined
+  const { liveCells, updateLiveCell, onSorted, updateLiveCellsLockStatus } = useLiveCells({ initSortInfo })
+  const { pageNo, pageSize, onPageChange } = usePagination()
+  const currentPageLiveCells = useMemo(() => {
+    return liveCells.slice(pageSize * (pageNo - 1), pageSize * pageNo)
+  }, [pageNo, pageSize, liveCells])
+  const { onSelect, onSelectAll, isAllSelected, selectedOutPoints, hasSelectLocked, isAllLocked } = useSelect(liveCells)
+  const { password, error, onPasswordChange, setError, resetPassword } = usePassword()
+  const { action, operateCells, 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,
+        epoch,
+        bestKnownBlockTimestamp,
+      }),
+    [
+      updateLiveCell,
+      t,
+      onOpenActionDialog,
+      onSelect,
+      onSelectAll,
+      isAllSelected,
+      selectedOutPoints,
+      epoch,
+      bestKnownBlockTimestamp,
+    ]
+  )
+  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 ? <EyesOpen onClick={onChangeShowBalance} /> : <EyesClose 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&nbsp;({liveCells.length})</div>}
+          columns={columns}
+          dataSource={currentPageLiveCells}
+          onSorted={onSorted}
+          initSortInfo={initSortInfo}
+        />
+        {selectedOutPoints.size ? (
+          <div className={styles.multiActions}>
+            <button type="button" disabled={isAllLocked} onClick={onMultiAction} data-action={Actions.Lock}>
+              <LockCell />
+              {t('cell-manage.lock')}
+            </button>
+            <button type="button" disabled={!hasSelectLocked} onClick={onMultiAction} data-action={Actions.Unlock}>
+              <UnLock />
+              {t('cell-manage.unlock')}
+            </button>
+            <button type="button" disabled={hasSelectLocked} 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>
+  )
+}
+
+CellManagement.displayName = 'CellManage'
+export default CellManagement
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 61438e54d6..6f88e8e24d 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 8e7297a42f..5dbc8515e4 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,
@@ -244,18 +245,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 f22f45e60d..0275ab5fec 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 { 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 PageContainer from 'components/PageContainer'
 import TransactionStatusWrap from 'components/TransactionStatusWrap'
 import FormattedTokenAmount from 'components/FormattedTokenAmount'
@@ -12,11 +19,21 @@ 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 TransactionType from 'components/TransactionType'
+import { getLockedBalance } from 'services/remote/cellManage'
 import styles from './overview.module.scss'
 
 const { PAGE_SIZE, CONFIRMATION_THRESHOLD } = CONSTANTS
@@ -99,6 +116,18 @@ const Overview = () => {
     setShowBalance(v => !v)
   }, [setShowBalance])
 
+  const gotoCellManage = useCallback((e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+    const { order } = e.currentTarget.dataset
+    navigate(`${RoutePath.Overview}/${RoutePath.CellManage}?order=${order}`)
+  }, [])
+  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}>
@@ -122,11 +151,31 @@ const Overview = () => {
             <span className={styles.balanceUnit}>CKB</span>
             <BalanceSyncIcon connectionStatus={connectionStatus} syncStatus={syncStatus} />
             <div className={styles.items}>
+              <button className={styles.button} type="button" data-order="locked" 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 f933622425..e5411df0b9 100644
--- a/packages/neuron-ui/src/components/Send/hooks.ts
+++ b/packages/neuron-ui/src/components/Send/hooks.ts
@@ -52,6 +52,7 @@ const updateTransactionWith =
     isMainnet,
     dispatch,
     t,
+    consumeOutPoints,
   }: {
     walletID: string
     price: string
@@ -62,6 +63,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) {
@@ -84,6 +86,7 @@ const updateTransactionWith =
           date: item.date,
         })),
         feeRate: price,
+        consumeOutPoints,
       }
       return generator(realParams)
         .then((res: any) => {
@@ -161,7 +164,8 @@ const useOnTransactionChange = (
   isSendMax: boolean,
   setTotalAmount: (val: string) => void,
   setErrorMessage: (val: string) => void,
-  t: TFunction
+  t: TFunction,
+  consumeOutPoints?: CKBComponents.OutPoint[]
 ) => {
   useEffect(() => {
     clearTimeout(generateTxTimer)
@@ -184,9 +188,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) =>
@@ -325,7 +330,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])
 
@@ -378,12 +384,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 8632bd1209..97240daadb 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, useEffect } from 'react'
+import React, { useState, useCallback, useEffect, useMemo } 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'
@@ -25,7 +25,7 @@ import { useSearchParams } from 'react-router-dom'
 import { useInitialize } from './hooks'
 import styles from './send.module.scss'
 
-const SendHeader = ({ balance }: { balance: string }) => {
+const SendHeader = ({ balance, useConsumeCell }: { balance: string; useConsumeCell: boolean }) => {
   const { t } = useTranslation()
   const onBack = useGoBack()
 
@@ -38,12 +38,16 @@ const SendHeader = ({ balance }: { balance: string }) => {
     <div className={styles.headerContainer}>
       <GoBack className={styles.goBack} onClick={onBack} />
       <p>{t('navbar.send')}</p>
-      <Button className={styles.btn} type="text" onClick={onChangeShowBalance}>
-        {showBalance ? <EyesOpen /> : <EyesClose />}
-      </Button>
-      <p className={styles.balance}>
-        {t('send.balance')} {showBalance ? shannonToCKBFormatter(balance) : HIDE_BALANCE} CKB
-      </p>
+      {useConsumeCell ? null : (
+        <>
+          <Button className={styles.btn} type="text" onClick={onChangeShowBalance}>
+            {showBalance ? <EyesOpen /> : <EyesClose />}
+          </Button>
+          <p className={styles.balance}>
+            {t('send.balance')} {showBalance ? shannonToCKBFormatter(balance) : HIDE_BALANCE} CKB
+          </p>
+        </>
+      )}
     </div>
   )
 }
@@ -58,11 +62,13 @@ const Send = () => {
     wallet: { id: walletID = '', balance = '', device },
     chain: { networkID, connectionStatus },
     settings: { networks = [] },
+    consumeCells,
   } = useGlobalState()
   const dispatch = useDispatch()
   const { t } = useTranslation()
 
   const isMainnet = isMainnetUtil(networks, networkID)
+  const consumeOutPoints = useMemo(() => consumeCells?.map(v => v.outPoint), [useMemo])
 
   const {
     outputs,
@@ -83,7 +89,17 @@ const Send = () => {
     isSendMax,
     onSendMaxClick: handleSendMaxClick,
     updateIsSendMax,
-  } = 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 [searchParams] = useSearchParams()
 
@@ -127,12 +143,19 @@ const Send = () => {
     isSendMax,
     setTotalAmount,
     setErrorMessage,
-    t
+    t,
+    consumeOutPoints
   )
 
   let errorMessageUnderTotal = errorMessage
   try {
-    validateTotalAmount(totalAmount, fee, balance)
+    validateTotalAmount(
+      totalAmount,
+      fee,
+      consumeCells
+        ? consumeCells.reduce((total, addr) => total + BigInt(addr.capacity || 0), BigInt(0)).toString()
+        : balance
+    )
   } catch (err) {
     if (isErrorWithI18n(err)) {
       errorMessageUnderTotal = t(err.message)
@@ -169,8 +192,16 @@ const Send = () => {
     return false
   })()
 
+  useEffect(() => {
+    return () => {
+      dispatch({
+        type: AppActions.UpdateConsumeCells,
+      })
+    }
+  }, [])
+
   return (
-    <PageContainer head={<SendHeader balance={balance} />}>
+    <PageContainer head={<SendHeader balance={balance} useConsumeCell={!!consumeCells?.length} />}>
       <form onSubmit={handleSubmit} data-wallet-id={walletID} data-status={disabled ? 'not-ready' : 'ready'}>
         <div className={`${styles.layout} ${showWaitForFullySynced ? styles.withFullySynced : ''}`}>
           <div className={styles.left}>
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index a60c6dee05..0720469ccc 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",
@@ -1148,6 +1149,55 @@
         "add-network": "Add Network",
         "ignore-external-node": "Ignore external node"
       }
+    },
+    "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": {
+        "multi-locktime": "The cell has a time lock and you can't use it until {{time}}.",
+        "multi-locktime-reached": "The time lock for this cell has expired and you need to claim it in Customized Assets before using it.",
+        "cheque-acp-multisig": "This is a {{type}} cell and does not support unlocking.",
+        "NFT-SUDT-DAO": " This is a {{type}} asset and does not support unlocking.",
+        "Unknown": "This is an uncataloged asset,please check and confirm before proceeding."
+      },
+      "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 b8dc8731cf..66ecd3fc35 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",
@@ -1119,6 +1120,55 @@
         "add-network": "添加網絡",
         "ignore-external-node": "忽略外部節點"
       }
+    },
+    "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": {
+        "multi-locktime": "這是壹個有時間鎖的 cell, 只能在 {{time}} 之後使用。",
+        "multi-locktime-reached": "此 Cell 的鎖定已經結束，請在\"自定義資產\"中解鎖後使用。",
+        "cheque-acp-multisig": "這是壹個 {{type}} 的 cell, 不支持解鎖。",
+        "NFT-SUDT-DAO": "這是壹個 {{type}} 的資產，不支持解鎖。",
+        "Unknown": "This is an uncataloged asset,please check and confirm before proceeding."
+      },
+      "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 766a89bd10..7d24c9dc24 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",
@@ -1140,6 +1141,55 @@
         "add-network": "添加网络",
         "ignore-external-node": "忽略外部节点"
       }
+    },
+    "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": {
+        "multi-locktime": "这是一个有时间锁的 cell, 只能在 {{time}} 之后使用。",
+        "multi-locktime-reached": "此 Cell 的锁定已经结束，请在\"自定义资产\"中解锁后使用。",
+        "cheque-acp-multisig": "这是一个 {{type}} 的 cell, 不支持解锁。",
+        "NFT-SUDT-DAO": "这是一个 {{type}} 的资产，不支持解锁。",
+        "Unknown": "這是壹項未知的資產，請在繼續操作之前進行檢查和確認。"
+      },
+      "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..76114bd4f2 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 CellManagement from 'components/CellManagement'
 
 const toolsRouters = [
   {
@@ -65,6 +66,16 @@ const mainRouterConfig: RouteObject[] = [
             ),
             children: [...toolsRouters],
           },
+          {
+            path: RoutePath.CellManage,
+            element: (
+              <>
+                <CellManagement />
+                <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 7935f86df0..3ca2ffdff6 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -153,6 +153,11 @@ type Action =
   | 'get-sync-progress-by-addresses'
   // spore
   | 'generate-transfer-spore-tx'
+  // cell-manage
+  | '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 082db564b8..5579dcd438 100644
--- a/packages/neuron-ui/src/states/stateProvider/reducer.ts
+++ b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -1,3 +1,4 @@
+import type { OutPoint } from '@ckb-lumos/base'
 import produce, { Draft } from 'immer'
 import { OfflineSignJSON } from 'services/remote'
 import initStates from 'states/init'
@@ -65,6 +66,9 @@ export enum AppActions {
   GetFeeRateStats = 'getFeeRateStats',
   UpdateCountDown = 'updateCountDown',
   SignVerify = 'signVerify',
+
+  // Cell manage
+  UpdateConsumeCells = 'UpdateConsumeCells',
 }
 
 export type StateAction =
@@ -116,6 +120,7 @@ export type StateAction =
   | { type: NeuronWalletActions.UpdateAppUpdaterStatus; payload: State.AppUpdater }
   | { type: NeuronWalletActions.GetSUDTAccountList; payload: Controller.GetSUDTAccountList.Response }
   | { type: AppActions.SignVerify; payload: string }
+  | { type: AppActions.UpdateConsumeCells; payload?: { outPoint: OutPoint; capacity: string }[] }
 
 export type StateDispatch = React.Dispatch<StateAction> // TODO: add type of payload
 
@@ -410,6 +415,11 @@ export const reducer = produce((state: Draft<State.AppWithNeuronWallet>, action:
       break
     }
 
+    case AppActions.UpdateConsumeCells: {
+      state.consumeCells = 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 043f51e3d1..3916fb842d 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -331,6 +331,56 @@ declare namespace State {
     updater: AppUpdater
     sUDTAccounts: SUDTAccount[]
     experimental: Experimental | null
+    consumeCells?: { outPoint: OutPoint; capacity: string }[]
+  }
+
+  enum LockScriptCategory {
+    SECP256K1 = 'SECP256K1',
+    ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+    MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+    MULTISIG = 'MULTISIG',
+    Cheque = 'Cheque',
+    Unknown = 'Unknown',
+  }
+
+  enum TypeScriptCategory {
+    DAO = 'DAO',
+    NFT = 'NFT',
+    NFTClass = 'NFTClass',
+    NFTIssuer = 'NFTIssuer',
+    SUDT = 'SUDT',
+    Spore = 'Spore',
+    Unknown = 'Unknown',
+  }
+
+  interface LiveCellWithLocalInfoAPI {
+    capacity: CKBComponents.Capacity
+    outPoint: CKBComponents.OutPoint
+    lock: CKBComponents.Script
+    type?: CKBComponents.Script
+    data?: CKBComponents.Bytes
+    timestamp: string
+    description?: string
+    lockScriptType: LockScriptCategory
+    typeScriptType?: TypeScriptCategory
+    locked?: boolean
+  }
+  interface LiveCellWithLocalInfo extends LiveCellWithLocalInfoAPI {
+    lockedReason?: { key: string; params?: Record<string, any> }
+    cellType?: 'CKB' | 'SUDT' | 'NFT' | 'Spore' | '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..ce71adb71e 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,22 @@ export enum SendType {
   unknowNewCell = 'unknowNewCell',
   sendCKB = 'sendCKB',
 }
+
+export enum LockScriptCategory {
+  SECP256K1 = 'SECP256K1',
+  ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+  MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+  MULTISIG = 'MULTISIG',
+  Cheque = 'Cheque',
+  Unknown = 'Unknown',
+}
+
+export enum TypeScriptCategory {
+  DAO = 'DAO',
+  NFT = 'NFT',
+  NFTClass = 'NFTClass',
+  NFTIssuer = 'NFTIssuer',
+  SUDT = 'SUDT',
+  Spore = 'Spore',
+  Unknown = 'Unknown',
+}
diff --git a/packages/neuron-ui/src/utils/hooks/index.ts b/packages/neuron-ui/src/utils/hooks/index.ts
index 8de2d6897d..0d2d63f131 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)
@@ -561,3 +579,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/utils/parsers.ts b/packages/neuron-ui/src/utils/parsers.ts
index cfad394fe1..d53d3ecf3d 100644
--- a/packages/neuron-ui/src/utils/parsers.ts
+++ b/packages/neuron-ui/src/utils/parsers.ts
@@ -1,5 +1,5 @@
 import { toUint64Le, parseEpoch } from 'services/chain'
-import { PAGE_SIZE } from './const'
+import { MILLISECONDS, PAGE_SIZE } from './const'
 
 export const listParams = (search: string) => {
   const query = new URLSearchParams(search)
@@ -44,3 +44,26 @@ export const toUint128Le = (hexString: string) => {
 
   return `${toUint64Le(`0x${s.substr(18, 16)}`)}${toUint64Le(s.substr(0, 18)).slice(2)}`
 }
+
+export const getLockTimestamp = ({
+  lockArgs,
+  epoch,
+  bestKnownBlockTimestamp,
+}: {
+  lockArgs: string
+  epoch: string
+  bestKnownBlockTimestamp: number
+}) => {
+  const targetEpochInfo = epochParser(toUint64Le(`0x${lockArgs.slice(-16)}`))
+  const currentEpochInfo = epochParser(epoch)
+  const targetEpochFraction =
+    Number(targetEpochInfo.length) > 0 ? Number(targetEpochInfo.index) / Number(targetEpochInfo.length) : 1
+  const epochsInfo = {
+    target: Number(targetEpochInfo.number) + Math.min(targetEpochFraction, 1),
+    current: Number(currentEpochInfo.number) + Number(currentEpochInfo.index) / Number(currentEpochInfo.length),
+  }
+  return {
+    hasReached: epochsInfo.target <= epochsInfo.current,
+    lockTimestamp: bestKnownBlockTimestamp + (epochsInfo.target - epochsInfo.current) * MILLISECONDS,
+  }
+}
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 542cb2843d..464dc6e7d1 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -46,6 +46,11 @@ import { ReactComponent as AddressbookSvg } from './Addressbook.svg'
 import { ReactComponent as AddSvg } from './Add.svg'
 import { ReactComponent as AddSimpleSvg } from './AddSimple.svg'
 import { ReactComponent as SwitchSvg } from './Switch.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'
 
@@ -104,7 +109,12 @@ 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 Switch = WrapSvg(SwitchSvg)
 export const AddSimple = WrapSvg(AddSimpleSvg)
+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..2cb92df1c0 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,8 @@ export type TableProps<T> = {
   rowExtendRender?: (v: T, idx: number) => React.ReactNode
   expandedRow?: number | null
   hasHoverTrBg?: boolean
+  onSorted?: (key?: keyof T, type?: SortType) => void
+  initSortInfo?: { key: string; direction: SortType }
 }
 
 const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
@@ -52,6 +55,8 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
     rowExtendRender,
     expandedRow,
     hasHoverTrBg = true,
+    onSorted,
+    initSortInfo,
   } = props
   const [showBalance, setShowBalance] = useState(true)
   const onClickBalanceIcon = useCallback(() => {
@@ -64,34 +69,33 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
 
   const columnList = useMemo(() => columns.filter(item => !item.hidden), [columns])
 
-  const [sortIndex, setSortIndex] = useState(-1)
-  const [sortType, setSortType] = useState<SortType>(SortType.Normal)
+  const [sortInfo, setSortInfo] = useState<{ key: string; direction: SortType } | undefined>(initSortInfo)
 
   const currentDataSource = useMemo(() => {
-    if (sortIndex !== -1 && sortType !== SortType.Normal) {
-      const { sorter } = columnList[sortIndex]
-      if (sorter) {
-        return [...dataSource].sort((a: T, b: T) => sorter(a, b, sortType))
+    if (sortInfo && sortInfo.direction !== SortType.Normal) {
+      const sortColumn = columnList.find(v => (v.key ? v.key === sortInfo.key : v.dataIndex === sortInfo.key))
+      if (sortColumn?.sorter) {
+        return [...dataSource].sort((a: T, b: T) => sortColumn.sorter!(a, b, sortInfo.direction))
       }
     }
     return dataSource
-  }, [columnList, dataSource, sortIndex, sortType])
+  }, [columnList, dataSource, sortInfo])
 
   const handleSort = useCallback(
     (e: React.MouseEvent<SVGSVGElement>) => {
       const { dataset } = e.currentTarget
-      const { index, type } = dataset as { index: string; type: SortType }
-      const currentIndex = Number(index)
+      const { type, columnKey } = dataset as { type: SortType; columnKey: string }
 
-      if (sortIndex === currentIndex && sortType === type) {
-        setSortIndex(-1)
+      if (sortInfo?.key === columnKey && sortInfo?.direction === type) {
+        setSortInfo(undefined)
+        onSorted?.()
         return
       }
 
-      setSortIndex(currentIndex)
-      setSortType(type)
+      onSorted?.(columnKey, type)
+      setSortInfo({ key: columnKey, direction: type })
     },
-    [sortIndex, sortType, setSortIndex, setSortType]
+    [sortInfo, setSortInfo, onSorted]
   )
 
   return (
@@ -108,7 +112,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,19 +149,25 @@ 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}
+                            data-active={
+                              sortInfo?.key === (key ?? dataIndex) && sortInfo.direction === SortType.Increase
+                            }
                           />
                           <Sort
                             data-index={index}
+                            data-column-key={key || dataIndex}
                             data-type={SortType.Decrease}
                             onClick={handleSort}
-                            data-active={sortIndex === index && sortType === SortType.Decrease}
+                            data-active={
+                              sortInfo?.key === (key ?? dataIndex) && sortInfo.direction === SortType.Decrease
+                            }
                           />
                         </div>
                       ) : null}
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 7115b91a7d..45f5f4c8f2 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -62,6 +62,8 @@ 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 CellManagement from './cell-management'
+import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
 
 export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet' | 'migrate-acp'
 // Handle channel messages from renderer process and user actions.
@@ -396,7 +398,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 +414,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)
       }
@@ -815,6 +829,51 @@ export default class ApiController {
         status: ResponseCode.Success,
       }
     })
+
+    // cell manager
+    handle('get-live-cells', async () => {
+      return {
+        result: await CellManagement.getLiveCells(),
+        status: ResponseCode.Success,
+      }
+    })
+
+    handle('update-live-cell-local-info', async (_, params: UpdateCellLocalInfo) => {
+      return {
+        result: await CellManagement.updateLiveCellLocalInfo(params),
+        status: ResponseCode.Success,
+      }
+    })
+
+    handle(
+      'update-live-cells-lock-status',
+      async (
+        _,
+        params: {
+          outPoints: CKBComponents.OutPoint[]
+          locked: boolean
+          password: string
+          lockScripts: CKBComponents.Script[]
+        }
+      ) => {
+        return {
+          result: await CellManagement.updateLiveCellsLockStatus(
+            params.outPoints,
+            params.locked,
+            params.lockScripts,
+            params.password
+          ),
+          status: ResponseCode.Success,
+        }
+      }
+    )
+
+    handle('get-locked-balance', async () => {
+      return {
+        result: await CellManagement.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-management.ts b/packages/neuron-wallet/src/controllers/cell-management.ts
new file mode 100644
index 0000000000..4757e3a929
--- /dev/null
+++ b/packages/neuron-wallet/src/controllers/cell-management.ts
@@ -0,0 +1,84 @@
+import type { OutPoint, Script } from '@ckb-lumos/base'
+import CellLocalInfo, { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
+import Output from '../models/chain/output'
+import CellsService, { LockScriptCategory, TypeScriptCategory } 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 CellManagement {
+  static async getLiveCells() {
+    const currentWallet = WalletService.getInstance().getCurrent()
+    if (!currentWallet) throw new CurrentWalletNotSet()
+    const liveCells = (await CellsService.getLiveOrSentCellByWalletId(currentWallet.id, { includeCheque: true })).map(
+      v => v.toModel()
+    )
+    const outPoints = liveCells.filter((v): v is Output & { outPoint: OutPoint } => !!v.outPoint).map(v => v.outPoint)
+    const cellLocalInfoMap = await CellLocalInfoService.getCellLocalInfoMap(outPoints)
+    return liveCells
+      .map<
+        Pick<Output, 'capacity' | 'outPoint' | 'lock' | 'type' | 'timestamp'> & {
+          lockScriptType: LockScriptCategory
+          typeScriptType?: TypeScriptCategory
+          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 = CellLocalInfo.getKey(v.outPoint)
+        return {
+          ...result,
+          description: cellLocalInfoMap[outPointKey]?.description,
+          locked: cellLocalInfoMap[outPointKey]?.locked,
+        }
+      })
+      .sort((a, b) => +(b.timestamp ?? 0) - +(a.timestamp ?? 0))
+  }
+
+  static updateLiveCellLocalInfo(updateCellLocalInfo: UpdateCellLocalInfo) {
+    return CellLocalInfoService.saveCellLocalInfo(updateCellLocalInfo)
+  }
+
+  static async updateLiveCellsLockStatus(
+    outPoints: OutPoint[],
+    locked: boolean,
+    lockScripts: 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 7e3abfa89e..1870a1e25c 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..714e012559
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/entities/cell-local-info.ts
@@ -0,0 +1,44 @@
+import type { OutPoint } from '@ckb-lumos/base'
+import { Entity, PrimaryColumn, Column } from 'typeorm'
+
+@Entity()
+export default class CellLocalInfo {
+  @PrimaryColumn({
+    type: 'varchar',
+    transformer: {
+      to: CellLocalInfo.getKey,
+      from: CellLocalInfo.fromKey,
+    },
+  })
+  outPoint!: OutPoint
+
+  @Column({
+    type: 'boolean',
+    default: false,
+  })
+  locked?: boolean
+
+  @Column({
+    type: 'varchar',
+    nullable: true,
+  })
+  description?: string
+
+  get key() {
+    return CellLocalInfo.getKey(this.outPoint)
+  }
+
+  static getKey(value: CKBComponents.OutPoint) {
+    return `${value.txHash}_${value.index}`
+  }
+
+  static fromKey(value: string): CKBComponents.OutPoint {
+    const [txHash, index] = value.split('_')
+    return {
+      txHash,
+      index,
+    }
+  }
+}
+
+export type UpdateCellLocalInfo = Pick<CellLocalInfo, 'outPoint' | 'locked' | 'description'>
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/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..8ce44ad5fe
--- /dev/null
+++ b/packages/neuron-wallet/src/services/cell-local-info.ts
@@ -0,0 +1,67 @@
+import { getConnection } from 'typeorm'
+import CellLocalInfo, { UpdateCellLocalInfo } 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[v.key] = 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, locked, description }: UpdateCellLocalInfo) {
+    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 => CellLocalInfo.getKey(v))
+    const lockedCells = await getConnection()
+      .getRepository(CellLocalInfo)
+      .createQueryBuilder()
+      .where('outPoint IN (:...lockedOutPoints)', { lockedOutPoints })
+      .andWhere({ locked: true })
+      .getMany()
+    return new Set(lockedCells.map(v => v.key))
+  }
+
+  static async getLockedCells(walletId: string) {
+    const liveCells = (await CellsService.getLiveOrSentCellByWalletId(walletId, { includeCheque: true })).map(v =>
+      v.toModel()
+    )
+    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(CellLocalInfo.getKey(v.outPoint)))
+  }
+}
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index 45dc514a3f..c3dc43dd85 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, IsNull, type ObjectLiteral } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
 import {
@@ -30,11 +30,14 @@ 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 { bytes } from '@ckb-lumos/codec'
 import { generateRPC } from '../utils/ckb-rpc'
 import { getClusterCellById, SporeData, unpackToRawClusterData } from '@spore-sdk/core'
 import NetworksService from './networks'
+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 CellLocalInfo from '../database/chain/entities/cell-local-info'
 
 export interface PaginationResult<T = any> {
   totalCount: number
@@ -60,6 +63,25 @@ export enum CustomizedType {
   Unknown = 'Unknown',
 }
 
+export enum LockScriptCategory {
+  SECP256K1 = 'SECP256K1',
+  ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+  MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+  MULTISIG = 'MULTISIG',
+  Cheque = CustomizedLock.Cheque,
+  Unknown = CustomizedType.Unknown,
+}
+
+export enum TypeScriptCategory {
+  DAO = 'DAO',
+  NFT = CustomizedType.NFT,
+  NFTClass = CustomizedType.NFTClass,
+  NFTIssuer = CustomizedType.NFTIssuer,
+  SUDT = CustomizedType.SUDT,
+  Spore = CustomizedType.Spore,
+  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)
@@ -272,7 +294,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 sporeInfos = assetAccountInfo.getSporeInfos()
 
@@ -387,7 +408,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
       }
 
@@ -506,37 +527,85 @@ export default class CellsService {
     return cellEntity
   }
 
-  private static getLiveOrSentCellByWalletId = async (
+  private static getChequeLiveCells = async (blake160s: string[], filter?: ObjectLiteral) => {
+    const assetAccountInfo = new AssetAccountInfo()
+    const chequeLockCodeHash = assetAccountInfo.getChequeInfo().codeHash
+    // find cheque
+    const allChequeOutputs = await getConnection()
+      .getRepository(OutputEntity)
+      .createQueryBuilder('output')
+      .leftJoinAndSelect('output.transaction', 'tx')
+      .where({
+        ...filter,
+        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))
+      )
+    })
+  }
+
+  public static getLiveOrSentCellByWalletId = async (
     walletId: string,
-    lockClass: {
-      codeHash: string
-      hashType: ScriptHashType
+    filter?: {
+      whereCondition?: ObjectLiteral
+      filterUnlocked?: boolean
+      includeCheque?: boolean
     }
   ) => {
-    return await getConnection()
+    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')
-      .where(
-        `
-        output.status IN (:...statuses) AND
-        hasData = false AND
-        typeHash is null AND
-        output.lockArgs in (
-          SELECT publicKeyInBlake160
-          FROM hd_public_key_info
-          WHERE walletId = :walletId
-        ) AND
-        output.lockCodeHash = :lockCodeHash AND
-        output.lockHashType = :lockHashType
-        `,
-        {
-          walletId,
-          lockCodeHash: lockClass.codeHash,
-          lockHashType: lockClass.hashType,
-          statuses: [OutputStatus.Live, OutputStatus.Sent],
-        }
+      .leftJoinAndSelect('output.transaction', 'tx')
+      .where({
+        status: In([OutputStatus.Live, OutputStatus.Sent]),
+        ...filter?.whereCondition,
+      })
+      .andWhere(
+        new Brackets(qb => {
+          qb.where({ lockArgs: In(blake160s) }).orWhere({ multiSignBlake160: In(multisigArgs) })
+        })
       )
       .getMany()
+    if (filter?.includeCheque) {
+      const currentWalletCheque = await CellsService.getChequeLiveCells(blake160s, filter.whereCondition)
+      outputs.push(...currentWalletCheque)
+    }
+    if (filter?.filterUnlocked) {
+      const lockedOutPointSet = await CellLocalInfoService.getLockedOutPoints(outputs.map(v => v.outPoint()))
+      return outputs.filter(v => v.outPoint() && !lockedOutPointSet.has(CellLocalInfo.getKey(v.outPoint())))
+    }
+    return outputs
+  }
+
+  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: {
@@ -587,7 +656,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
@@ -610,7 +680,17 @@ 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, {
+            whereCondition: {
+              lockCodeHash: lockClass.codeHash,
+              lockHashType: lockClass.hashType,
+              hasData: false,
+              typeHash: IsNull(),
+            },
+            filterUnlocked: true,
+          })
       : CellsService.getLiveOrSentCellByLockArgsMultisigOutput(lockClass))
 
     const liveCells = cellEntities.filter(c => c.status === OutputStatus.Live)
@@ -742,15 +822,29 @@ 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, {
+        whereCondition: {
+          lockCodeHash: lockClass.codeHash,
+          lockHashType: lockClass.hashType,
+          hasData: false,
+          typeHash: IsNull(),
+        },
+        filterUnlocked: true,
+      })
+    }
 
     const inputs: Input[] = cellEntities
       .filter(v => v.status === OutputStatus.Live)
@@ -1100,27 +1194,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()
@@ -1253,4 +1326,50 @@ export default class CellsService {
 
     return balances
   }
+
+  public static getCellLockType(output: CKBComponents.CellOutput): LockScriptCategory {
+    const assetAccountInfo = new AssetAccountInfo()
+    switch (output.lock.codeHash) {
+      case assetAccountInfo.getChequeInfo().codeHash:
+        return LockScriptCategory.Cheque
+      case SystemScriptInfo.MULTI_SIGN_CODE_HASH:
+        if (output.lock.args.length === LOCKTIME_ARGS_LENGTH) {
+          return LockScriptCategory.MULTI_LOCK_TIME
+        }
+        return LockScriptCategory.MULTISIG
+      case assetAccountInfo.anyoneCanPayCodeHash:
+        return LockScriptCategory.ANYONE_CAN_PAY
+      case SystemScriptInfo.SECP_CODE_HASH:
+        return LockScriptCategory.SECP256K1
+      default:
+        return LockScriptCategory.Unknown
+    }
+  }
+
+  public static getCellTypeType(output: CKBComponents.CellOutput): TypeScriptCategory | undefined {
+    const assetAccountInfo = new AssetAccountInfo()
+    if (output.type) {
+      switch (output.type.codeHash) {
+        case assetAccountInfo.getNftInfo().codeHash:
+          return TypeScriptCategory.NFT
+        case assetAccountInfo.getNftIssuerInfo().codeHash:
+          return TypeScriptCategory.NFTIssuer
+        case assetAccountInfo.getNftClassInfo().codeHash:
+          return TypeScriptCategory.NFTClass
+        case assetAccountInfo.getSudtCodeHash():
+          return TypeScriptCategory.SUDT
+        case SystemScriptInfo.DAO_CODE_HASH:
+          return TypeScriptCategory.DAO
+        default:
+          if (
+            [...assetAccountInfo.getSporeInfos(), ...assetAccountInfo.getSporeClusterInfo()].some(
+              v => v.codeHash === output.type.codeHash
+            )
+          ) {
+            return TypeScriptCategory.Spore
+          }
+          return TypeScriptCategory.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..1f9e31ef3f
--- /dev/null
+++ b/packages/neuron-wallet/src/services/sudt-token-info.ts
@@ -0,0 +1,53 @@
+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): Promise<SudtTokenInfoEntity | undefined> {
+    return getConnection()
+      .getRepository(SudtTokenInfoEntity)
+      .createQueryBuilder('info')
+      .leftJoinAndSelect('info.assetAccounts', 'aa')
+      .where(`info.tokenID = :typeArgs`, {
+        typeArgs,
+      })
+      .getOne()
+  }
+}
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index e25bc57611..8955281951 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -432,7 +432,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,
@@ -447,7 +448,10 @@ export default class TransactionSender {
         targetOutputs,
         changeAddress,
         fee,
-        feeRate
+        feeRate,
+        undefined,
+        undefined,
+        consumeOutPoints
       )
 
       return tx
@@ -463,14 +467,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 1584c102b9..657a2fe89e 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -172,7 +172,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) {
@@ -231,7 +232,8 @@ export class TransactionGenerator {
       TransactionGenerator.CHANGE_OUTPUT_DATA_SIZE,
       undefined,
       lockClass,
-      multisigConfig ? [multisigConfig] : []
+      multisigConfig ? [multisigConfig] : [],
+      consumeOutPoints
     )
     const finalFeeInt = BigInt(finalFee)
     tx.inputs = inputs
@@ -258,7 +260,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) {
@@ -280,7 +283,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 babc1ff6d3..ce2701eb57 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)
 
           if (tokenInfo) {
             sudtInfo = {
diff --git a/packages/neuron-wallet/src/utils/const.ts b/packages/neuron-wallet/src/utils/const.ts
index 66bb5e5f3b..d294db6b7f 100644
--- a/packages/neuron-wallet/src/utils/const.ts
+++ b/packages/neuron-wallet/src/utils/const.ts
@@ -16,6 +16,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-management.test.ts b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
new file mode 100644
index 0000000000..e1ad5a0623
--- /dev/null
+++ b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
@@ -0,0 +1,174 @@
+import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
+import CellManagement from '../../src/controllers/cell-management'
+import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
+import { AddressNotFound, CurrentWalletNotSet } from '../../src/exceptions'
+import OutPoint from '../../src/models/chain/out-point'
+import OutputEntity from '../../src/database/chain/entities/output'
+import { ScriptHashType } from '../../src/models/chain/script'
+import { scriptToAddress } from '../../src/utils/scriptAndAddress'
+import Transaction from '../../src/database/chain/entities/transaction'
+
+const getCurrentWalletMock = jest.fn()
+const getLiveOrSentCellByWalletIdMock = 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()
+  getLiveOrSentCellByWalletIdMock.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', () => ({
+  getLiveOrSentCellByWalletId: () => getLiveOrSentCellByWalletIdMock(),
+  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: OutPointSDK[]) => getCellLocalInfoMapMock(outPoints),
+  updateLiveCellLockStatus: (outPoints: OutPointSDK[], locked: boolean) =>
+    updateLiveCellLockStatusMock(outPoints, locked),
+  getLockedCells: () => getLockedCellsMock(),
+}))
+
+const secp256k1CodeHash = '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8'
+function createOutput(
+  capacity: string = '6100000000',
+  lockArgs: string = '0x36c329ed630d6ce750712a477543672adab57f4c'
+) {
+  const output = new OutputEntity()
+  output.capacity = capacity
+  output.lockArgs = lockArgs
+  output.lockCodeHash = secp256k1CodeHash
+  output.lockHashType = ScriptHashType.Type
+  output.outPointTxHash = `0x${'00'.repeat(32)}`
+  output.outPointIndex = '0'
+  output.transaction = new Transaction()
+  return output
+}
+describe('CellManage', () => {
+  beforeEach(() => {
+    resetMocks()
+  })
+  describe('getLiveCells', () => {
+    it('no current wallet', async () => {
+      getCurrentWalletMock.mockReturnValue(undefined)
+      await expect(CellManagement.getLiveCells()).rejects.toThrow(new CurrentWalletNotSet())
+    })
+    it('outpoint is not null and order by timestamp', async () => {
+      const output1 = createOutput()
+      output1.transaction.timestamp = '12'
+      const output2 = createOutput()
+      output2.transaction.timestamp = '13'
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLiveOrSentCellByWalletIdMock.mockResolvedValueOnce([output1, output2])
+      getCellLocalInfoMapMock.mockResolvedValueOnce({})
+      const res = await CellManagement.getLiveCells()
+      expect(getCellLocalInfoMapMock).toBeCalledWith([
+        { txHash: output1.outPointTxHash, index: output1.outPointIndex },
+        { txHash: output2.outPointTxHash, index: output2.outPointIndex },
+      ])
+      expect(res[0].timestamp).toBe(output2.transaction.timestamp)
+    })
+    it('outpoint is not null', async () => {
+      const output1 = createOutput()
+      output1.outPointTxHash = `0x${'01'.repeat(32)}`
+      output1.outPointIndex = '0'
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLiveOrSentCellByWalletIdMock.mockResolvedValueOnce([output1])
+      getCellLocalInfoMapMock.mockResolvedValueOnce({
+        [CellLocalInfo.getKey(output1.outPoint())]: { description: 'description', locked: true },
+      })
+      const res = await CellManagement.getLiveCells()
+      expect(res[0].description).toBe('description')
+      expect(res[0].locked).toBeTruthy()
+    })
+  })
+
+  describe('updateLiveCellsLockStatus', () => {
+    it('no current wallet', async () => {
+      getCurrentWalletMock.mockReturnValue(undefined)
+      await expect(CellManagement.updateLiveCellsLockStatus([], true, [], '')).rejects.toThrow(
+        new CurrentWalletNotSet()
+      )
+    })
+    it('address not found', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getAddressesByWalletIdMock.mockResolvedValueOnce([])
+      await expect(
+        CellManagement.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 CellManagement.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(CellManagement.getLockedBalance()).rejects.toThrow(new CurrentWalletNotSet())
+    })
+    it('success', async () => {
+      getCurrentWalletMock.mockReturnValue({ id: 'walletId1' })
+      getLockedCellsMock.mockResolvedValueOnce([{ capacity: '6100000000' }, { capacity: '6100000000' }])
+      expect(await CellManagement.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..0fc67685ca
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
@@ -0,0 +1,178 @@
+import type { OutPoint } from '@ckb-lumos/base'
+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: OutPoint, locked?: boolean, description?: string) => {
+  const cellLocalInfo = new CellLocalInfo()
+  cellLocalInfo.outPoint = outPoint
+  cellLocalInfo.locked = locked
+  cellLocalInfo.description = description
+  return cellLocalInfo
+}
+
+const getLiveOrSentCellByWalletIdMock = jest.fn()
+
+function resetMocks() {
+  getLiveOrSentCellByWalletIdMock.mockReset()
+}
+
+jest.mock('../../src/services/cells', () => ({
+  getLiveOrSentCellByWalletId: () => getLiveOrSentCellByWalletIdMock(),
+}))
+
+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({ outPoint: outPoints[0] })
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(1)
+    })
+    it('update entity', async () => {
+      await CellLocalInfoService.saveCellLocalInfo({ outPoint: outPoints[0] })
+      await expect(getConnection().getRepository(CellLocalInfo).count()).resolves.toBe(1)
+      await CellLocalInfoService.saveCellLocalInfo({ outPoint: outPoints[0], locked: true, description: '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 empty', 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 () => {
+      getLiveOrSentCellByWalletIdMock.mockResolvedValueOnce([
+        {
+          toModel() {
+            return {}
+          },
+        },
+      ])
+      await expect(CellLocalInfoService.getLockedCells('')).resolves.toHaveLength(0)
+    })
+    it('no locked cell', async () => {
+      getLiveOrSentCellByWalletIdMock.mockResolvedValueOnce([
+        {
+          toModel() {
+            return { 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()
+      getLiveOrSentCellByWalletIdMock.mockResolvedValueOnce([
+        {
+          toModel() {
+            return { 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..2706a20c47 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -1,10 +1,16 @@
 import { getConnection } from 'typeorm'
+import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 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,
+  LockScriptCategory,
+  TypeScriptCategory,
+} 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 +30,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 +170,14 @@ describe('CellsService', () => {
     return cell
   }
 
+  const createCellLocalInfo = (outPoint: OutPointSDK, 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 +211,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 +339,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 +774,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 +1640,180 @@ describe('CellsService', () => {
       })
     })
   })
+
+  describe('getLiveOrSentCellByWalletId', () => {
+    it('no live cell', async () => {
+      await createCell('61', OutputStatus.Dead, false, null)
+      await expect(CellsService.getLiveOrSentCellByWalletId(bob.walletId)).resolves.toHaveLength(0)
+    })
+    it('find secp256k1 output cell', async () => {
+      await createCell('61', OutputStatus.Live, false, null)
+      await expect(CellsService.getLiveOrSentCellByWalletId(bob.walletId)).resolves.toHaveLength(1)
+    })
+    it('find secp256k1 output cell with data', async () => {
+      await createCell('61', OutputStatus.Live, true, null)
+      await expect(CellsService.getLiveOrSentCellByWalletId(bob.walletId)).resolves.toHaveLength(1)
+    })
+    it('find secp256k1 output cell with type', async () => {
+      await createCell('61', OutputStatus.Live, false, typeScript)
+      await expect(CellsService.getLiveOrSentCellByWalletId(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.getLiveOrSentCellByWalletId(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(LockScriptCategory.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(LockScriptCategory.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(LockScriptCategory.MULTISIG)
+    })
+    it('ANYONE_CAN_PAY', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: assetAccountInfo.generateAnyoneCanPayScript('0x'),
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptCategory.ANYONE_CAN_PAY)
+    })
+    it('SECP256K1', () => {
+      const output = Output.fromObject({
+        capacity: '1000',
+        lock: bob.lockScript,
+      })
+      expect(CellsService.getCellLockType(output)).toBe(LockScriptCategory.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(LockScriptCategory.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(TypeScriptCategory.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(TypeScriptCategory.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(TypeScriptCategory.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(TypeScriptCategory.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(TypeScriptCategory.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(TypeScriptCategory.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..f2021694c6
--- /dev/null
+++ b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
@@ -0,0 +1,183 @@
+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 [assetAccount] = accounts
+    beforeEach(async () => {
+      const keyEntity = HdPublicKeyInfo.fromObject({
+        walletId: 'walletId',
+        publicKeyInBlake160: assetAccount.blake160,
+        addressType: 0,
+        addressIndex: 0,
+      })
+      await getConnection().manager.save(keyEntity)
+    })
+
+    it('no token info', async () => {
+      await expect(SudtTokenInfoService.getSudtTokenInfo('0x')).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)}`)).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)
+      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 692208d273..d52372dc3a 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -615,7 +615,10 @@ describe('TransactionSender Test', () => {
             ],
             fakeAddress1,
             fee,
-            feeRate
+            feeRate,
+            undefined,
+            undefined,
+            undefined
           )
         })
       })
@@ -649,7 +652,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..aaae2c253d 100644
--- a/packages/neuron-wallet/tests/setup.ts
+++ b/packages/neuron-wallet/tests/setup.ts
@@ -46,6 +46,13 @@ jest.mock('dotenv', () => ({
     process.env.MAINNET_CHEQUE_SCRIPT_HASHTYPE = 'type'
 
     process.env.MAINNET_SUDT_SCRIPT_CODEHASH = '0x48dbf59b4c7ee1547238021b4869bceedf4eea6b43772e5d66ef8865b6ae7212'
+    process.env.MAINNET_NFT_SCRIPT_CODEHASH = '0xb1837b5ad01a88558731953062d1f5cb547adf89ece01e8934a9f0aeed2d959f'
+    process.env.MAINNET_NFT_SCRIPT_HASH_TYPE = 'type'
+    process.env.MAINNET_NFT_CLASS_SCRIPT_CODEHASH = '0x095b8c0b4e51a45f953acd1fcd1e39489f2675b4bc94e7af27bb38958790e3fc'
+    process.env.MAINNET_NFT_CLASS_SCRIPT_HASH_TYPE = 'type'
+    process.env.MAINNET_NFT_ISSUER_SCRIPT_CODEHASH =
+      '0xb59879b6ea6fff985223117fa499ce84f8cfb028c4ffdfdf5d3ec19e905a11ed'
+    process.env.MAINNET_NFT_ISSUER_SCRIPT_HASH_TYPE = 'type'
 
     process.env.TESTNET_SUDT_DEP_TXHASH = '0xc1b2ae129fad7465aaa9acc9785f842ba3e6e8b8051d899defa89f5508a77958'
     process.env.TESTNET_SUDT_DEP_INDEX = '0'
@@ -81,6 +88,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'
   },
 }))
 

From c5307360c8d7c1693099ffe6ca7516a7c05b243e Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Mon, 27 Nov 2023 15:02:39 +0900
Subject: [PATCH 03/68] Bump dependencies (#2949)

---
 package.json                                  |  17 +-
 packages/neuron-ui/.eslintrc.js               |   2 +-
 packages/neuron-ui/package.json               |  21 +-
 .../calculation/calculateAPC/index.test.ts    |   1 +
 .../calculateClaimEpochValue/index.test.ts    |   1 +
 .../src/tests/calendar/index.test.ts          |   1 +
 .../CKBToShannonFormatter/index.test.ts       |   1 +
 .../addressesToBalance/index.test.ts          |   1 +
 .../formatters/bytesFormatter/index.test.ts   |   1 +
 .../complexNumberToPureNumber/index.test.ts   |   1 +
 .../currencyFormatter/index.test.ts           |   1 +
 .../difficultyFormatter/index.test.ts         |   1 +
 .../outputsToTotalAmount/index.test.ts        |   1 +
 .../padFractionDigitsIfDecimal/index.test.ts  |   1 +
 .../sUDTAmountFormatter/index.test.ts         |   1 +
 .../shannonToCKBFormatter/index.test.ts       |   1 +
 .../formatters/sporeFormatter/index.test.ts   |   1 +
 .../sudtAmountToValue/index.test.ts           |   1 +
 .../sudtValueToAmount/index.test.ts           |   1 +
 .../tests/getCompensatedTime/index.test.ts    |   1 +
 .../tests/getCompensationPeriod/index.test.ts |   1 +
 .../tests/getConnectionStatus/index.test.ts   |   3 +-
 .../src/tests/getDAOCellStatus/index.test.ts  |   1 +
 .../tests/getMultisigSignStatus/index.test.ts |   1 +
 .../src/tests/getPageNoList/index.test.ts     |   1 +
 .../src/tests/getSyncLeftTime/index.test.ts   |   1 +
 .../src/tests/is/isMainnet/index.test.ts      |   1 +
 .../tests/is/isReadyByVersion/index.test.ts   |   1 +
 .../tests/is/isSuccessResponse/index.test.ts  |   1 +
 .../neuron-ui/src/tests/parsers/index.test.ts |   1 +
 .../src/tests/sortAccounts/index.test.ts      |   1 +
 .../tests/validators/address/index.test.ts    |   1 +
 .../src/tests/validators/amount/index.test.ts |   1 +
 .../validators/amountRange/index.test.ts      |   1 +
 .../assetAccountAddress/index.test.ts         |   1 +
 .../validators/assetAccountName/index.test.ts |   1 +
 .../tests/validators/decimal/index.test.ts    |   1 +
 .../validators/networkName/index.test.ts      |   1 +
 .../tests/validators/outputs/index.test.ts    |   1 +
 .../passwordComplexity/index.test.ts          |   1 +
 .../tests/validators/sudtAmount/index.test.ts |   1 +
 .../src/tests/validators/symbol/index.test.ts |   1 +
 .../tests/validators/tokenId/index.test.ts    |   1 +
 .../tests/validators/tokenName/index.test.ts  |   1 +
 .../validators/totalAmount/index.test.ts      |   1 +
 .../src/tests/validators/url/index.test.ts    |   1 +
 packages/neuron-wallet/package.json           |  46 +-
 .../neuron-wallet/src/services/rpc-service.ts |   4 +-
 packages/neuron-wallet/src/utils/ckb-rpc.ts   |   8 +-
 .../tests/block-sync-renderer/queue.test.ts   |   1 +
 yarn.lock                                     | 719 +++++++++++-------
 51 files changed, 546 insertions(+), 317 deletions(-)

diff --git a/package.json b/package.json
index 143b5c5396..fa519aa9ca 100644
--- a/package.json
+++ b/package.json
@@ -41,16 +41,16 @@
     "update:client-versions": "node ./scripts/update-ckb-client-versions.js"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
+    "@babel/core": "7.23.3",
     "@types/jest": "27.5.2",
     "@types/node": "18.16.18",
-    "@types/npmlog": "4.1.4",
+    "@types/npmlog": "4.1.6",
     "@typescript-eslint/eslint-plugin": "5.60.1",
     "@typescript-eslint/parser": "5.60.1",
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "cross-env": "7.0.3",
-    "eslint": "8.38.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint": "8.54.0",
+    "eslint-config-prettier": "8.10.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
     "lerna": "7.1.0",
@@ -58,14 +58,13 @@
     "ncp": "2.0.0",
     "prettier": "2.8.8",
     "ts-jest": "27.1.5",
-    "typescript": "5.0.4",
+    "typescript": "5.3.2",
     "wait-on": "7.0.1"
   },
   "dependencies": {},
   "resolutions": {
-    "@types/react": "17.0.65",
-    "react-i18next": ">=11.16.4",
-    "usb": "1.8.8"
+    "@types/react": "17.0.71",
+    "react-i18next": ">=11.16.4"
   },
   "volta": {
     "node": "18.16.1"
diff --git a/packages/neuron-ui/.eslintrc.js b/packages/neuron-ui/.eslintrc.js
index b8001f8237..b83c885ab3 100644
--- a/packages/neuron-ui/.eslintrc.js
+++ b/packages/neuron-ui/.eslintrc.js
@@ -65,7 +65,7 @@ module.exports = {
     'import/no-extraneous-dependencies': [
       'error',
       {
-        devDependencies: ['**/*.stories.*', 'src/setupTests.ts'],
+        devDependencies: ['**/*.stories.*', 'src/setupTests.ts', '**/*.test.ts'],
       },
     ],
     'import/extensions': [
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index c2a3713dbc..344fbf9f61 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -50,8 +50,8 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.1",
-    "@ckb-lumos/codec": "0.21.0-next.1",
+    "@ckb-lumos/base": "0.21.0-next.2",
+    "@ckb-lumos/codec": "0.21.0-next.2",
     "@nervosnetwork/ckb-sdk-core": "0.109.0",
     "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",
@@ -69,7 +69,8 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
-    "@babel/preset-typescript": "7.23.2",
+    "@babel/preset-typescript": "7.23.3",
+    "@jest/globals": "27.5.1",
     "@storybook/addon-actions": "7.0.24",
     "@storybook/addon-essentials": "7.0.24",
     "@storybook/addon-interactions": "7.0.24",
@@ -78,17 +79,17 @@
     "@storybook/preset-create-react-app": "7.0.24",
     "@storybook/react": "7.0.24",
     "@storybook/react-webpack5": "7.0.24",
-    "@storybook/testing-library": "0.2.0",
-    "@types/enzyme": "3.10.13",
-    "@types/enzyme-adapter-react-16": "1.0.6",
+    "@storybook/testing-library": "0.2.2",
+    "@types/enzyme": "3.10.16",
+    "@types/enzyme-adapter-react-16": "1.0.9",
     "@types/node": "18.16.18",
-    "@types/react": "17.0.65",
-    "@types/react-dom": "17.0.20",
+    "@types/react": "17.0.71",
+    "@types/react-dom": "17.0.25",
     "@types/react-router-dom": "5.3.3",
-    "@types/styled-components": "5.1.27",
+    "@types/styled-components": "5.1.32",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "24.8.5",
+    "electron": "24.8.8",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",
diff --git a/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
index 8066d4badd..4e94d828a0 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import calculateAPC from 'utils/calculateAPC'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
index 93d10f0887..4917a70ece 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import calculateClaimEpochValue from 'utils/calculateClaimEpochValue'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/calendar/index.test.ts b/packages/neuron-ui/src/tests/calendar/index.test.ts
index 04315b7ec2..27792b5cbc 100644
--- a/packages/neuron-ui/src/tests/calendar/index.test.ts
+++ b/packages/neuron-ui/src/tests/calendar/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
 import {
   isDayInRange,
   isMonthInRange,
diff --git a/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
index ba6cd25116..6c74afa6a3 100644
--- a/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { CKBToShannonFormatter } from 'utils/formatters'
 import { CapacityUnit } from 'utils'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts b/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
index 07202c711e..e9bc9009c5 100644
--- a/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { addressesToBalance } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
index 4a80409b17..a98c5cdd46 100644
--- a/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { bytesFormatter } from 'utils/formatters'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts b/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
index bb7a538196..319208a831 100644
--- a/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { complexNumberToPureNumber } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
index 63959adc41..ac84e21567 100644
--- a/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { currencyFormatter } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
index e5cfc335db..f3c245189b 100644
--- a/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { difficultyFormatter } from 'utils/formatters'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts b/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
index 7a7cd78082..ed095c0c1e 100644
--- a/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { outputsToTotalAmount } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts b/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
index 4b2881b8e2..76c5563d17 100644
--- a/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
 import { padFractionDigitsIfDecimal } from 'utils/formatters'
 
 describe('padFractionDigitsIfDecimal', () => {
diff --git a/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
index d7ffed2f0f..842be431c9 100644
--- a/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { sUDTAmountFormatter } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
index 3787ca813a..adc889334b 100644
--- a/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { shannonToCKBFormatter } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
index 78c54b209e..17ad3f202c 100644
--- a/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
 import { sporeFormatter, truncateMiddle } from 'utils/formatters'
 
 describe('sporeFormatter', () => {
diff --git a/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts b/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
index 679a3d7a63..ea749c7102 100644
--- a/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { sudtAmountToValue } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts b/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
index b1c64e60ab..7470b6e775 100644
--- a/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { sudtValueToAmount } from 'utils/formatters'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts b/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
index 97ddaf2a63..df3dd6f19f 100644
--- a/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
+++ b/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import getCompensatedTime from 'utils/getCompensatedTime'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts b/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
index ff02cc41b3..26d74e4765 100644
--- a/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
+++ b/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import getCompensationPeriod from 'utils/getCompensationPeriod'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts b/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
index d318491cb3..66b098fd39 100644
--- a/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { ConnectionStatus } from 'utils'
 import getConnectionStatus from 'utils/getConnectionStatus'
 import fixtures from './fixtures.json'
@@ -9,6 +10,6 @@ describe('Test getConnectionStatus', () => {
 
   test.each(fixtureTable)(`%s`, (_title, params, expected) => {
     expect.assertions(1)
-    expect(getConnectionStatus(...params)).toBe(expected)
+    expect(getConnectionStatus(params[0])).toBe(expected)
   })
 })
diff --git a/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts b/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
index 5897390565..8023967548 100644
--- a/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import getDAOCellStatus, { CellStatus } from 'utils/getDAOCellStatus'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
index 8385cde682..4820f0fe7f 100644
--- a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
 import { MultisigConfig } from 'services/remote'
 import getMultisigSignStatus from 'utils/getMultisigSignStatus'
 import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
diff --git a/packages/neuron-ui/src/tests/getPageNoList/index.test.ts b/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
index e8336515d5..0947dfbda2 100644
--- a/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
+++ b/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import getPageNoList from 'utils/getPageNoList'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts b/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
index 4447e320e4..25988887dd 100644
--- a/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
+++ b/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import getSyncLeftTime from 'utils/getSyncLeftTime'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts b/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
index 10d8af1da9..18cf7a8085 100644
--- a/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isMainnet } from 'utils/is'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts b/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
index c37977d95c..6f9a113bad 100644
--- a/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isReadyByVersion } from 'utils/is'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts b/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
index 1d0a50f7dc..efaafded4a 100644
--- a/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isSuccessResponse } from 'utils/is'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/parsers/index.test.ts b/packages/neuron-ui/src/tests/parsers/index.test.ts
index d9dc7e31db..2ab0f07925 100644
--- a/packages/neuron-ui/src/tests/parsers/index.test.ts
+++ b/packages/neuron-ui/src/tests/parsers/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
 import { listParams, epochParser, toUint128Le } from 'utils/parsers'
 
 describe('listParams', () => {
diff --git a/packages/neuron-ui/src/tests/sortAccounts/index.test.ts b/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
index 53249f3579..27b52a56d6 100644
--- a/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
+++ b/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import sortAccounts, { Account } from 'utils/sortAccounts'
 import fixtures from './fixtures.json'
 
diff --git a/packages/neuron-ui/src/tests/validators/address/index.test.ts b/packages/neuron-ui/src/tests/validators/address/index.test.ts
index 59a8c1a58e..402c40b82c 100644
--- a/packages/neuron-ui/src/tests/validators/address/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/address/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAddress } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/amount/index.test.ts b/packages/neuron-ui/src/tests/validators/amount/index.test.ts
index 9c1ac74e69..2048ab2e54 100644
--- a/packages/neuron-ui/src/tests/validators/amount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/amount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAmount } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts b/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
index 2061364ab8..ce3cc24472 100644
--- a/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAmountRange } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts b/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
index b09b6775f9..40c36b65cf 100644
--- a/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAssetAccountAddress } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts b/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
index 4bbe8169f4..2ea6305086 100644
--- a/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAssetAccountName } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/decimal/index.test.ts b/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
index a579546928..0d0fad954f 100644
--- a/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateDecimal } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/networkName/index.test.ts b/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
index ad39dd7cb2..bdbe78ed2f 100644
--- a/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateNetworkName } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/outputs/index.test.ts b/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
index 8c9827c364..dc7af3472e 100644
--- a/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { validateOutputs } from 'utils/validators'
 import fixtures from './fixtures'
 
diff --git a/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts b/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
index 85c7fc4b78..ab23aa929f 100644
--- a/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validatePasswordComplexity } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts b/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
index e04f191a21..5143476937 100644
--- a/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateAssetAccountAmount } from 'utils/validators'
 
diff --git a/packages/neuron-ui/src/tests/validators/symbol/index.test.ts b/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
index f20fcf651c..4a533748d5 100644
--- a/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateSymbol } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts b/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
index 4110535426..b19545793b 100644
--- a/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateTokenId } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts b/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
index c981928028..8716536a5e 100644
--- a/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateTokenName } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts b/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
index f31ec17fbe..f2cee32d6a 100644
--- a/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateTotalAmount } from 'utils/validators'
 
diff --git a/packages/neuron-ui/src/tests/validators/url/index.test.ts b/packages/neuron-ui/src/tests/validators/url/index.test.ts
index be3af6e4a4..2dcecac6f8 100644
--- a/packages/neuron-ui/src/tests/validators/url/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/url/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
 import { isErrorWithI18n } from 'exceptions'
 import { validateURL } from 'utils/validators'
 import fixtures from './fixtures'
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index db9ddb637f..f85c7e1d8a 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -42,20 +42,20 @@
     ]
   },
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.1",
-    "@ckb-lumos/bi": "0.21.0-next.1",
-    "@ckb-lumos/ckb-indexer": "0.21.0-next.1",
-    "@ckb-lumos/codec": "0.21.0-next.1",
-    "@ckb-lumos/common-scripts": "0.21.0-next.1",
-    "@ckb-lumos/config-manager": "0.21.0-next.1",
-    "@ckb-lumos/hd": "0.21.0-next.1",
-    "@ckb-lumos/helpers": "0.21.0-next.1",
-    "@ckb-lumos/rpc": "0.21.0-next.1",
+    "@ckb-lumos/base": "0.21.0-next.2",
+    "@ckb-lumos/bi": "0.21.0-next.2",
+    "@ckb-lumos/ckb-indexer": "0.21.0-next.2",
+    "@ckb-lumos/codec": "0.21.0-next.2",
+    "@ckb-lumos/common-scripts": "0.21.0-next.2",
+    "@ckb-lumos/config-manager": "0.21.0-next.2",
+    "@ckb-lumos/hd": "0.21.0-next.2",
+    "@ckb-lumos/helpers": "0.21.0-next.2",
+    "@ckb-lumos/rpc": "0.21.0-next.2",
     "@iarna/toml": "2.2.5",
-    "@ledgerhq/hw-transport-node-hid": "6.27.16",
+    "@ledgerhq/hw-transport-node-hid": "6.27.22",
     "@spore-sdk/core": "0.1.0-beta.9",
-    "archiver": "5.3.0",
-    "async": "3.2.4",
+    "archiver": "5.3.2",
+    "async": "3.2.5",
     "bn.js": "4.12.0",
     "chalk": "3.0.0",
     "dotenv": "8.6.0",
@@ -77,27 +77,27 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@electron/notarize": "2.0.0",
+    "@electron/notarize": "2.2.0",
     "@nervosnetwork/ckb-types": "0.109.0",
     "@types/archiver": "3.1.1",
-    "@types/async": "3.2.21",
-    "@types/electron-devtools-installer": "2.2.2",
-    "@types/elliptic": "6.4.15",
-    "@types/iarna__toml": "2.0.2",
+    "@types/async": "3.2.24",
+    "@types/electron-devtools-installer": "2.2.5",
+    "@types/elliptic": "6.4.18",
+    "@types/iarna__toml": "2.0.5",
     "@types/jest-when": "3.5.2",
-    "@types/ledgerhq__hw-transport": "4.21.4",
-    "@types/ledgerhq__hw-transport-node-hid": "4.22.2",
-    "@types/leveldown": "4.0.4",
+    "@types/ledgerhq__hw-transport": "4.21.8",
+    "@types/ledgerhq__hw-transport-node-hid": "4.22.5",
+    "@types/leveldown": "4.0.6",
     "@types/levelup": "4.3.3",
-    "@types/sqlite3": "3.1.8",
+    "@types/sqlite3": "3.1.11",
     "@types/uuid": "8.3.4",
     "devtron": "1.4.0",
-    "electron": "24.8.5",
+    "electron": "24.8.8",
     "electron-build-env": "0.2.0",
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.5.2",
     "neuron-ui": "0.111.1",
-    "typescript": "5.0.4"
+    "typescript": "5.3.2"
   }
 }
diff --git a/packages/neuron-wallet/src/services/rpc-service.ts b/packages/neuron-wallet/src/services/rpc-service.ts
index 2f38401fdd..8b59adf858 100644
--- a/packages/neuron-wallet/src/services/rpc-service.ts
+++ b/packages/neuron-wallet/src/services/rpc-service.ts
@@ -1,3 +1,4 @@
+import type { LocalNode } from '@ckb-lumos/base'
 import CommonUtils from '../utils/common'
 import Block from '../models/chain/block'
 import BlockHeader from '../models/chain/block-header'
@@ -5,6 +6,7 @@ import TransactionWithStatus from '../models/chain/transaction-with-status'
 import logger from '../utils/logger'
 import { generateRPC } from '../utils/ckb-rpc'
 import { NetworkType } from '../models/network'
+
 export default class RpcService {
   private retryTime: number
   private retryInterval: number
@@ -74,7 +76,7 @@ export default class RpcService {
     return syncState
   }
 
-  public async localNodeInfo() {
+  public async localNodeInfo(): Promise<LocalNode> {
     return this.retry(async () => {
       return this.rpc.localNodeInfo()
     })
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
index 880a55d125..55fc0bb9f2 100644
--- a/packages/neuron-wallet/src/utils/ckb-rpc.ts
+++ b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -1,3 +1,5 @@
+import type { ParamsFormatter } from '@ckb-lumos/rpc'
+import type { Block } from '@ckb-lumos/base'
 import { HexString } from '@ckb-lumos/base'
 import { CKBRPC } from '@ckb-lumos/rpc'
 import { Method } from '@ckb-lumos/rpc/lib/method'
@@ -124,7 +126,7 @@ export class FullCKBRPC extends CKBRPC {
     return this.getBlockHash('0x0')
   }
 
-  getGenesisBlock = async () => {
+  getGenesisBlock = async (): Promise<Block> => {
     return this.getBlockByNumber('0x0')
   }
 }
@@ -244,9 +246,9 @@ export class LightRPC extends Base {
     return this.#node
   }
 
-  #paramsFormatter = paramsFormatter
+  #paramsFormatter: typeof ParamsFormatter = paramsFormatter
 
-  get paramsFormatter() {
+  get paramsFormatter(): typeof ParamsFormatter {
     return this.#paramsFormatter
   }
 
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
index 83d2580dec..9886c3e881 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
@@ -1,3 +1,4 @@
+import '../../src/types/ckbComponents.d.ts'
 import { Subject } from 'rxjs'
 import { Tip } from '@ckb-lumos/base'
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
diff --git a/yarn.lock b/yarn.lock
index 8a2996bbc2..bfda35675f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -71,21 +71,21 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
-  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
+"@babel/core@7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
+  integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/generator" "^7.23.3"
     "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helpers" "^7.23.2"
-    "@babel/parser" "^7.23.0"
+    "@babel/parser" "^7.23.3"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
+    "@babel/traverse" "^7.23.3"
+    "@babel/types" "^7.23.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -163,6 +163,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e"
+  integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
+  dependencies:
+    "@babel/types" "^7.23.3"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/generator@~7.21.1":
   version "7.21.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.9.tgz#3a1b706e07d836e204aee0650e8ee878d3aaa241"
@@ -347,10 +357,10 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
-  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
@@ -520,6 +530,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
+"@babel/parser@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9"
+  integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
+
 "@babel/parser@~7.21.2":
   version "7.21.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.9.tgz#ab18ea3b85b4bc33ba98a8d4c2032c557d23cf14"
@@ -777,6 +792,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-syntax-jsx@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
+  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -840,6 +862,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-syntax-typescript@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f"
+  integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
@@ -1045,12 +1074,12 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
-  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
+"@babel/plugin-transform-modules-commonjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
@@ -1274,16 +1303,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz#15adef906451d86349eb4b8764865c960eb54127"
-  integrity sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-typescript" "^7.22.5"
-
 "@babel/plugin-transform-typescript@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d"
@@ -1294,6 +1313,16 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-typescript" "^7.22.5"
 
+"@babel/plugin-transform-typescript@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.3.tgz#ce806e6cb485d468c48c4f717696719678ab0138"
+  integrity sha512-ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.23.3"
+
 "@babel/plugin-transform-unicode-escapes@^7.21.5", "@babel/plugin-transform-unicode-escapes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
@@ -1525,16 +1554,16 @@
     "@babel/plugin-transform-react-jsx-development" "^7.22.5"
     "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
 
-"@babel/preset-typescript@7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.2.tgz#c8de488130b7081f7e1482936ad3de5b018beef4"
-  integrity sha512-u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA==
+"@babel/preset-typescript@7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913"
+  integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-syntax-jsx" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
-    "@babel/plugin-transform-typescript" "^7.22.15"
+    "@babel/plugin-syntax-jsx" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-typescript" "^7.23.3"
 
 "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.0":
   version "7.22.5"
@@ -1627,6 +1656,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
+  integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.3"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.3"
+    "@babel/types" "^7.23.3"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@~7.21.2":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
@@ -1670,6 +1715,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598"
+  integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@~7.21.2":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
@@ -1703,14 +1757,14 @@
     js-xxhash "^1.0.4"
     lodash.isequal "^4.5.0"
 
-"@ckb-lumos/base@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.1.tgz#ad82d0147c479b84bc0e80c3e32ad6a39ee75285"
-  integrity sha512-dJL3pqa28oJcNfYLNOuWRIJCeWhUq9l7l2/SZItb9wIT4MX5pD0Z1tA8/s9qbvwmmsab+QGKaLCHXNNeOvS0hg==
+"@ckb-lumos/base@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.2.tgz#8d7ba32aa98f63de64f0140ef2e530a16450a382"
+  integrity sha512-1QiuVR7BD6RV2oq3CpM1RBMoPQ0E+F4e4MLwtg1kWRkN0UQWLin8OIDewb7hXsifU/ZpoTdluoCOGGV0CY1DkQ==
   dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@ckb-lumos/codec" "0.21.0-next.1"
-    "@ckb-lumos/toolkit" "0.21.0-next.1"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/codec" "0.21.0-next.2"
+    "@ckb-lumos/toolkit" "0.21.0-next.2"
     "@types/blake2b" "^2.1.0"
     "@types/lodash.isequal" "^4.5.5"
     blake2b "^2.1.3"
@@ -1724,10 +1778,10 @@
   dependencies:
     jsbi "^4.1.0"
 
-"@ckb-lumos/bi@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.1.tgz#357b8da31882ab5e3e3f8aca54c30dd576e4544d"
-  integrity sha512-FaMKBbtr826upcEVYt9/K/hutxHySD21t7ut5yv8lfj6LYcg6hWjtrbCM2INVV6/8HatfAf8YV2KsNRaluyt3A==
+"@ckb-lumos/bi@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.2.tgz#0797e8774c00d3f4e609833050529e0f6e022620"
+  integrity sha512-3c8jC94eO57vFFo30g9Rh6qrfk5EF+7OD58hX1GknXaHwykMs3EBQodmA7DUV517dswkHy5IzI5gt5ROn9asjQ==
   dependencies:
     jsbi "^4.1.0"
 
@@ -1743,16 +1797,16 @@
     cross-fetch "^3.1.5"
     events "^3.3.0"
 
-"@ckb-lumos/ckb-indexer@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.0-next.1.tgz#bc2fd6fcd2c482040565c255d7a9f8fd9269b462"
-  integrity sha512-ftT8Rodv/oXIOZLfsXEOLQnHy05c8Wj3h6QasXPlZlRGMdtWrThGz+XVI6lz4VSIfVMPSbwnYT+Dv7bf8fDfdw==
+"@ckb-lumos/ckb-indexer@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.0-next.2.tgz#b151ffaea0b53ca989b336d6e9b539017450a475"
+  integrity sha512-Niwx2LPU0jH9La7ItSA1IHpX8Z025+qZHcUs1hDLIDHhxtqV5OiPRDrBAPn6B8iJMf1WqyaGLuqHZ6S5R1sEWw==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@ckb-lumos/codec" "0.21.0-next.1"
-    "@ckb-lumos/rpc" "0.21.0-next.1"
-    "@ckb-lumos/toolkit" "0.21.0-next.1"
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/codec" "0.21.0-next.2"
+    "@ckb-lumos/rpc" "0.21.0-next.2"
+    "@ckb-lumos/toolkit" "0.21.0-next.2"
     cross-fetch "^3.1.5"
     events "^3.3.0"
 
@@ -1763,12 +1817,12 @@
   dependencies:
     "@ckb-lumos/bi" "0.20.0"
 
-"@ckb-lumos/codec@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.1.tgz#a75f5331026039799afb4f3419bea388e220d26c"
-  integrity sha512-b1w4wbIAbuYngNTKtu6np93EYgnmM4tb6NGdaYN0vZ3kyunlODkLWyRHyMo+FGeBdWQjBwBbmxGNyXwDxtTEGQ==
+"@ckb-lumos/codec@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.2.tgz#d29465fc22c2b98182b6079453be7deb7d3fd1ba"
+  integrity sha512-yTtWIG9LESLTU3tBb9fHREWo2mO0Ts7SSL1Jp3MSqYbnl90JZeYr/skvn+vaV9/2Cl/6qEgeKYa1AnHNSLchkw==
   dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.1"
+    "@ckb-lumos/bi" "0.21.0-next.2"
 
 "@ckb-lumos/common-scripts@0.20.0":
   version "0.20.0"
@@ -1784,18 +1838,18 @@
     "@ckb-lumos/toolkit" "0.20.0"
     immutable "^4.0.0-rc.12"
 
-"@ckb-lumos/common-scripts@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.1.tgz#92e0295f9e123f3fdfe80e02706cc08c6310ffca"
-  integrity sha512-KhnWbNY1fNKTxp9CR4GAGyWsjjN1eOvidNLFwltLY03n8er2jtoHRbx3t944fIhUMtIwUVkWBi43SqpUCgSJbw==
-  dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@ckb-lumos/codec" "0.21.0-next.1"
-    "@ckb-lumos/config-manager" "0.21.0-next.1"
-    "@ckb-lumos/helpers" "0.21.0-next.1"
-    "@ckb-lumos/rpc" "0.21.0-next.1"
-    "@ckb-lumos/toolkit" "0.21.0-next.1"
+"@ckb-lumos/common-scripts@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.2.tgz#222e58a96d92a4ddfa9e501fe2f0a5428c036e96"
+  integrity sha512-43r7DvXSccsi80NcXh0jaZT0MdQ+rhsElWBO2U3zRUt/55rV4HBaoo26Rj8h7esi0tVfDbiDrnc16ymN1V+B3w==
+  dependencies:
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/codec" "0.21.0-next.2"
+    "@ckb-lumos/config-manager" "0.21.0-next.2"
+    "@ckb-lumos/helpers" "0.21.0-next.2"
+    "@ckb-lumos/rpc" "0.21.0-next.2"
+    "@ckb-lumos/toolkit" "0.21.0-next.2"
     immutable "^4.3.0"
 
 "@ckb-lumos/config-manager@0.20.0", "@ckb-lumos/config-manager@^0.20.0":
@@ -1809,14 +1863,14 @@
     "@types/deep-freeze-strict" "^1.1.0"
     deep-freeze-strict "^1.1.1"
 
-"@ckb-lumos/config-manager@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.1.tgz#927e21a5d9450155ebf766422a707fd3b0856a14"
-  integrity sha512-G8CO+q1RH/Gt8ou8p/N99AUh5hIdU+MZcTZHwABOa4CLbXk2xFenRfeGhHv4u4ddYZ3SLx1zND7pSnbImmrh2A==
+"@ckb-lumos/config-manager@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.2.tgz#ef08003193a49b248440fc73ce9207b1bb6a2a5f"
+  integrity sha512-dVyMcd5hbnTpN2nuukLOWv2J73hpuMf3ZRSO3asqAodKGZek74JhwOtZD9saCOItLYeOWdRRmzfXad34lDgHXg==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@ckb-lumos/codec" "0.21.0-next.1"
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/codec" "0.21.0-next.2"
     "@types/deep-freeze-strict" "^1.1.0"
     deep-freeze-strict "^1.1.1"
 
@@ -1833,13 +1887,13 @@
     sha3 "^2.1.3"
     uuid "^8.3.0"
 
-"@ckb-lumos/hd@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.0-next.1.tgz#ffa4b80b974187982bbfa280138ca1dab0b2df0e"
-  integrity sha512-gISrSs4OWoBVecRnYMfjYQc83aE0Khjjs1KmAkAg1J53PWGeU3kjbUQSCHjF6poFL5ylEARX9vOKixRfm6nktg==
+"@ckb-lumos/hd@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.0-next.2.tgz#03239f9d31cd9daf70f224563e7733089194dbb6"
+  integrity sha512-wj6k0d39yJEKWlC1cjXezZ4Qjf0u6rG+R6zQdqRXZ2dUJ/n82+fX+hLSAcjOgm1mGNft/6c55IfCs5dag/xQVw==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
     bn.js "^5.1.3"
     elliptic "^6.5.4"
     scrypt-js "^3.0.1"
@@ -1858,16 +1912,16 @@
     bech32 "^2.0.0"
     immutable "^4.0.0-rc.12"
 
-"@ckb-lumos/helpers@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.1.tgz#f0f2d9e231f5a266d53df0c60e7b7610b87e10b5"
-  integrity sha512-lSvn2L97be7IlONFTdjjz+/jG6QlpEGyETyrcSfJxeOOtgjicPFaLXLnaTBIt/IElRZ2ZpclbTFvSNcbVOvKdQ==
+"@ckb-lumos/helpers@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.2.tgz#4a3ac9ff9e52f2063ce2c3670e2c72bb94acad45"
+  integrity sha512-pZkJwn4jV9uFICtS0Un0ftBnRvlC5BHAueeIBXwa7uclSFHxAejqr2lsM0KLavLBjK/kerOq182mejK9ejX/fQ==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@ckb-lumos/codec" "0.21.0-next.1"
-    "@ckb-lumos/config-manager" "0.21.0-next.1"
-    "@ckb-lumos/toolkit" "0.21.0-next.1"
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/codec" "0.21.0-next.2"
+    "@ckb-lumos/config-manager" "0.21.0-next.2"
+    "@ckb-lumos/toolkit" "0.21.0-next.2"
     bech32 "^2.0.0"
     immutable "^4.3.0"
 
@@ -1897,28 +1951,27 @@
     axios "0.27.2"
     tslib "2.3.1"
 
-"@ckb-lumos/rpc@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.1.tgz#f31610fc1713ae63e25475d3653ee8cc3eeabc0f"
-  integrity sha512-6IjnME2wGg1rmVnajQ7CTBqbLnXkdNqRERRmnD1J9EnoHBc+onSYSfkC58ZCVCOe0xZIR2vNKmOUQ++dmlKKiQ==
+"@ckb-lumos/rpc@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.2.tgz#a840f18535c419448e982807f49ede7012ac7daf"
+  integrity sha512-WWV1x+I2mS8/CFlstSC2POrQ64TIgr7H8YjdA0jMT7o8Pt7qo2KXO4bFwSuPMgtdo2DKPSxTUS9zFjiZsWmXRw==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.1"
-    "@ckb-lumos/bi" "0.21.0-next.1"
-    "@vespaiach/axios-fetch-adapter" "^0.3.1"
-    axios "0.27.2"
-    tslib "2.3.1"
+    "@ckb-lumos/base" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.0-next.2"
+    abort-controller "^3.0.0"
+    cross-fetch "^3.1.5"
 
 "@ckb-lumos/toolkit@0.20.0":
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0.tgz#8f71043324e50c8a3e94c65414325482d874cfca"
   integrity sha512-nLNXRPG20NqUdXwHAnKwr0T7nZyDrf4fGwIrsxo+7ffqWeg9wNEhZoqTBJLgxEpoe0I+WHRLwYLiwUbkkqR1SQ==
 
-"@ckb-lumos/toolkit@0.21.0-next.1":
-  version "0.21.0-next.1"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.0-next.1.tgz#f8ce7b5fa5b388f1870efd309a114f3df2e74c61"
-  integrity sha512-CBnRM8Y0P6TV0FjACmaAz2YcPiIlcwJlU1tXDtcpzp4fcGL4uSMTcrJwFqWB8OE2s12EfN4+d0Ie4bn8/uq1Fg==
+"@ckb-lumos/toolkit@0.21.0-next.2":
+  version "0.21.0-next.2"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.0-next.2.tgz#13a4b0c39cd8240dde24647ac50890f2f7ef1970"
+  integrity sha512-pTTXn6NwwNv3Ms3uj9ywzA4UtiI84IDBw5TEWCAlz4JVwh2dqlncci0O0YboaNA0gg1cVYCITQFLJBQvXQkDRw==
   dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.1"
+    "@ckb-lumos/bi" "0.21.0-next.2"
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -2072,13 +2125,14 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/notarize@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.0.0.tgz#4df39e817264746aa9bd779e0091b6c441715b72"
-  integrity sha512-dqDpd2YCgl6PHJgXEuKGYH3+L4GIGV7ZbKYJjJv66ed+hVPxZA+GAL5JH8/hCnoyQa8WzJTzqd+qhiL5Oxr+SA==
+"@electron/notarize@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657"
+  integrity sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg==
   dependencies:
     debug "^4.1.1"
     fs-extra "^9.0.1"
+    promise-retry "^2.0.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -2220,7 +2274,12 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
   integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
-"@eslint/eslintrc@^2.0.2", "@eslint/eslintrc@^2.0.3":
+"@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
+"@eslint/eslintrc@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
   integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
@@ -2235,16 +2294,31 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.38.0":
-  version "8.38.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892"
-  integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==
+"@eslint/eslintrc@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
+  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
 
 "@eslint/js@8.43.0":
   version "8.43.0"
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0"
   integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==
 
+"@eslint/js@8.54.0":
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
+  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
+
 "@fal-works/esbuild-plugin-global-externals@^2.1.2":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz#c05ed35ad82df8e6ac616c68b92c2282bd083ba4"
@@ -2360,7 +2434,7 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@humanwhocodes/config-array@^0.11.10", "@humanwhocodes/config-array@^0.11.8":
+"@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
   integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
@@ -2369,6 +2443,15 @@
     debug "^4.1.1"
     minimatch "^3.0.5"
 
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -2379,6 +2462,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
@@ -2504,7 +2592,7 @@
     jest-mock "^27.5.1"
     jest-util "^27.5.1"
 
-"@jest/globals@^27.5.1":
+"@jest/globals@27.5.1", "@jest/globals@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
   integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==
@@ -2766,14 +2854,14 @@
     rxjs "6"
     semver "^7.3.5"
 
-"@ledgerhq/devices@^8.0.4":
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.4.tgz#ebc7779adbbec2d046424603a481623eb3fbe306"
-  integrity sha512-dxOiWZmtEv1tgw70+rW8gviCRZUeGDUnxY6HUPiRqTAc0Ts2AXxiJChgAsPvIywWTGW+S67Nxq1oTZdpRbdt+A==
+"@ledgerhq/devices@^8.0.8":
+  version "8.0.8"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.8.tgz#cd233eb54a044913160c9183be9fb22adae4e071"
+  integrity sha512-0j7E8DY2jeSSATc8IJk+tXDZ9u+Z7tXxB8I4TzXrfV/8A5exMh/K1IwX6Jt1zlw1wre4CT9MV4mzUs3M/TE7lg==
   dependencies:
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/logs" "^6.10.1"
-    rxjs "6"
+    "@ledgerhq/errors" "^6.15.0"
+    "@ledgerhq/logs" "^6.11.0"
+    rxjs "^7.8.1"
     semver "^7.3.5"
 
 "@ledgerhq/errors@^5.50.0":
@@ -2781,35 +2869,35 @@
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9"
   integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow==
 
-"@ledgerhq/errors@^6.12.7":
-  version "6.12.7"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.7.tgz#c7b630488d5713bc7b1e1682d6ab5d08918c69f1"
-  integrity sha512-1BpjzFErPK7qPFx0oItcX0mNLJMplVAm2Dpl5urZlubewnTyyw5sahIBjU+8LLCWJ2eGEh/0wyvh0jMtR0n2Mg==
+"@ledgerhq/errors@^6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.15.0.tgz#45cda73915f695cc072cb8a99650830bc5dc6668"
+  integrity sha512-6xaw5/mgoht62TnL3rXsaQYEFwpnXyNDk1AOSJksIjFHx9bHUnkyVmrnGQDj0JLzi+E7bHEgTrpCs8wpeDh9jA==
 
-"@ledgerhq/hw-transport-node-hid-noevents@^6.27.16":
-  version "6.27.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.16.tgz#5497b8194ec7802e221a0dd95b799d6c12da1a89"
-  integrity sha512-7MK245Cfj4B4WijO+a0iux+glmyHr44ezSuec4h1PfQrtiOGf+Sk26oi8WHJX+pabc9c566Qxkgdo4FvHWCCaA==
+"@ledgerhq/hw-transport-node-hid-noevents@^6.28.0":
+  version "6.28.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.28.0.tgz#bf6b6615458fa98ae348a034f127233e448682ee"
+  integrity sha512-7hhgZQzYTFEazxu8Lu/LBk9ah2if4EIQyPuapUfbH+kgbJ6QkGcYQEVO6ZfIIIO4osLvncI1eOU5KpzSlXsJjA==
   dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/logs" "^6.10.1"
+    "@ledgerhq/devices" "^8.0.8"
+    "@ledgerhq/errors" "^6.15.0"
+    "@ledgerhq/hw-transport" "^6.29.0"
+    "@ledgerhq/logs" "^6.11.0"
     node-hid "^2.1.2"
 
-"@ledgerhq/hw-transport-node-hid@6.27.16":
-  version "6.27.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.16.tgz#36df554efb3dd4efeef8590d9fc0f68cbedacf91"
-  integrity sha512-V/SA8G5qH+Lbl/bO11GAZKIWCgTfLRWe18gibLXFAdqFeQn8FxRoJTATJaYhWEWsU1T9NPvCfje3EWDUoXnmKg==
+"@ledgerhq/hw-transport-node-hid@6.27.22":
+  version "6.27.22"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.22.tgz#321dc38ecd93512bd4be7fa8d90ae159281a5017"
+  integrity sha512-Nc6QVTmhsAN6U7YvLhZgryCz8+5p25063Kaoq8H5vDZPsixF1vDzY4ivdZnd8RpV/PM2wLXHwPrXaKmW66RdQw==
   dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
-    "@ledgerhq/hw-transport" "^6.28.5"
-    "@ledgerhq/hw-transport-node-hid-noevents" "^6.27.16"
-    "@ledgerhq/logs" "^6.10.1"
+    "@ledgerhq/devices" "^8.0.8"
+    "@ledgerhq/errors" "^6.15.0"
+    "@ledgerhq/hw-transport" "^6.29.0"
+    "@ledgerhq/hw-transport-node-hid-noevents" "^6.28.0"
+    "@ledgerhq/logs" "^6.11.0"
     lodash "^4.17.21"
     node-hid "^2.1.2"
-    usb "^1.7.0"
+    usb "2.9.0"
 
 "@ledgerhq/hw-transport@^5.9.0":
   version "5.51.1"
@@ -2820,13 +2908,14 @@
     "@ledgerhq/errors" "^5.50.0"
     events "^3.3.0"
 
-"@ledgerhq/hw-transport@^6.28.5":
-  version "6.28.5"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.5.tgz#675193be2f695a596068145351da598316c25831"
-  integrity sha512-xmw5RhYbqExBBqTvOnOjN/RYNIGMBxFJ+zcYNfkfw/E+uEY3L7xq8Z7sC/n7URTT6xtEctElqduBJnBQE4OQtw==
+"@ledgerhq/hw-transport@^6.29.0":
+  version "6.29.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.29.0.tgz#2b85f39d90b093930f0c7bfc513b29eb47ba97fa"
+  integrity sha512-WQfzxt3EnnbOmzZVYiCgSmNsqafBOFQn40awvUPY2IZviJRs23/1ANPHAo76bzPV88+Qk0+1wZlcnIanGN6fFA==
   dependencies:
-    "@ledgerhq/devices" "^8.0.4"
-    "@ledgerhq/errors" "^6.12.7"
+    "@ledgerhq/devices" "^8.0.8"
+    "@ledgerhq/errors" "^6.15.0"
+    "@ledgerhq/logs" "^6.11.0"
     events "^3.3.0"
 
 "@ledgerhq/logs@^5.50.0":
@@ -2834,10 +2923,10 @@
   resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186"
   integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==
 
-"@ledgerhq/logs@^6.10.1":
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d"
-  integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w==
+"@ledgerhq/logs@^6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.11.0.tgz#0d28e7edcf71548506f4304686cba480ba91bbcf"
+  integrity sha512-HHK9y4GGe4X7CXbRUCh7z8Mp+WggpJn1dmUjmuk1rNugESF6o8nAOnXA+BxwtRRNV3CgNJR3Wxdos4J9qV0Zsg==
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
@@ -4192,13 +4281,13 @@
     nanoid "^3.3.1"
     read-pkg-up "^7.0.1"
 
-"@storybook/testing-library@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/testing-library/-/testing-library-0.2.0.tgz#09202b90ea5bd67b503dbb1a0b1f3ab3eb005d04"
-  integrity sha512-Ff6jNnrsosmDshgCf0Eb5Cz7IA34p/1Ps5N3Kp3598kfXpBSccSkQQvVFUXC3kIHw/isIXWPqntZuKqnWUz7Gw==
+"@storybook/testing-library@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/testing-library/-/testing-library-0.2.2.tgz#c8e089cc8d7354f6066fdb580fae3eedf568aa7c"
+  integrity sha512-L8sXFJUHmrlyU2BsWWZGuAjv39Jl1uAqUHdxmN42JY15M4+XCMjGlArdCCjDe1wpTSW6USYISA9axjZojgtvnw==
   dependencies:
     "@testing-library/dom" "^9.0.0"
-    "@testing-library/user-event" "^14.0.0"
+    "@testing-library/user-event" "^14.4.0"
     ts-dedent "^2.2.0"
 
 "@storybook/theming@7.0.24":
@@ -4355,10 +4444,10 @@
     lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
-"@testing-library/user-event@^14.0.0":
-  version "14.4.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591"
-  integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==
+"@testing-library/user-event@^14.4.0":
+  version "14.5.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f"
+  integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==
 
 "@tootallnate/once@1":
   version "1.1.2"
@@ -4405,10 +4494,10 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/async@3.2.21":
-  version "3.2.21"
-  resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.21.tgz#470b06c25fc104c169e80a9c91866e8204e91175"
-  integrity sha512-msYM0OYxzkwpiDJZZDo7XsYuFIpiAOh+o3hygudSpSzeW+R0DAEKZvdQriHYT95m9CvscLDg5s0Mxlrlhoy2qw==
+"@types/async@3.2.24":
+  version "3.2.24"
+  resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.24.tgz#3a96351047575bbcf2340541b2d955a35339608f"
+  integrity sha512-8iHVLHsCCOBKjCF2KwFe0p9Z3rfM9mL+sSP8btyR5vTjJRAqpBYD28/ZLgXPf0pjG1VxOvtCV/BgXkQbpSe8Hw==
 
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.20.1"
@@ -4536,26 +4625,26 @@
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9"
   integrity sha512-ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g==
 
-"@types/electron-devtools-installer@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@types/electron-devtools-installer/-/electron-devtools-installer-2.2.2.tgz#5a91929ee76b5de0d171edec5bd049292d48a2a4"
-  integrity sha512-8o2XkyAw2HZoVD5KpIoUJmEgZ7BPVv33p7rY1jmn/wJUbugtQUc44vNMDTguUNUGiLv+oqgtyYmiYctHDZEzdQ==
+"@types/electron-devtools-installer@2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@types/electron-devtools-installer/-/electron-devtools-installer-2.2.5.tgz#33572d0edee2510a6c293d0d5c858ee09f07cd19"
+  integrity sha512-DhH8z0dadKuDolvH4TiW40Vp7H3VyZbOoZv98hhBaUfnxmvvcXTjkZjzw/54xvAmuG4KFzExOGAiVLg3jM2ojQ==
 
-"@types/elliptic@6.4.15":
-  version "6.4.15"
-  resolved "https://registry.yarnpkg.com/@types/elliptic/-/elliptic-6.4.15.tgz#992ae323fd04ab03d884da7122e5dac1665c75ff"
-  integrity sha512-tW9Z/mrlymYEbx/WWcO/Kkly0VxqPNaf/p3KcZTYKI282ZX+50efZvY/p6FoMuTpFq+QMyABQNfs6OXvdmVUhQ==
+"@types/elliptic@6.4.18":
+  version "6.4.18"
+  resolved "https://registry.yarnpkg.com/@types/elliptic/-/elliptic-6.4.18.tgz#bc96e26e1ccccbabe8b6f0e409c85898635482e1"
+  integrity sha512-UseG6H5vjRiNpQvrhy4VF/JXdA3V/Fp5amvveaL+fs28BZ6xIKJBPnUPRlEaZpysD9MbpfaLi8lbl7PGUAkpWw==
   dependencies:
     "@types/bn.js" "*"
 
-"@types/enzyme-adapter-react-16@1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz#8aca7ae2fd6c7137d869b6616e696d21bb8b0cec"
-  integrity sha512-VonDkZ15jzqDWL8mPFIQnnLtjwebuL9YnDkqeCDYnB4IVgwUm0mwKkqhrxLL6mb05xm7qqa3IE95m8CZE9imCg==
+"@types/enzyme-adapter-react-16@1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.9.tgz#337d85f0e91be2654b246ec11701dcf75af30afc"
+  integrity sha512-z24MMxGtUL8HhXdye3tWzjp+19QTsABqLaX2oOZpxMPHRJgLfahQmOeTTrEBQd9ogW20+UmPBXD9j+XOasFHvw==
   dependencies:
     "@types/enzyme" "*"
 
-"@types/enzyme@*", "@types/enzyme@3.10.13":
+"@types/enzyme@*":
   version "3.10.13"
   resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.13.tgz#332c0ed59b01f7b1c398c532a1c21a5feefabeb1"
   integrity sha512-FCtoUhmFsud0Yx9fmZk179GkdZ4U9B0GFte64/Md+W/agx0L5SxsIIbhLBOxIb9y2UfBA4WQnaG1Od/UsUQs9Q==
@@ -4563,6 +4652,14 @@
     "@types/cheerio" "*"
     "@types/react" "^16"
 
+"@types/enzyme@3.10.16":
+  version "3.10.16"
+  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.16.tgz#100c49093f694545fc903266b2eb410df08859a9"
+  integrity sha512-17uMdJjSKjvdn/MhO/G2lRNPZGvJxFpvgONrsRoS1+khtJ6UcnCwC9v3gk2UqPyAkMZb6a1VYxScc/vOgkDl9w==
+  dependencies:
+    "@types/cheerio" "*"
+    "@types/react" "^16"
+
 "@types/escodegen@^0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@types/escodegen/-/escodegen-0.0.6.tgz#5230a9ce796e042cda6f086dbf19f22ea330659c"
@@ -4689,10 +4786,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/iarna__toml@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/iarna__toml/-/iarna__toml-2.0.2.tgz#2e61b079e50760b477bc70e4df1fe5b633ef6c63"
-  integrity sha512-Q3obxKhBLVVbEQ8zsAmsQVobAAZhi8dFFFjF0q5xKXiaHvH8IkSxcbM27e46M9feUMieR03SPpmp5CtaNzpdBg==
+"@types/iarna__toml@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/iarna__toml/-/iarna__toml-2.0.5.tgz#95f134b33c17abc15981e4b81b036c7e4238aa81"
+  integrity sha512-I55y+SxI0ayM4MBU6yfGJGmi4wRll6wtSeKiFYAZj+Z5Q1DVbMgBSVDYY+xQZbjIlLs/pN4fidnvR8faDrmxPg==
   dependencies:
     "@types/node" "*"
 
@@ -4763,31 +4860,38 @@
   dependencies:
     "@types/node" "*"
 
-"@types/ledgerhq__hw-transport-node-hid@4.22.2":
-  version "4.22.2"
-  resolved "https://registry.yarnpkg.com/@types/ledgerhq__hw-transport-node-hid/-/ledgerhq__hw-transport-node-hid-4.22.2.tgz#f3de58b9b49b461dd96e5bfb646328c242e70aca"
-  integrity sha512-b9dXYEZ8Iijv20LykEVhbThVzSjchMpvj8y/mSsCSP1n7Ncs+YqD8mjEV/bGTks9jAP8CdxhRqOGq+h47/4B9g==
+"@types/ledgerhq__hw-transport-node-hid@4.22.5":
+  version "4.22.5"
+  resolved "https://registry.yarnpkg.com/@types/ledgerhq__hw-transport-node-hid/-/ledgerhq__hw-transport-node-hid-4.22.5.tgz#67f203e6fdcc77a5ddbd4f36e90fc219573833ab"
+  integrity sha512-a9d88sFWpjPu6J1F3JYL2nzSzzZLLSD0E8bnU9daKhBqomVswpXsoU/lfrnSSt2pVMgiRiZEKIMvW5ih2vF7sQ==
   dependencies:
     "@types/ledgerhq__hw-transport" "*"
     "@types/node" "*"
     "@types/node-hid" "*"
 
-"@types/ledgerhq__hw-transport@*", "@types/ledgerhq__hw-transport@4.21.4":
+"@types/ledgerhq__hw-transport@*":
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/@types/ledgerhq__hw-transport/-/ledgerhq__hw-transport-4.21.4.tgz#3a78a02d2b51d2b0dd8099412d5567d21118225c"
   integrity sha512-vep+6yZnGv6owAthIY0w3f72w4dJIb4+yE5PCHveInTlZE9wukvU6Wc5Eig0OUUxcdhTazzeZx1xUaNVLqyQSg==
   dependencies:
     "@types/node" "*"
 
+"@types/ledgerhq__hw-transport@4.21.8":
+  version "4.21.8"
+  resolved "https://registry.yarnpkg.com/@types/ledgerhq__hw-transport/-/ledgerhq__hw-transport-4.21.8.tgz#973fedb76ade14307fe85db336373a5a5da54f79"
+  integrity sha512-uO2AJYZUVCwgyqgyy2/KW+JsQaO0hcwDdubRaHgF2ehO0ngGAY41PbE8qnPnmUw1uerMXONvL68QFioA7Y6C5g==
+  dependencies:
+    "@types/node" "*"
+
 "@types/level-errors@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/level-errors/-/level-errors-3.0.0.tgz#15c1f4915a5ef763b51651b15e90f6dc081b96a8"
   integrity sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ==
 
-"@types/leveldown@4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/leveldown/-/leveldown-4.0.4.tgz#0310119dd38aa8085eb93b6edd45d2125b2836a1"
-  integrity sha512-rl1uWsxCtjyUORVCB/zyCc9JoYIUuZSTzBSQalZY3g8+gAJgDvH+YFluWVx4yh+x52JVC80Egj4NG5lXboK8kg==
+"@types/leveldown@4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@types/leveldown/-/leveldown-4.0.6.tgz#ecf4c2f929880ea8f52be1414196fac513e21dc7"
+  integrity sha512-AQ3vqW1j5aQ3U6A22e/k1WrZHHIewvGrBmq4zRxS9fRDpqTe3HoD+F11nEV+8zStfEbGHzzvk8dHF/4JEXmZnQ==
   dependencies:
     "@types/abstract-leveldown" "*"
     "@types/node" "*"
@@ -4888,7 +4992,14 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/npmlog@4.1.4", "@types/npmlog@^4.1.2":
+"@types/npmlog@4.1.6":
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.6.tgz#792341665000209ee76997df8a16300fda6d77cb"
+  integrity sha512-0l3z16vnlJGl2Mi/rgJFrdwfLZ4jfNYgE6ZShEpjqhHuGTqdEzNles03NpYHwUMVYZa+Tj46UxKIEpE78lQ3DQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/npmlog@^4.1.2":
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.4.tgz#30eb872153c7ead3e8688c476054ddca004115f6"
   integrity sha512-WKG4gTr8przEZBiJ5r3s8ZIAoMXNbOgQ+j/d5O4X3x6kZJRLNvyUJuUK/KoG3+8BaOHPhp2m7WC6JKKeovDSzQ==
@@ -4936,10 +5047,10 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@17.0.20":
-  version "17.0.20"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53"
-  integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==
+"@types/react-dom@17.0.25":
+  version "17.0.25"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
+  integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
   dependencies:
     "@types/react" "^17"
 
@@ -4960,10 +5071,10 @@
     "@types/history" "^4.7.11"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.65", "@types/react@>=16", "@types/react@^16", "@types/react@^17":
-  version "17.0.65"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd"
-  integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ==
+"@types/react@*", "@types/react@17.0.71", "@types/react@>=16", "@types/react@^16", "@types/react@^17":
+  version "17.0.71"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.71.tgz#3673d446ad482b1564e44bf853b3ab5bcbc942c4"
+  integrity sha512-lfqOu9mp16nmaGRrS8deS2Taqhd5Ih0o92Te5Ws6I1py4ytHBcXLqh0YIqVsViqwVI5f+haiFM6hju814BzcmA==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -5029,10 +5140,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/sqlite3@3.1.8":
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/@types/sqlite3/-/sqlite3-3.1.8.tgz#e64310c5841fc01c1a8795d960d951e4cf940296"
-  integrity sha512-sQMt/qnyUWnqiTcJXm5ZfNPIBeJ/DVvJDwxw+0tAxPJvadzfiP1QhryO1JOR6t1yfb8NpzQb/Rud06mob5laIA==
+"@types/sqlite3@3.1.11":
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/@types/sqlite3/-/sqlite3-3.1.11.tgz#845044b81585f1fcc143ee8d963ca5da63d0e768"
+  integrity sha512-KYF+QgxAnnAh7DWPdNDroxkDI3/MspH1NMx6m/N/6fT1G6+jvsw4/ZePt8R8cr7ta58aboeTfYFBDxTJ5yv15w==
   dependencies:
     "@types/node" "*"
 
@@ -5041,10 +5152,10 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/styled-components@5.1.27":
-  version "5.1.27"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.27.tgz#1915eedba0d52f26ba5a383fccb7fe50e2e71106"
-  integrity sha512-oY9c1SdztRRF0QDQdwXEenfAjGN4WGUkaMpx5hvdTbYYqw01qoY2GrHi+kAR6SVofynzD6KbGoF5ITP0zh5pvg==
+"@types/styled-components@5.1.32":
+  version "5.1.32"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.32.tgz#58718971519c4562229ba85face98e8530d21bfd"
+  integrity sha512-DqVpl8R0vbhVSop4120UHtGrFmHuPeoDwF4hDT0kPJTY8ty0SI38RV3VhCMsWigMUXG+kCXu7vMRqMFNy6eQgA==
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
@@ -5070,6 +5181,11 @@
   resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
   integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ==
 
+"@types/w3c-web-usb@^1.0.6":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz#cf89cccd2d93b6245e784c19afe0a9f5038d4528"
+  integrity sha512-CHgUI5kTc/QLMP8hODUHhge0D4vx+9UiAwIGiT0sTy/B2XpdX1U5rJt6JSISgr6ikRT7vxV9EVAFeYZqUnl1gQ==
+
 "@types/ws@^8.5.5":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
@@ -5275,6 +5391,11 @@
     prop-types "^15.7.2"
     tslib "^1.10.0"
 
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@vespaiach/axios-fetch-adapter@^0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz#b0c08167bec9cc558f578a1b9ccff52ead1cf1cb"
@@ -5478,6 +5599,13 @@ abbrev@1, abbrev@^1.0.0:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 abstract-leveldown@^6.1.1, abstract-leveldown@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a"
@@ -5558,6 +5686,11 @@ acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
   integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
+acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -5806,16 +5939,16 @@ archiver-utils@^2.1.0:
     normalize-path "^3.0.0"
     readable-stream "^2.0.0"
 
-archiver@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba"
-  integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==
+archiver@5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.2.tgz#99991d5957e53bd0303a392979276ac4ddccf3b0"
+  integrity sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==
   dependencies:
     archiver-utils "^2.1.0"
-    async "^3.2.0"
+    async "^3.2.4"
     buffer-crc32 "^0.2.1"
     readable-stream "^3.6.0"
-    readdir-glob "^1.0.0"
+    readdir-glob "^1.1.2"
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
@@ -6081,7 +6214,12 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@3.2.4, async@^3.2.0, async@^3.2.3:
+async@3.2.5, async@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
+async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
   integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
@@ -7468,10 +7606,10 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-concurrently@8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.1.tgz#bcab9cacc38c23c503839583151e0fa96fd5b584"
-  integrity sha512-nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ==
+concurrently@8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
+  integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
   dependencies:
     chalk "^4.1.2"
     date-fns "^2.30.0"
@@ -8618,10 +8756,10 @@ electron-window-state@5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@24.8.5:
-  version "24.8.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-24.8.5.tgz#795e13670f89de927bc4e40fd2a64ff7f9f7c3b6"
-  integrity sha512-CWSF0CrD1XhxyoXUcCcEoJB8orMTHuOrkj2s87XU11vjgVJHhzhCBh9TVqhMQt7U6TtcGYa5kDIiLRekxJRaRA==
+electron@24.8.8:
+  version "24.8.8"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-24.8.8.tgz#b369e8f8910d41e94817b79ea3d37e0f0822e884"
+  integrity sha512-0A2tGwG/0hxnD32Lil9wgSydQ0HCP5AdkgcH+qee3QgaC2jVq55YIbrj/0ZAq4L7yiZvQTzYIrc6kie7OahJKQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
@@ -9029,10 +9167,10 @@ eslint-config-airbnb@19.0.4:
     object.assign "^4.1.2"
     object.entries "^1.1.5"
 
-eslint-config-prettier@8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+eslint-config-prettier@8.10.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
 
 eslint-config-react-app@^7.0.1:
   version "7.0.1"
@@ -9176,7 +9314,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1, eslint-scope@^7.2.0:
+eslint-scope@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
   integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
@@ -9184,16 +9322,29 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.0:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
 eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
+eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
 eslint-webpack-plugin@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz#1978cdb9edc461e4b0195a20da950cf57988347c"
@@ -9205,27 +9356,28 @@ eslint-webpack-plugin@^3.1.1:
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
 
-eslint@8.38.0:
-  version "8.38.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a"
-  integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==
+eslint@8.54.0:
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
+  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.38.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.3"
+    "@eslint/js" "8.54.0"
+    "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-visitor-keys "^3.4.0"
-    espree "^9.5.1"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -9233,22 +9385,19 @@ eslint@8.38.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
 eslint@^8.3.0:
@@ -9296,7 +9445,7 @@ eslint@^8.3.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.1, espree@^9.5.2:
+espree@^9.5.2:
   version "9.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
   integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
@@ -9305,6 +9454,15 @@ espree@^9.5.1, espree@^9.5.2:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -9358,6 +9516,11 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -12242,11 +12405,6 @@ joi@^17.7.0:
     "@sideway/formula" "^3.0.1"
     "@sideway/pinpoint" "^2.0.0"
 
-js-sdsl@^4.1.4:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.1.tgz#9e3c7b566d8d9a7e1fe8fc26d00b5ab0f8918ab3"
-  integrity sha512-6Gsx8R0RucyePbWqPssR8DyfuXmLBooYN5cZFZKjHGnQuaf7pEzhtpceagJxVu4LqhYY5EYA7nko3FmeHZ1KbA==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -13655,6 +13813,11 @@ node-addon-api@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
   integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
 
+node-addon-api@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
+
 node-dir@^0.1.10, node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -13698,6 +13861,11 @@ node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
   integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
 
+node-gyp-build@^4.5.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.0.tgz#749f0033590b2a89ac8edb5e0775f95f5ae86d15"
+  integrity sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==
+
 node-gyp@8.x:
   version "8.4.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
@@ -14234,6 +14402,18 @@ optionator@^0.9.1:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+
 ora@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
@@ -15952,7 +16132,7 @@ readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdir-glob@^1.0.0:
+readdir-glob@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584"
   integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==
@@ -18019,10 +18199,10 @@ typeorm@0.2.45:
     yargs "^17.0.1"
     zen-observable-ts "^1.0.0"
 
-typescript@5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
-  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+typescript@5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43"
+  integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==
 
 "typescript@>=3 < 6":
   version "5.1.3"
@@ -18246,13 +18426,14 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-usb@1.8.8, usb@^1.7.0:
-  version "1.8.8"
-  resolved "https://registry.yarnpkg.com/usb/-/usb-1.8.8.tgz#54de33f9e57dc4efc1b5b5f72b6624a275775e80"
-  integrity sha512-xpRAoek268RE3ATqK8l6LjrF4ADHn/A3V3cXEFbYo3/D83ZCLSO0A5tFKO093F4w5IbDfBVlB9VsYzoGz6EJGw==
+usb@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/usb/-/usb-2.9.0.tgz#8ae3b175f93bee559400bff33491eee63406b6a2"
+  integrity sha512-G0I/fPgfHUzWH8xo2KkDxTTFruUWfppgSFJ+bQxz/kVY2x15EQ/XDB7dqD1G432G4gBG4jYQuF3U7j/orSs5nw==
   dependencies:
-    node-addon-api "^4.2.0"
-    node-gyp-build "^4.3.0"
+    "@types/w3c-web-usb" "^1.0.6"
+    node-addon-api "^6.0.0"
+    node-gyp-build "^4.5.0"
 
 use-resize-observer@^9.1.0:
   version "9.1.0"

From b1347f21aca5f4c5ee705cc10b808fa3f6688a2c Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 28 Nov 2023 23:51:14 +0900
Subject: [PATCH 04/68] ci: add an action to generate checksum table from
 release draft (#2962)

This commit adds an action to generate checksum table from
release draft.

The action runs a script to download assets into a temporary
directory, then run a script to load binaries to generate
the checksum table and print it in console.

Ref: https://github.com/Magickbase/neuron-public-issues/issues/326
---
 .../workflows/checksums-of-release-draft.yml  | 34 +++++++++++
 .../download-binaries-from-release-draft.js   | 57 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 .github/workflows/checksums-of-release-draft.yml
 create mode 100644 scripts/download-binaries-from-release-draft.js

diff --git a/.github/workflows/checksums-of-release-draft.yml b/.github/workflows/checksums-of-release-draft.yml
new file mode 100644
index 0000000000..a251b99e31
--- /dev/null
+++ b/.github/workflows/checksums-of-release-draft.yml
@@ -0,0 +1,34 @@
+name: Checksums of release draft
+
+on:
+  workflow_run:
+    workflows:
+      - Package Neuron for Release Draft
+    types:
+      - completed
+
+jobs:
+  checksums:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'latest'
+
+      - name: Download binaries
+        run: |
+          mkdir -p /tmp/Neuron
+          node ./scripts/download-binaries-from-release-draft.js /tmp/Neuron
+        shell: pwsh
+        env:
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+
+      - name: Checksums
+        run: node ./scripts/generate-checksum-table.js /tmp/Neuron
+        shell: pwsh
diff --git a/scripts/download-binaries-from-release-draft.js b/scripts/download-binaries-from-release-draft.js
new file mode 100644
index 0000000000..c85952a28f
--- /dev/null
+++ b/scripts/download-binaries-from-release-draft.js
@@ -0,0 +1,57 @@
+const { pipeline } = require('node:stream/promises')
+const { existsSync, createWriteStream } = require('node:fs')
+
+const { REPO, TOKEN } = process.env
+const GITHUB_API_URL = 'https://api.github.com'
+
+const download = async (directory) => {
+  if (!existsSync(directory)) {
+    throw new Error(`Directory ${directory} does not exist`)
+  }
+
+  const releases = await fetch(`${GITHUB_API_URL}/repos/${REPO}/releases`, {
+    headers: { Authorization: `Bearer ${TOKEN}` },
+  }).then((res) => res.json())
+
+  const draft = releases.find((r) => r.draft)
+
+  if (!draft) {
+    throw new Error('No release draft found')
+  }
+
+  const assetList = await fetch(`${GITHUB_API_URL}/repos/${REPO}/releases/${draft.id}/assets`, {
+    headers: { Authorization: `Bearer ${TOKEN}` },
+  })
+    .then((res) => res.json())
+    .then((res) => res.map(({ name, url }) => ({ name, url })))
+
+  assetList.forEach(async ({ name, url }) => {
+    const path = `${directory}/${name}`
+
+    await pipeline(
+      await fetch(url, {
+        headers: {
+          Authorization: `Bearer ${TOKEN}`,
+          'Content-Type': 'application/octet-stream',
+          Accept: 'application/octet-stream',
+        },
+      })
+        .then(async (res) => res.body)
+        .catch(() => {
+          throw new Error('Fail to fetch asset')
+        }),
+
+      createWriteStream(path)
+    )
+  })
+}
+
+if (process.argv.length < 3) {
+  throw new Error(
+    `Directory for binaries is required, use command as 'node ./download-binaries-from-release-draft.js ./binaries`
+  )
+}
+
+const directory = process.argv[2]
+
+download(directory)

From 34533d8d88cb2c3302421428d2f56bcd5c648548 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 30 Nov 2023 18:11:38 +0900
Subject: [PATCH 05/68] chore: optimize issue template (#2961)

* chore: optimize issue template

1. Use GitHub's form feature by default;
2. Update submission rules to lead users to help center;
3. Add a field for ckb light client.

* chore: update description of "detail of the issue"

Inform users to upload screenshots to demonstrate the issue
clearly
---
 .github/ISSUE_TEMPLATE/bug_report.md          | 16 ----
 .github/ISSUE_TEMPLATE/bug_report.yml         | 77 +++++++++++++++++++
 .../ISSUE_TEMPLATE/synchronization-issue.yml  | 55 -------------
 3 files changed, 77 insertions(+), 71 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/synchronization-issue.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 31c00758f7..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug** (Please enter details, the more detail the better)
-
-
-**Debug info** (Please upload the debug info from `Help` - `Export Debug Information`)
-
-
-**Screenshots** (If applicable, add screenshots to help explain your problem.)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..b5a721c9f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,77 @@
+name: Bug Report
+description: Create a report to help us improve Neuron
+title: '[Bug Report] **Please describe the bug shortly**'
+labels:
+  - bug
+assignees:
+  - Keith-CY
+  - yanguoyu
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please check [Helpe Center](https://neuron.magickbase.com/help-center) first to see if your issue is already addressed.
+
+  - type: dropdown
+    id: type
+    validations:
+      required: true
+    attributes:
+      label: Topic Type
+      options:
+        - Cannot Synchronize
+        - Cannot Send Transaction
+        - Incorrect Balance
+        - User Experience
+        - Other
+
+  - type: textarea
+    id: detial
+    validations:
+      required: true
+    attributes:
+      label: Detail of the issue
+      description: Please append detail of the issue here, including steps to reproduce, screenshots, etc.
+
+  - type: markdown
+    attributes:
+      value: |
+
+        ---
+        ## Please add neuron logs if possible, they can be exported by `Menu -> Help -> Export Debug Information`
+
+        <sub>
+        The debug information will be exported as a zip file, you may upload it by drag&drop into **Detail of the issue**, or paste them in the following fields, respectively.
+        </sub>
+
+  - type: textarea
+    id: bundled-ckb
+    validations:
+      required: false
+    attributes:
+      label: bundled-ckb.log
+      render: shell
+
+  - type: textarea
+    id: bundled-ckb-light-mainnet
+    validations:
+      required: false
+    attributes:
+      label: bundled-ckb-light-mainnet.log
+      render: shell
+
+  - type: textarea
+    id: main-log
+    validations:
+      required: false
+    attributes:
+      label: main.log
+      render: shell
+
+  - type: textarea
+    id: status
+    validations:
+      required: false
+    attributes:
+      label: status.log
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/synchronization-issue.yml b/.github/ISSUE_TEMPLATE/synchronization-issue.yml
deleted file mode 100644
index 3a44b6ec99..0000000000
--- a/.github/ISSUE_TEMPLATE/synchronization-issue.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Synchronization issue
-description: Neuron doesn't synchronize
-title: '[Synchronization] **brief description**'
-labels:
-  - bug
-assignees:
-  - Keith-CY
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please check if these issues help
-        - [Synchronization doesnt' start](https://github.com/nervosnetwork/neuron/issues/2388)
-        - [Transactions keep pending on Neuron v0.101.3](https://github.com/nervosnetwork/neuron/issues/2384)
-        - [`Check for update` in settings doesn't work](https://github.com/nervosnetwork/neuron/issues/2372)
-
-  - type: textarea
-    id: detial
-    validations:
-      required: true
-    attributes:
-      label: Detail of the issue
-      description: Elaborate on your issue in this field
-      
-  - type: markdown
-    attributes:
-      value: |
-
-        ---
-        ## Please add neuron logs if possible, they can be exported by `Menu -> Help -> Export Debug Information`
-
-  - type: textarea
-    id: bundled-ckb
-    validations:
-      required: false
-    attributes:
-      label: bundled-ckb.log
-      render: shell
-      
-  - type: textarea
-    id: main-log
-    validations:
-      required: false
-    attributes:
-      label: main.log
-      render: shell
-
-  - type: textarea
-    id: status
-    validations:
-      required: false
-    attributes:
-      label: status.log
-      render: shell
-

From 517048d1596d6ef527ea5d560682150264059a8a Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 7 Dec 2023 14:58:53 +0900
Subject: [PATCH 06/68] Merge master into dev (#2975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update ckb node assume valid target for rc/v0.112.0.

* chore: update versions and changelogs

* feat: Update Neuron compatibility table

* fix: Fix light client sync tx type. (#2965)

* fix: Fix light client sync tx type.

* feat: update ckb client versions (#2970)

* chore: Update ckb node assume valid target (#2968)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update Neuron compatibility table (#2971)

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>

* chore: Update ckb node assume valid target for rc/v0.112.0. (#2972)

* chore: update release date

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
Co-authored-by: 严国宇 <841185308@qq.com>
---
 .ckb-light-version                            |   2 +-
 CHANGELOG.md                                  |  31 ++
 compatible.json                               |  12 +
 lerna.json                                    |   2 +-
 package.json                                  |   2 +-
 packages/neuron-ui/package.json               |   2 +-
 packages/neuron-wallet/.env                   |   2 +-
 packages/neuron-wallet/package.json           |   4 +-
 .../src/block-sync-renderer/sync/connector.ts | 153 ++++++-
 .../sync/indexer-cache-service.ts             |  65 ++-
 .../sync/indexer-connector.ts                 | 167 +------
 .../sync/light-connector.ts                   | 263 +++++------
 .../src/block-sync-renderer/sync/queue.ts     |   2 +-
 .../chain/entities/indexer-tx-hash-cache.ts   |  25 +-
 .../database/chain/entities/sync-progress.ts  |   3 +
 .../neuron-wallet/src/database/chain/index.ts |   2 +-
 .../1694228328076-CreateCellLocalInfo.ts      |  14 -
 ...234043431-IndexerTxHashCacheRemoveField.ts |  13 +
 .../1701234043432-CreateCellLocalInfo.ts      |  15 +
 .../src/database/chain/ormconfig.ts           |   6 +-
 .../src/services/light-runner.ts              |   2 +-
 .../src/services/sync-progress.ts             |  22 +-
 packages/neuron-wallet/src/utils/ckb-rpc.ts   |   3 +-
 .../block-sync-renderer/connector.test.ts     | 411 ++++++++++++++++++
 .../indexer-cache-service.intg.test.ts        |  13 +-
 .../indexer-connector.test.ts                 | 204 +--------
 .../light-connector.test.ts                   | 299 +++----------
 27 files changed, 896 insertions(+), 843 deletions(-)
 delete mode 100644 packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1701234043431-IndexerTxHashCacheRemoveField.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1701234043432-CreateCellLocalInfo.ts
 create mode 100644 packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts

diff --git a/.ckb-light-version b/.ckb-light-version
index 937cd78462..7becae11d1 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1 +1 @@
-v0.3.1
+v0.3.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b693e98026..cd475928af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+# 0.112.0 (2023-12-07)
+
+### CKB Node & Light Client
+
+- [CKB@v0.112.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.112.1) was released on Nov. 21st, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.3.2](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.2) was released on Dec. 5th, 2023. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x1d46fe5bb62d19a004eadd7ba40564c45620905ab260d8a546a9e4b9d7cc0f85`(at height `11,511,944`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/2968)
+
+---
+
+## New features
+
+- #2810: Support Spore Protocol.(@homura)
+- #2916: Add light client in compatibility table.(@yanguoyu)
+- #2926: Refactor switch between light client mainnet and light client testnet to make it more intuitive.(@yanguoyu)
+
+## Bug fixes
+
+- #2928: Fix condition of compatibility alert.(@yanguoyu)
+- #2935: Fix migration settings.(@yanguoyu)
+- #2945: Fix Nervos DAO withdrawal on light client mode.(@homura)
+- #2944: Fix requests jam when a synced transaction includes cellbase cells.(@yanguoyu)
+- #2965: Fix transaction type recognition on light client mode.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.111.1...v0.112.0
+
+
 # 0.111.1 (2023-11-08)
 
 ### CKB Node & Light Client
diff --git a/compatible.json b/compatible.json
index 14fd093098..204a2ddda4 100644
--- a/compatible.json
+++ b/compatible.json
@@ -55,6 +55,18 @@
         "0.103"
       ],
       "light": []
+    },
+    "0.112": {
+      "full": [
+        "0.112",
+        "0.111",
+        "0.110",
+        "0.109"
+      ],
+      "light": [
+        "0.3",
+        "0.2"
+      ]
     }
   }
 }
diff --git a/lerna.json b/lerna.json
index 0284582121..8fd1da0d48 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.111.1",
+  "version": "0.112.0",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/package.json b/package.json
index fa519aa9ca..184cad7b1f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.111.1",
+  "version": "0.112.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 344fbf9f61..4e02b16de6 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.111.1",
+  "version": "0.112.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-wallet/.env b/packages/neuron-wallet/.env
index 5c7ab981bd..70dda01370 100644
--- a/packages/neuron-wallet/.env
+++ b/packages/neuron-wallet/.env
@@ -117,4 +117,4 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
 MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
 
 # CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0x79cecdd6f41361e2474290224751284312a018528d1d92f4e18dd6d542feddfe'
+CKB_NODE_ASSUME_VALID_TARGET='0x1d46fe5bb62d19a004eadd7ba40564c45620905ab260d8a546a9e4b9d7cc0f85'
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index f85c7e1d8a..521a628e8c 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.111.1",
+  "version": "0.112.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -97,7 +97,7 @@
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.5.2",
-    "neuron-ui": "0.111.1",
+    "neuron-ui": "0.112.0",
     "typescript": "5.3.2"
   }
 }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
index 0f1a7ab08f..fd19a734f2 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
@@ -1,5 +1,13 @@
-import { SyncAddressType } from '../../database/chain/entities/sync-progress'
 import { Subject } from 'rxjs'
+import { queue, QueueObject } from 'async'
+import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
+import { QueryOptions } from '@ckb-lumos/base'
+import AddressMeta from '../../database/address/meta'
+import { Address } from '../../models/address'
+import { SyncAddressType } from '../../database/chain/entities/sync-progress'
+import IndexerCacheService from './indexer-cache-service'
+import logger from '../../utils/logger'
+import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
 
 export interface BlockTips {
   cacheTipNumber: number
@@ -41,15 +49,146 @@ export interface AppendScript {
   scriptType: CKBRPC.ScriptType
 }
 
-export abstract class Connector<TransactionsSubjectParam = unknown> {
-  abstract blockTipsSubject: Subject<BlockTips>
-  abstract transactionsSubject: Subject<{ txHashes: CKBComponents.Hash[]; params: TransactionsSubjectParam }>
+export abstract class Connector {
+  public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
+  public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string }>()
+  protected indexer: CkbIndexer
+  protected processNextBlockNumberQueue: QueueObject<void>
+  protected processingBlockNumber?: string
+  protected addressesByWalletId: Map<string, AddressMeta[]> = new Map()
+  protected pollingIndexer: boolean = false
+  private indexerQueryQueue: QueueObject<LumosCellQuery> | undefined
 
   abstract connect(): Promise<void>
-  abstract notifyCurrentBlockNumberProcessed(param: TransactionsSubjectParam): void
-  abstract stop(): void
-  abstract getLiveCellsByScript(query: LumosCellQuery): Promise<unknown>
+  abstract processTxsInNextBlockNumber(): Promise<void>
+  protected abstract upsertTxHashes(): Promise<unknown>
+  public abstract notifyCurrentBlockNumberProcessed(blockNumber: string): Promise<void>
   async appendScript(_scripts: AppendScript[]) {
     // do nothing
   }
+
+  constructor({ addresses, nodeUrl, indexerUrl }: { addresses: Address[]; nodeUrl: string; indexerUrl: string }) {
+    this.indexer = new CkbIndexer(nodeUrl, indexerUrl)
+    this.addressesByWalletId = addresses
+      .map(address => AddressMeta.fromObject(address))
+      .reduce((addressesByWalletId, addressMeta) => {
+        if (!addressesByWalletId.has(addressMeta.walletId)) {
+          addressesByWalletId.set(addressMeta.walletId, [])
+        }
+
+        const addressMetas = addressesByWalletId.get(addressMeta.walletId)
+        addressMetas!.push(addressMeta)
+
+        return addressesByWalletId
+      }, new Map<string, AddressMeta[]>())
+
+    this.processNextBlockNumberQueue = queue(async () => this.processTxsInNextBlockNumber(), 1)
+    this.processNextBlockNumberQueue.error((err: any) => {
+      logger.error(`Connector: \tError in processing next block number queue: ${err}`)
+    })
+
+    this.indexerQueryQueue = queue(async (query: any) => {
+      return await this.collectLiveCellsByScript(query)
+    })
+  }
+
+  public stop(): void {
+    this.pollingIndexer = false
+  }
+
+  protected async processNextBlockNumber() {
+    // the processNextBlockNumberQueue is a queue to ensure that ONLY one
+    // block processing task runs at a time to avoid the data conflict while syncing
+    this.processNextBlockNumberQueue?.push()
+    await this.processNextBlockNumberQueue?.drain()
+  }
+
+  protected async getTxHashesWithNextUnprocessedBlockNumber(): Promise<[string | undefined, string[]]> {
+    const txHashCachesByNextBlockNumberAndAddress = await Promise.all(
+      [...this.addressesByWalletId.keys()].map(async walletId =>
+        IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
+      )
+    )
+    const groupedTxHashCaches = txHashCachesByNextBlockNumberAndAddress.flat().reduce((grouped, txHashCache) => {
+      if (!grouped.get(txHashCache.blockNumber.toString())) {
+        grouped.set(txHashCache.blockNumber.toString(), [])
+      }
+      grouped.get(txHashCache.blockNumber.toString())!.push(txHashCache)
+
+      return grouped
+    }, new Map<string, Array<IndexerTxHashCache>>())
+
+    const nextUnprocessedBlockNumber = [...groupedTxHashCaches.keys()].sort((a, b) => parseInt(a) - parseInt(b)).shift()
+
+    if (!nextUnprocessedBlockNumber) {
+      return [undefined, []]
+    }
+
+    const txHashCachesInNextUnprocessedBlockNumber = groupedTxHashCaches.get(nextUnprocessedBlockNumber)
+
+    return [nextUnprocessedBlockNumber, txHashCachesInNextUnprocessedBlockNumber!.map(({ txHash }) => txHash)]
+  }
+
+  protected async notifyAndSyncNext(indexerTipNumber: number) {
+    const nextUnprocessedBlockNumber = await IndexerCacheService.nextUnprocessedBlock([
+      ...this.addressesByWalletId.keys(),
+    ])
+    if (nextUnprocessedBlockNumber) {
+      this.blockTipsSubject.next({
+        cacheTipNumber: parseInt(nextUnprocessedBlockNumber),
+        indexerTipNumber,
+      })
+      if (!this.processingBlockNumber) {
+        await this.processNextBlockNumber()
+      }
+      return true
+    }
+    this.blockTipsSubject.next({
+      cacheTipNumber: indexerTipNumber,
+      indexerTipNumber,
+    })
+    return false
+  }
+
+  public async getLiveCellsByScript(query: LumosCellQuery) {
+    return new Promise((resolve, reject) => {
+      this.indexerQueryQueue!.push(query, (err: any, result: unknown) => {
+        if (err) {
+          return reject(err)
+        }
+        resolve(result)
+      })
+    })
+  }
+
+  private async collectLiveCellsByScript(query: LumosCellQuery) {
+    const { lock, type, data } = query
+    if (!lock && !type) {
+      throw new Error('at least one parameter is required')
+    }
+
+    const queries: QueryOptions = {
+      ...(lock ? { lock } : {}),
+      ...(type ? { type } : {}),
+      data: data || 'any',
+    }
+
+    const collector = new CellCollector(this.indexer, queries)
+
+    const result = []
+    for await (const cell of collector.collect()) {
+      //somehow the lumos indexer returns an invalid hash type "lock" for hash type "data"
+      //for now we have to fix it here
+      const cellOutput = cell.cellOutput
+      // FIXME
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      if (cellOutput.type?.hashType === 'lock') {
+        console.error('Unexpected hash type "lock" found with the query', JSON.stringify(queries))
+        cellOutput.type.hashType = 'data'
+      }
+      result.push(cell)
+    }
+    return result
+  }
 }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
index 0bd628201f..4775f70a67 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
@@ -1,4 +1,4 @@
-import { getConnection } from 'typeorm'
+import { In, getConnection } from 'typeorm'
 import { queue } from 'async'
 import AddressMeta from '../../database/address/meta'
 import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
@@ -27,19 +27,17 @@ export default class IndexerCacheService {
     this.indexer = indexer
   }
 
-  private async getTxHashes(): Promise<IndexerTxHashCache[]> {
+  private static async getTxHashes(walletIds: string[]): Promise<IndexerTxHashCache[]> {
     return getConnection()
       .getRepository(IndexerTxHashCache)
       .createQueryBuilder()
       .where({
-        walletId: this.walletId,
+        walletId: In(walletIds),
       })
       .getMany()
   }
 
-  public static async nextUnprocessedBlock(
-    walletIds: string[]
-  ): Promise<{ blockNumber: string; blockHash: string } | undefined> {
+  public static async nextUnprocessedBlock(walletIds: string[]): Promise<string | undefined> {
     const result = await getConnection()
       .getRepository(IndexerTxHashCache)
       .createQueryBuilder()
@@ -51,10 +49,7 @@ export default class IndexerCacheService {
       return
     }
 
-    return {
-      blockNumber: result.blockNumber.toString(),
-      blockHash: result.blockHash,
-    }
+    return result.blockNumber.toString()
   }
 
   public static async updateCacheProcessed(txHash: string) {
@@ -183,7 +178,7 @@ export default class IndexerCacheService {
       await this.saveCacheBlockNumber(tipBlockNumber)
       return []
     }
-    const txMetasCaches = await this.getTxHashes()
+    const txMetasCaches = await IndexerCacheService.getTxHashes([this.walletId])
     const cachedTxHashes = txMetasCaches.map(meta => meta.txHash.toString())
 
     const cachedTxHashesSet = new Set(cachedTxHashes)
@@ -218,7 +213,7 @@ export default class IndexerCacheService {
 
     const indexerCaches: IndexerTxHashCache[] = []
     for (const txWithStatus of txsWithStatus) {
-      const { transaction, txStatus } = txWithStatus
+      const { transaction } = txWithStatus
       const mappings = mappingsByTxHash.get(transaction.hash!)
       if (!mappings) {
         continue
@@ -229,8 +224,6 @@ export default class IndexerCacheService {
           IndexerTxHashCache.fromObject({
             txHash: transaction.hash!,
             blockNumber: parseInt(transaction.blockNumber!),
-            blockHash: txStatus.blockHash!,
-            blockTimestamp: transaction.timestamp!,
             lockHash,
             address,
             walletId: this.walletId,
@@ -245,6 +238,44 @@ export default class IndexerCacheService {
     return newTxHashes
   }
 
+  public static async upsertIndexerCache(
+    txs: {
+      txHash: string
+      txIndex: string
+      blockNumber: string
+      lockHash: string
+      address: string
+      walletId: string
+    }[]
+  ): Promise<string[]> {
+    if (!txs.length) {
+      return []
+    }
+    const walletIds = txs.map(v => v.walletId)
+    const txMetasCaches = await IndexerCacheService.getTxHashes(walletIds)
+    const cachedTxHashes = txMetasCaches.map(meta => meta.txHash.toString())
+
+    const cachedTxHashesSet = new Set(cachedTxHashes)
+
+    const newTxHashes = txs.filter(({ txHash }) => !cachedTxHashesSet.has(txHash))
+
+    if (!newTxHashes.length) {
+      return []
+    }
+    const indexerCaches: IndexerTxHashCache[] = newTxHashes.map(v =>
+      IndexerTxHashCache.fromObject({
+        txHash: v.txHash,
+        blockNumber: parseInt(v.blockNumber!),
+        lockHash: v.lockHash,
+        address: v.address,
+        walletId: v.walletId,
+      })
+    )
+    indexerCaches.sort((a, b) => a.blockNumber - b.blockNumber)
+    await getConnection().manager.save(indexerCaches, { chunk: 100 })
+    return newTxHashes.map(v => v.txHash)
+  }
+
   public async updateProcessedTxHashes(blockNumber: string) {
     await getConnection()
       .createQueryBuilder()
@@ -259,13 +290,13 @@ export default class IndexerCacheService {
       .execute()
   }
 
-  public async nextUnprocessedTxsGroupedByBlockNumber(): Promise<IndexerTxHashCache[]> {
+  public static async nextUnprocessedTxsGroupedByBlockNumber(walletId: string): Promise<IndexerTxHashCache[]> {
     const cache = await getConnection()
       .getRepository(IndexerTxHashCache)
       .createQueryBuilder()
       .where({
         isProcessed: false,
-        walletId: this.walletId,
+        walletId,
       })
       .orderBy('blockNumber', 'ASC')
       .getOne()
@@ -281,7 +312,7 @@ export default class IndexerCacheService {
       .where({
         blockNumber,
         isProcessed: false,
-        walletId: this.walletId,
+        walletId,
       })
       .getMany()
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
index 1233c9ecd3..cec772ad50 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
@@ -1,55 +1,18 @@
-import { Subject } from 'rxjs'
-import { queue, QueueObject } from 'async'
-import { Tip, QueryOptions } from '@ckb-lumos/base'
-import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
+import { Tip } from '@ckb-lumos/base'
 import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import RpcService from '../../services/rpc-service'
 import { Address } from '../../models/address'
-import AddressMeta from '../../database/address/meta'
-import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
-import IndexerCacheService from './indexer-cache-service'
-import { BlockTips, LumosCellQuery, Connector } from './connector'
+import { Connector } from './connector'
 import { NetworkType } from '../../models/network'
+import IndexerCacheService from './indexer-cache-service'
 
-export default class IndexerConnector extends Connector<string | undefined> {
-  private indexer: CkbIndexer
+export default class IndexerConnector extends Connector {
   private rpcService: RpcService
-  private addressesByWalletId: Map<string, AddressMeta[]>
-  private processNextBlockNumberQueue: QueueObject<null> | undefined
-  private indexerQueryQueue: QueueObject<LumosCellQuery> | undefined
-
-  private processingBlockNumber: string | undefined
-  private pollingIndexer: boolean = false
-  public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
-  public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string | undefined }>()
 
   constructor(addresses: Address[], nodeUrl: string, indexerUrl: string, nodeType: NetworkType) {
-    super()
-    this.indexer = new CkbIndexer(nodeUrl, indexerUrl)
+    super({ addresses, nodeUrl, indexerUrl })
     this.rpcService = new RpcService(nodeUrl, nodeType)
-
-    this.addressesByWalletId = addresses
-      .map(address => AddressMeta.fromObject(address))
-      .reduce((addressesByWalletId, addressMeta) => {
-        if (!addressesByWalletId.has(addressMeta.walletId)) {
-          addressesByWalletId.set(addressMeta.walletId, [])
-        }
-
-        const addressMetas = addressesByWalletId.get(addressMeta.walletId)
-        addressMetas!.push(addressMeta)
-
-        return addressesByWalletId
-      }, new Map<string, AddressMeta[]>())
-
-    this.processNextBlockNumberQueue = queue(async () => this.processTxsInNextBlockNumber(), 1)
-    this.processNextBlockNumberQueue.error((err: any) => {
-      logger.error(`Error in processing next block number queue: ${err}`)
-    })
-
-    this.indexerQueryQueue = queue(async (query: any) => {
-      return await this.collectLiveCellsByScript(query)
-    })
   }
 
   private async synchronize(indexerTipBlock: Tip) {
@@ -58,24 +21,8 @@ export default class IndexerConnector extends Connector<string | undefined> {
     }
 
     await this.upsertTxHashes()
-
     const indexerTipNumber = parseInt(indexerTipBlock.blockNumber, 16)
-
-    const nextUnprocessedBlockTip = await IndexerCacheService.nextUnprocessedBlock([...this.addressesByWalletId.keys()])
-    if (nextUnprocessedBlockTip) {
-      this.blockTipsSubject.next({
-        cacheTipNumber: parseInt(nextUnprocessedBlockTip.blockNumber),
-        indexerTipNumber,
-      })
-      if (!this.processingBlockNumber) {
-        await this.processNextBlockNumber()
-      }
-    } else {
-      this.blockTipsSubject.next({
-        cacheTipNumber: indexerTipNumber,
-        indexerTipNumber,
-      })
-    }
+    await this.notifyAndSyncNext(indexerTipNumber)
   }
 
   private async initSync() {
@@ -99,84 +46,15 @@ export default class IndexerConnector extends Connector<string | undefined> {
     }
   }
 
-  public async getLiveCellsByScript(query: LumosCellQuery) {
-    return new Promise((resolve, reject) => {
-      this.indexerQueryQueue!.push(query, (err: any, result: unknown) => {
-        if (err) {
-          return reject(err)
-        }
-        resolve(result)
-      })
-    })
-  }
-
-  private async collectLiveCellsByScript(query: LumosCellQuery) {
-    const { lock, type, data } = query
-    if (!lock && !type) {
-      throw new Error('at least one parameter is required')
-    }
-
-    const queries: QueryOptions = {}
-    if (lock) {
-      queries.lock = lock
-    }
-    if (type) {
-      queries.type = type
-    }
-    queries.data = data || 'any'
-
-    const collector = new CellCollector(this.indexer, queries)
-
-    const result = []
-    for await (const cell of collector.collect()) {
-      //somehow the lumos indexer returns an invalid hash type "lock" for hash type "data"
-      //for now we have to fix it here
-      const cellOutput = cell.cellOutput
-      // FIXME
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      if (cellOutput.type?.hashType === 'lock') {
-        console.error('Unexpected hash type "lock" found with the query', JSON.stringify(queries))
-        cellOutput.type.hashType = 'data'
-      }
-      result.push(cell)
-    }
-    return result
-  }
-
-  private async getTxHashesWithNextUnprocessedBlockNumber(): Promise<[string | undefined, string[]]> {
-    const txHashCachesByNextBlockNumberAndAddress = await Promise.all(
-      [...this.addressesByWalletId.entries()].map(async ([walletId, addressMetas]) => {
-        const indexerCacheService = new IndexerCacheService(walletId, addressMetas, this.rpcService, this.indexer)
-        return indexerCacheService.nextUnprocessedTxsGroupedByBlockNumber()
-      })
-    )
-    const groupedTxHashCaches = txHashCachesByNextBlockNumberAndAddress
-      .flat()
-      .sort((a, b) => {
-        return parseInt(a.blockTimestamp) - parseInt(b.blockTimestamp)
-      })
-      .reduce((grouped, txHashCache) => {
-        if (!grouped.get(txHashCache.blockNumber.toString())) {
-          grouped.set(txHashCache.blockNumber.toString(), [])
-        }
-        grouped.get(txHashCache.blockNumber.toString())!.push(txHashCache)
-
-        return grouped
-      }, new Map<string, Array<IndexerTxHashCache>>())
-
-    const nextUnprocessedBlockNumber = [...groupedTxHashCaches.keys()].sort((a, b) => parseInt(a) - parseInt(b)).shift()
-
-    if (!nextUnprocessedBlockNumber) {
-      return [undefined, []]
+  async processTxsInNextBlockNumber() {
+    const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
+    if (nextBlockNumber !== undefined && txHashesInNextBlock.length) {
+      this.processingBlockNumber = nextBlockNumber
+      this.transactionsSubject.next({ txHashes: txHashesInNextBlock, params: this.processingBlockNumber })
     }
-
-    const txHashCachesInNextUnprocessedBlockNumber = groupedTxHashCaches.get(nextUnprocessedBlockNumber)
-
-    return [nextUnprocessedBlockNumber, txHashCachesInNextUnprocessedBlockNumber!.map(({ txHash }) => txHash)]
   }
 
-  private async upsertTxHashes(): Promise<string[]> {
+  protected async upsertTxHashes(): Promise<string[]> {
     const arrayOfInsertedTxHashes = []
     for (const [walletId, addressMetas] of [...this.addressesByWalletId.entries()]) {
       const indexerCacheService = new IndexerCacheService(walletId, addressMetas, this.rpcService, this.indexer)
@@ -186,29 +64,12 @@ export default class IndexerConnector extends Connector<string | undefined> {
     return arrayOfInsertedTxHashes.flat()
   }
 
-  private async processNextBlockNumber() {
-    this.processNextBlockNumberQueue!.push(null)
-    await this.processNextBlockNumberQueue!.drain()
-  }
-
-  private async processTxsInNextBlockNumber() {
-    const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
-    if (nextBlockNumber !== undefined && txHashesInNextBlock.length) {
-      this.processingBlockNumber = nextBlockNumber
-      this.transactionsSubject.next({ txHashes: txHashesInNextBlock, params: this.processingBlockNumber })
-    }
-  }
-
-  public notifyCurrentBlockNumberProcessed(blockNumber: string) {
+  public async notifyCurrentBlockNumberProcessed(blockNumber: string) {
     if (blockNumber === this.processingBlockNumber) {
-      delete this.processingBlockNumber
+      this.processingBlockNumber = undefined
     } else {
       return
     }
     this.processNextBlockNumber()
   }
-
-  public stop(): void {
-    this.pollingIndexer = false
-  }
 }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
index 46a9ad4d59..9a02faa48d 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
@@ -1,54 +1,41 @@
-import { BI } from '@ckb-lumos/bi'
-import { Subject } from 'rxjs'
-import { queue, QueueObject } from 'async'
-import type { HexString, QueryOptions, TransactionWithStatus } from '@ckb-lumos/base'
-import { Indexer as CkbIndexer, CellCollector } from '@ckb-lumos/ckb-indexer'
+import type { HexString, Script, TransactionWithStatus } from '@ckb-lumos/base'
 import logger from '../../utils/logger'
 import { Address } from '../../models/address'
 import AddressMeta from '../../database/address/meta'
 import { scheduler } from 'timers/promises'
 import SyncProgressService from '../../services/sync-progress'
-import { BlockTips, LumosCellQuery, Connector, AppendScript } from './connector'
+import { Connector, AppendScript } from './connector'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { FetchTransactionReturnType, LightRPC, LightScriptFilter } from '../../utils/ckb-rpc'
 import Multisig from '../../services/multisig'
-import { SyncAddressType } from '../../database/chain/entities/sync-progress'
+import SyncProgress, { SyncAddressType } from '../../database/chain/entities/sync-progress'
 import WalletService from '../../services/wallets'
 import AssetAccountInfo from '../../models/asset-account-info'
 import { DepType } from '../../models/chain/cell-dep'
 import { molecule } from '@ckb-lumos/codec'
 import { blockchain } from '@ckb-lumos/base'
 import type { Base } from '@ckb-lumos/rpc/lib/Base'
-
-interface SyncQueueParam {
-  script: CKBComponents.Script
-  scriptType: CKBRPC.ScriptType
-  blockRange: [HexString, HexString]
-  cursor?: HexString
-}
+import { getConnection } from 'typeorm'
+import { BI } from '@ckb-lumos/bi'
+import IndexerCacheService from './indexer-cache-service'
+import { ScriptType } from '@ckb-lumos/ckb-indexer/lib/type'
+import { scriptToAddress } from '../../utils/scriptAndAddress'
+import NetworksService from '../../services/networks'
 
 const unpackGroup = molecule.vector(blockchain.OutPoint)
 
-export default class LightConnector extends Connector<CKBComponents.Hash> {
+export default class LightConnector extends Connector {
   private lightRpc: LightRPC
-  private indexer: CkbIndexer
   private addressMetas: AddressMeta[]
-  private syncQueue: QueueObject<SyncQueueParam> = queue(this.syncNextWithScript.bind(this), 1)
-  private indexerQueryQueue: QueueObject<LumosCellQuery> | undefined
-  private pollingIndexer: boolean = false
-  private syncInQueue: Map<CKBComponents.Hash, { blockStartNumber: number; blockEndNumber: number; cursor?: string }> =
-    new Map()
-
-  public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
-  public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: CKBComponents.Hash }>()
 
   constructor(addresses: Address[], nodeUrl: string) {
-    super()
-    this.indexer = new CkbIndexer(nodeUrl, nodeUrl)
+    super({
+      addresses,
+      nodeUrl,
+      indexerUrl: nodeUrl,
+    })
     this.lightRpc = new LightRPC(nodeUrl)
     this.addressMetas = addresses.map(address => AddressMeta.fromObject(address))
-    this.indexerQueryQueue = queue(this.collectLiveCellsByScript.bind(this))
-
     // fetch some dep cell
     this.fetchDepCell()
   }
@@ -98,52 +85,90 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
   }
 
   private async synchronize() {
-    if (!this.syncQueue.idle()) {
-      return
+    const syncScripts = await this.upsertTxHashes()
+    await this.updateSyncedBlockOfScripts(syncScripts)
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinBlockNumber()
+    const hasNextBlock = await this.notifyAndSyncNext(minSyncBlockNumber)
+    if (!hasNextBlock) {
+      await this.updateBlockStartNumber(minSyncBlockNumber)
+    }
+  }
+
+  private async getTransactions({
+    script,
+    blockRange,
+    scriptType,
+  }: {
+    script: Script
+    blockRange: [HexString, HexString]
+    scriptType: ScriptType
+  }) {
+    const res = []
+    let lastCursor: HexString | undefined = undefined
+    while (lastCursor !== '0x') {
+      const result = await this.lightRpc.getTransactions(
+        { script, blockRange, scriptType },
+        'asc',
+        '0x64',
+        lastCursor as unknown as HexString
+      )
+      lastCursor = result.lastCursor
+      res.push(...result.txs)
     }
-    await this.subscribeSync()
+    return res
+  }
+
+  protected async upsertTxHashes() {
     const syncScripts = await this.lightRpc.getScripts()
     const syncStatusMap = await SyncProgressService.getAllSyncStatusToMap()
-    syncStatusMap.forEach(v => {
-      if (v.cursor && !this.syncInQueue.has(v.hash)) {
-        this.syncQueue.push({
-          script: {
-            codeHash: v.codeHash,
-            hashType: v.hashType,
-            args: v.args,
-          },
-          blockRange: [BI.from(v.blockStartNumber).toHexString(), BI.from(v.blockEndNumber).toHexString()],
-          scriptType: v.scriptType,
-          cursor: v.cursor,
-        })
-      }
-    })
-    syncScripts.forEach(syncScript => {
+    const insertTxCaches: {
+      txHash: string
+      txIndex: string
+      blockNumber: string
+      lockHash: string
+      address: string
+      walletId: string
+    }[] = []
+    const isMainnet = NetworksService.getInstance().isMainnet()
+    for (let index = 0; index < syncScripts.length; index++) {
+      const syncScript = syncScripts[index]
       const scriptHash = scriptToHash(syncScript.script)
       const syncStatus = syncStatusMap.get(scriptHash)
-      if (
-        syncStatus &&
-        !this.syncInQueue.has(scriptHash) &&
-        !syncStatus.cursor &&
-        syncStatus.blockEndNumber < parseInt(syncScript.blockNumber)
-      ) {
-        this.syncQueue.push({
+      if (syncStatus) {
+        const txs = await this.getTransactions({
           script: syncScript.script,
-          blockRange: [BI.from(syncStatus.blockEndNumber).toHexString(), syncScript.blockNumber],
           scriptType: syncScript.scriptType,
-          cursor: undefined,
+          blockRange: [BI.from(syncStatus.blockEndNumber).toHexString(), syncScript.blockNumber],
         })
+        insertTxCaches.push(
+          ...txs.map(v => ({
+            ...v,
+            lockHash: scriptHash,
+            address: scriptToAddress(syncScript.script, isMainnet),
+            walletId: syncStatus.walletId,
+          }))
+        )
       }
-    })
+    }
+    // save txs to indexer cache
+    await IndexerCacheService.upsertIndexerCache(insertTxCaches)
+    return syncScripts
   }
 
-  private async subscribeSync() {
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinBlockNumber()
-    const header = await this.lightRpc.getTipHeader()
-    this.blockTipsSubject.next({
-      cacheTipNumber: minSyncBlockNumber,
-      indexerTipNumber: +header.number,
+  private async updateSyncedBlockOfScripts(syncScripts: LightScriptFilter[]) {
+    if (!syncScripts.length) {
+      return
+    }
+    const syncStatusMap = await SyncProgressService.getAllSyncStatusToMap()
+    const updatedSyncProgress: SyncProgress[] = []
+    syncScripts.forEach(v => {
+      const currentSyncProgress = syncStatusMap.get(scriptToHash(v.script))
+      if (currentSyncProgress) {
+        currentSyncProgress.blockEndNumber = parseInt(v.blockNumber)
+        updatedSyncProgress.push(currentSyncProgress)
+      }
     })
+    await getConnection().manager.save(updatedSyncProgress, { chunk: 100 })
   }
 
   private async initSyncProgress(appendScripts: AppendScript[] = []) {
@@ -177,32 +202,29 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
       (pre, cur) => ({ ...pre, [cur.id]: cur.startBlockNumber }),
       {}
     )
-    const otherTypeSyncProgress = await SyncProgressService.getOtherTypeSyncProgress()
+    const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
     const setScriptsParams = [
       ...allScripts.map(v => {
-        let syncedBlockNumber = existSyncscripts[scriptToHash(v.script)]?.blockNumber
-        const walletStartBlockNumber = walletStartBlockMap[v.walletId]
-        if (
-          walletStartBlockNumber &&
-          (!syncedBlockNumber || BigInt(syncedBlockNumber) < BigInt(walletStartBlockNumber))
-        ) {
-          syncedBlockNumber = walletStartBlockNumber
-        }
+        const blockNumber = Math.max(
+          parseInt(walletStartBlockMap[v.walletId] ?? '0x0'),
+          walletMinBlockNumber?.[v.walletId] ?? 0,
+          parseInt(existSyncscripts[scriptToHash(v.script)]?.blockNumber ?? '0x0')
+        )
         return {
           ...v,
-          blockNumber: syncedBlockNumber ?? `0x${(walletMinBlockNumber?.[v.walletId] ?? 0).toString(16)}`,
+          blockNumber: `0x${blockNumber.toString(16)}`,
         }
       }),
       ...appendScripts.map(v => ({
         ...v,
         blockNumber:
           existSyncscripts[scriptToHash(v.script)]?.blockNumber ??
-          `0x${(otherTypeSyncProgress[scriptToHash(v.script)] ?? 0).toString(16)}`,
+          `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
       })),
     ]
     await this.lightRpc.setScripts(setScriptsParams)
     const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
-    await SyncProgressService.resetSyncProgress([allScripts, appendScripts].flat())
+    await SyncProgressService.resetSyncProgress(setScriptsParams)
     await SyncProgressService.updateSyncProgressFlag(walletIds)
     await SyncProgressService.removeByHashesAndAddressType(
       SyncAddressType.Multisig,
@@ -219,30 +241,6 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
     }
   }
 
-  private async syncNextWithScript({ script, scriptType, blockRange, cursor }: SyncQueueParam) {
-    const syncProgress = await SyncProgressService.getSyncStatus(script)
-    if (!syncProgress) {
-      return
-    }
-    const result = await this.lightRpc.getTransactions({ script, blockRange, scriptType }, 'asc', '0x64', cursor!)
-    if (!result.txs.length) {
-      await SyncProgressService.updateSyncStatus(syncProgress.hash, {
-        blockStartNumber: parseInt(blockRange[1]),
-        blockEndNumber: parseInt(blockRange[1]),
-        cursor: undefined,
-      })
-      return
-    }
-    const txHashes = result.txs.map(v => v.txHash)
-    await this.fetchPreviousOutputs(txHashes)
-    this.transactionsSubject.next({ txHashes, params: syncProgress.hash })
-    this.syncInQueue.set(syncProgress.hash, {
-      blockStartNumber: result.lastCursor === '0x' ? parseInt(blockRange[1]) : parseInt(blockRange[0]),
-      blockEndNumber: parseInt(blockRange[1]),
-      cursor: result.lastCursor === '0x' ? undefined : result.lastCursor,
-    })
-  }
-
   private async fetchPreviousOutputs(txHashes: string[]) {
     const transactions = await this.lightRpc
       .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
@@ -260,28 +258,12 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
     await this.lightRpc.createBatchRequest([...previousTxHashes].map(v => ['fetchTransaction' as keyof Base, v])).exec()
   }
 
-  private async collectLiveCellsByScript(query: LumosCellQuery) {
-    const { lock, type, data } = query
-    if (!lock && !type) {
-      throw new Error('at least one script is required')
-    }
-
-    const queries: QueryOptions = {}
-    if (lock) {
-      queries.lock = lock
-    }
-    if (type) {
-      queries.type = type
-    }
-    queries.data = data || 'any'
-
-    const collector = new CellCollector(this.indexer, queries)
-
-    const result = []
-    for await (const cell of collector.collect()) {
-      result.push(cell)
-    }
-    return result
+  private async updateBlockStartNumber(blockNumber: number) {
+    const scripts = await this.lightRpc.getScripts()
+    await SyncProgressService.updateBlockNumber(
+      scripts.map(v => v.script.args),
+      blockNumber
+    )
   }
 
   public async connect() {
@@ -295,34 +277,27 @@ export default class LightConnector extends Connector<CKBComponents.Hash> {
     }
   }
 
-  public stop(): void {
-    this.pollingIndexer = false
-  }
-
-  public async getLiveCellsByScript(query: LumosCellQuery) {
-    return new Promise((resolve, reject) => {
-      this.indexerQueryQueue!.push(query, (err: any, result: unknown) => {
-        if (err) {
-          return reject(err)
-        }
-        resolve(result)
-      })
-    })
+  async appendScript(scripts: AppendScript[]) {
+    this.initSyncProgress(scripts)
   }
 
-  public async notifyCurrentBlockNumberProcessed(hash: CKBComponents.Hash) {
-    const nextSyncParams = this.syncInQueue.get(hash)
-    if (nextSyncParams) {
-      try {
-        await SyncProgressService.updateSyncStatus(hash, nextSyncParams)
-      } finally {
-        this.syncInQueue.delete(hash)
-      }
+  async processTxsInNextBlockNumber() {
+    const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
+    if (nextBlockNumber !== undefined && txHashesInNextBlock.length) {
+      this.processingBlockNumber = nextBlockNumber
+      await this.fetchPreviousOutputs(txHashesInNextBlock)
+      this.transactionsSubject.next({ txHashes: txHashesInNextBlock, params: this.processingBlockNumber })
     }
-    await this.subscribeSync()
   }
 
-  async appendScript(scripts: AppendScript[]) {
-    this.initSyncProgress(scripts)
+  public async notifyCurrentBlockNumberProcessed(blockNumber: string) {
+    if (blockNumber === this.processingBlockNumber) {
+      this.processingBlockNumber = undefined
+    } else {
+      return
+    }
+    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinBlockNumber()
+    await this.updateBlockStartNumber(Math.min(parseInt(blockNumber), minCachedBlockNumber))
+    this.processNextBlockNumber()
   }
 }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
index e53df531d4..36944d7dcc 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -98,7 +98,7 @@ export default class Queue {
         }
       }
 
-      this.#indexerConnector!.notifyCurrentBlockNumberProcessed(params)
+      await this.#indexerConnector!.notifyCurrentBlockNumberProcessed(params)
     })
 
     this.#checkAndSaveQueue.error((err: any, task: any) => {
diff --git a/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts b/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
index 0a278e44c4..a2b3ce1530 100644
--- a/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
@@ -37,19 +37,6 @@ export default class IndexerTxHashCache extends BaseEntity {
   @Index()
   blockNumber!: number
 
-  @Column({
-    type: 'character',
-    length: 32,
-  })
-  @Index()
-  blockHash!: string
-
-  @Column({
-    type: 'varchar',
-  })
-  @Index()
-  blockTimestamp!: string
-
   @Column()
   @Index()
   isProcessed: boolean = false
@@ -67,20 +54,10 @@ export default class IndexerTxHashCache extends BaseEntity {
   })
   updatedAt!: Date
 
-  static fromObject(obj: {
-    txHash: string
-    blockNumber: number
-    blockHash: string
-    blockTimestamp: string
-    lockHash: string
-    address: string
-    walletId: string
-  }) {
+  static fromObject(obj: { txHash: string; blockNumber: number; lockHash: string; address: string; walletId: string }) {
     const result = new IndexerTxHashCache()
     result.txHash = obj.txHash
     result.blockNumber = obj.blockNumber
-    result.blockHash = obj.blockHash
-    result.blockTimestamp = obj.blockTimestamp
     result.lockHash = obj.lockHash
     result.address = obj.address
     result.walletId = obj.walletId
diff --git a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
index 65d786a503..abacf26067 100644
--- a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
@@ -47,6 +47,7 @@ export default class SyncProgress {
     scriptType: CKBRPC.ScriptType
     walletId: string
     addressType?: SyncAddressType
+    blockNumber: string
   }) {
     const res = new SyncProgress()
     res.hash = scriptToHash(obj.script)
@@ -57,6 +58,8 @@ export default class SyncProgress {
     res.scriptType = obj.scriptType
     res.delete = false
     res.addressType = obj.addressType ?? SyncAddressType.Default
+    res.blockStartNumber = parseInt(obj.blockNumber)
+    res.blockEndNumber = parseInt(obj.blockNumber)
     return res
   }
 }
diff --git a/packages/neuron-wallet/src/database/chain/index.ts b/packages/neuron-wallet/src/database/chain/index.ts
index 74e755a62f..bfa5492391 100644
--- a/packages/neuron-wallet/src/database/chain/index.ts
+++ b/packages/neuron-wallet/src/database/chain/index.ts
@@ -20,7 +20,7 @@ export const clean = async (clearAllLightClientData?: boolean) => {
     }),
     clearAllLightClientData
       ? getConnection().getRepository(SyncProgress).clear()
-      : SyncProgressService.clearCurrentWalletProgress(),
+      : SyncProgressService.clearWalletProgress(),
   ])
   MultisigOutputChangedSubject.getSubject().next('reset')
 
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts b/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
deleted file mode 100644
index d3701fba6e..0000000000
--- a/packages/neuron-wallet/src/database/chain/migrations/1694228328076-CreateCellLocalInfo.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-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/migrations/1701234043431-IndexerTxHashCacheRemoveField.ts b/packages/neuron-wallet/src/database/chain/migrations/1701234043431-IndexerTxHashCacheRemoveField.ts
new file mode 100644
index 0000000000..1eade1a4cd
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1701234043431-IndexerTxHashCacheRemoveField.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class IndexerTxHashCacheRemoveField1701234043431 implements MigrationInterface {
+    name = 'IndexerTxHashCacheRemoveField1701234043431'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.dropColumn('indexer_tx_hash_cache', 'blockHash');
+        await queryRunner.dropColumn('indexer_tx_hash_cache', 'blockTimestamp');
+    }
+
+    public async down(): Promise<void> {}
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1701234043432-CreateCellLocalInfo.ts b/packages/neuron-wallet/src/database/chain/migrations/1701234043432-CreateCellLocalInfo.ts
new file mode 100644
index 0000000000..b4fad5dac7
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1701234043432-CreateCellLocalInfo.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class CreateCellLocalInfo1701234043432 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 ef932ac0e3..d87ac1cbd0 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -56,7 +56,8 @@ 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'
+import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234043431-IndexerTxHashCacheRemoveField'
+import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -129,7 +130,8 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       TxLock1684488676083,
       ResetSyncProgressPrimaryKey1690361215400,
       TxLockAddArgs1694746034975,
-      CreateCellLocalInfo1694228328076,
+      IndexerTxHashCacheRemoveField1701234043431,
+      CreateCellLocalInfo1701234043432,
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/src/services/light-runner.ts b/packages/neuron-wallet/src/services/light-runner.ts
index 72f1d0a032..1c05fbf38e 100644
--- a/packages/neuron-wallet/src/services/light-runner.ts
+++ b/packages/neuron-wallet/src/services/light-runner.ts
@@ -145,7 +145,7 @@ export class CKBLightRunner extends NodeRunner {
 
     const network = NetworksService.getInstance().getCurrent()
     if (!this.logStream.get(network.id)) {
-      this.logStream.set(network.id, fs.createWriteStream(this.getLogPath()))
+      this.logStream.set(network.id, fs.createWriteStream(this.getLogPath(), { flags: 'a' }))
     }
     const logStream = this.logStream.get(network.id)
 
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 806004f75f..962f5ad287 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -1,6 +1,5 @@
-import { Equal, getConnection, In, Not } from 'typeorm'
+import { getConnection, In, LessThan, Not } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
-import { HexString } from '@ckb-lumos/base'
 import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
 import WalletService from './wallets'
 
@@ -11,6 +10,7 @@ export default class SyncProgressService {
       scriptType: CKBRPC.ScriptType
       walletId: string
       addressType?: SyncAddressType
+      blockNumber: string
     }[]
   ) {
     await getConnection()
@@ -51,7 +51,7 @@ export default class SyncProgressService {
       .createQueryBuilder()
       .update(SyncProgress)
       .set({ blockStartNumber: blockNumber })
-      .where({ blake160s: In(blake160s) })
+      .where({ args: In(blake160s), blockStartNumber: LessThan(blockNumber) })
       .execute()
   }
 
@@ -78,13 +78,6 @@ export default class SyncProgressService {
     return result
   }
 
-  static async updateSyncStatus(
-    hash: HexString,
-    { blockStartNumber, blockEndNumber, cursor }: { blockStartNumber: number; blockEndNumber: number; cursor?: string }
-  ) {
-    await getConnection().manager.update(SyncProgress, { hash }, { blockStartNumber, blockEndNumber, cursor })
-  }
-
   static async getCurrentWalletMinBlockNumber() {
     const currentWallet = WalletService.getInstance().getCurrent()
     const item = await getConnection()
@@ -111,7 +104,7 @@ export default class SyncProgressService {
     return items.reduce<Record<string, number>>((pre, cur) => ({ ...pre, [cur.walletId]: cur.blockStartNumber }), {})
   }
 
-  static async getOtherTypeSyncProgress() {
+  static async getOtherTypeSyncBlockNumber() {
     const items = await getConnection().getRepository(SyncProgress).find({
       addressType: SyncAddressType.Multisig,
     })
@@ -126,14 +119,11 @@ export default class SyncProgressService {
       .getMany()
   }
 
-  static async clearCurrentWalletProgress() {
-    const currentWallet = WalletService.getInstance().getCurrent()
-    await getConnection().getRepository(SyncProgress).delete({ walletId: currentWallet?.id })
+  static async clearWalletProgress() {
     await getConnection()
       .createQueryBuilder()
       .update(SyncProgress)
-      .set({ blockEndNumber: 0, cursor: undefined })
-      .where({ walletId: Not(Equal(currentWallet?.id)) })
+      .set({ blockStartNumber: 0, blockEndNumber: 0 })
       .execute()
   }
 }
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
index 55fc0bb9f2..95f4f60ba0 100644
--- a/packages/neuron-wallet/src/utils/ckb-rpc.ts
+++ b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -1,5 +1,6 @@
 import type { ParamsFormatter } from '@ckb-lumos/rpc'
 import type { Block } from '@ckb-lumos/base'
+import type { Script } from '@ckb-lumos/base'
 import { HexString } from '@ckb-lumos/base'
 import { CKBRPC } from '@ckb-lumos/rpc'
 import { Method } from '@ckb-lumos/rpc/lib/method'
@@ -18,7 +19,7 @@ import CommonUtils from './common'
 import { NetworkType } from '../models/network'
 
 export interface LightScriptFilter {
-  script: CKBComponents.Script
+  script: Script
   blockNumber: CKBComponents.BlockNumber
   scriptType: CKBRPC.ScriptType
 }
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
new file mode 100644
index 0000000000..acc7b37354
--- /dev/null
+++ b/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
@@ -0,0 +1,411 @@
+import { scriptToAddress } from '../../src/utils/scriptAndAddress'
+import { AddressType } from '../../src/models/keys/address'
+import { Address, AddressVersion } from '../../src/models/address'
+import SystemScriptInfo from '../../src/models/system-script-info'
+import { Connector, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/connector'
+import AddressMeta from '../../src/database/address/meta'
+import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
+import { ScriptHashType } from '../../src/models/chain/script'
+
+const stubbedNextUnprocessedBlockFn = jest.fn()
+const stubbedNextUnprocessedTxsGroupedByBlockNumberFn = jest.fn()
+const stubbedProcessTxsInNextBlockNumberFn = jest.fn()
+const stubbedIndexerConstructor = jest.fn()
+const stubbedCellCollectorConstructor = jest.fn()
+const stubbedBlockTipsSubscribe = jest.fn()
+const stubbedCellCellectFn = jest.fn()
+
+class TestConnector extends Connector {
+  async connect() {}
+  async processTxsInNextBlockNumber(): Promise<void> {
+    return stubbedProcessTxsInNextBlockNumberFn()
+  }
+
+  async upsertTxHashes(): Promise<void> {}
+
+  async notifyCurrentBlockNumberProcessed() {}
+
+  getAddressesByWalletId() {
+    return this.addressesByWalletId
+  }
+}
+
+const script = SystemScriptInfo.generateSecpScript('0x36c329ed630d6ce750712a477543672adab57f4c')
+const address = scriptToAddress(script, false)
+const walletId1 = 'walletid1'
+const walletId2 = 'walletid2'
+const addressObj1: Address = {
+  address,
+  blake160: '0x',
+  walletId: walletId1,
+  path: '',
+  addressType: AddressType.Receiving,
+  addressIndex: 0,
+  txCount: 0,
+  liveBalance: '',
+  sentBalance: '',
+  pendingBalance: '',
+  balance: '',
+  version: AddressVersion.Testnet,
+}
+const addressObj2: Address = {
+  address,
+  blake160: '0x',
+  walletId: walletId2,
+  path: '',
+  addressType: AddressType.Receiving,
+  addressIndex: 0,
+  txCount: 0,
+  liveBalance: '',
+  sentBalance: '',
+  pendingBalance: '',
+  balance: '',
+  version: AddressVersion.Testnet,
+}
+
+const resetMocks = () => {
+  stubbedNextUnprocessedBlockFn.mockReset()
+  stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockReset()
+  stubbedProcessTxsInNextBlockNumberFn.mockReset()
+  stubbedIndexerConstructor.mockReset()
+  stubbedCellCollectorConstructor.mockReset()
+  stubbedBlockTipsSubscribe.mockReset()
+  stubbedCellCellectFn.mockReset()
+}
+
+jest.mock('@ckb-lumos/ckb-indexer', () => {
+  return {
+    Indexer: class {
+      constructor(...params: unknown[]) {
+        stubbedIndexerConstructor(...params)
+      }
+    },
+    CellCollector: class {
+      constructor(...params: unknown[]) {
+        return stubbedCellCollectorConstructor(...params)
+      }
+
+      collect(...params: unknown[]) {
+        return stubbedCellCellectFn(...params)
+      }
+    },
+  }
+})
+
+jest.mock('../../src/block-sync-renderer/sync/indexer-cache-service', () => ({
+  nextUnprocessedBlock: () => stubbedNextUnprocessedBlockFn(),
+  nextUnprocessedTxsGroupedByBlockNumber: (walletId: string) =>
+    stubbedNextUnprocessedTxsGroupedByBlockNumberFn(walletId),
+}))
+
+describe('unit tests for IndexerConnector', () => {
+  const nodeUrl = 'http://nodeurl:8114'
+
+  beforeEach(() => {
+    resetMocks()
+    jest.useFakeTimers('legacy')
+  })
+  afterEach(() => {
+    jest.clearAllTimers()
+  })
+
+  describe('#constructor', () => {
+    const STUB_URI = 'stub_uri'
+
+    it('inits lumos indexer with a node url and indexer folder path', () => {
+      new TestConnector({
+        addresses: [],
+        nodeUrl,
+        indexerUrl: STUB_URI,
+      })
+      expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
+    })
+
+    it('init with addresses', () => {
+      const connector = new TestConnector({
+        addresses: [addressObj1, addressObj2],
+        nodeUrl,
+        indexerUrl: STUB_URI,
+      })
+      expect(connector.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj1))
+      expect(connector.getAddressesByWalletId().get(walletId2)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj2))
+    })
+  })
+
+  describe('#getTxHashesWithNextUnprocessedBlockNumber', () => {
+    const connector = new TestConnector({
+      addresses: [addressObj1, addressObj2],
+      nodeUrl,
+      indexerUrl: '',
+    })
+    it('no cached tx', async () => {
+      stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockResolvedValue([])
+      // @ts-ignore private method
+      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
+      expect(result).toStrictEqual([undefined, []])
+    })
+    it('get cached tx and sort by block number', async () => {
+      stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockImplementation(walletId =>
+        walletId === walletId1
+          ? [
+              IndexerTxHashCache.fromObject({
+                txHash: 'hash1',
+                blockNumber: 10,
+                lockHash: script.computeHash(),
+                address,
+                walletId,
+              }),
+            ]
+          : [
+              IndexerTxHashCache.fromObject({
+                txHash: 'hash2',
+                blockNumber: 2,
+                lockHash: script.computeHash(),
+                address,
+                walletId,
+              }),
+            ]
+      )
+      // @ts-ignore private method
+      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
+      expect(result).toStrictEqual(['2', ['hash2']])
+    })
+  })
+
+  describe('#notifyAndSyncNext', () => {
+    const connector = new TestConnector({
+      addresses: [addressObj1, addressObj2],
+      nodeUrl,
+      indexerUrl: '',
+    })
+    connector.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
+
+    it('exist unprocessed block and no current process block', async () => {
+      //@ts-ignore private property
+      connector.processingBlockNumber = undefined
+      stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
+      //@ts-ignore private method
+      await connector.notifyAndSyncNext(100)
+      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
+        cacheTipNumber: 10,
+        indexerTipNumber: 100,
+      })
+      expect(stubbedProcessTxsInNextBlockNumberFn).toHaveBeenCalled()
+    })
+    it('exist unprocessed block and has current process block', async () => {
+      //@ts-ignore private property
+      connector.processingBlockNumber = '5'
+      stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
+      //@ts-ignore private method
+      await connector.notifyAndSyncNext(100)
+      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
+        cacheTipNumber: 10,
+        indexerTipNumber: 100,
+      })
+      expect(stubbedProcessTxsInNextBlockNumberFn).toHaveBeenCalledTimes(0)
+    })
+    it('no unprocessed block', async () => {
+      //@ts-ignore private property
+      connector.processingBlockNumber = '5'
+      stubbedNextUnprocessedBlockFn.mockResolvedValue(undefined)
+      //@ts-ignore private method
+      await connector.notifyAndSyncNext(100)
+      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
+        cacheTipNumber: 100,
+        indexerTipNumber: 100,
+      })
+    })
+  })
+
+  describe('#getLiveCellsByScript', () => {
+    let fakeCell1: LumosCell, fakeCell2: LumosCell
+    let cells: LumosCell[]
+
+    fakeCell1 = {
+      blockHash: '0x',
+      outPoint: {
+        txHash: '0x',
+        index: '0x0',
+      },
+      cellOutput: {
+        capacity: '0x0',
+        lock: {
+          hashType: 'type',
+          codeHash: '0xcode',
+          args: '0x1',
+        },
+        type: {
+          hashType: 'data',
+          codeHash: '0xcode',
+          args: '0x1',
+        },
+      },
+    }
+    fakeCell2 = {
+      blockHash: '0x',
+      outPoint: {
+        txHash: '0x',
+        index: '0x0',
+      },
+      cellOutput: {
+        capacity: '0x0',
+        lock: {
+          hashType: 'type',
+          codeHash: '0xcode',
+          args: '0x2',
+        },
+        type: {
+          hashType: 'lock',
+          codeHash: '0xcode',
+          args: '0x2',
+        },
+      },
+    }
+    const fakeCells = [fakeCell1, fakeCell2]
+
+    const connector = new TestConnector({
+      addresses: [addressObj1, addressObj2],
+      nodeUrl,
+      indexerUrl: '',
+    })
+
+    describe('when success', () => {
+      const query: LumosCellQuery = {
+        lock: {
+          hashType: ScriptHashType.Data,
+          codeHash: '0xcode',
+          args: '0x',
+        },
+        type: {
+          hashType: ScriptHashType.Data,
+          codeHash: '0xcode',
+          args: '0x',
+        },
+        data: null,
+      }
+
+      beforeEach(async () => {
+        stubbedCellCellectFn.mockReturnValueOnce([
+          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[0])))),
+          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
+        ])
+
+        //@ts-ignore
+        cells = await connector.getLiveCellsByScript(query)
+      })
+      it('transform the query parameter', () => {
+        expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
+          lock: {
+            hashType: query.lock!.hashType,
+            codeHash: query.lock!.codeHash,
+            args: query.lock!.args,
+          },
+          type: {
+            hashType: query.type!.hashType,
+            codeHash: query.type!.codeHash,
+            args: query.type!.args,
+          },
+          data: 'any',
+        })
+      })
+      it('returns live cells with property value fix', async () => {
+        fakeCell2.cellOutput.type!.hashType = 'data'
+        expect(cells).toEqual([fakeCell1, fakeCell2])
+      })
+    })
+    describe('when handling concurrent requests', () => {
+      const query1: LumosCellQuery = {
+        lock: {
+          hashType: ScriptHashType.Data,
+          codeHash: '0xcode',
+          args: '0x1',
+        },
+        type: {
+          hashType: ScriptHashType.Data,
+          codeHash: '0xcode',
+          args: '0x1',
+        },
+        data: null,
+      }
+      const query2: LumosCellQuery = {
+        lock: {
+          hashType: ScriptHashType.Type,
+          codeHash: '0xcode',
+          args: '0x2',
+        },
+        type: {
+          hashType: ScriptHashType.Type,
+          codeHash: '0xcode',
+          args: '0x2',
+        },
+        data: null,
+      }
+
+      const results: unknown[] = []
+      beforeEach(async () => {
+        const stubbedCellCellect1 = jest.fn()
+        stubbedCellCellect1.mockReturnValueOnce([
+          new Promise(resolve => {
+            //fake the waiting, the other concurrent requests should wait until this is finished
+            setTimeout(() => {
+              resolve(JSON.parse(JSON.stringify(fakeCells[0])))
+            }, 500)
+          }),
+        ])
+
+        const stubbedCellCellect2 = jest.fn()
+        stubbedCellCellect2.mockReturnValueOnce([
+          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
+        ])
+
+        stubbedCellCollectorConstructor.mockImplementation((_indexer: any, query: any) => {
+          if (query.lock.args === '0x1') {
+            return {
+              collect: stubbedCellCellect1,
+            }
+          }
+          if (query.lock.args === '0x2') {
+            return {
+              collect: stubbedCellCellect2,
+            }
+          }
+        })
+
+        const promises = Promise.all([
+          new Promise<void>(resolve => {
+            connector.getLiveCellsByScript(query1).then(cells => {
+              results.push(cells)
+              resolve()
+            })
+          }),
+          new Promise<void>(resolve => {
+            connector.getLiveCellsByScript(query2).then(cells => {
+              results.push(cells)
+              resolve()
+            })
+          }),
+        ])
+
+        jest.advanceTimersByTime(500)
+        await promises
+      })
+      it('process one by one in order', () => {
+        expect(results.length).toEqual(2)
+        expect(results[0]).toEqual([fakeCells[0]])
+      })
+    })
+    describe('when fails', () => {
+      describe('when both type and lock parameter is not specified', () => {
+        it('throws error', async () => {
+          let err
+          try {
+            await connector.getLiveCellsByScript({ lock: null, type: null, data: null })
+          } catch (error) {
+            err = error
+          }
+          expect(err).toEqual(new Error('at least one parameter is required'))
+        })
+      })
+    })
+  })
+})
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
index 509c7808f3..21e922ff1f 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
@@ -364,7 +364,7 @@ describe('indexer cache service', () => {
       })
       describe('with all unprocessed transactions', () => {
         it('returns the tx hashes for the next block number', async () => {
-          const txHashes = await indexerCacheService.nextUnprocessedTxsGroupedByBlockNumber()
+          const txHashes = await IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
           expect(txHashes).toHaveLength(1)
           expect(txHashes![0].blockNumber).toEqual(parseInt(fakeBlock1.number))
         })
@@ -383,7 +383,7 @@ describe('indexer cache service', () => {
             .execute()
         })
         it('returns the tx hashes for the next block number', async () => {
-          const txHashes = await indexerCacheService.nextUnprocessedTxsGroupedByBlockNumber()
+          const txHashes = await IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
           expect(txHashes).toHaveLength(2)
           expect(txHashes![0].blockNumber).toEqual(parseInt(fakeBlock2.number))
         })
@@ -401,7 +401,7 @@ describe('indexer cache service', () => {
               .execute()
           })
           it('returns the unprocessed tx hash in the next block number', async () => {
-            const txHashes = await indexerCacheService.nextUnprocessedTxsGroupedByBlockNumber()
+            const txHashes = await IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
             expect(txHashes).toHaveLength(1)
             expect(txHashes![0].blockNumber).toEqual(parseInt(fakeBlock2.number))
             expect(txHashes![0].txHash).toEqual(fakeTx3.transaction.hash)
@@ -440,7 +440,7 @@ describe('indexer cache service', () => {
           .execute()
       })
       it('returns empty array when no unprocessed transactions', async () => {
-        const txHashes = await indexerCacheService.nextUnprocessedTxsGroupedByBlockNumber()
+        const txHashes = await IndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber(walletId)
         expect(txHashes).toEqual([])
       })
     })
@@ -465,10 +465,7 @@ describe('indexer cache service', () => {
           nextUnprocessedBlock = await IndexerCacheService.nextUnprocessedBlock([walletId])
         })
         it('returns next unprocessed block number', async () => {
-          expect(nextUnprocessedBlock).toEqual({
-            blockNumber: fakeBlock1.number,
-            blockHash: fakeBlock1.hash,
-          })
+          expect(nextUnprocessedBlock).toEqual(fakeBlock1.number)
         })
       })
       describe('check with walletId that does not have hash caches', () => {
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts
index 878f54f2d4..b79147f525 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts
@@ -4,9 +4,7 @@ import { AddressType } from '../../src/models/keys/address'
 import { Address, AddressVersion } from '../../src/models/address'
 import SystemScriptInfo from '../../src/models/system-script-info'
 import IndexerConnector from '../../src/block-sync-renderer/sync/indexer-connector'
-import type { LumosCell, LumosCellQuery } from '../../src/block-sync-renderer/sync/connector'
 import { flushPromises } from '../test-utils'
-import { ScriptHashType } from '../../src/models/chain/script'
 
 const stubbedTipFn = jest.fn()
 const stubbedGetTransactionFn = jest.fn()
@@ -50,6 +48,7 @@ describe('unit tests for IndexerConnector', () => {
   stubbedIndexerConstructor = jest.fn()
   stubbedIndexerCacheService = jest.fn()
   stubbedIndexerCacheService.nextUnprocessedBlock = stubbedNextUnprocessedBlock
+  stubbedIndexerCacheService.nextUnprocessedTxsGroupedByBlockNumber = stubbedNextUnprocessedTxsGroupedByBlockNumberFn
   stubbedRPCServiceConstructor = jest.fn()
   stubbedCellCollectorConstructor = jest.fn()
 
@@ -75,7 +74,6 @@ describe('unit tests for IndexerConnector', () => {
   jest.doMock('../../src/block-sync-renderer/sync/indexer-cache-service', () => {
     return stubbedIndexerCacheService.mockImplementation(() => ({
       upsertTxHashes: stubbedUpsertTxHashesFn,
-      nextUnprocessedTxsGroupedByBlockNumber: stubbedNextUnprocessedTxsGroupedByBlockNumberFn,
     }))
   })
   stubbedIndexerConnector = require('../../src/block-sync-renderer/sync/indexer-connector').default
@@ -227,9 +225,9 @@ describe('unit tests for IndexerConnector', () => {
           describe('when loaded block number is already in order', () => {
             beforeEach(async () => {
               when(stubbedNextUnprocessedTxsGroupedByBlockNumberFn)
-                .calledWith()
+                .calledWith(addressObj1.walletId)
                 .mockResolvedValueOnce([fakeTxHashCache1])
-                .calledWith()
+                .calledWith(addressObj2.walletId)
                 .mockResolvedValueOnce([fakeTxHashCache2, fakeTxHashCache3])
 
               await connectIndexer(indexerConnector)
@@ -246,9 +244,9 @@ describe('unit tests for IndexerConnector', () => {
           describe('when loaded block number is not in order', () => {
             beforeEach(async () => {
               when(stubbedNextUnprocessedTxsGroupedByBlockNumberFn)
-                .calledWith()
+                .calledWith(addressObj1.walletId)
                 .mockResolvedValueOnce([fakeTxHashCache2, fakeTxHashCache3])
-                .calledWith()
+                .calledWith(addressObj2.walletId)
                 .mockResolvedValueOnce([fakeTxHashCache1])
 
               await connectIndexer(indexerConnector)
@@ -342,7 +340,7 @@ describe('unit tests for IndexerConnector', () => {
           })
           it('throws error', async () => {
             expect(stubbedLoggerErrorFn).toHaveBeenCalledWith(
-              'Error in processing next block number queue: Error: exception'
+              'Connector: \tError in processing next block number queue: Error: exception'
             )
           })
         })
@@ -387,10 +385,7 @@ describe('unit tests for IndexerConnector', () => {
           })
           describe('when there are unprocessed blocks', () => {
             beforeEach(async () => {
-              stubbedNextUnprocessedBlock.mockResolvedValue({
-                blockNumber: fakeBlock3.number,
-                blockHash: fakeBlock3.hash,
-              })
+              stubbedNextUnprocessedBlock.mockResolvedValue(fakeBlock3.number)
               jest.advanceTimersByTime(5000)
               await flushPromises()
             })
@@ -405,190 +400,5 @@ describe('unit tests for IndexerConnector', () => {
         })
       })
     })
-    describe('#getLiveCellsByScript', () => {
-      let fakeCell1: LumosCell, fakeCell2: LumosCell
-      let cells: LumosCell[]
-
-      fakeCell1 = {
-        blockHash: '0x',
-        outPoint: {
-          txHash: '0x',
-          index: '0x0',
-        },
-        cellOutput: {
-          capacity: '0x0',
-          lock: {
-            hashType: 'type',
-            codeHash: '0xcode',
-            args: '0x1',
-          },
-          type: {
-            hashType: 'data',
-            codeHash: '0xcode',
-            args: '0x1',
-          },
-        },
-      }
-      fakeCell2 = {
-        blockHash: '0x',
-        outPoint: {
-          txHash: '0x',
-          index: '0x0',
-        },
-        cellOutput: {
-          capacity: '0x0',
-          lock: {
-            hashType: 'type',
-            codeHash: '0xcode',
-            args: '0x2',
-          },
-          type: {
-            hashType: 'lock',
-            codeHash: '0xcode',
-            args: '0x2',
-          },
-        },
-      }
-      const fakeCells = [fakeCell1, fakeCell2]
-
-      describe('when success', () => {
-        const query: LumosCellQuery = {
-          lock: {
-            hashType: ScriptHashType.Data,
-            codeHash: '0xcode',
-            args: '0x',
-          },
-          type: {
-            hashType: ScriptHashType.Data,
-            codeHash: '0xcode',
-            args: '0x',
-          },
-          data: null,
-        }
-
-        beforeEach(async () => {
-          stubbedCellCellectFn.mockReturnValueOnce([
-            new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[0])))),
-            new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
-          ])
-
-          //@ts-ignore
-          cells = await indexerConnector.getLiveCellsByScript(query)
-        })
-        it('transform the query parameter', () => {
-          expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
-            lock: {
-              hashType: query.lock!.hashType,
-              codeHash: query.lock!.codeHash,
-              args: query.lock!.args,
-            },
-            type: {
-              hashType: query.type!.hashType,
-              codeHash: query.type!.codeHash,
-              args: query.type!.args,
-            },
-            data: 'any',
-          })
-        })
-        it('returns live cells with property value fix', async () => {
-          fakeCell2.cellOutput.type!.hashType = 'data'
-          expect(cells).toEqual([fakeCell1, fakeCell2])
-        })
-      })
-      describe('when handling concurrent requests', () => {
-        const query1: LumosCellQuery = {
-          lock: {
-            hashType: ScriptHashType.Data,
-            codeHash: '0xcode',
-            args: '0x1',
-          },
-          type: {
-            hashType: ScriptHashType.Data,
-            codeHash: '0xcode',
-            args: '0x1',
-          },
-          data: null,
-        }
-        const query2: LumosCellQuery = {
-          lock: {
-            hashType: ScriptHashType.Type,
-            codeHash: '0xcode',
-            args: '0x2',
-          },
-          type: {
-            hashType: ScriptHashType.Type,
-            codeHash: '0xcode',
-            args: '0x2',
-          },
-          data: null,
-        }
-
-        const results: unknown[] = []
-        beforeEach(async () => {
-          const stubbedCellCellect1 = jest.fn()
-          stubbedCellCellect1.mockReturnValueOnce([
-            new Promise(resolve => {
-              //fake the waiting, the other concurrent requests should wait until this is finished
-              setTimeout(() => {
-                resolve(JSON.parse(JSON.stringify(fakeCells[0])))
-              }, 500)
-            }),
-          ])
-
-          const stubbedCellCellect2 = jest.fn()
-          stubbedCellCellect2.mockReturnValueOnce([
-            new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
-          ])
-
-          stubbedCellCollectorConstructor.mockImplementation((_indexer: any, query: any) => {
-            if (query.lock.args === '0x1') {
-              return {
-                collect: stubbedCellCellect1,
-              }
-            }
-            if (query.lock.args === '0x2') {
-              return {
-                collect: stubbedCellCellect2,
-              }
-            }
-          })
-
-          const promises = Promise.all([
-            new Promise<void>(resolve => {
-              indexerConnector.getLiveCellsByScript(query1).then(cells => {
-                results.push(cells)
-                resolve()
-              })
-            }),
-            new Promise<void>(resolve => {
-              indexerConnector.getLiveCellsByScript(query2).then(cells => {
-                results.push(cells)
-                resolve()
-              })
-            }),
-          ])
-
-          jest.advanceTimersByTime(500)
-          await promises
-        })
-        it('process one by one in order', () => {
-          expect(results.length).toEqual(2)
-          expect(results[0]).toEqual([fakeCells[0]])
-        })
-      })
-      describe('when fails', () => {
-        describe('when both type and lock parameter is not specified', () => {
-          it('throws error', async () => {
-            let err
-            try {
-              await indexerConnector.getLiveCellsByScript({ lock: null, type: null, data: null })
-            } catch (error) {
-              err = error
-            }
-            expect(err).toEqual(new Error('at least one parameter is required'))
-          })
-        })
-      })
-    })
   })
 })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts
index ef27cccea5..e02ec508e5 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts
@@ -1,7 +1,5 @@
-import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import type { Script } from '@ckb-lumos/base'
 import LightConnector from '../../src/block-sync-renderer/sync/light-connector'
-import SyncProgress from '../../src/database/chain/entities/sync-progress'
-import { BI } from '@ckb-lumos/bi'
 import AddressMeta from '../../src/database/address/meta'
 
 const getSyncStatusMock = jest.fn()
@@ -13,6 +11,7 @@ const updateSyncProgressFlagMock = jest.fn()
 const getWalletMinBlockNumberMock = jest.fn()
 const removeByHashesAndAddressType = jest.fn()
 const getOtherTypeSyncProgressMock = jest.fn()
+const getOtherTypeSyncBlockNumberMock = jest.fn()
 
 const setScriptsMock = jest.fn()
 const getScriptsMock = jest.fn()
@@ -33,6 +32,7 @@ function mockReset() {
   updateSyncStatusMock.mockReset()
   getWalletMinBlockNumberMock.mockReset()
   getOtherTypeSyncProgressMock.mockReset()
+  getOtherTypeSyncBlockNumberMock.mockReset()
 
   setScriptsMock.mockReset()
   getScriptsMock.mockReset()
@@ -56,10 +56,11 @@ jest.mock('../../src/services/sync-progress', () => {
     static updateSyncStatus: any = (hash: string, update: any) => updateSyncStatusMock(hash, update)
     static updateSyncProgressFlag: any = (walletIds: string[]) => updateSyncProgressFlagMock(walletIds)
     static getWalletMinBlockNumber: any = () => getWalletMinBlockNumberMock()
-    static removeByHashesAndAddressType: any = (type: number, scripts: CKBComponents.Script[]) =>
+    static removeByHashesAndAddressType: any = (type: number, scripts: Script[]) =>
       removeByHashesAndAddressType(type, scripts)
 
     static getOtherTypeSyncProgress: any = () => getOtherTypeSyncProgressMock()
+    static getOtherTypeSyncBlockNumber: any = () => getOtherTypeSyncBlockNumberMock()
   }
 })
 
@@ -94,12 +95,12 @@ jest.mock('timers/promises', () => ({
   },
 }))
 
-const script: CKBComponents.Script = {
+const script: Script = {
   args: '0x403f0d4e833b2a8d372772a63facaa310dfeef92',
   codeHash: '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8',
   hashType: 'type',
 }
-const scriptHash = scriptToHash(script)
+// const scriptHash = scriptToHash(script)
 const address = 'ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2q8ux5aqem92xnwfmj5cl6e233phlwlysqhjx5w'
 
 describe('test light connector', () => {
@@ -112,161 +113,6 @@ describe('test light connector', () => {
   afterEach(() => {
     mockReset()
   })
-  describe('test synchronize', () => {
-    it('syncQueue is not idle', async () => {
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.syncQueue.push({})
-      // @ts-ignore: private-method
-      await connector.synchronize()
-      expect(getScriptsMock).not.toBeCalled()
-    })
-    it('syncQueue is idle', async () => {
-      getScriptsMock.mockResolvedValue([])
-      getAllSyncStatusToMapMock.mockResolvedValue(new Map())
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.subscribeSync = jest.fn()
-      // @ts-ignore: private-method
-      await connector.synchronize()
-      expect(getScriptsMock).toBeCalled()
-      expect(getAllSyncStatusToMapMock).toBeCalled()
-    })
-    it('some script sync cursor is not empty', async () => {
-      getScriptsMock.mockResolvedValue([])
-      const syncProgress = SyncProgress.fromObject({
-        script,
-        scriptType: 'lock',
-        walletId: 'walletId1',
-      })
-      syncProgress.blockStartNumber = 0
-      syncProgress.blockEndNumber = 1
-      syncProgress.cursor = '0x1'
-      getAllSyncStatusToMapMock.mockResolvedValue(new Map([[scriptHash, syncProgress]]))
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.subscribeSync = jest.fn()
-      // @ts-ignore: private-method
-      await connector.synchronize()
-      // @ts-ignore: private-method
-      const queue = connector.syncQueue.workersList()
-      expect(queue[0].data).toStrictEqual({
-        script: {
-          codeHash: syncProgress.codeHash,
-          hashType: syncProgress.hashType,
-          args: syncProgress.args,
-        },
-        blockRange: [
-          BI.from(syncProgress.blockStartNumber).toHexString(),
-          BI.from(syncProgress.blockEndNumber).toHexString(),
-        ],
-        scriptType: syncProgress.scriptType,
-        cursor: syncProgress.cursor,
-      })
-    })
-    it('some script sync cursor is not empty but is in sync queue', async () => {
-      getScriptsMock.mockResolvedValue([])
-      const syncProgress = SyncProgress.fromObject({
-        script,
-        scriptType: 'lock',
-        walletId: 'walletId1',
-      })
-      syncProgress.blockStartNumber = 0
-      syncProgress.blockEndNumber = 1
-      syncProgress.cursor = '0x1'
-      getAllSyncStatusToMapMock.mockResolvedValue(new Map([[scriptHash, syncProgress]]))
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.syncInQueue.set(scriptHash, {})
-      // @ts-ignore: private-method
-      connector.subscribeSync = jest.fn()
-      // @ts-ignore: private-method
-      connector.syncQueue.pause()
-      // @ts-ignore: private-method
-      await connector.synchronize()
-      // @ts-ignore: private-method
-      expect(connector.syncQueue.length()).toBe(0)
-    })
-    it('some script sync to new block', async () => {
-      getScriptsMock.mockResolvedValue([
-        {
-          script,
-          scriptType: 'lock',
-          blockNumber: '0xaa',
-        },
-      ])
-      const syncProgress = SyncProgress.fromObject({
-        script,
-        scriptType: 'lock',
-        walletId: 'walletId1',
-      })
-      syncProgress.blockStartNumber = 0
-      syncProgress.blockEndNumber = 1
-      getAllSyncStatusToMapMock.mockResolvedValue(new Map([[scriptHash, syncProgress]]))
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.subscribeSync = jest.fn()
-      // @ts-ignore: private-method
-      await connector.synchronize()
-      // @ts-ignore: private-method
-      const queue = connector.syncQueue.workersList()
-      expect(queue[0].data).toStrictEqual({
-        script: {
-          codeHash: syncProgress.codeHash,
-          hashType: syncProgress.hashType,
-          args: syncProgress.args,
-        },
-        blockRange: [BI.from(syncProgress.blockEndNumber).toHexString(), BI.from('0xaa').toHexString()],
-        scriptType: syncProgress.scriptType,
-        cursor: syncProgress.cursor,
-      })
-    }),
-      it('some script sync to new block but is in sync queue', async () => {
-        getScriptsMock.mockResolvedValue([
-          {
-            script,
-            scriptType: 'lock',
-            blockNumber: '0xaa',
-          },
-        ])
-        const syncProgress = SyncProgress.fromObject({
-          script,
-          scriptType: 'lock',
-          walletId: 'walletId1',
-        })
-        syncProgress.blockStartNumber = 0
-        syncProgress.blockEndNumber = 1
-        getAllSyncStatusToMapMock.mockResolvedValue(new Map([[scriptHash, syncProgress]]))
-        const connector = new LightConnector([], '')
-        // @ts-ignore: private-method
-        connector.syncInQueue.set(scriptHash, {})
-        // @ts-ignore: private-method
-        connector.subscribeSync = jest.fn()
-        // @ts-ignore: private-method
-        connector.syncQueue.pause()
-        // @ts-ignore: private-method
-        await connector.synchronize()
-        // @ts-ignore: private-method
-        expect(connector.syncQueue.length()).toBe(0)
-      })
-  })
-
-  describe('test subscribeSync', () => {
-    it('run success', async () => {
-      getCurrentWalletMinBlockNumberMock.mockResolvedValue(100)
-      getTipHeaderMock.mockResolvedValue({ number: '0xaa' })
-      const connector = new LightConnector([], '')
-      // @ts-ignore: private-method
-      connector.blockTipsSubject = { next: jest.fn() }
-      // @ts-ignore: private-method
-      await connector.subscribeSync()
-      // @ts-ignore: private-method
-      expect(connector.blockTipsSubject.next).toBeCalledWith({
-        cacheTipNumber: 100,
-        indexerTipNumber: 170,
-      })
-    })
-  })
 
   describe('test initSyncProgress', () => {
     it('there is not exist addressmata', async () => {
@@ -278,6 +124,7 @@ describe('test light connector', () => {
     it('append multisig script', async () => {
       getScriptsMock.mockResolvedValue([])
       const connect = new LightConnector([], '')
+      getOtherTypeSyncBlockNumberMock.mockResolvedValueOnce({})
       //@ts-ignore
       await connect.initSyncProgress([{ walletId: 'walletId', script, addressType: 1, scriptType: 'lock' }])
       expect(getScriptsMock).toBeCalledTimes(1)
@@ -319,9 +166,24 @@ describe('test light connector', () => {
         },
       ])
       expect(resetSyncProgressMock).toBeCalledWith([
-        { script: addressMeta.generateDefaultLockScript().toSDK(), scriptType: 'lock', walletId: 'walletId' },
-        { script: addressMeta.generateACPLockScript().toSDK(), scriptType: 'lock', walletId: 'walletId' },
-        { script: addressMeta.generateLegacyACPLockScript().toSDK(), scriptType: 'lock', walletId: 'walletId' },
+        {
+          script: addressMeta.generateDefaultLockScript().toSDK(),
+          scriptType: 'lock',
+          walletId: 'walletId',
+          blockNumber: '0xaa',
+        },
+        {
+          script: addressMeta.generateACPLockScript().toSDK(),
+          scriptType: 'lock',
+          walletId: 'walletId',
+          blockNumber: '0x0',
+        },
+        {
+          script: addressMeta.generateLegacyACPLockScript().toSDK(),
+          scriptType: 'lock',
+          walletId: 'walletId',
+          blockNumber: '0x0',
+        },
       ])
       expect(updateSyncProgressFlagMock).toBeCalledWith(['walletId'])
     })
@@ -422,73 +284,6 @@ describe('test light connector', () => {
     })
   })
 
-  describe('test syncNextWithScript', () => {
-    it('no syncprogress in db', async () => {
-      getSyncStatusMock.mockResolvedValue(undefined)
-      const connect = new LightConnector([], '')
-      //@ts-ignore
-      await connect.syncNextWithScript({ script, scriptType: 'lock' })
-      expect(getTransactionsMock).toBeCalledTimes(0)
-    })
-    it('there is no tx in blockRange ', async () => {
-      const syncProgress = SyncProgress.fromObject({ script, scriptType: 'lock', walletId: 'walletId' })
-      getSyncStatusMock.mockResolvedValue(syncProgress)
-      getTransactionsMock.mockResolvedValue({ txs: [], lastCursor: '0x' })
-      const connect = new LightConnector([], '')
-      //@ts-ignore
-      await connect.syncNextWithScript({ script, scriptType: 'lock', blockRange: ['0xaa', '0xbb'] })
-      expect(getTransactionsMock).toBeCalledWith(
-        { script, blockRange: ['0xaa', '0xbb'], scriptType: 'lock' },
-        'asc',
-        '0x64',
-        undefined
-      )
-      expect(updateSyncStatusMock).toBeCalledWith(scriptHash, {
-        blockStartNumber: 187,
-        blockEndNumber: 187,
-        cursor: undefined,
-      })
-    })
-    it('there are some txs in blockRange but no more', async () => {
-      const syncProgress = SyncProgress.fromObject({ script, scriptType: 'lock', walletId: 'walletId' })
-      getSyncStatusMock.mockResolvedValue(syncProgress)
-      getTransactionsMock.mockResolvedValue({ txs: [{ txHash: '0xhash1' }], lastCursor: '0x' })
-      const connect = new LightConnector([], '')
-      //@ts-ignore
-      connect.transactionsSubject = { next: jest.fn() }
-      //@ts-ignore
-      await connect.syncNextWithScript({ script, scriptType: 'lock', blockRange: ['0xaa', '0xbb'] })
-      expect(connect.transactionsSubject.next).toBeCalledWith({ txHashes: ['0xhash1'], params: scriptHash })
-      //@ts-ignore
-      expect(connect.syncInQueue.has(scriptHash)).toBeTruthy()
-      //@ts-ignore
-      expect(connect.syncInQueue.get(scriptHash)).toStrictEqual({
-        blockStartNumber: 187,
-        blockEndNumber: 187,
-        cursor: undefined,
-      })
-    })
-    it('there are some txs in blockRange and more', async () => {
-      const syncProgress = SyncProgress.fromObject({ script, scriptType: 'lock', walletId: 'walletId' })
-      getSyncStatusMock.mockResolvedValue(syncProgress)
-      getTransactionsMock.mockResolvedValue({ txs: [{ txHash: '0xhash1' }], lastCursor: '0xaa' })
-      const connect = new LightConnector([], '')
-      //@ts-ignore
-      connect.transactionsSubject = { next: jest.fn() }
-      //@ts-ignore
-      await connect.syncNextWithScript({ script, scriptType: 'lock', blockRange: ['0xaa', '0xbb'] })
-      expect(connect.transactionsSubject.next).toBeCalledWith({ txHashes: ['0xhash1'], params: scriptHash })
-      //@ts-ignore
-      expect(connect.syncInQueue.has(scriptHash)).toBeTruthy()
-      //@ts-ignore
-      expect(connect.syncInQueue.get(scriptHash)).toStrictEqual({
-        blockStartNumber: 170,
-        blockEndNumber: 187,
-        cursor: '0xaa',
-      })
-    })
-  })
-
   describe('test connect', () => {
     const mockFn = jest.fn()
     beforeEach(() => {
@@ -523,26 +318,30 @@ describe('test light connector', () => {
     })
   })
 
-  describe('test notifyCurrentBlockNumberProcessed', () => {
-    it('hash is not in syncInQueue', async () => {
-      const connect = new LightConnector([], '')
-      const mockFn = jest.fn()
-      //@ts-ignore
-      connect.subscribeSync = mockFn
-      await connect.notifyCurrentBlockNumberProcessed('0xhash1')
-      expect(updateSyncStatusMock).toBeCalledTimes(0)
-      expect(mockFn).toBeCalledTimes(1)
+  describe('#notifyCurrentBlockNumberProcessed', () => {
+    const connector = new LightConnector([], '')
+    const updateBlockStartNumberMock = jest.fn()
+    beforeAll(() => {
+      // @ts-ignore private property
+      connector.updateBlockStartNumber = updateBlockStartNumberMock
     })
-    it('hash is in syncInQueue', async () => {
-      const connect = new LightConnector([], '')
-      //@ts-ignore
-      connect.subscribeSync = jest.fn()
-      //@ts-ignore
-      connect.syncInQueue.set('0xhash1', { blockStartNumber: 1, blockEndNumber: 1 })
-      await connect.notifyCurrentBlockNumberProcessed('0xhash1')
-      //@ts-ignore
-      expect(connect.syncInQueue.has('0xhash1')).toBeFalsy()
-      expect(updateSyncStatusMock).toBeCalledWith('0xhash1', { blockStartNumber: 1, blockEndNumber: 1 })
+    beforeEach(() => {
+      updateBlockStartNumberMock.mockReset()
+    })
+    it('last process block number finish', async () => {
+      // @ts-ignore private property
+      connector.processingBlockNumber = '0xaa'
+      getCurrentWalletMinBlockNumberMock.mockResolvedValueOnce(100)
+      await connector.notifyCurrentBlockNumberProcessed('0xaa')
+      // @ts-ignore private property
+      expect(connector.processingBlockNumber).toBeUndefined()
+      expect(updateBlockStartNumberMock).toBeCalledWith(100)
+    })
+    it('not last process block number finish', async () => {
+      // @ts-ignore private property
+      connector.processingBlockNumber = undefined
+      await connector.notifyCurrentBlockNumberProcessed('0xaa')
+      expect(updateBlockStartNumberMock).toBeCalledTimes(0)
     })
   })
 })

From 88ca283700f38d3b3e342576c2ce2e47ac505afb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:46:34 +0800
Subject: [PATCH 07/68] chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2
 (#2966)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bfda35675f..47c64148aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,9 +13,9 @@
   integrity sha512-plhoNEfSVdHMKXQyAxvH0Zyv3/4NL8r6pwgMQdmHR2vBUXn2t74PN2pBRppqKUa6RMT0yldyvOHG5Dbjwy2mBQ==
 
 "@adobe/css-tools@^4.0.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
-  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.2.tgz#a6abc715fb6884851fca9dad37fc34739a04fd11"
+  integrity sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==
 
 "@alloc/quick-lru@^5.2.0":
   version "5.2.0"

From 194baf50a632ec937a1c0e53ea3edaef4ba156d4 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 14 Dec 2023 17:56:26 +0900
Subject: [PATCH 08/68] chore: bump ts-jest to 29.1.1 (#2982)

---
 package.json |  2 +-
 yarn.lock    | 88 ++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 184cad7b1f..21b80bd5ec 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "lint-staged": "13.3.0",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
-    "ts-jest": "27.1.5",
+    "ts-jest": "29.1.1",
     "typescript": "5.3.2",
     "wait-on": "7.0.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 47c64148aa..364f4a01a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2646,6 +2646,13 @@
   dependencies:
     "@sinclair/typebox" "^0.25.16"
 
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
 "@jest/source-map@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
@@ -2794,6 +2801,18 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
@@ -3454,6 +3473,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
   integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
 
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -12242,7 +12266,7 @@ jest-util@^25.5.0:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-util@^27.0.0, jest-util@^27.5.1:
+jest-util@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
   integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
@@ -12266,6 +12290,18 @@ jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.0.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-util@^29.5.0:
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
@@ -12553,11 +12589,6 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
 json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
@@ -12565,6 +12596,11 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonc-parser@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
@@ -16739,18 +16775,18 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -18002,19 +18038,19 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
-ts-jest@27.1.5:
-  version "27.1.5"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz#0ddf1b163fbaae3d5b7504a1e65c914a95cff297"
-  integrity sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==
+ts-jest@29.1.1:
+  version "29.1.1"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
+  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
-    jest-util "^27.0.0"
-    json5 "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
     lodash.memoize "4.x"
     make-error "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
+    semver "^7.5.3"
+    yargs-parser "^21.0.1"
 
 ts-pnp@^1.1.6:
   version "1.2.0"
@@ -19252,16 +19288,16 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs-parser@21.1.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
+yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
 yargs@16.2.0, yargs@^16.0.0, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"

From f598a0fcd97551253539e240a9d8017464525897 Mon Sep 17 00:00:00 2001
From: homura <homura.dev@gmail.com>
Date: Thu, 14 Dec 2023 16:56:45 +0800
Subject: [PATCH 09/68] refactor: upgrade lumos to 0.21 (#2964)

* chore: upgrade lumos to 0.21

* refactor: fetch with keepalive to replace the http agent

* refactor: rename variable for more clear

* chore: upgrade lumos to 0.21.1

* refactor: remove unnecessary http agent

* refactor: remove unnecessary global declaration
---
 packages/neuron-ui/package.json               |   4 +-
 packages/neuron-wallet/package.json           |  18 +-
 .../neuron-wallet/src/services/sdk-core.ts    |  27 +-
 .../src/services/transaction-sender.ts        |   4 +-
 .../src/types/ckbComponents.d.ts              | 542 +++++++++---------
 packages/neuron-wallet/src/utils/ckb-rpc.ts   |  42 +-
 .../neuron-wallet/tests/utils/ckb-rpc.test.ts |  13 +-
 yarn.lock                                     | 142 ++---
 8 files changed, 378 insertions(+), 414 deletions(-)

diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 4e02b16de6..6a8520f77e 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -50,8 +50,8 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.2",
-    "@ckb-lumos/codec": "0.21.0-next.2",
+    "@ckb-lumos/base": "0.21.1",
+    "@ckb-lumos/codec": "0.21.1",
     "@nervosnetwork/ckb-sdk-core": "0.109.0",
     "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 521a628e8c..e7d7aca14f 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -42,15 +42,15 @@
     ]
   },
   "dependencies": {
-    "@ckb-lumos/base": "0.21.0-next.2",
-    "@ckb-lumos/bi": "0.21.0-next.2",
-    "@ckb-lumos/ckb-indexer": "0.21.0-next.2",
-    "@ckb-lumos/codec": "0.21.0-next.2",
-    "@ckb-lumos/common-scripts": "0.21.0-next.2",
-    "@ckb-lumos/config-manager": "0.21.0-next.2",
-    "@ckb-lumos/hd": "0.21.0-next.2",
-    "@ckb-lumos/helpers": "0.21.0-next.2",
-    "@ckb-lumos/rpc": "0.21.0-next.2",
+    "@ckb-lumos/base": "0.21.1",
+    "@ckb-lumos/bi": "0.21.1",
+    "@ckb-lumos/ckb-indexer": "0.21.1",
+    "@ckb-lumos/codec": "0.21.1",
+    "@ckb-lumos/common-scripts": "0.21.1",
+    "@ckb-lumos/config-manager": "0.21.1",
+    "@ckb-lumos/hd": "0.21.1",
+    "@ckb-lumos/helpers": "0.21.1",
+    "@ckb-lumos/rpc": "0.21.1",
     "@iarna/toml": "2.2.5",
     "@ledgerhq/hw-transport-node-hid": "6.27.22",
     "@spore-sdk/core": "0.1.0-beta.9",
diff --git a/packages/neuron-wallet/src/services/sdk-core.ts b/packages/neuron-wallet/src/services/sdk-core.ts
index a951c08ff6..36017e078c 100644
--- a/packages/neuron-wallet/src/services/sdk-core.ts
+++ b/packages/neuron-wallet/src/services/sdk-core.ts
@@ -1,32 +1,7 @@
 import { CKBRPC } from '@ckb-lumos/rpc'
-import https from 'https'
-import http from 'http'
-
-let httpsAgent: https.Agent
-let httpAgent: http.Agent
-
-const getHttpsAgent = () => {
-  if (!httpsAgent) {
-    httpsAgent = new https.Agent({ keepAlive: true })
-  }
-  return httpsAgent
-}
-
-const getHttpAgent = () => {
-  if (!httpAgent) {
-    httpAgent = new http.Agent({ keepAlive: true })
-  }
-  return httpAgent
-}
 
 export const generateCKB = (url: string): CKBRPC => {
-  const rpc = new CKBRPC(url)
-  if (url.startsWith('https')) {
-    rpc.setNode({ url, httpsAgent: getHttpsAgent() })
-  } else {
-    rpc.setNode({ url, httpAgent: getHttpAgent() })
-  }
-  return rpc
+  return new CKBRPC(url, { fetch: (request, init) => globalThis.fetch(request, { ...init, keepalive: true }) })
 }
 
 export default {
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 8955281951..208739a2d0 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -855,7 +855,9 @@ export default class TransactionSender {
     const rpc = generateRPC(currentNetwork.remote, currentNetwork.type)
 
     let tx = await rpc.getTransaction(depositOutPoint.txHash)
-    if (tx.txStatus.status !== 'committed') throw new Error('Transaction is not committed yet')
+    if (tx.txStatus.status !== 'committed' || !tx.txStatus.blockHash) {
+      throw new Error('Transaction is not committed yet')
+    }
     const depositBlockHash = tx.txStatus.blockHash
 
     const cellOutput = tx.transaction.outputs[+depositOutPoint.index]
diff --git a/packages/neuron-wallet/src/types/ckbComponents.d.ts b/packages/neuron-wallet/src/types/ckbComponents.d.ts
index 56e2ff19b7..0bd03bb762 100644
--- a/packages/neuron-wallet/src/types/ckbComponents.d.ts
+++ b/packages/neuron-wallet/src/types/ckbComponents.d.ts
@@ -1,280 +1,272 @@
-import type { Agent as HttpsAgent } from 'node:https'
-import type { Agent as HttpAgent } from 'node:http'
-
-declare global {
-  declare namespace CKBComponents {
-    type DAO = string
-    type Hash = string
-    type Number = string
-    type Hash256 = string
-    type UInt32 = string
-    type UInt64 = string
-    type U256 = string
-    type Index = string
-    type Version = string
-    type Count = string
-    type Difficulty = string
-    type BlockNumber = string
-    type EpochInHeader = string
-    type Capacity = string
-    type ProposalShortId = string
-    type Timestamp = string
-    type Nonce = string
-    type Cycles = string
-    type Size = string
-    type OutputsValidator = 'default' | 'passthrough' | undefined
-    type RationalU256 = Record<'denom' | 'numer', string>
-    type ProposalWindow = Record<'closest' | 'farthest', BlockNumber>
-    type EpochNumberWithFraction = string
-    type EpochNumber = string
-    enum TransactionStatus {
-      Pending = 'pending',
-      Proposed = 'proposed',
-      Committed = 'committed',
-    }
-    type ScriptHashType = api.HashType
-    type DepType = 'code' | 'depGroup'
-    type JsonBytes = string
-    /**
-     * @typedef Bytes, keep consistent with CKB
-     * @description Bytes will be serialized to string
-     * @see https://github.com/nervosnetwork/ckb/blob/develop/util/jsonrpc-types/src/blockchain.rs#L19
-     */
-    type Bytes = string
-    type Since = string
-    interface Node {
-      url: string
-      httpAgent?: HttpAgent
-      httpsAgent?: HttpsAgent
-    }
-    interface Method {
-      name: string
-      method: string
-      paramsFormatters: function[]
-      resultFormatters?: function
-    }
-    /**
-     * RPC Units
-     */
-    type Witness = Bytes
-    type Script = api.Script
-    type CellInput = api.Input
-    type CellOutput = api.Output
-    type Cell = CellOutput
-    type OutPoint = api.OutPoint
-    type CellDep = api.CellDep
-    type RawTransaction = api.RawTransaction & {
-      witnesses: Witness[]
-    }
-    type Transaction = Required<api.Transaction>
-    type TransactionWithStatus = api.TransactionWithStatus
-    type BlockHeader = api.Header
-    type Block = api.Block
-    type UncleBlock = api.UncleBlock
-    type LiveCell = api.LiveCell
-    type AlertMessage = api.AlertMessage
-    type BlockchainInfo = api.ChainInfo
-    type LocalNodeInfo = api.LocalNode
-    type RemoteNodeInfo = api.RemoteNode
-    type TxPoolInfo = api.TxPoolInfo
-    type Epoch = api.Epoch
-    type RunDryResult = api.DryRunResult
-    type BannedAddress = api.BannedAddr
-    type WitnessArgs = api.WitnessArgs
-    type BlockEconomicState = api.BlockEconomicState
-    type SyncState = api.SyncState
-    type TransactionProof = api.TransactionProof
-    type TxVerbosity = api.TxVerbosity
-    type TxPoolVerbosity = api.TxPoolVerbosity
-    type RawTxPool = api.RawTxPool
-    type Consensus = api.Consensus
-    type HardForks = api.HardForks
-    type HardForkFeature = api.HardforkFeature
-    type SoftForkStatus = api.SoftForkStatus
-    type SoftFork = api.SoftFork
-    type Buried = api.Buried
-    type Rfc0043 = api.Rfc0043
-    type Ratio = api.Ratio
-    type Deployment = api.Deployment
-    type QueryOptions = api.QueryOptions
-    interface TransactionPoint {
-      blockNumber: BlockNumber
-      index: Index
-      txHash: Hash256
-    }
-    interface TransactionByLockHash {
-      consumedBy: undefined | TransactionPoint
-      createdBy: TransactionPoint
-    }
-    type TransactionsByLockHash = TransactionByLockHash[]
-    interface FeeRate {
-      feeRate: string
-    }
-    interface CellIncludingOutPoint {
-      blockHash: Hash256
+declare namespace CKBComponents {
+  type DAO = string
+  type Hash = string
+  type Number = string
+  type Hash256 = string
+  type UInt32 = string
+  type UInt64 = string
+  type U256 = string
+  type Index = string
+  type Version = string
+  type Count = string
+  type Difficulty = string
+  type BlockNumber = string
+  type EpochInHeader = string
+  type Capacity = string
+  type ProposalShortId = string
+  type Timestamp = string
+  type Nonce = string
+  type Cycles = string
+  type Size = string
+  type OutputsValidator = 'default' | 'passthrough' | undefined
+  type RationalU256 = Record<'denom' | 'numer', string>
+  type ProposalWindow = Record<'closest' | 'farthest', BlockNumber>
+  type EpochNumberWithFraction = string
+  type EpochNumber = string
+  enum TransactionStatus {
+    Pending = 'pending',
+    Proposed = 'proposed',
+    Committed = 'committed',
+  }
+  type ScriptHashType = api.HashType
+  type DepType = 'code' | 'depGroup'
+  type JsonBytes = string
+  /**
+   * @typedef Bytes, keep consistent with CKB
+   * @description Bytes will be serialized to string
+   * @see https://github.com/nervosnetwork/ckb/blob/develop/util/jsonrpc-types/src/blockchain.rs#L19
+   */
+  type Bytes = string
+  type Since = string
+  interface Node {
+    url: string
+  }
+  interface Method {
+    name: string
+    method: string
+    paramsFormatters: function[]
+    resultFormatters?: function
+  }
+  /**
+   * RPC Units
+   */
+  type Witness = Bytes
+  type Script = api.Script
+  type CellInput = api.Input
+  type CellOutput = api.Output
+  type Cell = CellOutput
+  type OutPoint = api.OutPoint
+  type CellDep = api.CellDep
+  type RawTransaction = api.RawTransaction & {
+    witnesses: Witness[]
+  }
+  type Transaction = Required<api.Transaction>
+  type TransactionWithStatus = api.TransactionWithStatus
+  type BlockHeader = api.Header
+  type Block = api.Block
+  type UncleBlock = api.UncleBlock
+  type LiveCell = api.LiveCell
+  type AlertMessage = api.AlertMessage
+  type BlockchainInfo = api.ChainInfo
+  type LocalNodeInfo = api.LocalNode
+  type RemoteNodeInfo = api.RemoteNode
+  type TxPoolInfo = api.TxPoolInfo
+  type Epoch = api.Epoch
+  type RunDryResult = api.DryRunResult
+  type BannedAddress = api.BannedAddr
+  type WitnessArgs = api.WitnessArgs
+  type BlockEconomicState = api.BlockEconomicState
+  type SyncState = api.SyncState
+  type TransactionProof = api.TransactionProof
+  type TxVerbosity = api.TxVerbosity
+  type TxPoolVerbosity = api.TxPoolVerbosity
+  type RawTxPool = api.RawTxPool
+  type Consensus = api.Consensus
+  type HardForks = api.HardForks
+  type HardForkFeature = api.HardforkFeature
+  type SoftForkStatus = api.SoftForkStatus
+  type SoftFork = api.SoftFork
+  type Buried = api.Buried
+  type Rfc0043 = api.Rfc0043
+  type Ratio = api.Ratio
+  type Deployment = api.Deployment
+  type QueryOptions = api.QueryOptions
+  interface TransactionPoint {
+    blockNumber: BlockNumber
+    index: Index
+    txHash: Hash256
+  }
+  interface TransactionByLockHash {
+    consumedBy: undefined | TransactionPoint
+    createdBy: TransactionPoint
+  }
+  type TransactionsByLockHash = TransactionByLockHash[]
+  interface FeeRate {
+    feeRate: string
+  }
+  interface CellIncludingOutPoint {
+    blockHash: Hash256
+    capacity: Capacity
+    lock: Script
+    outPoint: OutPoint
+    cellbase: boolean
+    outputDataLen: string
+  }
+  type TransactionTrace = {
+    action: string
+    info: string
+    time: Timestamp
+  }[]
+  enum CellStatus {
+    Live = 'live',
+    Unknown = 'unknown',
+  }
+  interface LiveCellByLockHash {
+    cellOutput: CellOutput
+    createdBy: TransactionPoint
+    cellbase: boolean
+    outputDataLen: string
+  }
+  type LiveCellsByLockHash = LiveCellByLockHash[]
+  interface PeersState {
+    lastUpdated: string
+    blocksInFlight: string
+    peer: string
+  }
+  interface LockHashIndexState {
+    blockHash: Hash256
+    blockNumber: BlockNumber
+    lockHash: Hash256
+  }
+  type LockHashIndexStates = LockHashIndexState[]
+  type BannedAddresses = BannedAddress[]
+  interface CellbaseOutputCapacityDetails {
+    primary: string
+    proposalReward: string
+    secondary: string
+    total: string
+    txFee: string
+  }
+  interface RawTransactionToSign extends Omit<RawTransaction, 'witnesses'> {
+    witnesses: (WitnessArgs | Witness)[]
+  }
+  interface CapacityByLockHash {
+    blockNumber: BlockNumber
+    capacity: Capacity
+    cellsCount: string
+  }
+  type TxPoolIds = Record<'pending' | 'proposed', Array<Hash256>>
+  interface Tip {
+    blockNumber: BlockNumber
+    blockHash: Hash256
+  }
+  type ScriptType = 'type' | 'lock'
+  type Order = 'asc' | 'desc'
+  type IOType = 'input' | 'output' | 'both'
+  type ScriptSearchMode = 'prefix' | 'exact'
+  interface IndexerCell {
+    blockNumber: BlockNumber
+    outPoint: OutPoint
+    output: {
       capacity: Capacity
       lock: Script
-      outPoint: OutPoint
-      cellbase: boolean
-      outputDataLen: string
-    }
-    type TransactionTrace = {
-      action: string
-      info: string
-      time: Timestamp
-    }[]
-    enum CellStatus {
-      Live = 'live',
-      Unknown = 'unknown',
-    }
-    interface LiveCellByLockHash {
-      cellOutput: CellOutput
-      createdBy: TransactionPoint
-      cellbase: boolean
-      outputDataLen: string
-    }
-    type LiveCellsByLockHash = LiveCellByLockHash[]
-    interface PeersState {
-      lastUpdated: string
-      blocksInFlight: string
-      peer: string
-    }
-    interface LockHashIndexState {
-      blockHash: Hash256
-      blockNumber: BlockNumber
-      lockHash: Hash256
-    }
-    type LockHashIndexStates = LockHashIndexState[]
-    type BannedAddresses = BannedAddress[]
-    interface CellbaseOutputCapacityDetails {
-      primary: string
-      proposalReward: string
-      secondary: string
-      total: string
-      txFee: string
-    }
-    interface RawTransactionToSign extends Omit<RawTransaction, 'witnesses'> {
-      witnesses: (WitnessArgs | Witness)[]
-    }
-    interface CapacityByLockHash {
-      blockNumber: BlockNumber
-      capacity: Capacity
-      cellsCount: string
-    }
-    type TxPoolIds = Record<'pending' | 'proposed', Array<Hash256>>
-    interface Tip {
-      blockNumber: BlockNumber
-      blockHash: Hash256
-    }
-    type ScriptType = 'type' | 'lock'
-    type Order = 'asc' | 'desc'
-    type IOType = 'input' | 'output' | 'both'
-    type ScriptSearchMode = 'prefix' | 'exact'
-    interface IndexerCell {
-      blockNumber: BlockNumber
-      outPoint: OutPoint
-      output: {
-        capacity: Capacity
-        lock: Script
-        type?: Script
-      }
-      outputData: string
-      txIndex: string
-    }
-    interface IndexerCellWithoutData extends Omit<IndexerCell, 'outputData'> {
-      outputData: null
-    }
-    interface GetCellsResult<WithData extends boolean = true> {
-      lastCursor: string
-      objects: WithData extends true ? IndexerCell[] : IndexerCellWithoutData[]
+      type?: Script
     }
-    type IndexerTransaction<Grouped extends boolean = false> = Grouped extends true
-      ? GroupedIndexerTransaction
-      : UngroupedIndexerTransaction
-    type UngroupedIndexerTransaction = {
-      txHash: Hash256
-      blockNumber: BlockNumber
-      ioIndex: number
-      ioType: IOType
-      txIndex: number
-    }
-    type GroupedIndexerTransaction = {
-      txHash: Hash256
-      blockNumber: BlockNumber
-      txIndex: number
-      cells: Array<[IOType, number]>
-    }
-    interface GetTransactionsResult<Grouped extends boolean = false> {
-      lastCursor: Hash256
-      objects: IndexerTransaction<Grouped>[]
-    }
-    interface CKBIndexerQueryOptions extends QueryOptions {
-      outputDataLenRange?: HexadecimalRange
-      outputCapacityRange?: HexadecimalRange
-      scriptLenRange?: HexadecimalRange
-      bufferSize?: number
-      withData?: boolean
-      groupByTransaction?: boolean
-    }
-    type HexadecimalRange = [string, string]
-    interface SearchFilter {
-      script?: Script
-      scriptLenRange?: HexadecimalRange
-      outputDataLenRange?: HexadecimalRange
-      outputCapacityRange?: HexadecimalRange
-      blockRange?: HexadecimalRange
-    }
-    interface SearchKey {
-      script: Script
-      scriptType: ScriptType
-      filter?: SearchFilter
-      scriptSearchMode?: ScriptSearchMode
-    }
-    interface GetLiveCellsResult<WithData extends boolean = true> {
-      lastCursor: string
-      objects: WithData extends true ? IndexerCell[] : IndexerCellWithoutData[]
-    }
-    interface GetCellsSearchKey<WithData extends boolean = boolean> extends SearchKey {
-      withData?: WithData
-    }
-    interface GetTransactionsSearchKey<Group extends boolean = boolean> extends SearchKey {
-      groupByTransaction?: Group
-    }
-    interface CellsCapacity {
-      capacity: Capacity
-      blockHash: Hash256
-      blockNumber: BlockNumber
-    }
-    interface BlockFilter {
-      data: api.HexString
-      hash: api.Hash
-    }
-    interface TransactionAndWitnessProof {
-      blockHash: Hash256
-      transactionsProof: api.MerkleProof
-      witnessesProof: api.MerkleProof
-    }
-    type TransactionView = api.Transaction & {
-      hash: api.Hash
-    }
-    interface BlockView {
-      header: BlockHeader
-      uncles: UncleBlock[]
-      transactions: TransactionView[]
-      proposals: ProposalShortId[]
-    }
-    type SerializedBlock = api.HexString
-    interface FeeRateStatistics {
-      mean: UInt64
-      median: UInt64
-    }
-    interface EstimateCycles {
-      cycles: UInt64
-    }
-    type DeploymentPos = api.DeploymentPos
-    type DeploymentState = api.DeploymentState
-    type DeploymentInfo = api.DeploymentInfo
-    type DeploymentsInfo = api.DeploymentsInfo
+    outputData: string
+    txIndex: string
+  }
+  interface IndexerCellWithoutData extends Omit<IndexerCell, 'outputData'> {
+    outputData: null
+  }
+  interface GetCellsResult<WithData extends boolean = true> {
+    lastCursor: string
+    objects: WithData extends true ? IndexerCell[] : IndexerCellWithoutData[]
+  }
+  type IndexerTransaction<Grouped extends boolean = false> = Grouped extends true
+    ? GroupedIndexerTransaction
+    : UngroupedIndexerTransaction
+  type UngroupedIndexerTransaction = {
+    txHash: Hash256
+    blockNumber: BlockNumber
+    ioIndex: number
+    ioType: IOType
+    txIndex: number
+  }
+  type GroupedIndexerTransaction = {
+    txHash: Hash256
+    blockNumber: BlockNumber
+    txIndex: number
+    cells: Array<[IOType, number]>
+  }
+  interface GetTransactionsResult<Grouped extends boolean = false> {
+    lastCursor: Hash256
+    objects: IndexerTransaction<Grouped>[]
+  }
+  interface CKBIndexerQueryOptions extends QueryOptions {
+    outputDataLenRange?: HexadecimalRange
+    outputCapacityRange?: HexadecimalRange
+    scriptLenRange?: HexadecimalRange
+    bufferSize?: number
+    withData?: boolean
+    groupByTransaction?: boolean
+  }
+  type HexadecimalRange = [string, string]
+  interface SearchFilter {
+    script?: Script
+    scriptLenRange?: HexadecimalRange
+    outputDataLenRange?: HexadecimalRange
+    outputCapacityRange?: HexadecimalRange
+    blockRange?: HexadecimalRange
+  }
+  interface SearchKey {
+    script: Script
+    scriptType: ScriptType
+    filter?: SearchFilter
+    scriptSearchMode?: ScriptSearchMode
+  }
+  interface GetLiveCellsResult<WithData extends boolean = true> {
+    lastCursor: string
+    objects: WithData extends true ? IndexerCell[] : IndexerCellWithoutData[]
+  }
+  interface GetCellsSearchKey<WithData extends boolean = boolean> extends SearchKey {
+    withData?: WithData
+  }
+  interface GetTransactionsSearchKey<Group extends boolean = boolean> extends SearchKey {
+    groupByTransaction?: Group
+  }
+  interface CellsCapacity {
+    capacity: Capacity
+    blockHash: Hash256
+    blockNumber: BlockNumber
+  }
+  interface BlockFilter {
+    data: api.HexString
+    hash: api.Hash
+  }
+  interface TransactionAndWitnessProof {
+    blockHash: Hash256
+    transactionsProof: api.MerkleProof
+    witnessesProof: api.MerkleProof
+  }
+  type TransactionView = api.Transaction & {
+    hash: api.Hash
+  }
+  interface BlockView {
+    header: BlockHeader
+    uncles: UncleBlock[]
+    transactions: TransactionView[]
+    proposals: ProposalShortId[]
+  }
+  type SerializedBlock = api.HexString
+  interface FeeRateStatistics {
+    mean: UInt64
+    median: UInt64
+  }
+  interface EstimateCycles {
+    cycles: UInt64
   }
-  //# sourceMappingURL=api.d.ts.map
+  type DeploymentPos = api.DeploymentPos
+  type DeploymentState = api.DeploymentState
+  type DeploymentInfo = api.DeploymentInfo
+  type DeploymentsInfo = api.DeploymentsInfo
 }
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
index 95f4f60ba0..0d4c69b4d2 100644
--- a/packages/neuron-wallet/src/utils/ckb-rpc.ts
+++ b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -3,7 +3,7 @@ import type { Block } from '@ckb-lumos/base'
 import type { Script } from '@ckb-lumos/base'
 import { HexString } from '@ckb-lumos/base'
 import { CKBRPC } from '@ckb-lumos/rpc'
-import { Method } from '@ckb-lumos/rpc/lib/method'
+import { Method as SdkRpcMethod } from '@ckb-lumos/rpc/lib/method'
 import * as resultFormatter from '@ckb-lumos/rpc/lib/resultFormatter'
 import { formatter as paramsFormatter } from '@ckb-lumos/rpc/lib/paramsFormatter'
 import { Base } from '@ckb-lumos/rpc/lib/Base'
@@ -12,11 +12,11 @@ import {
   PayloadInBatchException,
   IdNotMatchedInBatchException,
 } from '@ckb-lumos/rpc/lib/exceptions'
-import https from 'https'
-import http from 'http'
 import { request } from 'undici'
 import CommonUtils from './common'
 import { NetworkType } from '../models/network'
+import type { RPCConfig } from '@ckb-lumos/rpc/lib/types/common'
+import type { CKBComponents } from '@ckb-lumos/rpc/lib/types/api'
 
 export interface LightScriptFilter {
   script: Script
@@ -132,6 +132,12 @@ export class FullCKBRPC extends CKBRPC {
   }
 }
 
+class Method extends SdkRpcMethod {
+  constructor(node: CKBComponents.Node, options: CKBComponents.Method) {
+    super(node, options, rpcConfig)
+  }
+}
+
 export type FetchTransactionReturnType = {
   status: 'fetched' | 'fetching' | 'added' | 'not_found'
   txWithStatus?: CKBComponents.TransactionWithStatus
@@ -193,14 +199,14 @@ export class LightRPC extends Base {
     this.getTransactionInLight = new Method(this.node, {
       name: 'getTransaction',
       ...this.rpcProperties['getTransaction'],
-    }).call
+    }).call as Base['getTransaction']
     this.fetchTransaction = new Method(this.node, {
       name: 'fetchTransaction',
       ...lightRPCProperties['fetchTransaction'],
     }).call
   }
 
-  getTransaction = async (hash: string): Promise<CKBComponents.TransactionWithStatus> => {
+  getTransaction: Base['getTransaction'] = (async (hash: string) => {
     let tx = await this.getTransactionInLight(hash)
     if (!tx?.transaction) {
       tx = await CommonUtils.retry(3, 100, async () => {
@@ -215,7 +221,7 @@ export class LightRPC extends Base {
       }
     }
     return tx
-  }
+  }) as Base['getTransaction']
 
   getTipBlockNumber = async () => {
     const headerTip = await this.getTipHeader()
@@ -360,21 +366,8 @@ export class LightRPC extends Base {
   }
 }
 
-let httpsAgent: https.Agent
-let httpAgent: http.Agent
-
-const getHttpsAgent = () => {
-  if (!httpsAgent) {
-    httpsAgent = new https.Agent({ keepAlive: true })
-  }
-  return httpsAgent
-}
-
-const getHttpAgent = () => {
-  if (!httpAgent) {
-    httpAgent = new http.Agent({ keepAlive: true })
-  }
-  return httpAgent
+const rpcConfig: Partial<RPCConfig> = {
+  fetch: (request, init) => globalThis.fetch(request, { ...init, keepalive: true }),
 }
 
 export const generateRPC = (url: string, type: NetworkType) => {
@@ -382,12 +375,7 @@ export const generateRPC = (url: string, type: NetworkType) => {
   if (type === NetworkType.Light) {
     rpc = new LightRPC(url)
   } else {
-    rpc = new FullCKBRPC(url)
-  }
-  if (url?.startsWith('https')) {
-    rpc.setNode({ url, httpsAgent: getHttpsAgent() })
-  } else {
-    rpc.setNode({ url, httpAgent: getHttpAgent() })
+    rpc = new FullCKBRPC(url, rpcConfig)
   }
   return rpc
 }
diff --git a/packages/neuron-wallet/tests/utils/ckb-rpc.test.ts b/packages/neuron-wallet/tests/utils/ckb-rpc.test.ts
index ab04ab664a..8fc9e61e9d 100644
--- a/packages/neuron-wallet/tests/utils/ckb-rpc.test.ts
+++ b/packages/neuron-wallet/tests/utils/ckb-rpc.test.ts
@@ -12,9 +12,16 @@ describe('test ckb rpc file', () => {
       const result = generateRPC(BUNDLED_CKB_URL, NetworkType.Default)
       expect(result instanceof FullCKBRPC).toBeTruthy()
     })
-    it('url is https', () => {
-      const result = generateRPC('https://localhost:8114', NetworkType.Default)
-      expect(result.node.httpsAgent).toBeDefined()
+    it('fetch should be keepalive', async () => {
+      const fetch = globalThis.fetch
+      globalThis.fetch = jest.fn()
+
+      const rpc = generateRPC('https://localhost:8114', NetworkType.Default)
+      await rpc.getTipBlockNumber().catch(() => {})
+
+      expect((globalThis.fetch as unknown as jest.Mock).mock.calls[0][1]).toMatchObject({ keepalive: true })
+
+      globalThis.fetch = fetch
     })
   })
 })
diff --git a/yarn.lock b/yarn.lock
index 364f4a01a7..cc6b605164 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1757,14 +1757,14 @@
     js-xxhash "^1.0.4"
     lodash.isequal "^4.5.0"
 
-"@ckb-lumos/base@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.0-next.2.tgz#8d7ba32aa98f63de64f0140ef2e530a16450a382"
-  integrity sha512-1QiuVR7BD6RV2oq3CpM1RBMoPQ0E+F4e4MLwtg1kWRkN0UQWLin8OIDewb7hXsifU/ZpoTdluoCOGGV0CY1DkQ==
-  dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.2"
-    "@ckb-lumos/codec" "0.21.0-next.2"
-    "@ckb-lumos/toolkit" "0.21.0-next.2"
+"@ckb-lumos/base@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.1.tgz#1faf7909b5a68a124256d937cfb0fa03bb6b5457"
+  integrity sha512-7O+jBl7pqMsRbYTMNnbpamgaQzvaLZq+ftMtnKZ3A+Zbs6hZcGbz/6nfbRZnyJitPXQHRPT5KAQz6g+TiYqJGg==
+  dependencies:
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/codec" "0.21.1"
+    "@ckb-lumos/toolkit" "0.21.1"
     "@types/blake2b" "^2.1.0"
     "@types/lodash.isequal" "^4.5.5"
     blake2b "^2.1.3"
@@ -1778,10 +1778,10 @@
   dependencies:
     jsbi "^4.1.0"
 
-"@ckb-lumos/bi@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.0-next.2.tgz#0797e8774c00d3f4e609833050529e0f6e022620"
-  integrity sha512-3c8jC94eO57vFFo30g9Rh6qrfk5EF+7OD58hX1GknXaHwykMs3EBQodmA7DUV517dswkHy5IzI5gt5ROn9asjQ==
+"@ckb-lumos/bi@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.1.tgz#dfaa0968a9ffd990c1c4fcfc0711f20f09eb0485"
+  integrity sha512-6q8uesvu3DAM7GReei9H5seino4tnakTeg8uXtZBPDC6rboMohLCPQvEwhl1iHmsybXvBYVQt4Te1BPPZtuaRw==
   dependencies:
     jsbi "^4.1.0"
 
@@ -1797,16 +1797,16 @@
     cross-fetch "^3.1.5"
     events "^3.3.0"
 
-"@ckb-lumos/ckb-indexer@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.0-next.2.tgz#b151ffaea0b53ca989b336d6e9b539017450a475"
-  integrity sha512-Niwx2LPU0jH9La7ItSA1IHpX8Z025+qZHcUs1hDLIDHhxtqV5OiPRDrBAPn6B8iJMf1WqyaGLuqHZ6S5R1sEWw==
+"@ckb-lumos/ckb-indexer@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.1.tgz#a0e0ac3261c98181dc8c72e9e726030bb210779d"
+  integrity sha512-592pMVP3lwTXF7TmlOcayvGYKOhkYpjbLHUDo7By4yWbm7ZpdexaN5hn0X1sjJgMuee5prxGr9/fY684VTpJQw==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
-    "@ckb-lumos/codec" "0.21.0-next.2"
-    "@ckb-lumos/rpc" "0.21.0-next.2"
-    "@ckb-lumos/toolkit" "0.21.0-next.2"
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/codec" "0.21.1"
+    "@ckb-lumos/rpc" "0.21.1"
+    "@ckb-lumos/toolkit" "0.21.1"
     cross-fetch "^3.1.5"
     events "^3.3.0"
 
@@ -1817,12 +1817,12 @@
   dependencies:
     "@ckb-lumos/bi" "0.20.0"
 
-"@ckb-lumos/codec@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.0-next.2.tgz#d29465fc22c2b98182b6079453be7deb7d3fd1ba"
-  integrity sha512-yTtWIG9LESLTU3tBb9fHREWo2mO0Ts7SSL1Jp3MSqYbnl90JZeYr/skvn+vaV9/2Cl/6qEgeKYa1AnHNSLchkw==
+"@ckb-lumos/codec@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.1.tgz#160f21efa0cded6ea461eb6476f9af6010b682e0"
+  integrity sha512-z6IUUxVZrx663iC7VM9CmaQZL8jsdM3ybgz0UCS24JgBXTNec+Uz0/Zrl7yeH6fBpVls44C2wObcHKigKaNVAA==
   dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.1"
 
 "@ckb-lumos/common-scripts@0.20.0":
   version "0.20.0"
@@ -1838,18 +1838,18 @@
     "@ckb-lumos/toolkit" "0.20.0"
     immutable "^4.0.0-rc.12"
 
-"@ckb-lumos/common-scripts@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.0-next.2.tgz#222e58a96d92a4ddfa9e501fe2f0a5428c036e96"
-  integrity sha512-43r7DvXSccsi80NcXh0jaZT0MdQ+rhsElWBO2U3zRUt/55rV4HBaoo26Rj8h7esi0tVfDbiDrnc16ymN1V+B3w==
-  dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
-    "@ckb-lumos/codec" "0.21.0-next.2"
-    "@ckb-lumos/config-manager" "0.21.0-next.2"
-    "@ckb-lumos/helpers" "0.21.0-next.2"
-    "@ckb-lumos/rpc" "0.21.0-next.2"
-    "@ckb-lumos/toolkit" "0.21.0-next.2"
+"@ckb-lumos/common-scripts@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.1.tgz#64776b5ce55d8c66898a3ab592c7f77fe13d865e"
+  integrity sha512-EfZQ9wdxPmEsxVVwtBjhpZVKbYCm1FJkMt59ABsIO1Ub7yi0qap7AQl0MMbuLwWIGKwS2w0U3wx/oJPm7z1RXg==
+  dependencies:
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/codec" "0.21.1"
+    "@ckb-lumos/config-manager" "0.21.1"
+    "@ckb-lumos/helpers" "0.21.1"
+    "@ckb-lumos/rpc" "0.21.1"
+    "@ckb-lumos/toolkit" "0.21.1"
     immutable "^4.3.0"
 
 "@ckb-lumos/config-manager@0.20.0", "@ckb-lumos/config-manager@^0.20.0":
@@ -1863,14 +1863,14 @@
     "@types/deep-freeze-strict" "^1.1.0"
     deep-freeze-strict "^1.1.1"
 
-"@ckb-lumos/config-manager@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.0-next.2.tgz#ef08003193a49b248440fc73ce9207b1bb6a2a5f"
-  integrity sha512-dVyMcd5hbnTpN2nuukLOWv2J73hpuMf3ZRSO3asqAodKGZek74JhwOtZD9saCOItLYeOWdRRmzfXad34lDgHXg==
+"@ckb-lumos/config-manager@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.1.tgz#857050ebf2ca38096d8fae26b6a8927164798ca3"
+  integrity sha512-BmrNqYyaksdCKHWagyC8+R8GUxhIO+sOM5S925jlkpjju2sUbH0Id2/zmdb7I9KxdKnbx3WsR+hqy7/bYqw1lA==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
-    "@ckb-lumos/codec" "0.21.0-next.2"
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/codec" "0.21.1"
     "@types/deep-freeze-strict" "^1.1.0"
     deep-freeze-strict "^1.1.1"
 
@@ -1887,13 +1887,13 @@
     sha3 "^2.1.3"
     uuid "^8.3.0"
 
-"@ckb-lumos/hd@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.0-next.2.tgz#03239f9d31cd9daf70f224563e7733089194dbb6"
-  integrity sha512-wj6k0d39yJEKWlC1cjXezZ4Qjf0u6rG+R6zQdqRXZ2dUJ/n82+fX+hLSAcjOgm1mGNft/6c55IfCs5dag/xQVw==
+"@ckb-lumos/hd@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.1.tgz#406026ac2b570f72b4407149cb941d09bb8a0ab6"
+  integrity sha512-BnfpJf/sx/dJzL5BrOxPeKbKgv2x74KWd0xwjw1/gBQ2IMhu0S1mLwFsOT3Zu2nuhpQYvZGvr0cd3vD/SoMDow==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
     bn.js "^5.1.3"
     elliptic "^6.5.4"
     scrypt-js "^3.0.1"
@@ -1912,16 +1912,16 @@
     bech32 "^2.0.0"
     immutable "^4.0.0-rc.12"
 
-"@ckb-lumos/helpers@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.0-next.2.tgz#4a3ac9ff9e52f2063ce2c3670e2c72bb94acad45"
-  integrity sha512-pZkJwn4jV9uFICtS0Un0ftBnRvlC5BHAueeIBXwa7uclSFHxAejqr2lsM0KLavLBjK/kerOq182mejK9ejX/fQ==
+"@ckb-lumos/helpers@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.1.tgz#fffd455071f51556b2cd2539a255b3759893da08"
+  integrity sha512-jFN6DtWzwVNEY4kmnzczRaQqtyRJQwzAEuHRUQ0LqTiIGM+SlfgjH/l/InAG4cIhDOurMudnUJ4ex68wmbkhVw==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
-    "@ckb-lumos/codec" "0.21.0-next.2"
-    "@ckb-lumos/config-manager" "0.21.0-next.2"
-    "@ckb-lumos/toolkit" "0.21.0-next.2"
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/codec" "0.21.1"
+    "@ckb-lumos/config-manager" "0.21.1"
+    "@ckb-lumos/toolkit" "0.21.1"
     bech32 "^2.0.0"
     immutable "^4.3.0"
 
@@ -1951,13 +1951,13 @@
     axios "0.27.2"
     tslib "2.3.1"
 
-"@ckb-lumos/rpc@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.0-next.2.tgz#a840f18535c419448e982807f49ede7012ac7daf"
-  integrity sha512-WWV1x+I2mS8/CFlstSC2POrQ64TIgr7H8YjdA0jMT7o8Pt7qo2KXO4bFwSuPMgtdo2DKPSxTUS9zFjiZsWmXRw==
+"@ckb-lumos/rpc@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.1.tgz#f6a6b3ed6d76adfb84c148e4b4acadb7fbaa7d7a"
+  integrity sha512-gZWXYCyQ98s84Pb+buOiYL3HOIxQPLHQdCyo96GFerNw9lB1XsbaGWzfHPYpZvOQqYtnJ1GUfTkQkADrQ7hmew==
   dependencies:
-    "@ckb-lumos/base" "0.21.0-next.2"
-    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
     abort-controller "^3.0.0"
     cross-fetch "^3.1.5"
 
@@ -1966,12 +1966,12 @@
   resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0.tgz#8f71043324e50c8a3e94c65414325482d874cfca"
   integrity sha512-nLNXRPG20NqUdXwHAnKwr0T7nZyDrf4fGwIrsxo+7ffqWeg9wNEhZoqTBJLgxEpoe0I+WHRLwYLiwUbkkqR1SQ==
 
-"@ckb-lumos/toolkit@0.21.0-next.2":
-  version "0.21.0-next.2"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.0-next.2.tgz#13a4b0c39cd8240dde24647ac50890f2f7ef1970"
-  integrity sha512-pTTXn6NwwNv3Ms3uj9ywzA4UtiI84IDBw5TEWCAlz4JVwh2dqlncci0O0YboaNA0gg1cVYCITQFLJBQvXQkDRw==
+"@ckb-lumos/toolkit@0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.1.tgz#bcf4bf05615375087e3dd02fb087b797a8c67f37"
+  integrity sha512-awrFos7uQXEVGbqKSv/8Fc8B8XAfxdYoyYak4zFyAAmxxA0NiTTvk9V8TsOA7zVXpxct4Jal22+qUe+4Jg8T/g==
   dependencies:
-    "@ckb-lumos/bi" "0.21.0-next.2"
+    "@ckb-lumos/bi" "0.21.1"
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"

From c2ab3ac6e80717dbe4e0e30a9a7529c2cd4caf75 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Fri, 15 Dec 2023 21:50:08 +0800
Subject: [PATCH 10/68] fix: some ui issue (#2952)

* fix: some ui issue

* fix: some ui issue

* feat: validateCapacity

* fix: syncIcon

* fix: comments

* fix: releaseDate

* fix: Issue on UI withdrawing from NervosDao

* fix: releaseDate

* fix

---------

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../balanceSyncIcon.module.scss               |  2 +-
 .../GeneralSetting/generalSetting.module.scss |  6 +++++
 .../src/components/GeneralSetting/index.tsx   | 18 ++++++++++---
 .../components/History/history.module.scss    |  7 ++++++
 .../src/components/History/index.tsx          | 10 +++++++-
 .../src/components/NetworkSetting/index.tsx   |  6 ++++-
 .../neuron-ui/src/components/Send/index.tsx   |  2 +-
 .../SendFromMultisigDialog/hooks.ts           |  4 +--
 .../transactionStatusWrap.module.scss         |  1 +
 .../neuron-ui/src/containers/Main/hooks.ts    |  1 +
 packages/neuron-ui/src/exceptions/amount.ts   | 12 +++++++++
 packages/neuron-ui/src/locales/en.json        |  4 +--
 .../src/tests/validators/capacity/fixtures.ts | 20 +++++++++++++++
 .../tests/validators/capacity/index.test.ts   | 25 +++++++++++++++++++
 packages/neuron-ui/src/utils/hooks/index.ts   | 11 +++++---
 .../src/utils/validators/capacity.ts          | 19 ++++++++++++++
 .../neuron-ui/src/utils/validators/index.ts   |  1 +
 .../neuron-ui/src/widgets/Icons/Clean.svg     |  3 +++
 packages/neuron-ui/src/widgets/Icons/icon.tsx |  2 ++
 19 files changed, 139 insertions(+), 15 deletions(-)
 create mode 100644 packages/neuron-ui/src/tests/validators/capacity/fixtures.ts
 create mode 100644 packages/neuron-ui/src/tests/validators/capacity/index.test.ts
 create mode 100644 packages/neuron-ui/src/utils/validators/capacity.ts
 create mode 100644 packages/neuron-ui/src/widgets/Icons/Clean.svg

diff --git a/packages/neuron-ui/src/components/BalanceSyncingIcon/balanceSyncIcon.module.scss b/packages/neuron-ui/src/components/BalanceSyncingIcon/balanceSyncIcon.module.scss
index 116c7a0466..c51b395b6a 100644
--- a/packages/neuron-ui/src/components/BalanceSyncingIcon/balanceSyncIcon.module.scss
+++ b/packages/neuron-ui/src/components/BalanceSyncingIcon/balanceSyncIcon.module.scss
@@ -5,6 +5,6 @@
   margin-left: 4px;
 
   path {
-    fill: #ffffff;
+    fill: var(--main-text-color);
   }
 }
diff --git a/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss b/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss
index c9fb6d0603..e55142e967 100644
--- a/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss
+++ b/packages/neuron-ui/src/components/GeneralSetting/generalSetting.module.scss
@@ -85,6 +85,12 @@ $action-button-width: 11.25rem;
     background: var(--table-head-background-color);
     color: var(--dialog-secondary-text-color);
 
+    h1 {
+      &:first-child {
+        display: none;
+      }
+    }
+
     ul {
       list-style-type: disc;
       padding-left: 30px;
diff --git a/packages/neuron-ui/src/components/GeneralSetting/index.tsx b/packages/neuron-ui/src/components/GeneralSetting/index.tsx
index 8819e4b5eb..7866c4eaaa 100644
--- a/packages/neuron-ui/src/components/GeneralSetting/index.tsx
+++ b/packages/neuron-ui/src/components/GeneralSetting/index.tsx
@@ -18,7 +18,6 @@ interface UpdateDownloadStatusProps {
   onCancel: () => void
   progress: number
   newVersion: string
-  releaseDate: string
   releaseNotes: string
   progressInfo: null | State.ProgressInfo
 }
@@ -28,13 +27,13 @@ const UpdateDownloadStatus = ({
   onCancel,
   progress = 0,
   newVersion = '',
-  releaseDate = '',
   releaseNotes = '',
   progressInfo,
 }: UpdateDownloadStatusProps) => {
   const [t] = useTranslation()
   const available = newVersion !== '' && progress < 0
   const downloaded = progress >= 1
+  const [publishedAt, setPublishedAt] = useState('')
 
   const handleConfirm = useCallback(
     (e: React.FormEvent) => {
@@ -51,6 +50,18 @@ const UpdateDownloadStatus = ({
     [downloadUpdate, installUpdate]
   )
 
+  useEffect(() => {
+    if (available) {
+      fetch(`https://api.github.com/repos/nervosnetwork/neuron/releases/tags/v${newVersion}`)
+        .then(async res => {
+          // eslint-disable-next-line camelcase
+          const { published_at } = await res.json()
+          setPublishedAt(published_at)
+        })
+        .catch(() => {})
+    }
+  }, [available, setPublishedAt])
+
   if (available) {
     const releaseNotesHtml = () => {
       return { __html: releaseNotes }
@@ -72,7 +83,7 @@ const UpdateDownloadStatus = ({
       >
         <div className={styles.install}>
           <p className={styles.title}>
-            {newVersion} ({uniformTimeFormatter(new Date(releaseDate)).split(' ')[0]})
+            {newVersion} {publishedAt ? `(${uniformTimeFormatter(new Date(publishedAt)).split(' ')[0]})` : null}
           </p>
           <div className={styles.releaseNotesStyle}>
             <div dangerouslySetInnerHTML={releaseNotesHtml()} />
@@ -217,7 +228,6 @@ const GeneralSetting = ({ updater }: GeneralSettingProps) => {
         progress={updater.downloadProgress}
         progressInfo={updater.progressInfo}
         newVersion={updater.version}
-        releaseDate={updater.releaseDate}
         releaseNotes={updater.releaseNotes}
       />
 
diff --git a/packages/neuron-ui/src/components/History/history.module.scss b/packages/neuron-ui/src/components/History/history.module.scss
index 6f88e8e24d..c389de4ac8 100644
--- a/packages/neuron-ui/src/components/History/history.module.scss
+++ b/packages/neuron-ui/src/components/History/history.module.scss
@@ -37,6 +37,13 @@ body {
     font-weight: 500;
     padding-right: 10px;
   }
+  .searchBoxSuffix {
+    font-family: inherit;
+    display: flex;
+    align-items: center;
+    padding-left: 10px;
+    cursor: pointer;
+  }
   .exportButton {
     color: var(--main-text-color);
     border-color: var(--history-button-border);
diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index 1329d5281b..38c96c5429 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -6,7 +6,7 @@ import SUDTAvatar from 'widgets/SUDTAvatar'
 import Button from 'widgets/Button'
 import Table, { TableProps } from 'widgets/Table'
 import TextField from 'widgets/TextField'
-import { Download, Search, ArrowNext } from 'widgets/Icons/icon'
+import { Download, Search, ArrowNext, Clean } from 'widgets/Icons/icon'
 
 import PageContainer from 'components/PageContainer'
 import TransactionStatusWrap from 'components/TransactionStatusWrap'
@@ -47,6 +47,7 @@ const History = () => {
 
   const { keywords, onKeywordsChange } = useSearch(search, id, dispatch)
   const onSearch = useCallback(() => navigate(`${RoutePath.History}?keywords=${keywords}`), [navigate, keywords])
+  const onClean = useCallback(() => onKeywordsChange(undefined, ''), [onKeywordsChange])
   const onExport = useCallback(() => {
     setIsExporting(true)
     const timer = setTimeout(() => {
@@ -183,6 +184,13 @@ const History = () => {
                   <Search onClick={onSearch} />
                 </span>
               }
+              suffix={
+                keywords ? (
+                  <span className={styles.searchBoxSuffix}>
+                    <Clean onClick={onClean} />
+                  </span>
+                ) : null
+              }
               placeholder={t('history.search.placeholder')}
               className={styles.tableHeaderInput}
               stack={false}
diff --git a/packages/neuron-ui/src/components/NetworkSetting/index.tsx b/packages/neuron-ui/src/components/NetworkSetting/index.tsx
index e82447e235..7af39881f5 100644
--- a/packages/neuron-ui/src/components/NetworkSetting/index.tsx
+++ b/packages/neuron-ui/src/components/NetworkSetting/index.tsx
@@ -101,7 +101,11 @@ const NetworkSetting = ({ chain = chainState, settings: { networks = [] } }: Sta
           value: network.id,
           label: (
             <div className={styles.networkLabel}>
-              <p>{`${network.name} (${network.remote})`}</p>
+              <p>{`${network.name} (${
+                network.remote.length > 40
+                  ? `${network.remote.slice(0, 20)}...${network.remote.slice(-20)}`
+                  : network.remote
+              })`}</p>
               <div className={styles.tag}>{t(getNetworkLabelI18nkey(network.chain))}</div>
             </div>
           ),
diff --git a/packages/neuron-ui/src/components/Send/index.tsx b/packages/neuron-ui/src/components/Send/index.tsx
index 97240daadb..05b2cb61ca 100644
--- a/packages/neuron-ui/src/components/Send/index.tsx
+++ b/packages/neuron-ui/src/components/Send/index.tsx
@@ -169,7 +169,7 @@ const Send = () => {
     !send.generatedTx ||
     outputs.some(v => !v.address)
 
-  const outputErrors = useOutputErrors(outputs, isMainnet)
+  const outputErrors = useOutputErrors(outputs, isMainnet, isSendMax)
 
   const isMaxBtnDisabled = (() => {
     try {
diff --git a/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts b/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
index e183db9ff0..e2463e3c31 100644
--- a/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
+++ b/packages/neuron-ui/src/components/SendFromMultisigDialog/hooks.ts
@@ -133,7 +133,8 @@ export const useSendInfo = ({
     },
     [setSendInfoList]
   )
-  const outputErrors = useOutputErrors(sendInfoList, isMainnet)
+  const [isSendMax, setIsSendMax] = useState(false)
+  const outputErrors = useOutputErrors(sendInfoList, isMainnet, isSendMax)
   const totalAmount = useMemo(
     () => outputsToTotalAmount(sendInfoList.filter((v, idx) => !!v.amount && !outputErrors[idx].amountError)),
     [sendInfoList, outputErrors]
@@ -172,7 +173,6 @@ export const useSendInfo = ({
       }
     }, 300)
   }, [sendInfoList, setErrorMessage, multisigConfig, dispatch, t, isMainnet, outputErrors])
-  const [isSendMax, setIsSendMax] = useState(false)
   const onSendMaxClick = useCallback(() => {
     if (!isSendMax) {
       setIsSendMax(true)
diff --git a/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss b/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
index 7e87b9f483..c19f1df9b9 100644
--- a/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
+++ b/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
@@ -20,5 +20,6 @@
     color: #999;
     font-size: 12px;
     margin-left: 4px;
+    white-space: nowrap;
   }
 }
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
index b332e2ca9d..3111c1ca43 100644
--- a/packages/neuron-ui/src/containers/Main/hooks.ts
+++ b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -198,6 +198,7 @@ export const useSubscription = ({
       })
       CONNECTING_DEADLINE = Date.now() + CONNECTING_BUFFER
       currentNetworkIDCache.save(currentNetworkID)
+      updateAddressListAndBalance(walletID)(dispatch)
     })
     const connectionStatusSubscription = ConnectionStatusSubject.subscribe(status => {
       if (isCurrentUrl(status.url)) {
diff --git a/packages/neuron-ui/src/exceptions/amount.ts b/packages/neuron-ui/src/exceptions/amount.ts
index f24fd01d78..f148c17714 100644
--- a/packages/neuron-ui/src/exceptions/amount.ts
+++ b/packages/neuron-ui/src/exceptions/amount.ts
@@ -56,3 +56,15 @@ export class AmountNegativeException extends RangeError {
     this.i18n.fieldValue = value
   }
 }
+
+export class CapacityTooSmallException extends Error {
+  public code = ErrorCode.CapacityTooSmall
+  public i18n: {
+    bytes: string
+  }
+
+  constructor(bytes: string) {
+    super(`${I18N_PATH}${ErrorCode.CapacityTooSmall}`)
+    this.i18n = { bytes }
+  }
+}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 0720469ccc..08c1ba3add 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -678,7 +678,7 @@
       "cancel": "Cancel",
       "proceed": "Proceed",
       "compensation": "Compensation",
-      "notice-wait-time": "Notice: You are initiating withdrawn and the final withdrawn will need to wait for {{epochs}} epochs {{blocks}} blocks (about {{days} days).",
+      "notice-wait-time": "Notice: You are initiating withdrawn and the final withdrawn will need to wait for {{epochs}} epochs {{blocks}} blocks (about {{days}} days).",
       "deposit-dialog-title": "Deposit",
       "deposit-terms": "Nervos DAO needs 102 CKBytes for deposit cell storage, which is not compensation-bearing. <br />Please visit the <0>Nervos DAO RFC</0> for more information about Nervos DAO",
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKBytes",
@@ -728,7 +728,7 @@
     "nervos-dao-detail": {
       "tx-detail": "Transaction Detail",
       "deposited": "Deposited",
-      "withdrawn": "Withdrawn",
+      "withdrawn": "Withdraw",
       "unlocked": "Unlocked",
       "basic-information": "Basic Information",
       "transaction-hash": "Transaction Hash",
diff --git a/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts b/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts
new file mode 100644
index 0000000000..002fcad53b
--- /dev/null
+++ b/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts
@@ -0,0 +1,20 @@
+import { ErrorCode } from 'utils/enums'
+
+export default {
+  'Should throw an error when address is not a string': {
+    params: {
+      address: 'ckb1qrgqep8saj8agswr30pls73hra28ry8jlnlc3ejzh3dl2ju7xxpjxqgqqy28n5m69va267nv0wvsudngtxz8t9jwss3xkhpk',
+      amount: '62',
+      unit: 'ckb',
+    },
+    exception: ErrorCode.CapacityTooSmall,
+  },
+  'Should throw an error when address is required but not provided': {
+    params: {
+      address: 'ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2n0egquval9ljqm2ga6t9509kwcex5ejq3hy6dk',
+      amount: '62',
+      unit: 'ckb',
+    },
+    exception: null,
+  },
+}
diff --git a/packages/neuron-ui/src/tests/validators/capacity/index.test.ts b/packages/neuron-ui/src/tests/validators/capacity/index.test.ts
new file mode 100644
index 0000000000..d750f0b52f
--- /dev/null
+++ b/packages/neuron-ui/src/tests/validators/capacity/index.test.ts
@@ -0,0 +1,25 @@
+import { describe, test, expect } from '@jest/globals'
+import { isErrorWithI18n } from 'exceptions'
+import { validateCapacity } from 'utils/validators'
+import fixtures from './fixtures'
+
+const fixtureTable: Fixture.Validator<typeof validateCapacity>[] = Object.entries(fixtures).map(
+  ([title, { params, exception }]) => [title, [params], exception]
+)
+
+describe(`Test capacity validator`, () => {
+  test.each(fixtureTable)(`%s`, (_title, [params], exception) => {
+    if (exception) {
+      expect.assertions(2)
+      try {
+        validateCapacity(params)
+      } catch (err) {
+        expect(isErrorWithI18n(err)).toBeTruthy()
+        expect((err as { code: number }).code).toBe(exception)
+      }
+    } else {
+      expect.assertions(1)
+      expect(validateCapacity(params)).toBeTruthy()
+    }
+  })
+})
diff --git a/packages/neuron-ui/src/utils/hooks/index.ts b/packages/neuron-ui/src/utils/hooks/index.ts
index 0d2d63f131..9496c06422 100644
--- a/packages/neuron-ui/src/utils/hooks/index.ts
+++ b/packages/neuron-ui/src/utils/hooks/index.ts
@@ -23,6 +23,7 @@ import {
   validateAmount,
   validateAddress,
   validateAmountRange,
+  validateCapacity,
 } from 'utils/validators'
 import { MenuItemConstructorOptions, shell } from 'electron'
 import { ErrorWithI18n, isErrorWithI18n } from 'exceptions'
@@ -499,18 +500,22 @@ export const useForceUpdate = <T extends (...args: any[]) => void>(cb: T) => {
 }
 
 export const useOutputErrors = (
-  outputs: Partial<Record<'address' | 'amount' | 'date', string>>[],
-  isMainnet: boolean
+  outputs: Partial<Record<'address' | 'amount' | 'date' | 'unit', string>>[],
+  isMainnet: boolean,
+  isSendMax?: boolean
 ) => {
   return useMemo(
     () =>
-      outputs.map(({ address, amount, date }) => {
+      outputs.map(({ address, amount, date, unit }, index) => {
         let amountError: ErrorWithI18n | undefined
         if (amount !== undefined) {
           try {
             const extraSize = date ? CONSTANTS.SINCE_FIELD_SIZE : 0
             validateAmount(amount)
             validateAmountRange(amount, extraSize)
+            if (!(isSendMax && index === outputs.length - 1)) {
+              validateCapacity({ address, amount, unit })
+            }
           } catch (err) {
             if (isErrorWithI18n(err)) {
               amountError = err
diff --git a/packages/neuron-ui/src/utils/validators/capacity.ts b/packages/neuron-ui/src/utils/validators/capacity.ts
new file mode 100644
index 0000000000..2f3a53f0c6
--- /dev/null
+++ b/packages/neuron-ui/src/utils/validators/capacity.ts
@@ -0,0 +1,19 @@
+import { CKBToShannonFormatter } from 'utils/formatters'
+import { CapacityTooSmallException } from 'exceptions'
+import { bytes as byteUtils } from '@ckb-lumos/codec'
+import { ckbCore } from 'services/chain'
+
+export const validateCapacity = (item: State.Output) => {
+  const { amount, unit, address } = item
+  const capacity = CKBToShannonFormatter(amount, unit)
+  const script = ckbCore.utils.addressToScript(address as string)
+  const size = 1 + byteUtils.concat(script.args, script.codeHash).byteLength
+  const outputSize = 8 + byteUtils.bytify('0x').byteLength + size
+
+  if (BigInt(capacity) < BigInt(outputSize) * BigInt(10 ** 8)) {
+    throw new CapacityTooSmallException(outputSize.toString())
+  }
+
+  return true
+}
+export default validateCapacity
diff --git a/packages/neuron-ui/src/utils/validators/index.ts b/packages/neuron-ui/src/utils/validators/index.ts
index f17bd58683..9a2e61c4e6 100644
--- a/packages/neuron-ui/src/utils/validators/index.ts
+++ b/packages/neuron-ui/src/utils/validators/index.ts
@@ -13,3 +13,4 @@ export * from './tokenId'
 export * from './tokenName'
 export * from './symbol'
 export * from './decimal'
+export * from './capacity'
diff --git a/packages/neuron-ui/src/widgets/Icons/Clean.svg b/packages/neuron-ui/src/widgets/Icons/Clean.svg
new file mode 100644
index 0000000000..9edcc0df86
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Clean.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="M14.2211 2.90945C14.5336 2.59703 14.5336 2.0905 14.2211 1.77808C13.9087 1.46566 13.4022 1.46566 13.0898 1.77808L7.99921 6.86864L2.90864 1.77808C2.59622 1.46566 2.08969 1.46566 1.77727 1.77808C1.46485 2.0905 1.46485 2.59703 1.77727 2.90945L6.86784 8.00001L1.77606 13.0918C1.46364 13.4042 1.46364 13.9107 1.77606 14.2232C2.08848 14.5356 2.59501 14.5356 2.90743 14.2232L7.99921 9.13138L13.091 14.2232C13.4034 14.5356 13.9099 14.5356 14.2223 14.2232C14.5348 13.9107 14.5348 13.4042 14.2224 13.0918L9.13058 8.00001L14.2211 2.90945Z" fill="#666666"/>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index 464dc6e7d1..e58d9aa183 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -46,6 +46,7 @@ import { ReactComponent as AddressbookSvg } from './Addressbook.svg'
 import { ReactComponent as AddSvg } from './Add.svg'
 import { ReactComponent as AddSimpleSvg } from './AddSimple.svg'
 import { ReactComponent as SwitchSvg } from './Switch.svg'
+import { ReactComponent as CleanSvg } from './Clean.svg'
 import { ReactComponent as CellManageSvg } from './CellManage.svg'
 import { ReactComponent as LockSvg } from './Lock.svg'
 import { ReactComponent as LockCellSvg } from './LockCell.svg'
@@ -113,6 +114,7 @@ export const Addressbook = WrapSvg(AddressbookSvg, styles.withTheme)
 export const Add = WrapSvg(AddSvg)
 export const Switch = WrapSvg(SwitchSvg)
 export const AddSimple = WrapSvg(AddSimpleSvg)
+export const Clean = WrapSvg(CleanSvg)
 export const CellManage = WrapSvg(CellManageSvg, styles.withTheme)
 export const Lock = WrapSvg(LockSvg, styles.withTheme)
 export const LockCell = WrapSvg(LockCellSvg)

From 6640e21ea970da3913ccf826ab83d3aea6f646db Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 19 Dec 2023 15:40:35 +0900
Subject: [PATCH 11/68] Bump dependencies (#2980)

* chore(deps): update dependency lerna to v7.4.2 (#314)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency jest-when to v3.6.0 (#313)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency jest-styled-components to v7.2.0 (#312)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (#320)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (#318)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (#321)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency react-i18next to v13.5.0 (#325)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @babel/core to v7.23.5 (#327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency typescript to v5.3.3

* chore(deps): update dependency @types/enzyme to v3.10.18 (#328)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: update reviewers of renovate (#330)

* refactor: introduce tslib

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json                        |   6 +-
 packages/neuron-ui/package.json     |   9 +-
 packages/neuron-wallet/package.json |   7 +-
 renovate.json                       |   2 +-
 tsconfig.json                       |   3 +-
 yarn.lock                           | 887 ++++++++++++++++++++--------
 6 files changed, 672 insertions(+), 242 deletions(-)

diff --git a/package.json b/package.json
index 21b80bd5ec..de208d177c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "update:client-versions": "node ./scripts/update-ckb-client-versions.js"
   },
   "devDependencies": {
-    "@babel/core": "7.23.3",
+    "@babel/core": "7.23.5",
     "@types/jest": "27.5.2",
     "@types/node": "18.16.18",
     "@types/npmlog": "4.1.6",
@@ -53,12 +53,12 @@
     "eslint-config-prettier": "8.10.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
-    "lerna": "7.1.0",
+    "lerna": "7.4.2",
     "lint-staged": "13.3.0",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
     "ts-jest": "29.1.1",
-    "typescript": "5.3.2",
+    "typescript": "5.3.3",
     "wait-on": "7.0.1"
   },
   "dependencies": {},
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 6a8520f77e..f9253e0dce 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -65,7 +65,8 @@
     "react-i18next": "12.1.5",
     "react-router-dom": "6.14.0",
     "react-transition-group": "4.4.5",
-    "sass": "1.63.6"
+    "sass": "1.63.6",
+    "tslib": "2.6.2"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
@@ -80,7 +81,7 @@
     "@storybook/react": "7.0.24",
     "@storybook/react-webpack5": "7.0.24",
     "@storybook/testing-library": "0.2.2",
-    "@types/enzyme": "3.10.16",
+    "@types/enzyme": "3.10.18",
     "@types/enzyme-adapter-react-16": "1.0.9",
     "@types/node": "18.16.18",
     "@types/react": "17.0.71",
@@ -93,10 +94,10 @@
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.29.0",
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-react": "7.32.2",
-    "jest-styled-components": "7.1.1",
+    "jest-styled-components": "7.2.0",
     "react-app-rewired": "2.2.1",
     "react-scripts": "5.0.1",
     "react-test-renderer": "16.14.0",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index e7d7aca14f..6e040ee8a5 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -72,6 +72,7 @@
     "sha3": "2.1.4",
     "sqlite3": "5.1.6",
     "subleveldown": "4.1.4",
+    "tslib": "2.6.2",
     "typeorm": "0.2.45",
     "undici": "5.26.2",
     "uuid": "8.3.2"
@@ -84,7 +85,7 @@
     "@types/electron-devtools-installer": "2.2.5",
     "@types/elliptic": "6.4.18",
     "@types/iarna__toml": "2.0.5",
-    "@types/jest-when": "3.5.2",
+    "@types/jest-when": "3.5.5",
     "@types/ledgerhq__hw-transport": "4.21.8",
     "@types/ledgerhq__hw-transport-node-hid": "4.22.5",
     "@types/leveldown": "4.0.6",
@@ -96,8 +97,8 @@
     "electron-build-env": "0.2.0",
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",
-    "jest-when": "3.5.2",
+    "jest-when": "3.6.0",
     "neuron-ui": "0.112.0",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   }
 }
diff --git a/renovate.json b/renovate.json
index 44ba1e0835..3407c63b12 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,5 +8,5 @@
       "addLabels": ["types"]
     }
   ],
-  "reviewers": ["keith-cy", "yanguoyu", "jeffreyma597", "devchenyan", "WhiteMinds"]
+  "reviewers": ["Magickbase/neuron"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 594cf4c570..322b0c8d83 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,7 @@
     "removeComments": true,
     "preserveConstEnums": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "importHelpers": true,
   }
 }
diff --git a/yarn.lock b/yarn.lock
index cc6b605164..9d4e90fcc6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -61,6 +61,14 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
+"@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5", "@babel/compat-data@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
@@ -71,21 +79,21 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
-  integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
+"@babel/core@7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7"
+  integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.3"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.5"
     "@babel/helper-compilation-targets" "^7.22.15"
     "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.2"
-    "@babel/parser" "^7.23.3"
+    "@babel/helpers" "^7.23.5"
+    "@babel/parser" "^7.23.5"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.3"
-    "@babel/types" "^7.23.3"
+    "@babel/traverse" "^7.23.5"
+    "@babel/types" "^7.23.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -153,22 +161,12 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e"
-  integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
+"@babel/generator@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755"
+  integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==
   dependencies:
-    "@babel/types" "^7.23.3"
+    "@babel/types" "^7.23.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -444,6 +442,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
 "@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
@@ -488,14 +491,14 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
-  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
+"@babel/helpers@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e"
+  integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.2"
-    "@babel/types" "^7.23.0"
+    "@babel/traverse" "^7.23.5"
+    "@babel/types" "^7.23.5"
 
 "@babel/highlight@^7.22.13":
   version "7.22.13"
@@ -515,6 +518,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
@@ -525,15 +537,10 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
   integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
 
-"@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
-
-"@babel/parser@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9"
-  integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
+"@babel/parser@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563"
+  integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==
 
 "@babel/parser@~7.21.2":
   version "7.21.9"
@@ -1600,9 +1607,9 @@
     regenerator-runtime "^0.13.11"
 
 "@babel/runtime@^7.22.5":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
-  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e"
+  integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -1640,35 +1647,19 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
-  integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
+"@babel/traverse@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec"
+  integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.3"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.5"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.3"
-    "@babel/types" "^7.23.3"
+    "@babel/parser" "^7.23.5"
+    "@babel/types" "^7.23.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -1715,12 +1706,12 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598"
-  integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
+"@babel/types@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602"
+  integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
@@ -2952,32 +2943,84 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@lerna/child-process@7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.1.0.tgz#c3bde37e38822e0506e1ff3cda8b206417b2cf43"
-  integrity sha512-NmpwxygdVW2xprCNNgZ9d6P/pRlaXX2vfUynYNS+jsv7Q2uDZSdW86kjwEgbWyjSu7quZsmpQLqpl6PnfFl82g==
+"@lerna/child-process@7.4.2":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.4.2.tgz#a2fd013ac2150dc288270d3e0d0b850c06bec511"
+  integrity sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==
   dependencies:
     chalk "^4.1.0"
     execa "^5.0.0"
     strong-log-transformer "^2.1.0"
 
-"@lerna/create@7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.1.0.tgz#0bf1911ca1bfd6cea9820aaeefe7fd1136f52a26"
-  integrity sha512-qmj1c9J9AmMdiZW7akK7PVhUK3rwHnOgOBrz7TL0eoHsCE9kda+5VWiKFKSyDqq2zSai+a5OZU/pfkaPm8FygA==
+"@lerna/create@7.4.2":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.4.2.tgz#f845fad1480e46555af98bd39af29571605dddc9"
+  integrity sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==
   dependencies:
-    "@lerna/child-process" "7.1.0"
+    "@lerna/child-process" "7.4.2"
+    "@npmcli/run-script" "6.0.2"
+    "@nx/devkit" ">=16.5.1 < 17"
+    "@octokit/plugin-enterprise-rest" "6.0.1"
+    "@octokit/rest" "19.0.11"
+    byte-size "8.1.1"
+    chalk "4.1.0"
+    clone-deep "4.0.1"
+    cmd-shim "6.0.1"
+    columnify "1.6.0"
+    conventional-changelog-core "5.0.1"
+    conventional-recommended-bump "7.0.1"
+    cosmiconfig "^8.2.0"
     dedent "0.7.0"
+    execa "5.0.0"
     fs-extra "^11.1.1"
+    get-stream "6.0.0"
+    git-url-parse "13.1.0"
+    glob-parent "5.1.2"
+    globby "11.1.0"
+    graceful-fs "4.2.11"
+    has-unicode "2.0.1"
+    ini "^1.3.8"
     init-package-json "5.0.0"
+    inquirer "^8.2.4"
+    is-ci "3.0.1"
+    is-stream "2.0.0"
+    js-yaml "4.1.0"
+    libnpmpublish "7.3.0"
+    load-json-file "6.2.0"
+    lodash "^4.17.21"
+    make-dir "4.0.0"
+    minimatch "3.0.5"
+    multimatch "5.0.0"
+    node-fetch "2.6.7"
     npm-package-arg "8.1.1"
+    npm-packlist "5.1.1"
+    npm-registry-fetch "^14.0.5"
+    npmlog "^6.0.2"
+    nx ">=16.5.1 < 17"
+    p-map "4.0.0"
+    p-map-series "2.1.0"
+    p-queue "6.6.2"
     p-reduce "^2.1.0"
     pacote "^15.2.0"
     pify "5.0.0"
+    read-cmd-shim "4.0.0"
+    read-package-json "6.0.4"
+    resolve-from "5.0.0"
+    rimraf "^4.4.1"
     semver "^7.3.4"
+    signal-exit "3.0.7"
     slash "^3.0.0"
+    ssri "^9.0.1"
+    strong-log-transformer "2.1.0"
+    tar "6.1.11"
+    temp-dir "1.0.0"
+    upath "2.0.1"
+    uuid "^9.0.0"
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "5.0.0"
+    write-file-atomic "5.0.1"
+    write-pkg "4.0.0"
+    yargs "16.2.0"
     yargs-parser "20.2.4"
 
 "@malept/cross-spawn-promise@^1.1.0":
@@ -3165,81 +3208,83 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
-"@nrwl/devkit@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.3.2.tgz#b45393dfd62dcb75554ff0c2dff6715a907e3877"
-  integrity sha512-EiDwVIvh6AcClXv22Q7auQh7Iy/ONISEFWzTswy/J6ZmVGCQesbiwg4cGV0MKiScr+awdVzqyNey+wD6IR5Lkw==
+"@nrwl/devkit@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.10.0.tgz#ac8c5b4db00f12c4b817c937be2f7c4eb8f2593c"
+  integrity sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==
   dependencies:
-    "@nx/devkit" "16.3.2"
+    "@nx/devkit" "16.10.0"
 
-"@nrwl/tao@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.3.2.tgz#eefc1974342afbbe48e4e5351d6707ad2f9fb179"
-  integrity sha512-2Kg7dtv6JcQagCZPSq+okceI81NqmXGGgbKWqS7sOfdmp1otxS9uiUFNXw+Pdtnw38mdRviMtSOXScntu4sUKg==
+"@nrwl/tao@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.10.0.tgz#94642a0380709b8e387e1e33705a5a9624933375"
+  integrity sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==
   dependencies:
-    nx "16.3.2"
+    nx "16.10.0"
+    tslib "^2.3.0"
 
-"@nx/devkit@16.3.2", "@nx/devkit@>=16.1.3 < 17":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.3.2.tgz#95d58d104449c54bdc276fa1c9166fcad867cfa8"
-  integrity sha512-1ev3EDm2Sx/ibziZroL1SheqxDR7UgC49tkBgJz1GrQLQnfdhBYroCPSyBSWGPMLHjIuHb3+hyGSV1Bz+BIYOA==
+"@nx/devkit@16.10.0", "@nx/devkit@>=16.5.1 < 17":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.10.0.tgz#7e466be2dee2dcb1ccaf286786ca2a0a639aa007"
+  integrity sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==
   dependencies:
-    "@nrwl/devkit" "16.3.2"
+    "@nrwl/devkit" "16.10.0"
     ejs "^3.1.7"
+    enquirer "~2.3.6"
     ignore "^5.0.4"
-    semver "7.3.4"
+    semver "7.5.3"
     tmp "~0.2.1"
     tslib "^2.3.0"
 
-"@nx/nx-darwin-arm64@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.3.2.tgz#83b6e78b27d2d7da8f7626560f52070c8735d28a"
-  integrity sha512-YfYVNfsJBzBcBnJUU4AcA6A4QMkgnVlETfp4KGL36Otq542mRY1ISGHdox63ocI5AKh5gay5AaGcR4wR9PU9Vg==
-
-"@nx/nx-darwin-x64@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.3.2.tgz#0ae2a64356542c5fb73ca8038ce10ec4512e7fcb"
-  integrity sha512-bJtpozz0zSRVRrcQ76GrlT3TWEGTymLYWrVG51bH5KZ46t6/a4EQBI3uL3vubMmOZ0jR4ywybOcPBBhxmBJ68w==
-
-"@nx/nx-freebsd-x64@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.3.2.tgz#202adf4d6070f47ed46450f006ecd50851147c74"
-  integrity sha512-ZvufI0bWqT67nLbBo6ejrIGxypdoedRQTP/tudWbs/4isvxLe1uVku1BfKCTQUsJG367SqNOU1H5kzI/MRr3ow==
-
-"@nx/nx-linux-arm-gnueabihf@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.3.2.tgz#62314a82566e3647866b9dd4167a2d0e1397f001"
-  integrity sha512-IQL4kxdiZLvifar7+SIum3glRuVsxtE0dL8RvteSDXrxDQnaTUrjILC+VGhalRmk7ngBbGKNrhWOeeL7390CzQ==
-
-"@nx/nx-linux-arm64-gnu@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.3.2.tgz#02826400aa55b8f44bac83332dd29647d0e95001"
-  integrity sha512-f6AWgPVu3mfUEoOBa0rY2/7QY0Or9eR0KtLFpcPh7RUpxPw2EXzIbjD/0RGipdpspSrgiMKbZpsUjo6mXBFsQA==
-
-"@nx/nx-linux-arm64-musl@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.3.2.tgz#a0a81520e0904aa026a7ab0a8a3bf3facec9f14c"
-  integrity sha512-AvrWcYz7021E3b5P9/0i26p60XMZfw86Epks51L6AhlflarlOH4AcEChc7APMtb1ELAIbDWx2S6oIDRbQ7rtVA==
-
-"@nx/nx-linux-x64-gnu@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.3.2.tgz#e79b5c142ec8d9bfb458ea5803bc4b62abbcf296"
-  integrity sha512-K2pWGAcbCNm6b7UZI9cc8z4Rb540QcuepBXD7akjPjWerzXriT6VCn4i9mVKsCg2mwSfknTJJVJ1PZwJSmTl/Q==
-
-"@nx/nx-linux-x64-musl@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.3.2.tgz#900aee8f171638b9fb44378e2ac0548cb4aa99a7"
-  integrity sha512-sY1QDuQlqyYiRPJZanrtV07tU0DOXiCrWb0pDsGiO0qHuUSmW5Vw17GWEY4z3rt0/5U8fJ+/9WQrneviOmsOKg==
-
-"@nx/nx-win32-arm64-msvc@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.3.2.tgz#88db772b3535648e147b1a0206b1a1fe875fa9a5"
-  integrity sha512-wBfohT2hjrLKn9WFHvG0MFVk7uYhgYNiptnTLdTouziHgFyZ08vyl7XYBq55BwHPMQ5iswVoEfjn/5ZBfCPscg==
-
-"@nx/nx-win32-x64-msvc@16.3.2":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.3.2.tgz#2195faaf1fc465c7a89bfdd62323fdd2a5d91f15"
-  integrity sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw==
+"@nx/nx-darwin-arm64@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz#0c73010cac7a502549483b12bad347da9014e6f1"
+  integrity sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==
+
+"@nx/nx-darwin-x64@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz#2ccf270418d552fd0a8e0d6089aee4944315adaa"
+  integrity sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==
+
+"@nx/nx-freebsd-x64@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz#c3ee6914256e69493fed9355b0d6661d0e86da44"
+  integrity sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==
+
+"@nx/nx-linux-arm-gnueabihf@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz#a961eccbb38acb2da7fc125b29d1fead0b39152f"
+  integrity sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==
+
+"@nx/nx-linux-arm64-gnu@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz#795f20072549d03822b5c4639ef438e473dbb541"
+  integrity sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==
+
+"@nx/nx-linux-arm64-musl@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz#f2428ee6dbe2b2c326e8973f76c97666def33607"
+  integrity sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==
+
+"@nx/nx-linux-x64-gnu@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz#d36c2bcf94d49eaa24e3880ddaf6f1f617de539b"
+  integrity sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==
+
+"@nx/nx-linux-x64-musl@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.10.0.tgz#78bd2ab97a583b3d4ea3387b67fd7b136907493c"
+  integrity sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==
+
+"@nx/nx-win32-arm64-msvc@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz#ef20ec8d0c83d66e73e20df12d2c788b8f866396"
+  integrity sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==
+
+"@nx/nx-win32-x64-msvc@16.10.0":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz#7410a51d0f8be631eec9552f01b2e5946285927c"
+  integrity sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==
 
 "@octokit/auth-token@^3.0.0":
   version "3.0.4"
@@ -4676,10 +4721,10 @@
     "@types/cheerio" "*"
     "@types/react" "^16"
 
-"@types/enzyme@3.10.16":
-  version "3.10.16"
-  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.16.tgz#100c49093f694545fc903266b2eb410df08859a9"
-  integrity sha512-17uMdJjSKjvdn/MhO/G2lRNPZGvJxFpvgONrsRoS1+khtJ6UcnCwC9v3gk2UqPyAkMZb6a1VYxScc/vOgkDl9w==
+"@types/enzyme@3.10.18":
+  version "3.10.18"
+  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.18.tgz#86010e7cb56cf1450dd391b8cc3a788f6a6fadef"
+  integrity sha512-RaO/TyyHZvXkpzinbMTZmd/S5biU4zxkvDsn22ujC29t9FMSzq8tnn8f2MxQ2P8GVhFRG5jTAL05DXKyTtpEQQ==
   dependencies:
     "@types/cheerio" "*"
     "@types/react" "^16"
@@ -4844,10 +4889,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest-when@3.5.2":
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/@types/jest-when/-/jest-when-3.5.2.tgz#7e6225e827267d26f115dc97da6403a3b37556c5"
-  integrity sha512-1WP+wJDW7h4TYAVLoIebxRIVv8GPk66Qsq2nU7PkwKZ6usurnDQZgk0DfBNKAJ9gVzapCXSV53Vn/3nBHBNzAw==
+"@types/jest-when@3.5.5":
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/@types/jest-when/-/jest-when-3.5.5.tgz#c23e97945959277946c15eff2a2fe51d18743045"
+  integrity sha512-H9MDPIrz7NOu6IXP9OHExNN9LnJbGYAzRsGIDKxWr7Fth9vovemNV8yFbkUWLSEmuA8PREvAEvt9yK0PPLmFHA==
   dependencies:
     "@types/jest" "*"
 
@@ -5590,7 +5635,7 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-"@yarnpkg/parsers@^3.0.0-rc.18":
+"@yarnpkg/parsers@3.0.0-rc.46":
   version "3.0.0-rc.46"
   resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01"
   integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==
@@ -6077,6 +6122,17 @@ array-includes@^3.1.5, array-includes@^3.1.6:
     get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-string "^1.0.7"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -6108,6 +6164,17 @@ array.prototype.find@^2.1.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.2.1"
+
 array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -6118,6 +6185,16 @@ array.prototype.flat@^1.2.3, array.prototype.flat@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
 array.prototype.flatmap@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
@@ -6128,6 +6205,16 @@ array.prototype.flatmap@^1.3.1:
     es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
 array.prototype.reduce@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
@@ -6150,6 +6237,19 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -7062,6 +7162,15 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -7672,10 +7781,10 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
-conventional-changelog-angular@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541"
-  integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==
+conventional-changelog-angular@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz#5eec8edbff15aa9b1680a8dcfbd53e2d7eb2ba7a"
+  integrity sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==
   dependencies:
     compare-func "^2.0.0"
 
@@ -8255,6 +8364,15 @@ deferred-leveldown@~5.3.0:
     abstract-leveldown "~6.2.1"
     inherits "^2.0.3"
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -8421,6 +8539,11 @@ diff-sequences@^29.4.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
   integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
+
 dir-compare@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
@@ -8620,7 +8743,7 @@ dot-prop@^5.1.0:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv-expand@^10.0.0:
+dotenv-expand@^10.0.0, dotenv-expand@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-10.0.0.tgz#12605d00fb0af6d0a592e6558585784032e4ef37"
   integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==
@@ -8635,12 +8758,12 @@ dotenv@8.6.0, dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
-dotenv@^10.0.0, dotenv@~10.0.0:
+dotenv@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
-dotenv@^16.0.0:
+dotenv@^16.0.0, dotenv@~16.3.1:
   version "16.3.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
   integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
@@ -9035,6 +9158,51 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.5"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.12"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.13"
+
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
@@ -9225,7 +9393,16 @@ eslint-import-resolver-node@^0.3.7:
     is-core-module "^2.11.0"
     resolve "^1.22.1"
 
-eslint-module-utils@^2.7.4:
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
+
+eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
   integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
@@ -9240,7 +9417,30 @@ eslint-plugin-flowtype@^8.0.3:
     lodash "^4.17.21"
     string-natural-compare "^3.0.1"
 
-eslint-plugin-import@2.27.5, eslint-plugin-import@^2.25.3:
+eslint-plugin-import@2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+  dependencies:
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
+
+eslint-plugin-import@^2.25.3:
   version "2.27.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
   integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
@@ -9788,17 +9988,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
 fast-glob@^3.2.12, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -10201,6 +10390,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototype.name@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
@@ -10211,6 +10405,16 @@ function.prototype.name@^1.1.0, function.prototype.name@^1.1.2, function.prototy
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
+
 functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -10265,6 +10469,16 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-npm-tarball-url@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz#67dff908d699e9e2182530ae6e939a93e5f8dfdb"
@@ -10740,6 +10954,13 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -11339,6 +11560,13 @@ is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-mo
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.13.0, is-core-module@^2.13.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -11632,6 +11860,13 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+is-typed-array@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -11884,6 +12119,16 @@ jest-diff@^27.5.1:
     jest-get-type "^27.5.1"
     pretty-format "^27.5.1"
 
+jest-diff@^29.4.1:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
 jest-docblock@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
@@ -11937,6 +12182,11 @@ jest-get-type@^29.4.3:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
   integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
 
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+
 jest-haste-map@^25.5.1:
   version "25.5.1"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.5.1.tgz#1df10f716c1d94e60a1ebf7798c9fb3da2620943"
@@ -12248,10 +12498,10 @@ jest-snapshot@^27.5.1:
     pretty-format "^27.5.1"
     semver "^7.3.2"
 
-jest-styled-components@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.1.1.tgz#faf19c733e0de4bbef1f9151955b99e839b7df48"
-  integrity sha512-OUq31R5CivBF8oy81dnegNQrRW13TugMol/Dz6ZnFfEyo03exLASod7YGwyHGuayYlKmCstPtz0RQ1+NrAbIIA==
+jest-styled-components@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.2.0.tgz#67e768b98d3d58513341a62baca76f3e253a4deb"
+  integrity sha512-gwyyveNjvuRA0pyhbQoydXZllLZESs2VuL5fXCabzh0buHPAOUfANtW7n5YMPmdC0sH3VB7h2eUGZ23+tjvaBA==
   dependencies:
     "@adobe/css-tools" "^4.0.1"
 
@@ -12366,10 +12616,10 @@ jest-watcher@^28.0.0:
     jest-util "^28.1.3"
     string-length "^4.0.1"
 
-jest-when@3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/jest-when/-/jest-when-3.5.2.tgz#651d8a73751ab55c29698d388dffd3460cd52bdc"
-  integrity sha512-4rDvnhaWh08RcPsoEVXgxRnUIE9wVIbZtGqZ5x2Wm9Ziz9aQs89PipQFmOK0ycbEhVAgiV3MUeTXp3Ar4s2FcQ==
+jest-when@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jest-when/-/jest-when-3.6.0.tgz#b46ee408d68f671447b218f2ae6bd93fb5028acf"
+  integrity sha512-+cZWTy0ekAJo7M9Om0Scdor1jm3wDiYJWmXE8U22UVnkH54YCXAuaqz3P+up/FdtOg8g4wHOxV7Thd7nKhT6Dg==
 
 jest-worker@^25.5.0:
   version "25.5.0"
@@ -12737,15 +12987,15 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lerna@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.1.0.tgz#68855362c8a18f2c9ce14c01793076d2f7aea7c0"
-  integrity sha512-fY1EctsuP21eR7F9zmnqcdtBRkzvsoAOVYzjrtQQXYt9hlyA14RvjQJIF7R54t+T60As7kFYNgw2PHsC3orV2w==
+lerna@7.4.2:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.4.2.tgz#03497125d7b7c8d463eebfe17a701b16bde2ad09"
+  integrity sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==
   dependencies:
-    "@lerna/child-process" "7.1.0"
-    "@lerna/create" "7.1.0"
+    "@lerna/child-process" "7.4.2"
+    "@lerna/create" "7.4.2"
     "@npmcli/run-script" "6.0.2"
-    "@nx/devkit" ">=16.1.3 < 17"
+    "@nx/devkit" ">=16.5.1 < 17"
     "@octokit/plugin-enterprise-rest" "6.0.1"
     "@octokit/rest" "19.0.11"
     byte-size "8.1.1"
@@ -12753,7 +13003,7 @@ lerna@7.1.0:
     clone-deep "4.0.1"
     cmd-shim "6.0.1"
     columnify "1.6.0"
-    conventional-changelog-angular "6.0.0"
+    conventional-changelog-angular "7.0.0"
     conventional-changelog-core "5.0.1"
     conventional-recommended-bump "7.0.1"
     cosmiconfig "^8.2.0"
@@ -12779,7 +13029,8 @@ lerna@7.1.0:
     libnpmaccess "7.0.2"
     libnpmpublish "7.3.0"
     load-json-file "6.2.0"
-    make-dir "3.1.0"
+    lodash "^4.17.21"
+    make-dir "4.0.0"
     minimatch "3.0.5"
     multimatch "5.0.0"
     node-fetch "2.6.7"
@@ -12787,7 +13038,7 @@ lerna@7.1.0:
     npm-packlist "5.1.1"
     npm-registry-fetch "^14.0.5"
     npmlog "^6.0.2"
-    nx ">=16.1.3 < 17"
+    nx ">=16.5.1 < 17"
     p-map "4.0.0"
     p-map-series "2.1.0"
     p-pipe "3.1.0"
@@ -13212,12 +13463,12 @@ magic-string@^0.25.0, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+make-dir@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
-    semver "^6.0.0"
+    semver "^7.5.3"
 
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
@@ -13227,6 +13478,13 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-error@1.x:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -13949,6 +14207,11 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
+node-machine-id@1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
+  integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
+
 node-releases@^2.0.12:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
@@ -14175,36 +14438,38 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
   integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
 
-nx@16.3.2, "nx@>=16.1.3 < 17":
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-16.3.2.tgz#92a2d7ef06d15b3b111b7cf9d35de08de0a22d90"
-  integrity sha512-fOzCVL7qoCJAcYTJwvJ9j+PSaL791ro4AICWuLxaphZsp2jcLoav4Ev7ONPks2Wlkt8FS9bee3nqQ3w1ya36Og==
+nx@16.10.0, "nx@>=16.5.1 < 17":
+  version "16.10.0"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-16.10.0.tgz#b070461f7de0a3d7988bd78558ea84cda3543ace"
+  integrity sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==
   dependencies:
-    "@nrwl/tao" "16.3.2"
+    "@nrwl/tao" "16.10.0"
     "@parcel/watcher" "2.0.4"
     "@yarnpkg/lockfile" "^1.1.0"
-    "@yarnpkg/parsers" "^3.0.0-rc.18"
+    "@yarnpkg/parsers" "3.0.0-rc.46"
     "@zkochan/js-yaml" "0.0.6"
     axios "^1.0.0"
     chalk "^4.1.0"
     cli-cursor "3.1.0"
     cli-spinners "2.6.1"
-    cliui "^7.0.2"
-    dotenv "~10.0.0"
+    cliui "^8.0.1"
+    dotenv "~16.3.1"
+    dotenv-expand "~10.0.0"
     enquirer "~2.3.6"
-    fast-glob "3.2.7"
     figures "3.2.0"
     flat "^5.0.2"
     fs-extra "^11.1.0"
     glob "7.1.4"
     ignore "^5.0.4"
+    jest-diff "^29.4.1"
     js-yaml "4.1.0"
     jsonc-parser "3.2.0"
     lines-and-columns "~2.0.3"
     minimatch "3.0.5"
+    node-machine-id "1.1.12"
     npm-run-path "^4.0.1"
     open "^8.4.0"
-    semver "7.3.4"
+    semver "7.5.3"
     string-width "^4.2.3"
     strong-log-transformer "^2.1.0"
     tar-stream "~2.2.0"
@@ -14215,16 +14480,16 @@ nx@16.3.2, "nx@>=16.1.3 < 17":
     yargs "^17.6.2"
     yargs-parser "21.1.1"
   optionalDependencies:
-    "@nx/nx-darwin-arm64" "16.3.2"
-    "@nx/nx-darwin-x64" "16.3.2"
-    "@nx/nx-freebsd-x64" "16.3.2"
-    "@nx/nx-linux-arm-gnueabihf" "16.3.2"
-    "@nx/nx-linux-arm64-gnu" "16.3.2"
-    "@nx/nx-linux-arm64-musl" "16.3.2"
-    "@nx/nx-linux-x64-gnu" "16.3.2"
-    "@nx/nx-linux-x64-musl" "16.3.2"
-    "@nx/nx-win32-arm64-msvc" "16.3.2"
-    "@nx/nx-win32-x64-msvc" "16.3.2"
+    "@nx/nx-darwin-arm64" "16.10.0"
+    "@nx/nx-darwin-x64" "16.10.0"
+    "@nx/nx-freebsd-x64" "16.10.0"
+    "@nx/nx-linux-arm-gnueabihf" "16.10.0"
+    "@nx/nx-linux-arm64-gnu" "16.10.0"
+    "@nx/nx-linux-arm64-musl" "16.10.0"
+    "@nx/nx-linux-x64-gnu" "16.10.0"
+    "@nx/nx-linux-x64-musl" "16.10.0"
+    "@nx/nx-win32-arm64-msvc" "16.10.0"
+    "@nx/nx-win32-x64-msvc" "16.10.0"
 
 object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
@@ -14250,6 +14515,11 @@ object-inspect@^1.12.3, object-inspect@^1.7.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
 object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2, object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
@@ -14298,6 +14568,15 @@ object.fromentries@^2.0.0, object.fromentries@^2.0.5, object.fromentries@^2.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 object.getownpropertydescriptors@^2.1.0:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
@@ -14309,6 +14588,16 @@ object.getownpropertydescriptors@^2.1.0:
     es-abstract "^1.21.2"
     safe-array-concat "^1.0.0"
 
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -14333,6 +14622,15 @@ object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.5, object.values@
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 objectorarray@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.5.tgz#2c05248bbefabd8f43ad13b41085951aac5e68a5"
@@ -15552,6 +15850,15 @@ pretty-format@^29.0.0, pretty-format@^29.5.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -15909,9 +16216,9 @@ react-error-overlay@^6.0.11:
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
 react-i18next@12.1.5, react-i18next@>=11.16.4:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.3.1.tgz#9b072bf4dd4cafb028e92315a8a1415f8034bdca"
-  integrity sha512-JAtYREK879JXaN9GdzfBI4yJeo/XyLeXWUsRABvYXiFUakhZJ40l+kaTo+i+A/3cKIED41kS/HAbZ5BzFtq/Og==
+  version "13.5.0"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.5.0.tgz#44198f747628267a115c565f0c736a50a76b1ab0"
+  integrity sha512-CFJ5NDGJ2MUyBohEHxljOq/39NQ972rh1ajnadG9BjTk+UXbHLq4z5DKEbEQBDoIhUmmbuS/fIMJKo6VOax1HA==
   dependencies:
     "@babel/runtime" "^7.22.5"
     html-parse-stringify "^3.0.1"
@@ -16291,6 +16598,15 @@ regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0:
     define-properties "^1.2.0"
     functions-have-names "^1.2.3"
 
+regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    set-function-name "^2.0.0"
+
 regexpu-core@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
@@ -16428,6 +16744,15 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.4:
   version "2.0.0-next.4"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
@@ -16596,6 +16921,16 @@ safe-array-concat@^1.0.0:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -16768,10 +17103,10 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+semver@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -16871,6 +17206,25 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -17450,6 +17804,15 @@ string.prototype.trim@^1.2.1, string.prototype.trim@^1.2.7:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimend@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
@@ -17459,6 +17822,15 @@ string.prototype.trimend@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimstart@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
@@ -17468,6 +17840,15 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -18057,7 +18438,7 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tsconfig-paths@^3.14.1:
+tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
   integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
@@ -18081,6 +18462,11 @@ tslib@2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tslib@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -18191,6 +18577,36 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -18235,10 +18651,10 @@ typeorm@0.2.45:
     yargs "^17.0.1"
     zen-observable-ts "^1.0.0"
 
-typescript@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43"
-  integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==
+typescript@5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 "typescript@>=3 < 6":
   version "5.1.3"
@@ -18905,6 +19321,17 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.1"
     is-weakset "^2.0.1"
 
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.4"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which-typed-array@^1.1.2, which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"

From 1402f8b5ffdf3f88ffcbc3869d55d4d9c0656885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Tue, 19 Dec 2023 08:50:49 +0000
Subject: [PATCH 12/68] feat: Unpack the app to `app.asar` for test mode.
 (#2933)

feat: For test not package app dir
---
 .github/workflows/package_for_test.yml      | 11 +++++++++++
 packages/neuron-wallet/electron-builder.yml |  1 +
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
index 4b446bbf54..04c0f4fdd1 100644
--- a/.github/workflows/package_for_test.yml
+++ b/.github/workflows/package_for_test.yml
@@ -110,6 +110,14 @@ jobs:
         env:
           CI: false
 
+      - name: Write electron-build Test yml
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('node:fs')
+            const ympPath = 'packages/neuron-wallet/electron-builder.yml'
+            fs.writeFileSync(ympPath, fs.readFileSync(ympPath).toString().replace('asar: true', 'asar: false'))
+
       - name: Package for MacOS
         if: ${{ matrix.os == 'macos-latest' && env.MAC_SHOULD_CODE_SIGN == 'true' }}
         run: |
@@ -122,6 +130,7 @@ jobs:
           CSC_LINK: ${{ secrets.MAC_CERTIFICATE_BASE64 }}
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
           TEAM_ID: ${{ secrets.TEAM_ID }}
+          USE_HARD_LINKS: false
 
       - name: Package for MacOS for skip code sign
         if: ${{ matrix.os == 'macos-latest' && env.MAC_SHOULD_CODE_SIGN == 'false' }}
@@ -132,6 +141,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SKIP_NOTARIZE: true
+          USE_HARD_LINKS: false
 
       - name: Package for Windows
         if: matrix.os == 'windows-2019'
@@ -150,6 +160,7 @@ jobs:
           yarn package:test linux
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          USE_HARD_LINKS: false
 
       - name: Upload Neuron App Zip
         if: matrix.os == 'macos-latest'
diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml
index 514c724ef2..1e4aa42855 100644
--- a/packages/neuron-wallet/electron-builder.yml
+++ b/packages/neuron-wallet/electron-builder.yml
@@ -2,6 +2,7 @@ appId: com.nervos.neuron
 copyright: Copyright (C) 2019-2023 Nervos Foundation.
 productName: Neuron
 
+# This property will replace to false in package for test action
 asar: true
 
 directories:

From 94302cb652ff821d3dab75ae89f180d3b3e201ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 21 Dec 2023 09:06:31 +0000
Subject: [PATCH 13/68] feat: Support use sent cell when send CKB (#2963)

---
 .../neuron-ui/src/components/Send/hooks.ts    | 116 +++++++--
 .../neuron-ui/src/components/Send/index.tsx   |  46 ++--
 .../src/components/Send/send.module.scss      |  34 ++-
 packages/neuron-ui/src/locales/en.json        |   4 +-
 packages/neuron-ui/src/locales/zh-tw.json     |   4 +-
 packages/neuron-ui/src/locales/zh.json        |   4 +-
 packages/neuron-ui/src/states/init/chain.ts   |   1 +
 packages/neuron-ui/src/types/App/index.d.ts   |   1 +
 .../neuron-ui/src/types/Controller/index.d.ts |   1 +
 packages/neuron-wallet/src/controllers/api.ts |   2 +
 .../neuron-wallet/src/controllers/wallets.ts  |  18 +-
 .../src/models/chain/transaction.ts           |   1 +
 packages/neuron-wallet/src/services/cells.ts  |  27 +-
 .../src/services/transaction-sender.ts        |  85 ++++---
 .../src/services/tx/transaction-generator.ts  |  87 ++++---
 .../tests/services/cells.test.ts              |   1 +
 .../services/tx/transaction-generator.test.ts | 235 +++++++++---------
 .../services/tx/transaction-sender.test.ts    |  60 +++--
 18 files changed, 454 insertions(+), 273 deletions(-)

diff --git a/packages/neuron-ui/src/components/Send/hooks.ts b/packages/neuron-ui/src/components/Send/hooks.ts
index e5411df0b9..86fff5f3d4 100644
--- a/packages/neuron-ui/src/components/Send/hooks.ts
+++ b/packages/neuron-ui/src/components/Send/hooks.ts
@@ -50,6 +50,7 @@ const updateTransactionWith =
     setErrorMessage,
     updateTransactionOutput,
     isMainnet,
+    enableUseSentCell,
     dispatch,
     t,
     consumeOutPoints,
@@ -61,6 +62,7 @@ const updateTransactionWith =
     setErrorMessage: (val: string) => void
     updateTransactionOutput?: ReturnType<typeof useUpdateTransactionOutput>
     isMainnet: boolean
+    enableUseSentCell: boolean
     dispatch: StateDispatch
     t: TFunction
     consumeOutPoints?: CKBComponents.OutPoint[]
@@ -87,6 +89,7 @@ const updateTransactionWith =
         })),
         feeRate: price,
         consumeOutPoints,
+        enableUseSentCell,
       }
       return generator(realParams)
         .then((res: any) => {
@@ -155,18 +158,31 @@ const useRemoveTransactionOutput = (dispatch: StateDispatch) =>
     [dispatch]
   )
 
-const useOnTransactionChange = (
-  walletID: string,
-  items: State.Output[],
-  price: string,
-  isMainnet: boolean,
-  dispatch: StateDispatch,
-  isSendMax: boolean,
-  setTotalAmount: (val: string) => void,
-  setErrorMessage: (val: string) => void,
-  t: TFunction,
+const useOnTransactionChange = ({
+  walletID,
+  items,
+  price,
+  isMainnet,
+  dispatch,
+  isSendMax,
+  setTotalAmount,
+  setErrorMessage,
+  t,
+  consumeOutPoints,
+  enableUseSentCell,
+}: {
+  walletID: string
+  items: State.Output[]
+  price: string
+  isMainnet: boolean
+  dispatch: StateDispatch
+  isSendMax: boolean
+  setTotalAmount: (val: string) => void
+  setErrorMessage: (val: string) => void
+  t: TFunction
   consumeOutPoints?: CKBComponents.OutPoint[]
-) => {
+  enableUseSentCell: boolean
+}) => {
   useEffect(() => {
     clearTimeout(generateTxTimer)
     setErrorMessage('')
@@ -189,9 +205,22 @@ const useOnTransactionChange = (
         dispatch,
         t,
         consumeOutPoints,
+        enableUseSentCell,
       })
     }, 300)
-  }, [walletID, items, price, isSendMax, dispatch, setTotalAmount, setErrorMessage, t, isMainnet, consumeOutPoints])
+  }, [
+    walletID,
+    items,
+    price,
+    isSendMax,
+    dispatch,
+    setTotalAmount,
+    setErrorMessage,
+    t,
+    isMainnet,
+    consumeOutPoints,
+    enableUseSentCell,
+  ])
 }
 
 const useOnSubmit = (items: Readonly<State.Output[]>, isMainnet: boolean, dispatch: StateDispatch) =>
@@ -286,11 +315,13 @@ export const useGetBatchGeneratedTx = async ({
   priceArray = [],
   items,
   isSendMax,
+  enableUseSentCell,
 }: {
   walletID: string
   priceArray?: string[]
   items: Readonly<State.Output[]>
   isSendMax: boolean
+  enableUseSentCell?: boolean
 }) => {
   const getUpdateGeneratedTx = (params: Controller.GenerateTransactionParams) =>
     (isSendMax ? generateSendingAllTx : generateTx)(params).then((res: ControllerResponse<State.Transaction>) => {
@@ -309,7 +340,9 @@ export const useGetBatchGeneratedTx = async ({
     })),
   }
 
-  const requestArray = priceArray.map(itemPrice => getUpdateGeneratedTx({ ...realParams, feeRate: itemPrice }))
+  const requestArray = priceArray.map(itemPrice =>
+    getUpdateGeneratedTx({ ...realParams, feeRate: itemPrice, enableUseSentCell })
+  )
   const allPromiseResult = await Promise.allSettled<State.Transaction>(requestArray)
 
   const feeRateValueArray: FeeRateValueArrayItemType[] = allPromiseResult?.map(
@@ -322,17 +355,29 @@ export const useGetBatchGeneratedTx = async ({
   return feeRateValueArray
 }
 
-export const useInitialize = (
-  walletID: string,
-  items: Readonly<State.Output[]>,
-  generatedTx: any | null,
-  price: string,
-  sending: boolean,
-  isMainnet: boolean,
-  dispatch: React.Dispatch<any>,
-  t: TFunction,
+export const useInitialize = ({
+  walletID,
+  items,
+  generatedTx,
+  price,
+  sending,
+  isMainnet,
+  consumeOutPoints,
+  enableUseSentCell,
+  dispatch,
+  t,
+}: {
+  walletID: string
+  items: Readonly<State.Output[]>
+  generatedTx: any | null
+  price: string
+  sending: boolean
+  isMainnet: boolean
   consumeOutPoints?: CKBComponents.OutPoint[]
-) => {
+  enableUseSentCell: boolean
+  dispatch: React.Dispatch<any>
+  t: TFunction
+}) => {
   const fee = useMemo(() => calculateFee(generatedTx), [generatedTx])
 
   const [totalAmount, setTotalAmount] = useState('0')
@@ -382,6 +427,7 @@ export const useInitialize = (
       setErrorMessage,
       updateTransactionOutput,
       isMainnet,
+      enableUseSentCell,
       dispatch,
       t,
       consumeOutPoints,
@@ -390,7 +436,18 @@ export const useInitialize = (
         updateIsSendMax(false)
       }
     })
-  }, [walletID, updateTransactionOutput, price, items, dispatch, t, isMainnet, updateIsSendMax, consumeOutPoints])
+  }, [
+    walletID,
+    updateTransactionOutput,
+    price,
+    items,
+    dispatch,
+    t,
+    isMainnet,
+    updateIsSendMax,
+    consumeOutPoints,
+    enableUseSentCell,
+  ])
 
   const onSendMaxClick = useCallback(() => {
     if (!isSendMax) {
@@ -436,6 +493,17 @@ export const useInitialize = (
   }
 }
 
+export const useSendWithSentCell = () => {
+  const [enableUseSentCell, setEnableUseSentCell] = useState(false)
+  const onChangeEnableUseSentCell = useCallback(() => {
+    setEnableUseSentCell(v => !v)
+  }, [])
+  return {
+    enableUseSentCell,
+    onChangeEnableUseSentCell,
+  }
+}
+
 export default {
   useInitialize,
 }
diff --git a/packages/neuron-ui/src/components/Send/index.tsx b/packages/neuron-ui/src/components/Send/index.tsx
index 05b2cb61ca..c6c7a5563a 100644
--- a/packages/neuron-ui/src/components/Send/index.tsx
+++ b/packages/neuron-ui/src/components/Send/index.tsx
@@ -22,7 +22,7 @@ import { HIDE_BALANCE } from 'utils/const'
 
 import { isErrorWithI18n } from 'exceptions'
 import { useSearchParams } from 'react-router-dom'
-import { useInitialize } from './hooks'
+import { useInitialize, useSendWithSentCell } from './hooks'
 import styles from './send.module.scss'
 
 const SendHeader = ({ balance, useConsumeCell }: { balance: string; useConsumeCell: boolean }) => {
@@ -69,6 +69,7 @@ const Send = () => {
 
   const isMainnet = isMainnetUtil(networks, networkID)
   const consumeOutPoints = useMemo(() => consumeCells?.map(v => v.outPoint), [useMemo])
+  const { enableUseSentCell, onChangeEnableUseSentCell } = useSendWithSentCell()
 
   const {
     outputs,
@@ -89,17 +90,18 @@ const Send = () => {
     isSendMax,
     onSendMaxClick: handleSendMaxClick,
     updateIsSendMax,
-  } = useInitialize(
+  } = useInitialize({
     walletID,
-    send.outputs,
-    send.generatedTx,
-    send.price,
+    items: send.outputs,
+    generatedTx: send.generatedTx,
+    price: send.price,
     sending,
     isMainnet,
+    enableUseSentCell,
+    consumeOutPoints,
     dispatch,
     t,
-    consumeOutPoints
-  )
+  })
 
   const [searchParams] = useSearchParams()
 
@@ -134,18 +136,19 @@ const Send = () => {
     [setLocktimeIndex, updateTransactionOutput]
   )
 
-  useOnTransactionChange(
+  useOnTransactionChange({
     walletID,
-    outputs,
-    send.price,
+    items: outputs,
+    price: send.price,
     isMainnet,
     dispatch,
     isSendMax,
     setTotalAmount,
     setErrorMessage,
     t,
-    consumeOutPoints
-  )
+    consumeOutPoints,
+    enableUseSentCell,
+  })
 
   let errorMessageUnderTotal = errorMessage
   try {
@@ -265,10 +268,21 @@ const Send = () => {
               />
             </div>
             <div className={styles.rightFooter}>
-              <Button type="reset" onClick={handleClear} label={t('send.reset')} />
-              <Button type="submit" disabled={disabled} label={t('send.send')}>
-                {sending ? <Spinner /> : (t('send.send') as string)}
-              </Button>
+              <label htmlFor="send-with-sent-cell" className={styles.allowUseSent}>
+                <input
+                  type="checkbox"
+                  id="send-with-sent-cell"
+                  checked={enableUseSentCell}
+                  onChange={onChangeEnableUseSentCell}
+                />
+                <span>{t('send.allow-use-sent-cell')}</span>
+              </label>
+              <div className={styles.actions}>
+                <Button type="reset" onClick={handleClear} label={t('send.reset')} />
+                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                  {sending ? <Spinner /> : (t(enableUseSentCell ? 'send.submit-transaction' : 'send.send') as string)}
+                </Button>
+              </div>
             </div>
           </div>
         </div>
diff --git a/packages/neuron-ui/src/components/Send/send.module.scss b/packages/neuron-ui/src/components/Send/send.module.scss
index 44e52f6d56..32f5f430b5 100644
--- a/packages/neuron-ui/src/components/Send/send.module.scss
+++ b/packages/neuron-ui/src/components/Send/send.module.scss
@@ -57,6 +57,7 @@ $headerHeight: 104px;
     position: relative;
     border-radius: 16px;
     background: var(--secondary-background-color);
+    min-height: 436px;
 
     .content {
       padding: 16px;
@@ -76,13 +77,34 @@ $headerHeight: 104px;
       width: 100%;
       bottom: 16px;
       left: 0;
-      display: flex;
-      justify-content: center;
+      text-align: center;
+      .actions {
+        display: flex;
+        justify-content: center;
 
-      button {
-        width: 216px;
-        &:last-child {
-          margin-left: 12px;
+        button {
+          width: 216px;
+          &:last-child {
+            margin-left: 12px;
+          }
+        }
+      }
+      .allowUseSent {
+        display: inline-block;
+        margin-bottom: 16px;
+        color: var(--secondary-text-color);
+        input[type='checkbox'] {
+          display: none;
+          margin-right: 8px;
+        }
+        input[type='checkbox'] + span {
+          display: inline-block;
+          padding-left: 26px;
+          background: url('../../widgets/Icons/Radio.svg') no-repeat left top;
+          user-select: none;
+        }
+        input[type='checkbox']:checked + span {
+          background: url('../../widgets/Icons/RadioSelected.svg') no-repeat left top;
         }
       }
     }
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 08c1ba3add..032be96f9f 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -239,7 +239,9 @@
       "remove-receiving-address-msg": "Are you sure you want to remove the selected receiving address?",
       "locktime-notice-content": "According to the actual running block height, there may be some time variances in locktime.",
       "release-on": "Release on",
-      "locktime-warning": "Please ensure that receiver's wallet can support expiration unlocking. (Note: 1.Exchanges generally do not support expiration unlocking {{extraNote}})"
+      "locktime-warning": "Please ensure that receiver's wallet can support expiration unlocking. (Note: 1.Exchanges generally do not support expiration unlocking {{extraNote}})",
+      "allow-use-sent-cell": "Unconfirmed Outputs are allowed in this transaction.",
+      "submit-transaction": "Submit the transaction"
     },
     "receive": {
       "title": "Receive",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 66ecd3fc35..675eaf99f3 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -233,7 +233,9 @@
       "remove-receiving-address-msg": "確定要刪除所選收款地址？",
       "locktime-notice-content": "鎖定時間根據區塊鏈實際運行情況會有一定的誤差。",
       "release-on": "鎖定至",
-      "locktime-warning": "請確保對方錢包支持到期解鎖功能。（註：1.交易所壹般不支持到期解鎖功能 {{extraNote}}）"
+      "locktime-warning": "請確保對方錢包支持到期解鎖功能。（註：1.交易所壹般不支持到期解鎖功能 {{extraNote}}）",
+      "allow-use-sent-cell": "允許使用待確認的 Outputs 構建交易",
+      "submit-transaction": "發起交易"
     },
     "receive": {
       "title": "收款",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 7d24c9dc24..339302dfe7 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -232,7 +232,9 @@
       "remove-receiving-address-msg": "确定要删除所选收款地址？",
       "locktime-notice-content": "锁定时间根据区块链实际运行情况会有一定的误差。",
       "release-on": "锁定至",
-      "locktime-warning": "请确保对方钱包支持到期解锁功能。（注：1.交易所一般不支持到期解锁功能 {{extraNote}}）"
+      "locktime-warning": "请确保对方钱包支持到期解锁功能。（注：1.交易所一般不支持到期解锁功能 {{extraNote}}）",
+      "allow-use-sent-cell": "允许使用待确认的 Outputs 构建交易",
+      "submit-transaction": "发起交易"
     },
     "receive": {
       "title": "收款",
diff --git a/packages/neuron-ui/src/states/init/chain.ts b/packages/neuron-ui/src/states/init/chain.ts
index e0da056662..2fc84a4314 100644
--- a/packages/neuron-ui/src/states/init/chain.ts
+++ b/packages/neuron-ui/src/states/init/chain.ts
@@ -19,6 +19,7 @@ export const transactionState: State.DetailedTransaction = {
   blockHash: '',
   witnesses: [],
   nervosDao: false,
+  size: 0,
 }
 
 export const chainState: Readonly<State.Chain> = {
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 3916fb842d..243fd982de 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -50,6 +50,7 @@ declare namespace State {
     outputs: DetailedOutput[]
     outputsCount: string
     witnesses: string[]
+    size: number
   }
   interface Output {
     address: string | undefined
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 012dd89cac..33b3aab3b8 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -79,6 +79,7 @@ declare namespace Controller {
     }[]
     feeRate: string
     consumeOutPoints?: CKBComponents.OutPoint[]
+    enableUseSentCell?: boolean
   }
 
   type GenerateSendingAllTransactionParams = GenerateTransactionParams
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 45f5f4c8f2..239e9b36e1 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -404,6 +404,7 @@ export default class ApiController {
           fee: string
           feeRate: string
           consumeOutPoints?: CKBComponents.OutPoint[]
+          enableUseSentCell?: boolean
         }
       ) => {
         return this.#walletsController.generateTx(params)
@@ -420,6 +421,7 @@ export default class ApiController {
           fee: string
           feeRate: string
           consumeOutPoints: CKBComponents.OutPoint[]
+          enableUseSentCell?: boolean
         }
       ) => {
         return this.#walletsController.generateSendingAllTx(params)
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index 1870a1e25c..2865217439 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -458,6 +458,7 @@ export default class WalletsController {
     fee: string
     feeRate: string
     consumeOutPoints?: CKBComponents.OutPoint[]
+    enableUseSentCell?: boolean
   }) {
     if (!params) {
       throw new IsRequired('Parameters')
@@ -465,13 +466,7 @@ export default class WalletsController {
     const addresses: string[] = params.items.map(i => i.address)
     this.checkAddresses(addresses)
 
-    const tx: Transaction = await new TransactionSender().generateTx(
-      params.walletID,
-      params.items,
-      params.fee,
-      params.feeRate,
-      params.consumeOutPoints
-    )
+    const tx: Transaction = await new TransactionSender().generateTx(params)
     return {
       status: ResponseCode.Success,
       result: tx,
@@ -484,6 +479,7 @@ export default class WalletsController {
     fee: string
     feeRate: string
     consumeOutPoints?: CKBComponents.OutPoint[]
+    enableUseSentCell?: boolean
   }) {
     if (!params) {
       throw new IsRequired('Parameters')
@@ -491,13 +487,7 @@ export default class WalletsController {
     const addresses: string[] = params.items.map(i => i.address)
     this.checkAddresses(addresses)
 
-    const tx: Transaction = await new TransactionSender().generateSendingAllTx(
-      params.walletID,
-      params.items,
-      params.fee,
-      params.feeRate,
-      params.consumeOutPoints
-    )
+    const tx: Transaction = await new TransactionSender().generateSendingAllTx(params)
     return {
       status: ResponseCode.Success,
       result: tx,
diff --git a/packages/neuron-wallet/src/models/chain/transaction.ts b/packages/neuron-wallet/src/models/chain/transaction.ts
index 885c3b182a..2bd405c8bb 100644
--- a/packages/neuron-wallet/src/models/chain/transaction.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction.ts
@@ -60,6 +60,7 @@ export default class Transaction {
 
   public value?: string
   public fee?: string
+  public size?: number
   public interest?: string
 
   public type?: string
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index c3dc43dd85..3959c4137a 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -657,12 +657,14 @@ export default class CellsService {
       hashType: ScriptHashType
     } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
     multisigConfigs: MultisigConfigModel[] = [],
-    consumeOutPoints?: CKBComponents.OutPoint[]
+    consumeOutPoints?: CKBComponents.OutPoint[],
+    enableUseSentCell?: boolean
   ): Promise<{
     inputs: Input[]
     capacities: string
     finalFee: string
     hasChangeOutput: boolean
+    totalSize: number
   }> => {
     if (!walletId && !lockClass.lockArgs) {
       throw new TransactionInputParameterMiss()
@@ -693,20 +695,20 @@ export default class CellsService {
           })
       : CellsService.getLiveOrSentCellByLockArgsMultisigOutput(lockClass))
 
-    const liveCells = cellEntities.filter(c => c.status === OutputStatus.Live)
+    const useCells = enableUseSentCell ? cellEntities : cellEntities.filter(c => c.status === OutputStatus.Live)
     const sentBalance: bigint = cellEntities
       .filter(c => c.status === OutputStatus.Sent)
       .map(c => BigInt(c.capacity))
       .reduce((result, c) => result + c, BigInt(0))
 
     if (
-      liveCells.length === 0 &&
+      useCells.length === 0 &&
       sentBalance === BigInt(0) &&
       ((mode.isFeeRateMode() && feeRateInt !== BigInt(0)) || (mode.isFeeMode() && feeInt !== BigInt(0)))
     ) {
       throw new CapacityNotEnough()
     }
-    liveCells.sort((a, b) => {
+    useCells.sort((a, b) => {
       const result = BigInt(a.capacity) - BigInt(b.capacity)
       if (result > BigInt(0)) {
         return 1
@@ -744,7 +746,7 @@ export default class CellsService {
       }),
       {}
     )
-    liveCells.every(cell => {
+    useCells.every(cell => {
       const input: Input = new Input(cell.outPoint(), '0', cell.capacity, cell.lockScript(), cell.lockHash)
       if (inputs.find(el => el.lockHash === cell.lockHash!)) {
         totalSize += TransactionSize.emptyWitness()
@@ -771,6 +773,7 @@ export default class CellsService {
           return false
         } else if (diff - changeOutputFee >= minChangeCapacity) {
           needFee += changeOutputFee
+          totalSize += changeOutputSize + changeOutputDataSize
           hasChangeOutput = true
           return false
         }
@@ -813,6 +816,7 @@ export default class CellsService {
       capacities: inputCapacities.toString(),
       finalFee: finalFee.toString(),
       hasChangeOutput,
+      totalSize,
     }
   }
 
@@ -823,7 +827,8 @@ export default class CellsService {
       hashType: ScriptHashType
       args?: string
     } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
-    consumeOutPoints?: CKBComponents.OutPoint[]
+    consumeOutPoints?: CKBComponents.OutPoint[],
+    enableUseSentCell?: boolean
   ): Promise<Input[]> => {
     let cellEntities: (OutputEntity | MultisigOutput)[] = []
     if (consumeOutPoints?.length) {
@@ -846,13 +851,11 @@ export default class CellsService {
       })
     }
 
-    const inputs: Input[] = cellEntities
-      .filter(v => v.status === OutputStatus.Live)
-      .map(cell => {
-        return new Input(cell.outPoint(), '0', cell.capacity, cell.lockScript(), cell.lockHash)
-      })
+    const useCells = enableUseSentCell ? cellEntities : cellEntities.filter(v => v.status === OutputStatus.Live)
 
-    return inputs
+    return useCells.map(cell => {
+      return new Input(cell.outPoint(), '0', cell.capacity, cell.lockScript(), cell.lockHash)
+    })
   }
 
   public static async gatherAnyoneCanPayCKBInputs(
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 208739a2d0..9820c9c0e7 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -428,13 +428,21 @@ export default class TransactionSender {
     return [emptyWitness, ...restWitnesses]
   }
 
-  public generateTx = async (
-    walletID: string = '',
-    items: TargetOutput[] = [],
-    fee: string = '0',
-    feeRate: string = '0',
+  public generateTx = async ({
+    walletID = '',
+    items = [],
+    fee = '0',
+    feeRate = '0',
+    consumeOutPoints,
+    enableUseSentCell,
+  }: {
+    walletID: string
+    items: TargetOutput[]
+    fee: string
+    feeRate: string
     consumeOutPoints?: CKBComponents.OutPoint[]
-  ): Promise<Transaction> => {
+    enableUseSentCell?: boolean
+  }): Promise<Transaction> => {
     const targetOutputs = items.map(item => ({
       ...item,
       capacity: BigInt(item.capacity).toString(),
@@ -443,16 +451,15 @@ export default class TransactionSender {
     const changeAddress: string = await this.getChangeAddress()
 
     try {
-      const tx: Transaction = await TransactionGenerator.generateTx(
+      const tx: Transaction = await TransactionGenerator.generateTx({
         walletID,
         targetOutputs,
         changeAddress,
         fee,
         feeRate,
-        undefined,
-        undefined,
-        consumeOutPoints
-      )
+        consumeOutPoints,
+        enableUseSentCell,
+      })
 
       return tx
     } catch (error) {
@@ -463,26 +470,34 @@ export default class TransactionSender {
     }
   }
 
-  public generateSendingAllTx = async (
-    walletID: string = '',
-    items: TargetOutput[] = [],
-    fee: string = '0',
-    feeRate: string = '0',
+  public generateSendingAllTx = async ({
+    walletID = '',
+    items = [],
+    fee = '0',
+    feeRate = '0',
+    consumeOutPoints,
+    enableUseSentCell,
+  }: {
+    walletID: string
+    items: TargetOutput[]
+    fee: string
+    feeRate: string
     consumeOutPoints?: CKBComponents.OutPoint[]
-  ): Promise<Transaction> => {
+    enableUseSentCell?: boolean
+  }): Promise<Transaction> => {
     const targetOutputs = items.map(item => ({
       ...item,
       capacity: BigInt(item.capacity).toString(),
     }))
 
-    const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
+    const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
       walletID,
       targetOutputs,
       fee,
       feeRate,
-      undefined,
-      consumeOutPoints
-    )
+      consumeOutPoints,
+      enableUseSentCell,
+    })
 
     return tx
   }
@@ -496,13 +511,13 @@ export default class TransactionSender {
       capacity: BigInt(item.capacity).toString(),
     }))
 
-    const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
-      '',
+    const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+      walletID: '',
       targetOutputs,
-      '0',
-      '1000',
-      multisigConfig
-    )
+      fee: '0',
+      feeRate: '1000',
+      multisigConfig,
+    })
 
     return tx
   }
@@ -524,19 +539,19 @@ export default class TransactionSender {
         multisigConfig.n
       )
       const multisigAddresses = scriptToAddress(lockScript, NetworksService.getInstance().isMainnet())
-      const tx: Transaction = await TransactionGenerator.generateTx(
-        '',
+      const tx: Transaction = await TransactionGenerator.generateTx({
+        walletID: '',
         targetOutputs,
-        multisigAddresses,
-        '0',
-        '1000',
-        {
+        changeAddress: multisigAddresses,
+        fee: '0',
+        feeRate: '1000',
+        lockClass: {
           lockArgs: [lockScript.args],
           codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
           hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE,
         },
-        multisigConfig
-      )
+        multisigConfig,
+      })
       return tx
     } catch (error) {
       if (error instanceof CapacityNotEnoughForChange) {
diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
index 657a2fe89e..d0a833f13b 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -161,20 +161,34 @@ export class TransactionGenerator {
     return tx
   }
 
-  public static generateTx = async (
-    walletId: string,
-    targetOutputs: TargetOutput[],
-    changeAddress: string,
-    fee: string = '0',
-    feeRate: string = '0',
-    lockClass: {
+  public static generateTx = async ({
+    walletID,
+    targetOutputs,
+    changeAddress,
+    fee = '0',
+    feeRate = '0',
+    lockClass = {
+      codeHash: SystemScriptInfo.SECP_CODE_HASH,
+      hashType: ScriptHashType.Type,
+    },
+    multisigConfig,
+    consumeOutPoints,
+    enableUseSentCell,
+  }: {
+    walletID: string
+    targetOutputs: TargetOutput[]
+    changeAddress: string
+    fee: string
+    feeRate?: string
+    lockClass?: {
       lockArgs?: string[]
       codeHash: string
       hashType: ScriptHashType
-    } = { codeHash: SystemScriptInfo.SECP_CODE_HASH, hashType: ScriptHashType.Type },
-    multisigConfig?: MultisigConfigModel,
+    }
+    multisigConfig?: MultisigConfigModel
     consumeOutPoints?: CKBComponents.OutPoint[]
-  ): Promise<Transaction> => {
+    enableUseSentCell?: boolean
+  }): Promise<Transaction> => {
     let cellDep: CellDep
     if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
       cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep()
@@ -222,9 +236,9 @@ export class TransactionGenerator {
     })
 
     const baseSize: number = TransactionSize.tx(tx)
-    const { inputs, capacities, finalFee, hasChangeOutput } = await CellsService.gatherInputs(
+    const { inputs, capacities, finalFee, hasChangeOutput, totalSize } = await CellsService.gatherInputs(
       needCapacities.toString(),
-      walletId,
+      walletID,
       fee,
       feeRate,
       baseSize,
@@ -233,11 +247,13 @@ export class TransactionGenerator {
       undefined,
       lockClass,
       multisigConfig ? [multisigConfig] : [],
-      consumeOutPoints
+      consumeOutPoints,
+      enableUseSentCell
     )
     const finalFeeInt = BigInt(finalFee)
     tx.inputs = inputs
     tx.fee = finalFee
+    tx.size = totalSize
 
     // change
     if (hasChangeOutput) {
@@ -255,14 +271,23 @@ export class TransactionGenerator {
   }
 
   // rest of capacity all send to last target output.
-  public static generateSendingAllTx = async (
-    walletId: string,
-    targetOutputs: TargetOutput[],
-    fee: string = '0',
-    feeRate: string = '0',
-    multisigConfig?: MultisigConfigModel,
+  public static generateSendingAllTx = async ({
+    walletID,
+    targetOutputs,
+    fee = '0',
+    feeRate = '0',
+    multisigConfig,
+    consumeOutPoints,
+    enableUseSentCell,
+  }: {
+    walletID: string
+    targetOutputs: TargetOutput[]
+    fee: string
+    feeRate?: string
+    multisigConfig?: MultisigConfigModel
     consumeOutPoints?: CKBComponents.OutPoint[]
-  ): Promise<Transaction> => {
+    enableUseSentCell?: boolean
+  }): Promise<Transaction> => {
     let cellDep: CellDep
     if (multisigConfig) {
       cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep()
@@ -278,13 +303,14 @@ export class TransactionGenerator {
     const mode = new FeeMode(feeRateInt)
 
     const allInputs: Input[] = await CellsService.gatherAllInputs(
-      walletId,
+      walletID,
       multisigConfig
         ? Script.fromSDK(
             Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n)
           )
         : undefined,
-      consumeOutPoints
+      consumeOutPoints,
+      enableUseSentCell
     )
 
     if (allInputs.length === 0) {
@@ -331,15 +357,15 @@ export class TransactionGenerator {
 
     // change
     let finalFee: bigint = feeInt
+    const lockHashes = new Set(allInputs.map(i => i.lockHash!))
+    const keyCount: number = lockHashes.size
+    const txSize: number =
+      TransactionSize.tx(tx) +
+      (multisigConfig
+        ? TransactionSize.multiSignWitness(multisigConfig.r, multisigConfig.m, multisigConfig.n)
+        : TransactionSize.secpLockWitness() * keyCount) +
+      TransactionSize.emptyWitness() * (allInputs.length - keyCount)
     if (mode.isFeeRateMode()) {
-      const lockHashes = new Set(allInputs.map(i => i.lockHash!))
-      const keyCount: number = lockHashes.size
-      const txSize: number =
-        TransactionSize.tx(tx) +
-        (multisigConfig
-          ? TransactionSize.multiSignWitness(multisigConfig.r, multisigConfig.m, multisigConfig.n)
-          : TransactionSize.secpLockWitness() * keyCount) +
-        TransactionSize.emptyWitness() * (allInputs.length - keyCount)
       finalFee = TransactionFee.fee(txSize, feeRateInt)
     }
 
@@ -349,6 +375,7 @@ export class TransactionGenerator {
       .reduce((result, c) => result + c, BigInt(0))
     tx.outputs[outputs.length - 1].setCapacity((totalCapacity - capacitiesExceptLast - finalFee).toString())
     tx.fee = finalFee.toString()
+    tx.size = txSize
 
     // check
     if (
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index 2706a20c47..e8afb1bf48 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -712,6 +712,7 @@ describe('CellsService', () => {
             BigInt('1000')
           ).toString(),
           hasChangeOutput: true,
+          totalSize: 161,
         })
       })
     })
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index 3839a56a0f..46551c7a02 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -239,18 +239,18 @@ describe('TransactionGenerator', () => {
       const feeRate = '1000'
       it('capacity 500', async () => {
         const feeRate = '1000'
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: toShannon('500'),
             },
           ],
-          bob.address,
-          '0',
-          feeRate
-        )
+          changeAddress: bob.address,
+          fee: '0',
+          feeRate,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -269,18 +269,18 @@ describe('TransactionGenerator', () => {
 
       it('capacity 1000', async () => {
         const feeRate = '1000'
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: toShannon('1000'),
             },
           ],
-          bob.address,
-          '0',
-          feeRate
-        )
+          changeAddress: bob.address,
+          fee: '0',
+          feeRate,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -298,18 +298,18 @@ describe('TransactionGenerator', () => {
 
       it('capacity 1000 - fee, no change output', async () => {
         const feeRate = '1000'
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: BigInt(1000 * 10 ** 8 - 355).toString(),
             },
           ],
-          bob.address,
-          '0',
-          feeRate
-        )
+          changeAddress: bob.address,
+          fee: '0',
+          feeRate,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -327,18 +327,18 @@ describe('TransactionGenerator', () => {
 
       it('capacity 1000 - fee + 1 shannon', async () => {
         const feeRate = '1000'
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: (BigInt(1000 * 10 ** 8) - BigInt(464) + BigInt(1)).toString(),
             },
           ],
-          bob.address,
-          '0',
-          feeRate
-        )
+          changeAddress: bob.address,
+          fee: '0',
+          feeRate,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -358,9 +358,9 @@ describe('TransactionGenerator', () => {
         await getConnection().manager.save(aliceCell)
 
         const feeRate = '1000'
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: BigInt(1000 * 10 ** 8).toString(),
@@ -370,10 +370,10 @@ describe('TransactionGenerator', () => {
               capacity: BigInt(2500 * 10 ** 8).toString(),
             },
           ],
-          bob.address,
-          '0',
-          feeRate
-        )
+          changeAddress: bob.address,
+          fee: '0',
+          feeRate,
+        })
 
         const expectedSize: number =
           TransactionSize.tx(tx) + TransactionSize.secpLockWitness() * 2 + TransactionSize.emptyWitness()
@@ -384,18 +384,18 @@ describe('TransactionGenerator', () => {
 
       describe('with full address', () => {
         it(`only full address, 43 capacity`, async () => {
-          const tx: Transaction = await TransactionGenerator.generateTx(
-            walletId1,
-            [
+          const tx: Transaction = await TransactionGenerator.generateTx({
+            walletID: walletId1,
+            targetOutputs: [
               {
                 address: fullAddressInfo.address,
                 capacity: BigInt(43 * 10 ** 8).toString(),
               },
             ],
-            bob.address,
-            '0',
-            feeRate
-          )
+            changeAddress: bob.address,
+            fee: '0',
+            feeRate,
+          })
 
           const expectedSize: number = TransactionSize.tx(tx) + TransactionSize.secpLockWitness()
           const expectedFee: bigint = TransactionFee.fee(expectedSize, BigInt(feeRate))
@@ -405,25 +405,25 @@ describe('TransactionGenerator', () => {
 
         it('only full address, 42 capacity', async () => {
           expect(
-            TransactionGenerator.generateTx(
-              walletId1,
-              [
+            TransactionGenerator.generateTx({
+              walletID: walletId1,
+              targetOutputs: [
                 {
                   address: fullAddressInfo.address,
                   capacity: BigInt(42 * 10 ** 8).toString(),
                 },
               ],
-              bob.address,
-              '0',
-              feeRate
-            )
+              changeAddress: bob.address,
+              fee: '0',
+              feeRate,
+            })
           ).rejects.toThrowError()
         })
 
         it(`full address and bob's output`, async () => {
-          const tx: Transaction = await TransactionGenerator.generateTx(
-            walletId1,
-            [
+          const tx: Transaction = await TransactionGenerator.generateTx({
+            walletID: walletId1,
+            targetOutputs: [
               {
                 address: fullAddressInfo.address,
                 capacity: BigInt(1000 * 10 ** 8).toString(),
@@ -433,10 +433,10 @@ describe('TransactionGenerator', () => {
                 capacity: BigInt(1000 * 10 ** 8).toString(),
               },
             ],
-            bob.address,
-            '0',
-            feeRate
-          )
+            changeAddress: bob.address,
+            fee: '0',
+            feeRate,
+          })
 
           const expectedSize: number =
             TransactionSize.tx(tx) + TransactionSize.secpLockWitness() + TransactionSize.emptyWitness()
@@ -448,19 +448,19 @@ describe('TransactionGenerator', () => {
 
       describe('with date', () => {
         it('capacity 500', async () => {
-          const tx: Transaction = await TransactionGenerator.generateTx(
-            walletId1,
-            [
+          const tx: Transaction = await TransactionGenerator.generateTx({
+            walletID: walletId1,
+            targetOutputs: [
               {
                 address: bob.address,
                 capacity: toShannon('500'),
                 date,
               },
             ],
-            bob.address,
-            '0',
-            feeRate
-          )
+            changeAddress: bob.address,
+            fee: '0',
+            feeRate,
+          })
 
           const expectedSize: number = TransactionSize.tx(tx) + TransactionSize.secpLockWitness()
 
@@ -485,17 +485,17 @@ describe('TransactionGenerator', () => {
     describe('with fee 1000', () => {
       const fee = '1000'
       it('capacity 500', async () => {
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: toShannon('500'),
             },
           ],
-          bob.address,
-          fee
-        )
+          changeAddress: bob.address,
+          fee,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -508,17 +508,17 @@ describe('TransactionGenerator', () => {
       })
 
       it('capacity 1000', async () => {
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: toShannon('1000'),
             },
           ],
-          bob.address,
-          fee
-        )
+          changeAddress: bob.address,
+          fee,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -531,17 +531,17 @@ describe('TransactionGenerator', () => {
       })
 
       it('capacity 1000 - fee', async () => {
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: (BigInt(1000 * 10 ** 8) - BigInt(fee)).toString(),
             },
           ],
-          bob.address,
-          fee
-        )
+          changeAddress: bob.address,
+          fee,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -554,17 +554,17 @@ describe('TransactionGenerator', () => {
       })
 
       it('capacity 1000 - fee + 1 shannon', async () => {
-        const tx: Transaction = await TransactionGenerator.generateTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: (BigInt(1000 * 10 ** 8) - BigInt(fee) + BigInt(1)).toString(),
             },
           ],
-          bob.address,
-          fee
-        )
+          changeAddress: bob.address,
+          fee,
+        })
 
         const inputCapacities = tx
           .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -608,7 +608,11 @@ describe('TransactionGenerator', () => {
     it('with fee 800', async () => {
       const fee = '800'
       const feeInt = BigInt(fee)
-      const tx: Transaction = await TransactionGenerator.generateSendingAllTx(walletId1, targetOutputs, fee)
+      const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+        walletID: walletId1,
+        targetOutputs,
+        fee,
+      })
 
       const inputCapacities = tx
         .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -629,7 +633,12 @@ describe('TransactionGenerator', () => {
 
     it('with feeRate 1000', async () => {
       const feeRate = '1000'
-      const tx: Transaction = await TransactionGenerator.generateSendingAllTx(walletId1, targetOutputs, '0', feeRate)
+      const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+        walletID: walletId1,
+        targetOutputs,
+        fee: '0',
+        feeRate,
+      })
 
       const inputCapacities = tx
         .inputs!.map(input => BigInt(input.capacity ?? 0))
@@ -656,9 +665,9 @@ describe('TransactionGenerator', () => {
 
     it('full address with feeRate 1000, 43 capacity', async () => {
       const feeRate = '1000'
-      const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
-        walletId1,
-        [
+      const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+        walletID: walletId1,
+        targetOutputs: [
           {
             address: fullAddressInfo.address,
             capacity: toShannon('43'),
@@ -668,9 +677,9 @@ describe('TransactionGenerator', () => {
             capacity: toShannon('0'),
           },
         ],
-        '0',
-        feeRate
-      )
+        fee: '0',
+        feeRate,
+      })
 
       const outputCapacities = tx
         .outputs!.map(output => BigInt(output.capacity))
@@ -689,9 +698,9 @@ describe('TransactionGenerator', () => {
       const feeRate = '1000'
 
       expect(
-        TransactionGenerator.generateSendingAllTx(
-          walletId1,
-          [
+        TransactionGenerator.generateSendingAllTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: fullAddressInfo.address,
               capacity: toShannon('42'),
@@ -701,27 +710,27 @@ describe('TransactionGenerator', () => {
               capacity: toShannon('0'),
             },
           ],
-          '0',
-          feeRate
-        )
+          fee: '0',
+          feeRate,
+        })
       ).rejects.toThrowError()
     })
 
     describe('feeRate = 1000, with date', () => {
       const feeRate = '1000'
       it('capacity 500', async () => {
-        const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
-          walletId1,
-          [
+        const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+          walletID: walletId1,
+          targetOutputs: [
             {
               address: bob.address,
               capacity: toShannon('500'),
               date,
             },
           ],
-          '0',
-          feeRate
-        )
+          fee: '0',
+          feeRate,
+        })
 
         expect(tx.outputs[0].lock.codeHash).toEqual(SystemScriptInfo.MULTI_SIGN_CODE_HASH)
 
@@ -744,12 +753,12 @@ describe('TransactionGenerator', () => {
         }),
       })
       const feeRate = '1000'
-      const tx: Transaction = await TransactionGenerator.generateSendingAllTx(
-        walletId1,
+      const tx: Transaction = await TransactionGenerator.generateSendingAllTx({
+        walletID: walletId1,
         targetOutputs,
-        '0',
+        fee: '0',
         feeRate,
-        MultisigConfigModel.fromObject({
+        multisigConfig: MultisigConfigModel.fromObject({
           walletId: walletId1,
           r: 1,
           m: 2,
@@ -759,8 +768,8 @@ describe('TransactionGenerator', () => {
             'ckt1qyqdpymnu202x3p4cnrrgek5czcdsg95xznswjr98y',
             'ckt1qyqwqcknusdreymrhhme00hg9af3pr5hcmwqzfxvda',
           ].map(v => addressToScript(v).args),
-        })
-      )
+        }),
+      })
 
       const inputCapacities = tx
         .inputs!.map(input => BigInt(input.capacity ?? 0))
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 d52372dc3a..f4ca99d4e1 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -604,22 +604,26 @@ describe('TransactionSender Test', () => {
       })
       describe('success', () => {
         beforeEach(async () => {
-          await transactionSender.generateTx(fakeWallet.id, targetOutputs, fee, feeRate)
+          await transactionSender.generateTx({
+            walletID: fakeWallet.id,
+            items: targetOutputs,
+            fee,
+            feeRate,
+          })
         })
         it('generates transaction', () => {
-          expect(stubbedGenerateTx).toHaveBeenCalledWith(
-            fakeWallet.id,
-            [
+          expect(stubbedGenerateTx).toHaveBeenCalledWith({
+            walletID: fakeWallet.id,
+            targetOutputs: [
               { address: '1', capacity: '1' },
               { address: '1', capacity: '1' },
             ],
-            fakeAddress1,
+            changeAddress: fakeAddress1,
             fee,
             feeRate,
-            undefined,
-            undefined,
-            undefined
-          )
+            consumeOutPoints: undefined,
+            enableUseSentCell: undefined,
+          })
         })
       })
       describe('fail', () => {
@@ -627,9 +631,14 @@ describe('TransactionSender Test', () => {
           stubbedGenerateTx.mockRejectedValue(new CapacityNotEnoughForChange())
         })
         it('generates transaction', async () => {
-          expect(transactionSender.generateTx(fakeWallet.id, targetOutputs, fee, feeRate)).rejects.toThrowError(
-            CapacityNotEnoughForChangeByTransfer
-          )
+          expect(
+            transactionSender.generateTx({
+              walletID: fakeWallet.id,
+              items: targetOutputs,
+              fee,
+              feeRate,
+            })
+          ).rejects.toThrowError(CapacityNotEnoughForChangeByTransfer)
         })
       })
     })
@@ -642,20 +651,25 @@ describe('TransactionSender Test', () => {
           { address: '1', capacity: '1' },
           { address: '1', capacity: '1' },
         ]
-        await transactionSender.generateSendingAllTx(fakeWallet.id, targetOutputs, fee, feeRate)
+        await transactionSender.generateSendingAllTx({
+          walletID: fakeWallet.id,
+          items: targetOutputs,
+          fee,
+          feeRate,
+        })
       })
       it('generates transaction', () => {
-        expect(stubbedGenerateSendingAllTx).toHaveBeenCalledWith(
-          fakeWallet.id,
-          [
+        expect(stubbedGenerateSendingAllTx).toHaveBeenCalledWith({
+          walletID: fakeWallet.id,
+          targetOutputs: [
             { address: '1', capacity: '1' },
             { address: '1', capacity: '1' },
           ],
           fee,
           feeRate,
-          undefined,
-          undefined
-        )
+          consumeOutPoints: undefined,
+          enableUseSentCell: undefined,
+        })
       })
     })
 
@@ -673,7 +687,13 @@ describe('TransactionSender Test', () => {
           blake160s: ['blake160s'],
         })
         await transactionSender.generateMultisigSendAllTx(targetOutputs, multisigConfig)
-        expect(stubbedGenerateSendingAllTx).toHaveBeenCalledWith('', targetOutputs, '0', '1000', multisigConfig)
+        expect(stubbedGenerateSendingAllTx).toHaveBeenCalledWith({
+          walletID: '',
+          targetOutputs,
+          fee: '0',
+          feeRate: '1000',
+          multisigConfig,
+        })
       })
     })
 

From e0e5578573a1e3f5c7f1481acdb02a2d68c6c8c3 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 21 Dec 2023 18:21:21 +0900
Subject: [PATCH 14/68] Bump dependencies (#2993)

* chore(deps): update dependency lerna to v7.4.2 (#314)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency jest-when to v3.6.0 (#313)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency jest-styled-components to v7.2.0 (#312)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (#320)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (#318)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (#321)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency react-i18next to v13.5.0 (#325)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @babel/core to v7.23.5 (#327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency typescript to v5.3.3

* chore(deps): update dependency @types/enzyme to v3.10.18 (#328)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: update reviewers of renovate (#330)

* chore(deps): update dependency @babel/core to v7.23.6

* chore(deps): update dependency eslint-plugin-import to v2.29.1

* refactor: introduce tslib

* chore(deps): update dependency eslint to v8.56.0

* chore(deps): update react monorepo to v18

* chore(deps): update dependency wait-on to v7.2.0

* chore(deps): update dependency webpack to v5.89.0

* chore(deps): update dependency @types/styled-components to v5.1.34

* chore(deps): update node.js to v18.19.0

* refactor: update type declaration for react 18

* chore(deps): update peterjgrainger/action-create-branch action to v2.4.0

* chore(deps): update typescript-eslint monorepo to v5.62.0

* fix(deps): update dependency react-router-dom to v6.21.0

* fix(deps): update dependency sass to v1.69.5

* fix(deps): update dependency undici to v5.28.2

* chore(deps): update storybook monorepo to v7.6.6 (#342)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/checkout action to v4 (#349)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/github-script action to v7 (#350)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency react-i18next to v12.3.1

* chore(deps): update actions/setup-node action to v4

* chore(deps): update actions/stale action to v9

* chore(deps): update actions/upload-artifact action to v4

* chore(deps): update crazy-max/ghaction-import-gpg action to v6 (#355)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: rollback wait-on because it hangs in tcp connection

---------

Signed-off-by: Chen Yu <keithwhisper@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/add-replied-label.yml       |    6 +-
 .github/workflows/check-code-style.yml        |    4 +-
 .github/workflows/check-spell.yml             |    2 +-
 .github/workflows/check_checksums.yml         |    2 +-
 .github/workflows/check_storybook.yml         |    4 +-
 .../workflows/checksums-of-release-draft.yml  |    4 +-
 .github/workflows/codeql-analysis.yml         |    2 +-
 .github/workflows/package.yml                 |   16 +-
 .github/workflows/package_for_test.yml        |   20 +-
 .github/workflows/unit_tests.yml              |    4 +-
 .github/workflows/update-issue-status.yml     |    2 +-
 .../workflows/update_ckb_client_versions.yml  |    6 +-
 .../workflows/update_neuron_compatible.yml    |    6 +-
 .github/workflows/update_valid_target.yml     |   10 +-
 package.json                                  |   16 +-
 packages/neuron-ui/package.json               |   46 +-
 .../ImportHardware/select-model.tsx           |    2 +-
 .../NervosDAODetail/CellsCard/index.tsx       |   11 +-
 .../src/components/NervosDAODetail/index.tsx  |   13 +-
 .../src/components/NetworkSetting/index.tsx   |    2 +-
 .../src/components/Overview/index.tsx         |    2 +-
 .../src/components/SUDTSend/hooks.ts          |   11 +-
 .../src/components/SUDTSend/index.tsx         |   16 +-
 .../src/components/SpecialAssetList/index.tsx |    2 +-
 .../components/WalletEditorDialog/hooks.ts    |    7 +-
 .../src/components/WalletSetting/index.tsx    |    2 +-
 .../src/components/WalletWizard/hooks.ts      |    5 +-
 .../neuron-ui/src/containers/Main/hooks.ts    |    2 +-
 .../neuron-ui/src/widgets/Alert/index.tsx     |    2 +-
 .../src/widgets/RadioGroup/index.tsx          |    2 +-
 .../src/widgets/RingProgressBar/index.tsx     |    4 +-
 .../neuron-ui/src/widgets/Tooltip/index.tsx   |    2 +-
 packages/neuron-wallet/package.json           |    2 +-
 yarn.lock                                     | 3716 +++++++++++------
 34 files changed, 2459 insertions(+), 1494 deletions(-)

diff --git a/.github/workflows/add-replied-label.yml b/.github/workflows/add-replied-label.yml
index 0e7b35c48f..a8f9c1a97b 100644
--- a/.github/workflows/add-replied-label.yml
+++ b/.github/workflows/add-replied-label.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - id: check-access
         name: Check if the commenter is a collaborator
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             try{
@@ -30,7 +30,7 @@ jobs:
 
       - id: check-issue
         name: Check if the comment is replied in an issue
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const response = await github.rest.issues.get({
@@ -45,7 +45,7 @@ jobs:
       - id: add-label
         name: Add 'replied' label
         if: ${{ steps.check-access.outputs.result == 'true' && steps.check-issue.outputs.result == 'true' }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             await github.rest.issues.addLabels({
diff --git a/.github/workflows/check-code-style.yml b/.github/workflows/check-code-style.yml
index 61aa93474a..ca0b73c5ce 100644
--- a/.github/workflows/check-code-style.yml
+++ b/.github/workflows/check-code-style.yml
@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: "yarn"
 
diff --git a/.github/workflows/check-spell.yml b/.github/workflows/check-spell.yml
index 0830c528e8..56431a5b9f 100644
--- a/.github/workflows/check-spell.yml
+++ b/.github/workflows/check-spell.yml
@@ -8,5 +8,5 @@ jobs:
     name: Check spell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: crate-ci/typos@master
diff --git a/.github/workflows/check_checksums.yml b/.github/workflows/check_checksums.yml
index a0ab07480c..14a52723ae 100644
--- a/.github/workflows/check_checksums.yml
+++ b/.github/workflows/check_checksums.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Generate checksums from artifacts
         run:
diff --git a/.github/workflows/check_storybook.yml b/.github/workflows/check_storybook.yml
index c63ff69d39..1f351e7fb1 100644
--- a/.github/workflows/check_storybook.yml
+++ b/.github/workflows/check_storybook.yml
@@ -26,10 +26,10 @@ jobs:
           git config --global core.eol lf
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"
diff --git a/.github/workflows/checksums-of-release-draft.yml b/.github/workflows/checksums-of-release-draft.yml
index a251b99e31..e0881a8db9 100644
--- a/.github/workflows/checksums-of-release-draft.yml
+++ b/.github/workflows/checksums-of-release-draft.yml
@@ -13,10 +13,10 @@ jobs:
     if: github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 'latest'
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5956cb4205..cc8a8c740b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index b10ba13461..c22478947d 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -29,10 +29,10 @@ jobs:
           git config --global core.eol lf
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"
@@ -132,42 +132,42 @@ jobs:
 
       - name: Upload Neuron App Zip
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Mac
           path: release/Neuron-*-mac-x64.zip
 
       - name: Upload Neuron App Zip(arm64)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Mac
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Dmg
           path: release/Neuron-*-x64.dmg
 
       - name: Upload Neuron Dmg(arm64)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Dmg
           path: release/Neuron-*-arm64.dmg
 
       - name: Upload Neuron Win
         if: matrix.os == 'windows-2019'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Win
           path: release/Neuron-*-setup.exe
 
       - name: Upload Neuron Linux
         if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Linux
           path: release/Neuron-*.AppImage
diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
index 04c0f4fdd1..19ce1af5ac 100644
--- a/.github/workflows/package_for_test.yml
+++ b/.github/workflows/package_for_test.yml
@@ -33,17 +33,17 @@ jobs:
           git config --global core.eol lf
 
       - name: Checkout for push
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'push' }}
 
       - name: Checkout for PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'issue_comment' }}
         with:
           ref: refs/pull/${{ github.event.issue.number }}/merge
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"
@@ -111,7 +111,7 @@ jobs:
           CI: false
 
       - name: Write electron-build Test yml
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const fs = require('node:fs')
@@ -164,42 +164,42 @@ jobs:
 
       - name: Upload Neuron App Zip
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Mac-x64
           path: release/Neuron-*-mac-x64.zip
 
       - name: Upload Neuron App Zip(arm64)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Mac-arm64
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Dmg-x64
           path: release/Neuron-*-x64.dmg
 
       - name: Upload Neuron Dmg(arm64)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Dmg-arm64
           path: release/Neuron-*-arm64.dmg
 
       - name: Upload Neuron Win
         if: matrix.os == 'windows-2019'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Win
           path: release/Neuron-*-setup.exe
 
       - name: Upload Neuron Linux
         if: matrix.os == 'ubuntu-20.04'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Neuron-Linux
           path: release/Neuron-*.AppImage
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index ba643391b2..4ca3d472ad 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -26,10 +26,10 @@ jobs:
           git config --global core.eol lf
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: "yarn"
diff --git a/.github/workflows/update-issue-status.yml b/.github/workflows/update-issue-status.yml
index cff334fbfd..6fd7a11d49 100644
--- a/.github/workflows/update-issue-status.yml
+++ b/.github/workflows/update-issue-status.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Update stale issues
-        uses: actions/stale@v8
+        uses: actions/stale@v9
         with:
           any-of-issue-labels: replied
           stale-issue-label: stale
diff --git a/.github/workflows/update_ckb_client_versions.yml b/.github/workflows/update_ckb_client_versions.yml
index e661523a23..2719acf71d 100644
--- a/.github/workflows/update_ckb_client_versions.yml
+++ b/.github/workflows/update_ckb_client_versions.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
 
@@ -28,7 +28,7 @@ jobs:
           git add .ckb-version .ckb-light-version compatible.json
 
       - name: Set GPG
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/update_neuron_compatible.yml b/.github/workflows/update_neuron_compatible.yml
index 19363afadd..ac4764a899 100644
--- a/.github/workflows/update_neuron_compatible.yml
+++ b/.github/workflows/update_neuron_compatible.yml
@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
 
@@ -31,7 +31,7 @@ jobs:
           git add compatible.json
 
       - name: Set GPG
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/update_valid_target.yml b/.github/workflows/update_valid_target.yml
index e68d91ee15..c5c40702b8 100644
--- a/.github/workflows/update_valid_target.yml
+++ b/.github/workflows/update_valid_target.yml
@@ -10,7 +10,7 @@ jobs:
     if: ${{ startsWith(github.ref_name, 'rc/') }}
     steps:
       - name: Create Branch
-        uses: peterjgrainger/action-create-branch@v2.2.0
+        uses: peterjgrainger/action-create-branch@v2.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -18,12 +18,12 @@ jobs:
           sha: '${{ github.event.create.head.sha }}'
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'chore-update-valid-target/${{github.ref_name}}'
       
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.12.0
 
@@ -32,7 +32,7 @@ jobs:
           npm run update:valid-target
 
       - name: Commit env file
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BASE: ${{ github.ref_name }}
@@ -59,7 +59,7 @@ jobs:
             })
 
       - name: Create PR
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BASE: ${{github.ref}}
diff --git a/package.json b/package.json
index de208d177c..6eb94d735a 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "scripts": {
     "start:ui": "cd packages/neuron-ui && yarn run start",
     "start:wallet": "cd packages/neuron-wallet && yarn run start:debug",
-    "start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://127.0.0.1:3000 && yarn run start:wallet\"",
+    "start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on -t 10000 http://127.0.0.1:3000 && yarn run start:wallet\"",
     "clean": "lerna run --stream clean",
     "prebuild": "yarn clean",
     "build": "lerna run --stream build",
@@ -41,15 +41,15 @@
     "update:client-versions": "node ./scripts/update-ckb-client-versions.js"
   },
   "devDependencies": {
-    "@babel/core": "7.23.5",
+    "@babel/core": "7.23.6",
     "@types/jest": "27.5.2",
-    "@types/node": "18.16.18",
+    "@types/node": "18.19.3",
     "@types/npmlog": "4.1.6",
-    "@typescript-eslint/eslint-plugin": "5.60.1",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
     "concurrently": "8.2.2",
     "cross-env": "7.0.3",
-    "eslint": "8.54.0",
+    "eslint": "8.56.0",
     "eslint-config-prettier": "8.10.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
@@ -63,10 +63,10 @@
   },
   "dependencies": {},
   "resolutions": {
-    "@types/react": "17.0.71",
+    "@types/react": "18.2.45",
     "react-i18next": ">=11.16.4"
   },
   "volta": {
-    "node": "18.16.1"
+    "node": "18.19.0"
   }
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index f9253e0dce..540fe4d81f 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -55,57 +55,57 @@
     "@nervosnetwork/ckb-sdk-core": "0.109.0",
     "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",
-    "i18next": "21.10.0",
+    "i18next": "23.7.11",
     "immer": "9.0.21",
     "jsqr": "1.4.0",
     "office-ui-fabric-react": "7.204.0",
     "qr.js": "0.0.0",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "react-i18next": "12.1.5",
-    "react-router-dom": "6.14.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "react-i18next": "13.5.0",
+    "react-router-dom": "6.21.0",
     "react-transition-group": "4.4.5",
-    "sass": "1.63.6",
+    "sass": "1.69.5",
     "tslib": "2.6.2"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/preset-typescript": "7.23.3",
     "@jest/globals": "27.5.1",
-    "@storybook/addon-actions": "7.0.24",
-    "@storybook/addon-essentials": "7.0.24",
-    "@storybook/addon-interactions": "7.0.24",
-    "@storybook/addon-links": "7.0.24",
-    "@storybook/node-logger": "7.0.24",
-    "@storybook/preset-create-react-app": "7.0.24",
-    "@storybook/react": "7.0.24",
-    "@storybook/react-webpack5": "7.0.24",
+    "@storybook/addon-actions": "7.6.6",
+    "@storybook/addon-essentials": "7.6.6",
+    "@storybook/addon-interactions": "7.6.6",
+    "@storybook/addon-links": "7.6.6",
+    "@storybook/node-logger": "7.6.6",
+    "@storybook/preset-create-react-app": "7.6.6",
+    "@storybook/react": "7.6.6",
+    "@storybook/react-webpack5": "7.6.6",
     "@storybook/testing-library": "0.2.2",
     "@types/enzyme": "3.10.18",
     "@types/enzyme-adapter-react-16": "1.0.9",
-    "@types/node": "18.16.18",
-    "@types/react": "17.0.71",
-    "@types/react-dom": "17.0.25",
+    "@types/node": "18.19.3",
+    "@types/react": "18.2.45",
+    "@types/react-dom": "18.2.18",
     "@types/react-router-dom": "5.3.3",
-    "@types/styled-components": "5.1.32",
+    "@types/styled-components": "5.1.34",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
     "electron": "24.8.8",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-react": "7.32.2",
     "jest-styled-components": "7.2.0",
     "react-app-rewired": "2.2.1",
     "react-scripts": "5.0.1",
-    "react-test-renderer": "16.14.0",
-    "storybook": "7.0.24",
+    "react-test-renderer": "18.2.0",
+    "storybook": "7.6.6",
     "storybook-addon-react-router-v6": "1.0.2",
-    "webpack": "5.88.2"
+    "webpack": "5.89.0"
   },
   "resolutions": {
-    "react-i18next": "12.1.5"
+    "react-i18next": "12.3.1"
   }
 }
diff --git a/packages/neuron-ui/src/components/ImportHardware/select-model.tsx b/packages/neuron-ui/src/components/ImportHardware/select-model.tsx
index 67c2c7acd6..6c539575c3 100644
--- a/packages/neuron-ui/src/components/ImportHardware/select-model.tsx
+++ b/packages/neuron-ui/src/components/ImportHardware/select-model.tsx
@@ -51,7 +51,7 @@ const SelectModel = ({ dispatch }: { dispatch: React.Dispatch<ActionType> }) =>
     })
   }, [dispatch, model])
 
-  const onClickDeviceType = useCallback(e => {
+  const onClickDeviceType: React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement> = useCallback(e => {
     const { dataset } = e.target
     setModel(
       dataset.manufacturer && dataset.product
diff --git a/packages/neuron-ui/src/components/NervosDAODetail/CellsCard/index.tsx b/packages/neuron-ui/src/components/NervosDAODetail/CellsCard/index.tsx
index d6f8041f8c..da7689cd06 100644
--- a/packages/neuron-ui/src/components/NervosDAODetail/CellsCard/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAODetail/CellsCard/index.tsx
@@ -13,12 +13,11 @@ import CopyZone from 'widgets/CopyZone'
 import Tooltip from 'widgets/Tooltip'
 import styles from './cellsCard.module.scss'
 
-const TabsVariantWithCellsCard: FC<
-  VariantProps<{
-    title: string
-    cells: (State.DetailedInput | State.DetailedOutput)[]
-  }>
-> = ({ tabs, selectedTab, onTabChange }) => {
+const TabsVariantWithCellsCard = ({
+  tabs,
+  selectedTab,
+  onTabChange,
+}: VariantProps<{ title: string; cells: (State.DetailedInput | State.DetailedOutput)[] }>): React.ReactElement => {
   const [t] = useTranslation()
   const {
     chain: { networkID },
diff --git a/packages/neuron-ui/src/components/NervosDAODetail/index.tsx b/packages/neuron-ui/src/components/NervosDAODetail/index.tsx
index 6fc9fd8a53..f4ed335c33 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, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState, transactionState, useDispatch, showPageNotice } from 'states'
 import {
@@ -25,12 +25,11 @@ import styles from './nervosDAODetail.module.scss'
 import hooks from './hooks'
 import CellsCard from './CellsCard'
 
-const TabsVariantWithTxTypes: FC<
-  VariantProps<{
-    title: string
-    hash: string
-  }>
-> = ({ tabs, selectedTab, onTabChange }) => {
+const TabsVariantWithTxTypes = ({
+  tabs,
+  selectedTab,
+  onTabChange,
+}: VariantProps<Record<'title' | 'hash', string>>): React.ReactElement => {
   const [t] = useTranslation()
   const [transaction, setTransaction] = useState(transactionState)
   const [error, setError] = useState<string>()
diff --git a/packages/neuron-ui/src/components/NetworkSetting/index.tsx b/packages/neuron-ui/src/components/NetworkSetting/index.tsx
index 7af39881f5..aeb393cc48 100644
--- a/packages/neuron-ui/src/components/NetworkSetting/index.tsx
+++ b/packages/neuron-ui/src/components/NetworkSetting/index.tsx
@@ -62,7 +62,7 @@ const NetworkSetting = ({ chain = chainState, settings: { networks = [] } }: Sta
   useOnWindowResize(toggleBottomBorder)
 
   const handleChange = useCallback(
-    checked => {
+    (checked: string) => {
       if (checked !== currentId) {
         setCurrentNetwork(checked)
       }
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index 0275ab5fec..c637c9aae3 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -100,7 +100,7 @@ const Overview = () => {
     })(dispatch)
   }, [id, dispatch])
 
-  const onRecentActivityClick = useCallback((_, item: State.Transaction) => {
+  const onRecentActivityClick = useCallback((_: React.SyntheticEvent, item: State.Transaction) => {
     const { hash } = item
     navigate(`${RoutePath.Overview}/${hash}`)
   }, [])
diff --git a/packages/neuron-ui/src/components/SUDTSend/hooks.ts b/packages/neuron-ui/src/components/SUDTSend/hooks.ts
index 14c84f6cc9..0b06e1189c 100644
--- a/packages/neuron-ui/src/components/SUDTSend/hooks.ts
+++ b/packages/neuron-ui/src/components/SUDTSend/hooks.ts
@@ -1,3 +1,4 @@
+import type { TOptions } from 'i18next'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { AccountType, isAnyoneCanPayAddress, isSecp256k1Address, isSuccessResponse, shannonToCKBFormatter } from 'utils'
 import { SUDTAccount } from 'components/SUDTAccountList'
@@ -29,7 +30,7 @@ type Option = {
   tooltip?: string
   label: string
   key: SendType
-  params?: object
+  params?: TOptions
 }
 export function useOptions({
   address,
@@ -127,8 +128,8 @@ export function useSendType({
     }
   }, [addressLockType, accountType])
   const onChange = useCallback(
-    id => {
-      setSendType(id as SendType)
+    (id: SendType | undefined) => {
+      setSendType(id)
     },
     [setSendType]
   )
@@ -138,6 +139,10 @@ export function useSendType({
   }
 }
 
+export const isSendType = (v: string): v is SendType => {
+  return Object.values(SendType).includes(v as SendType)
+}
+
 export function getGenerator(sendType?: SendType) {
   if (sendType === SendType.secp256Cheque) {
     return generateChequeTransaction
diff --git a/packages/neuron-ui/src/components/SUDTSend/index.tsx b/packages/neuron-ui/src/components/SUDTSend/index.tsx
index 3b13ee4aad..8b7661721c 100644
--- a/packages/neuron-ui/src/components/SUDTSend/index.tsx
+++ b/packages/neuron-ui/src/components/SUDTSend/index.tsx
@@ -34,7 +34,15 @@ import { SendType } from 'utils/enums'
 import { AmountNotEnoughException, isErrorWithI18n } from 'exceptions'
 import { getDisplayName, getDisplaySymbol } from 'components/UANDisplay'
 import { Attention } from 'widgets/Icons/icon'
-import { AddressLockType, getGenerator, useAddressLockType, useOnSubmit, useOptions, useSendType } from './hooks'
+import {
+  AddressLockType,
+  getGenerator,
+  isSendType,
+  useAddressLockType,
+  useOnSubmit,
+  useOptions,
+  useSendType,
+} from './hooks'
 import styles from './sUDTSend.module.scss'
 
 const { INIT_SEND_PRICE, DEFAULT_SUDT_FIELDS, HIDE_BALANCE } = CONSTANTS
@@ -401,7 +409,11 @@ const SUDTSend = () => {
                       <>
                         {options.length > 1 ? (
                           <RadioGroup
-                            onChange={onChangeSendType}
+                            onChange={(v: string) => {
+                              if (isSendType(v)) {
+                                onChangeSendType(v)
+                              }
+                            }}
                             itemClassName={styles.optionItem}
                             options={options.map(item => ({
                               value: item.key,
diff --git a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
index 402d9f1e01..f0f9a69cb5 100644
--- a/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
+++ b/packages/neuron-ui/src/components/SpecialAssetList/index.tsx
@@ -220,7 +220,7 @@ const SpecialAssetList = () => {
   }, [search, id, dispatch, fetchList])
 
   const handleActionSuccess = useCallback(
-    text => {
+    (text: string) => {
       setNotice(text)
       fetchList(id, pageNo)
     },
diff --git a/packages/neuron-ui/src/components/WalletEditorDialog/hooks.ts b/packages/neuron-ui/src/components/WalletEditorDialog/hooks.ts
index 0a344b51cf..afe9f4c3c5 100644
--- a/packages/neuron-ui/src/components/WalletEditorDialog/hooks.ts
+++ b/packages/neuron-ui/src/components/WalletEditorDialog/hooks.ts
@@ -1,3 +1,4 @@
+import type { TOptions } from 'i18next'
 import { useState, useMemo, useCallback } from 'react'
 import { StateDispatch, updateWalletProperty } from 'states'
 import { ErrorCode, ResponseCode, CONSTANTS } from 'utils'
@@ -61,7 +62,11 @@ export const useOnSubmit = (
   }, [name, id, dispatch, disabled])
 }
 
-export const useHint = (name: string, usedNames: string[], t: (key: string, opts: object) => string): string | null => {
+export const useHint = (
+  name: string,
+  usedNames: string[],
+  t: (key: string, opts: TOptions) => string
+): string | null => {
   return useMemo(() => {
     if (name === '') {
       return t(`messages.codes.${ErrorCode.FieldRequired}`, { fieldName: 'name' })
diff --git a/packages/neuron-ui/src/components/WalletSetting/index.tsx b/packages/neuron-ui/src/components/WalletSetting/index.tsx
index 19a94a203a..821ae19c7b 100644
--- a/packages/neuron-ui/src/components/WalletSetting/index.tsx
+++ b/packages/neuron-ui/src/components/WalletSetting/index.tsx
@@ -71,7 +71,7 @@ const WalletSetting = ({
   const onHandleWallet = useOnHandleWallet({ dispatch })
 
   const handleChange = useCallback(
-    checked => {
+    (checked: string) => {
       onHandleWallet({
         target: {
           dataset: {
diff --git a/packages/neuron-ui/src/components/WalletWizard/hooks.ts b/packages/neuron-ui/src/components/WalletWizard/hooks.ts
index 40547bd7d8..c52c3867bd 100644
--- a/packages/neuron-ui/src/components/WalletWizard/hooks.ts
+++ b/packages/neuron-ui/src/components/WalletWizard/hooks.ts
@@ -3,8 +3,9 @@ import { useState, useCallback } from 'react'
 export const useInputWords = () => {
   const [inputsWords, setInputsWords] = useState<string[]>(new Array(12).fill(''))
   const onChangeInput = useCallback(
-    e => {
-      const idx = +e.target.dataset.idx
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const idx = Number(e.target.dataset.idx)
+      if (Number.isNaN(idx)) return
       const { value } = e.target
       setInputsWords(v => {
         const newWords = [...v]
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
index 3111c1ca43..e8c04e5a65 100644
--- a/packages/neuron-ui/src/containers/Main/hooks.ts
+++ b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -118,7 +118,7 @@ export const useSubscription = ({
   const { pageNo, pageSize, keywords } = chain.transactions
 
   const navigateToolsRouter = useCallback(
-    path => {
+    (path: string) => {
       const { pathname } = location
       const currentPath = [RoutePath.OfflineSign, RoutePath.SignVerify, RoutePath.MultisigAddress].find(item =>
         pathname.includes(item)
diff --git a/packages/neuron-ui/src/widgets/Alert/index.tsx b/packages/neuron-ui/src/widgets/Alert/index.tsx
index 79db002055..f1e1fe4b09 100644
--- a/packages/neuron-ui/src/widgets/Alert/index.tsx
+++ b/packages/neuron-ui/src/widgets/Alert/index.tsx
@@ -4,7 +4,7 @@ import styles from './index.module.scss'
 
 type AlertStatus = 'init' | 'success' | 'error' | 'warn'
 
-const Alert: React.FC<{ status: AlertStatus; className?: string; withIcon?: boolean }> = ({
+const Alert: React.FC<React.PropsWithChildren<{ status: AlertStatus; className?: string; withIcon?: boolean }>> = ({
   status,
   children,
   className,
diff --git a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
index 1ca7197d1a..0355b90693 100644
--- a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
+++ b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
@@ -11,7 +11,7 @@ export interface RadioGroupOptions {
 
 export interface RadioGroupProps {
   options: RadioGroupOptions[]
-  onChange?: (arg: string | number) => void
+  onChange?: (arg: string) => void
   defaultValue?: string | number
   value?: string | number
   itemClassName?: string
diff --git a/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx b/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
index 5712fd2bc7..ff85f6561f 100644
--- a/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
+++ b/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
@@ -13,12 +13,14 @@ const RingProgressBar = ({
   strokeWidth?: React.CSSProperties['strokeWidth']
   size?: React.CSSProperties['width']
 }) => {
+  // declare background as a string to avoid type error "Expression produces a union type that is too complex to represent."
+  const background: string = `conic-gradient(${color} 0%, ${color} ${percents}%, ${backgroundColor} ${percents}%, ${backgroundColor} 100%)`
   return (
     <div
       style={{
         width: size,
         height: size,
-        background: `conic-gradient(${color} 0%, ${color} ${percents}%, ${backgroundColor} ${percents}%, ${backgroundColor} 100%)`,
+        background,
         borderRadius: '50%',
         WebkitMask: `radial-gradient(transparent calc(${size}/2 - ${strokeWidth}), #000 calc(${size}/2 - ${strokeWidth}))`,
       }}
diff --git a/packages/neuron-ui/src/widgets/Tooltip/index.tsx b/packages/neuron-ui/src/widgets/Tooltip/index.tsx
index c4140812b0..8b6563cba4 100644
--- a/packages/neuron-ui/src/widgets/Tooltip/index.tsx
+++ b/packages/neuron-ui/src/widgets/Tooltip/index.tsx
@@ -16,7 +16,7 @@ interface TooltipProps {
   isTriggerNextToChild?: boolean
   onVisibleChange?: (visible: boolean) => void
 }
-const Tooltip: React.FC<TooltipProps> = ({
+const Tooltip: React.FC<React.PropsWithChildren<TooltipProps>> = ({
   children,
   tip,
   className = '',
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 6e040ee8a5..73b45ea269 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -74,7 +74,7 @@
     "subleveldown": "4.1.4",
     "tslib": "2.6.2",
     "typeorm": "0.2.45",
-    "undici": "5.26.2",
+    "undici": "5.28.2",
     "uuid": "8.3.2"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 9d4e90fcc6..9fad12f853 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -39,14 +39,14 @@
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@aw-web-design/x-default-browser@1.4.88":
-  version "1.4.88"
-  resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.88.tgz#33d869cb2a537cd6d2a8369d4dc8ea4988d4be89"
-  integrity sha512-AkEmF0wcwYC2QkhK703Y83fxWARttIWXDmQN8+cof8FmFZ5BRhnNXGymeb1S73bOCLfWjYELxtujL56idCN/XA==
+"@aw-web-design/x-default-browser@1.4.126":
+  version "1.4.126"
+  resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz#43e4bd8f0314ed907a8718d7e862a203af79bc16"
+  integrity sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==
   dependencies:
     default-browser-id "3.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
   integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
@@ -69,38 +69,38 @@
     "@babel/highlight" "^7.23.4"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5", "@babel/compat-data@^7.22.5":
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
   integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
 
-"@babel/compat-data@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
-  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
-
-"@babel/core@7.23.5":
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
   version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7"
-  integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+
+"@babel/core@7.23.6", "@babel/core@^7.18.9", "@babel/core@^7.23.0", "@babel/core@^7.23.2":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4"
+  integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
     "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.5"
-    "@babel/parser" "^7.23.5"
+    "@babel/helpers" "^7.23.6"
+    "@babel/parser" "^7.23.6"
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.5"
-    "@babel/types" "^7.23.5"
+    "@babel/traverse" "^7.23.6"
+    "@babel/types" "^7.23.6"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.16.0", "@babel/core@^7.20.2", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0":
+"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
   integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
@@ -121,27 +121,6 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@~7.21.0":
-  version "7.21.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
-  integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.5"
-    "@babel/helper-compilation-targets" "^7.21.5"
-    "@babel/helper-module-transforms" "^7.21.5"
-    "@babel/helpers" "^7.21.5"
-    "@babel/parser" "^7.21.8"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.5"
-    "@babel/types" "^7.21.5"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
-
 "@babel/eslint-parser@^7.16.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78"
@@ -151,7 +130,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.12.11", "@babel/generator@^7.21.5", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2":
+"@babel/generator@^7.22.5", "@babel/generator@^7.7.2":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
   integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
@@ -161,22 +140,12 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755"
-  integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==
-  dependencies:
-    "@babel/types" "^7.23.5"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@~7.21.1":
-  version "7.21.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.9.tgz#3a1b706e07d836e204aee0650e8ee878d3aaa241"
-  integrity sha512-F3fZga2uv09wFdEjEQIJxXALXfz0+JaOb7SabvVMmjHxeVTuGW8wgE8Vp1Hd7O+zMTYtcfEISGRzPkeiaPPsvg==
+"@babel/generator@^7.23.0", "@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
   dependencies:
-    "@babel/types" "^7.21.5"
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -188,6 +157,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
@@ -195,7 +171,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5", "@babel/helper-compilation-targets@^7.22.5":
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
   integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
@@ -206,14 +182,14 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
-  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
-    browserslist "^4.21.9"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
@@ -256,17 +232,14 @@
     regexpu-core "^5.3.1"
     semver "^6.3.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-create-regexp-features-plugin@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.4.0":
   version "0.4.0"
@@ -280,17 +253,28 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+"@babel/helper-define-polyfill-provider@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088"
+  integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
 
 "@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5":
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+
+"@babel/helper-function-name@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
   integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
@@ -306,7 +290,7 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
-"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+"@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
@@ -341,7 +325,7 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.21.5", "@babel/helper-module-transforms@^7.22.5":
+"@babel/helper-module-transforms@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
   integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
@@ -373,12 +357,21 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.5":
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
+
+"@babel/helper-remap-async-to-generator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
   integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==
@@ -388,6 +381,15 @@
     "@babel/helper-wrap-function" "^7.22.5"
     "@babel/types" "^7.22.5"
 
+"@babel/helper-replace-supers@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+
 "@babel/helper-replace-supers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
@@ -423,7 +425,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
+"@babel/helper-split-export-declaration@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
   integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
@@ -437,7 +439,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.22.5":
+"@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
@@ -447,11 +449,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
-
 "@babel/helper-validator-identifier@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044"
@@ -462,16 +459,35 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5":
+"@babel/helper-validator-identifier@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
-  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
 "@babel/helper-validator-option@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
   integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
 
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+  dependencies:
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
+
 "@babel/helper-wrap-function@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
@@ -482,7 +498,7 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.21.5", "@babel/helpers@^7.22.5":
+"@babel/helpers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
   integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
@@ -491,14 +507,14 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e"
-  integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==
+"@babel/helpers@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a"
+  integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==
   dependencies:
     "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.5"
-    "@babel/types" "^7.23.5"
+    "@babel/traverse" "^7.23.6"
+    "@babel/types" "^7.23.6"
 
 "@babel/highlight@^7.22.13":
   version "7.22.13"
@@ -527,7 +543,7 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.22.5":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
   integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
@@ -537,24 +553,26 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
   integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
 
-"@babel/parser@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563"
-  integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==
-
-"@babel/parser@~7.21.2":
-  version "7.21.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.9.tgz#ab18ea3b85b4bc33ba98a8d4c2032c557d23cf14"
-  integrity sha512-q5PNg/Bi1OpGgx5jYlvWZwAorZepEudDMCLtj967aeS7WMont7dUZI46M2XwcIQqvUlMxWfdLFu4S/qSxeUu5g==
+"@babel/parser@^7.23.0", "@babel/parser@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
+  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
   integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
   integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
@@ -563,17 +581,24 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
-"@babel/plugin-proposal-async-generator-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098"
+  integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6":
+"@babel/plugin-proposal-class-properties@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -581,15 +606,6 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
 "@babel/plugin-proposal-decorators@^7.16.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
@@ -601,39 +617,7 @@
     "@babel/helper-split-export-declaration" "^7.22.5"
     "@babel/plugin-syntax-decorators" "^7.22.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -641,7 +625,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.18.6":
+"@babel/plugin-proposal-numeric-separator@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
@@ -649,26 +633,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.21.0":
+"@babel/plugin-proposal-optional-chaining@^7.16.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -677,7 +642,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.18.6":
+"@babel/plugin-proposal-private-methods@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
@@ -690,7 +655,7 @@
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-private-property-in-object@7.21.11", "@babel/plugin-proposal-private-property-in-object@^7.21.0":
+"@babel/plugin-proposal-private-property-in-object@7.21.11":
   version "7.21.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
   integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
@@ -700,7 +665,7 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -764,13 +729,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0", "@babel/plugin-syntax-import-assertions@^7.22.5":
+"@babel/plugin-syntax-flow@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz#084564e0f3cc21ea6c70c44cff984a1c0509729a"
+  integrity sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-assertions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
   integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-syntax-import-assertions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-import-attributes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
@@ -778,6 +757,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-syntax-import-attributes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
+  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
@@ -884,13 +870,20 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.21.5", "@babel/plugin-transform-arrow-functions@^7.22.5":
+"@babel/plugin-transform-arrow-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
   integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-arrow-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-async-generator-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3"
@@ -901,7 +894,17 @@
     "@babel/helper-remap-async-to-generator" "^7.22.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-async-to-generator@^7.20.7", "@babel/plugin-transform-async-to-generator@^7.22.5":
+"@babel/plugin-transform-async-generator-functions@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a"
+  integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-transform-async-to-generator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
   integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
@@ -910,20 +913,43 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.22.5":
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
   integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.21.0", "@babel/plugin-transform-block-scoping@^7.22.5":
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
   integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-block-scoping@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-class-properties@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
@@ -932,6 +958,14 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-class-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
+  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-class-static-block@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
@@ -941,7 +975,16 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.21.0", "@babel/plugin-transform-classes@^7.22.5":
+"@babel/plugin-transform-class-static-block@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
+  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
   integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==
@@ -956,7 +999,22 @@
     "@babel/helper-split-export-declaration" "^7.22.5"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.21.5", "@babel/plugin-transform-computed-properties@^7.22.5":
+"@babel/plugin-transform-classes@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz#e7a75f815e0c534cc4c9a39c56636c84fc0d64f2"
+  integrity sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
   integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
@@ -964,14 +1022,29 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.21.3", "@babel/plugin-transform-destructuring@^7.22.5":
+"@babel/plugin-transform-computed-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.15"
+
+"@babel/plugin-transform-destructuring@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
   integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-destructuring@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
   integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
@@ -979,13 +1052,28 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.22.5":
+"@babel/plugin-transform-dotall-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
   integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-duplicate-keys@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-dynamic-import@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
@@ -994,7 +1082,15 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.22.5":
+"@babel/plugin-transform-dynamic-import@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
+  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
   integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
@@ -1002,6 +1098,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-exponentiation-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-export-namespace-from@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
@@ -1010,7 +1114,15 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@^7.16.0", "@babel/plugin-transform-flow-strip-types@^7.22.5":
+"@babel/plugin-transform-export-namespace-from@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
+  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-transform-flow-strip-types@^7.16.0":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz#0bb17110c7bf5b35a60754b2f00c58302381dee2"
   integrity sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==
@@ -1018,14 +1130,30 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-flow" "^7.22.5"
 
-"@babel/plugin-transform-for-of@^7.21.5", "@babel/plugin-transform-for-of@^7.22.5":
+"@babel/plugin-transform-flow-strip-types@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz#cfa7ca159cc3306fab526fc67091556b51af26ff"
+  integrity sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-flow" "^7.23.3"
+
+"@babel/plugin-transform-for-of@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
   integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.22.5":
+"@babel/plugin-transform-for-of@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
+  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-function-name@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
   integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
@@ -1034,6 +1162,15 @@
     "@babel/helper-function-name" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-function-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-json-strings@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
@@ -1042,13 +1179,28 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.22.5":
+"@babel/plugin-transform-json-strings@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
+  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-transform-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
   integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-logical-assignment-operators@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
@@ -1057,14 +1209,29 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.22.5":
+"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
+  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
   integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.22.5":
+"@babel/plugin-transform-member-expression-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-modules-amd@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
   integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
@@ -1072,7 +1239,15 @@
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.22.5":
+"@babel/plugin-transform-modules-amd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
   integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
@@ -1081,7 +1256,7 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.3":
+"@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
   integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
@@ -1090,7 +1265,7 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.20.11", "@babel/plugin-transform-modules-systemjs@^7.22.5":
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
   integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
@@ -1100,7 +1275,17 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.22.5":
+"@babel/plugin-transform-modules-systemjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
+  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
+"@babel/plugin-transform-modules-umd@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
   integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
@@ -1108,7 +1293,15 @@
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+"@babel/plugin-transform-modules-umd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
   integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
@@ -1116,13 +1309,28 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.22.5":
+"@babel/plugin-transform-new-target@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
   integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-new-target@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11", "@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
+  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
@@ -1139,6 +1347,14 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
+"@babel/plugin-transform-numeric-separator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
+  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-transform-object-rest-spread@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
@@ -1150,7 +1366,18 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.22.5":
+"@babel/plugin-transform-object-rest-spread@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
+  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
+  dependencies:
+    "@babel/compat-data" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+
+"@babel/plugin-transform-object-super@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
   integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
@@ -1158,6 +1385,14 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-replace-supers" "^7.22.5"
 
+"@babel/plugin-transform-object-super@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+
 "@babel/plugin-transform-optional-catch-binding@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
@@ -1166,6 +1401,14 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
+"@babel/plugin-transform-optional-catch-binding@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
+  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
 "@babel/plugin-transform-optional-chaining@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0"
@@ -1175,13 +1418,29 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3", "@babel/plugin-transform-parameters@^7.22.5":
+"@babel/plugin-transform-optional-chaining@^7.23.0", "@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
   integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-private-methods@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
@@ -1190,6 +1449,14 @@
     "@babel/helper-create-class-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-private-methods@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
+  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-private-property-in-object@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
@@ -1200,13 +1467,30 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.22.5":
+"@babel/plugin-transform-private-property-in-object@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
+  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
   integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-property-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-constant-elements@^7.12.1":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz#6dfa7c1c37f7d7279e417ceddf5a04abb8bb9c29"
@@ -1221,6 +1505,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-react-display-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200"
+  integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-jsx-development@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
@@ -1228,7 +1519,18 @@
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.22.5"
 
-"@babel/plugin-transform-react-jsx@^7.19.0", "@babel/plugin-transform-react-jsx@^7.22.5":
+"@babel/plugin-transform-react-jsx@^7.22.15":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312"
+  integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.23.3"
+    "@babel/types" "^7.23.4"
+
+"@babel/plugin-transform-react-jsx@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416"
   integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==
@@ -1247,7 +1549,15 @@
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.21.5", "@babel/plugin-transform-regenerator@^7.22.5":
+"@babel/plugin-transform-react-pure-annotations@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz#fabedbdb8ee40edf5da96f3ecfc6958e3783b93c"
+  integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
   integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
@@ -1255,13 +1565,28 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.22.5":
+"@babel/plugin-transform-regenerator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
   integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-reserved-words@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-runtime@^7.16.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
@@ -1274,14 +1599,21 @@
     babel-plugin-polyfill-regenerator "^0.5.0"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.22.5":
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
   integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.20.7", "@babel/plugin-transform-spread@^7.22.5":
+"@babel/plugin-transform-shorthand-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-spread@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
   integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
@@ -1289,27 +1621,56 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.22.5":
+"@babel/plugin-transform-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-sticky-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
   integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.22.5":
+"@babel/plugin-transform-sticky-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-template-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
   integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.22.5":
+"@babel/plugin-transform-template-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
   integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-typeof-symbol@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-typescript@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d"
@@ -1330,13 +1691,20 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-typescript" "^7.23.3"
 
-"@babel/plugin-transform-unicode-escapes@^7.21.5", "@babel/plugin-transform-unicode-escapes@^7.22.5":
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
   integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-unicode-escapes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-unicode-property-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
@@ -1345,7 +1713,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.22.5":
+"@babel/plugin-transform-unicode-property-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
+  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
   integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
@@ -1353,6 +1729,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-unicode-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-unicode-sets-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
@@ -1361,7 +1745,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.20.2":
+"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
+  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
   integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
@@ -1447,38 +1839,26 @@
     core-js-compat "^3.30.2"
     semver "^6.3.0"
 
-"@babel/preset-env@~7.21.0":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb"
-  integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==
-  dependencies:
-    "@babel/compat-data" "^7.21.5"
-    "@babel/helper-compilation-targets" "^7.21.5"
-    "@babel/helper-plugin-utils" "^7.21.5"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.21.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+"@babel/preset-env@^7.23.2":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.6.tgz#ad0ea799d5a3c07db5b9a172819bbd444092187a"
+  integrity sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-import-assertions" "^7.23.3"
+    "@babel/plugin-syntax-import-attributes" "^7.23.3"
     "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -1489,54 +1869,79 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.21.5"
-    "@babel/plugin-transform-async-to-generator" "^7.20.7"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.21.0"
-    "@babel/plugin-transform-classes" "^7.21.0"
-    "@babel/plugin-transform-computed-properties" "^7.21.5"
-    "@babel/plugin-transform-destructuring" "^7.21.3"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.21.5"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.20.11"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.21.3"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.21.5"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.20.7"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.21.5"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.21.5"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.23.3"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.4"
+    "@babel/plugin-transform-async-to-generator" "^7.23.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
+    "@babel/plugin-transform-block-scoping" "^7.23.4"
+    "@babel/plugin-transform-class-properties" "^7.23.3"
+    "@babel/plugin-transform-class-static-block" "^7.23.4"
+    "@babel/plugin-transform-classes" "^7.23.5"
+    "@babel/plugin-transform-computed-properties" "^7.23.3"
+    "@babel/plugin-transform-destructuring" "^7.23.3"
+    "@babel/plugin-transform-dotall-regex" "^7.23.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
+    "@babel/plugin-transform-dynamic-import" "^7.23.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
+    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
+    "@babel/plugin-transform-for-of" "^7.23.6"
+    "@babel/plugin-transform-function-name" "^7.23.3"
+    "@babel/plugin-transform-json-strings" "^7.23.4"
+    "@babel/plugin-transform-literals" "^7.23.3"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
+    "@babel/plugin-transform-modules-amd" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
+    "@babel/plugin-transform-modules-umd" "^7.23.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.23.3"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
+    "@babel/plugin-transform-numeric-separator" "^7.23.4"
+    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
+    "@babel/plugin-transform-object-super" "^7.23.3"
+    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
+    "@babel/plugin-transform-optional-chaining" "^7.23.4"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-private-methods" "^7.23.3"
+    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
+    "@babel/plugin-transform-property-literals" "^7.23.3"
+    "@babel/plugin-transform-regenerator" "^7.23.3"
+    "@babel/plugin-transform-reserved-words" "^7.23.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
+    "@babel/plugin-transform-spread" "^7.23.3"
+    "@babel/plugin-transform-sticky-regex" "^7.23.3"
+    "@babel/plugin-transform-template-literals" "^7.23.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
+    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
+    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
-"@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.18.6":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.22.5.tgz#876f24ab6b38bd79703a93f32020ca2162312784"
-  integrity sha512-ta2qZ+LSiGCrP5pgcGt8xMnnkXQrq8Sa4Ulhy06BOlF5QbLw9q5hIx7bn5MrsvyTGAfh6kTOo07Q+Pfld/8Y5Q==
+"@babel/preset-flow@^7.22.15":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.23.3.tgz#8084e08b9ccec287bd077ab288b286fab96ffab1"
+  integrity sha512-7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-transform-flow-strip-types" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-transform-flow-strip-types" "^7.23.3"
+
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
 
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
@@ -1549,7 +1954,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0", "@babel/preset-react@^7.18.6":
+"@babel/preset-react@^7.12.5", "@babel/preset-react@^7.16.0":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.5.tgz#c4d6058fbf80bccad02dd8c313a9aaa67e3c3dd6"
   integrity sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==
@@ -1561,7 +1966,19 @@
     "@babel/plugin-transform-react-jsx-development" "^7.22.5"
     "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
 
-"@babel/preset-typescript@7.23.3":
+"@babel/preset-react@^7.22.15":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.23.3.tgz#f73ca07e7590f977db07eb54dbe46538cc015709"
+  integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-transform-react-display-name" "^7.23.3"
+    "@babel/plugin-transform-react-jsx" "^7.22.15"
+    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.23.3"
+
+"@babel/preset-typescript@7.23.3", "@babel/preset-typescript@^7.23.0":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz#14534b34ed5b6d435aa05f1ae1c5e7adcc01d913"
   integrity sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==
@@ -1572,7 +1989,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.23.3"
     "@babel/plugin-transform-typescript" "^7.23.3"
 
-"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.0":
+"@babel/preset-typescript@^7.16.0":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
   integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
@@ -1583,10 +2000,10 @@
     "@babel/plugin-transform-modules-commonjs" "^7.22.5"
     "@babel/plugin-transform-typescript" "^7.22.5"
 
-"@babel/register@^7.13.16":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939"
-  integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==
+"@babel/register@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.15.tgz#c2c294a361d59f5fa7bcc8b97ef7319c32ecaec7"
+  integrity sha512-V3Q3EqoQdn65RCgTLwauZaTfd1ShhwPmbBv+1dkZV/HpCGMKVyn6oFcRlI7RaKqiDQjX2Qd3AuoEguBgdjIKlg==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -1599,13 +2016,20 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
   integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.13.10", "@babel/runtime@^7.23.2":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"
+  integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@^7.22.5":
   version "7.23.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e"
@@ -1613,15 +2037,6 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.20.7", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
 "@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
@@ -1631,55 +2046,48 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.21.5", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
+"@babel/template@^7.22.5", "@babel/template@^7.3.3":
   version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
-  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
     "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
     "@babel/parser" "^7.22.5"
     "@babel/types" "^7.22.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
 
-"@babel/traverse@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec"
-  integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==
+"@babel/traverse@^7.18.9", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5"
+  integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==
   dependencies:
     "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.5"
+    "@babel/generator" "^7.23.6"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.5"
-    "@babel/types" "^7.23.5"
-    debug "^4.1.0"
+    "@babel/parser" "^7.23.6"
+    "@babel/types" "^7.23.6"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@~7.21.2":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
-  integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
-  dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.5"
-    "@babel/helper-environment-visitor" "^7.21.5"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.5"
-    "@babel/types" "^7.21.5"
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
+  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
   integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
@@ -1688,40 +2096,31 @@
     "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282"
-  integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==
+"@babel/types@^7.18.9", "@babel/types@^7.22.19", "@babel/types@^7.23.4", "@babel/types@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
+  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.15"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602"
-  integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==
+"@babel/types@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282"
+  integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.15"
     to-fast-properties "^2.0.0"
 
-"@babel/types@~7.21.2":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
-  integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+"@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
   dependencies:
-    "@babel/helper-string-parser" "^7.21.5"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@base2/pretty-print-object@1.0.1":
@@ -2143,115 +2542,115 @@
   resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963"
   integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==
 
-"@esbuild/android-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
-  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
-
-"@esbuild/android-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
-  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
-
-"@esbuild/android-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
-  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
-
-"@esbuild/darwin-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
-  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
-
-"@esbuild/darwin-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
-  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
-
-"@esbuild/freebsd-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
-  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
-
-"@esbuild/freebsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
-  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
-
-"@esbuild/linux-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
-  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
-
-"@esbuild/linux-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
-  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
-
-"@esbuild/linux-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
-  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
-
-"@esbuild/linux-loong64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
-  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
-
-"@esbuild/linux-mips64el@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
-  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
-
-"@esbuild/linux-ppc64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
-  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
-
-"@esbuild/linux-riscv64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
-  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
-
-"@esbuild/linux-s390x@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
-  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
-
-"@esbuild/linux-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
-  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
-
-"@esbuild/netbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
-  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
-
-"@esbuild/openbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
-  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
-
-"@esbuild/sunos-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
-  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
-
-"@esbuild/win32-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
-  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
-
-"@esbuild/win32-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
-  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
-
-"@esbuild/win32-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
-  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
+"@esbuild/android-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
+  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
+
+"@esbuild/android-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
+  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
+
+"@esbuild/android-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
+  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
+
+"@esbuild/darwin-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
+  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
+
+"@esbuild/darwin-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
+  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
+
+"@esbuild/freebsd-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
+  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
+
+"@esbuild/freebsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
+  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
+
+"@esbuild/linux-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
+  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
+
+"@esbuild/linux-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
+  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
+
+"@esbuild/linux-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
+  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
+
+"@esbuild/linux-loong64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
+  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
+
+"@esbuild/linux-mips64el@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
+  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
+
+"@esbuild/linux-ppc64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
+  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
+
+"@esbuild/linux-riscv64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
+  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
+
+"@esbuild/linux-s390x@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
+  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
+
+"@esbuild/linux-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
+  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
+
+"@esbuild/netbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
+  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
+
+"@esbuild/openbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
+  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
+
+"@esbuild/sunos-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
+  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
+
+"@esbuild/win32-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
+  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
+
+"@esbuild/win32-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
+  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
+
+"@esbuild/win32-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
+  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
@@ -2285,10 +2684,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/eslintrc@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
-  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -2305,10 +2704,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0"
   integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==
 
-"@eslint/js@8.54.0":
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
-  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
+"@eslint/js@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
+  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
 "@fal-works/esbuild-plugin-global-externals@^2.1.2":
   version "2.1.2"
@@ -2320,6 +2719,33 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
   integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
 
+"@floating-ui/core@^1.4.2":
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.5.2.tgz#53a0f7a98c550e63134d504f26804f6b83dbc071"
+  integrity sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==
+  dependencies:
+    "@floating-ui/utils" "^0.1.3"
+
+"@floating-ui/dom@^1.5.1":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.5.3.tgz#54e50efcb432c06c23cd33de2b575102005436fa"
+  integrity sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==
+  dependencies:
+    "@floating-ui/core" "^1.4.2"
+    "@floating-ui/utils" "^0.1.3"
+
+"@floating-ui/react-dom@^2.0.0":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.4.tgz#b076fafbdfeb881e1d86ae748b7ff95150e9f3ec"
+  integrity sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==
+  dependencies:
+    "@floating-ui/dom" "^1.5.1"
+
+"@floating-ui/utils@^0.1.3":
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.1.6.tgz#22958c042e10b67463997bd6ea7115fe28cbcaf9"
+  integrity sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==
+
 "@fluentui/date-time-utilities@^7.9.1":
   version "7.9.1"
   resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz#bb486dc0a0fff33ef5803adabbf95e2cbf4be7be"
@@ -2491,7 +2917,7 @@
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
-"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
+"@istanbuljs/schema@^0.1.2":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
@@ -2836,12 +3262,12 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
   integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
@@ -3415,7 +3841,7 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.5.1", "@pmmmwh/react-refresh-webpack-plugin@^0.5.3", "@pmmmwh/react-refresh-webpack-plugin@^0.5.5":
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.1", "@pmmmwh/react-refresh-webpack-plugin@^0.5.3":
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8"
   integrity sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==
@@ -3430,10 +3856,315 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
-"@remix-run/router@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.7.0.tgz#550a8d5760b78efc5d60f62b5829b0f74c1fde81"
-  integrity sha512-Eu1V3kz3mV0wUpVTiFHuaT8UD1gj/0VnoFHQYX35xlslQUpe8CuYoKFn9d4WZFHm3yDywz6ALZuGdnUPKrNeAw==
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.11":
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.11.tgz#7c2268cedaa0644d677e8c4f377bc8fb304f714a"
+  integrity sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==
+  dependencies:
+    ansi-html-community "^0.0.8"
+    common-path-prefix "^3.0.0"
+    core-js-pure "^3.23.3"
+    error-stack-parser "^2.0.6"
+    find-up "^5.0.0"
+    html-entities "^2.1.0"
+    loader-utils "^2.0.4"
+    schema-utils "^3.0.0"
+    source-map "^0.7.3"
+
+"@radix-ui/number@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/number/-/number-1.0.1.tgz#644161a3557f46ed38a042acf4a770e826021674"
+  integrity sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/primitive@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.0.1.tgz#e46f9958b35d10e9f6dc71c497305c22e3e55dbd"
+  integrity sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-arrow@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz#c24f7968996ed934d57fe6cde5d6ec7266e1d25d"
+  integrity sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.3"
+
+"@radix-ui/react-collection@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.3.tgz#9595a66e09026187524a36c6e7e9c7d286469159"
+  integrity sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-slot" "1.0.2"
+
+"@radix-ui/react-compose-refs@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz#7ed868b66946aa6030e580b1ffca386dd4d21989"
+  integrity sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-context@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.1.tgz#fe46e67c96b240de59187dcb7a1a50ce3e2ec00c"
+  integrity sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-direction@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.0.1.tgz#9cb61bf2ccf568f3421422d182637b7f47596c9b"
+  integrity sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-dismissable-layer@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.4.tgz#883a48f5f938fa679427aa17fcba70c5494c6978"
+  integrity sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+    "@radix-ui/react-use-escape-keydown" "1.0.3"
+
+"@radix-ui/react-focus-guards@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz#1ea7e32092216b946397866199d892f71f7f98ad"
+  integrity sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-focus-scope@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz#9c2e8d4ed1189a1d419ee61edd5c1828726472f9"
+  integrity sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+
+"@radix-ui/react-id@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.1.tgz#73cdc181f650e4df24f0b6a5b7aa426b912c88c0"
+  integrity sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+
+"@radix-ui/react-popper@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.1.2.tgz#4c0b96fcd188dc1f334e02dba2d538973ad842e9"
+  integrity sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@floating-ui/react-dom" "^2.0.0"
+    "@radix-ui/react-arrow" "1.0.3"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+    "@radix-ui/react-use-rect" "1.0.1"
+    "@radix-ui/react-use-size" "1.0.1"
+    "@radix-ui/rect" "1.0.1"
+
+"@radix-ui/react-portal@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.0.3.tgz#ffb961244c8ed1b46f039e6c215a6c4d9989bda1"
+  integrity sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.3"
+
+"@radix-ui/react-primitive@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz#d49ea0f3f0b2fe3ab1cb5667eb03e8b843b914d0"
+  integrity sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-slot" "1.0.2"
+
+"@radix-ui/react-roving-focus@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz#e90c4a6a5f6ac09d3b8c1f5b5e81aab2f0db1974"
+  integrity sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-collection" "1.0.3"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-direction" "1.0.1"
+    "@radix-ui/react-id" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+
+"@radix-ui/react-select@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-1.2.2.tgz#caa981fa0d672cf3c1b2a5240135524e69b32181"
+  integrity sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/number" "1.0.1"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-collection" "1.0.3"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-direction" "1.0.1"
+    "@radix-ui/react-dismissable-layer" "1.0.4"
+    "@radix-ui/react-focus-guards" "1.0.1"
+    "@radix-ui/react-focus-scope" "1.0.3"
+    "@radix-ui/react-id" "1.0.1"
+    "@radix-ui/react-popper" "1.1.2"
+    "@radix-ui/react-portal" "1.0.3"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-slot" "1.0.2"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+    "@radix-ui/react-use-previous" "1.0.1"
+    "@radix-ui/react-visually-hidden" "1.0.3"
+    aria-hidden "^1.1.1"
+    react-remove-scroll "2.5.5"
+
+"@radix-ui/react-separator@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-separator/-/react-separator-1.0.3.tgz#be5a931a543d5726336b112f465f58585c04c8aa"
+  integrity sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.3"
+
+"@radix-ui/react-slot@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.0.2.tgz#a9ff4423eade67f501ffb32ec22064bc9d3099ab"
+  integrity sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "1.0.1"
+
+"@radix-ui/react-toggle-group@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle-group/-/react-toggle-group-1.0.4.tgz#f5b5c8c477831b013bec3580c55e20a68179d6ec"
+  integrity sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-direction" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-roving-focus" "1.0.4"
+    "@radix-ui/react-toggle" "1.0.3"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+
+"@radix-ui/react-toggle@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle/-/react-toggle-1.0.3.tgz#aecb2945630d1dc5c512997556c57aba894e539e"
+  integrity sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+
+"@radix-ui/react-toolbar@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-toolbar/-/react-toolbar-1.0.4.tgz#3211a105567fa016e89921b5b514877f833de559"
+  integrity sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-direction" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-roving-focus" "1.0.4"
+    "@radix-ui/react-separator" "1.0.3"
+    "@radix-ui/react-toggle-group" "1.0.4"
+
+"@radix-ui/react-use-callback-ref@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz#f4bb1f27f2023c984e6534317ebc411fc181107a"
+  integrity sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-controllable-state@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz#ecd2ced34e6330caf89a82854aa2f77e07440286"
+  integrity sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+
+"@radix-ui/react-use-escape-keydown@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755"
+  integrity sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+
+"@radix-ui/react-use-layout-effect@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz#be8c7bc809b0c8934acf6657b577daf948a75399"
+  integrity sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-previous@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-previous/-/react-use-previous-1.0.1.tgz#b595c087b07317a4f143696c6a01de43b0d0ec66"
+  integrity sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@radix-ui/react-use-rect@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-1.0.1.tgz#fde50b3bb9fd08f4a1cd204572e5943c244fcec2"
+  integrity sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/rect" "1.0.1"
+
+"@radix-ui/react-use-size@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-1.0.1.tgz#1c5f5fea940a7d7ade77694bb98116fb49f870b2"
+  integrity sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+
+"@radix-ui/react-visually-hidden@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.0.3.tgz#51aed9dd0fe5abcad7dee2a234ad36106a6984ac"
+  integrity sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-primitive" "1.0.3"
+
+"@radix-ui/rect@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.0.1.tgz#bf8e7d947671996da2e30f4904ece343bc4a883f"
+  integrity sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+
+"@remix-run/router@1.14.0":
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7"
+  integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==
 
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
@@ -3560,238 +4291,152 @@
   resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.5.tgz#3abc203c79b8c3e90fd6c156a0c62d5403520e12"
   integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
-"@storybook/addon-actions@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.24.tgz#6bdbd8118acfc46f140207a108a5a35cc980d948"
-  integrity sha512-sIPY6uH8I26KBWUb5fMYBB9xCKB02oSM8gIHzqPZ0DnW8zl+p6+dX3tAdX+XQvb9YOLJihxZ1GF1tOxFduc3Pw==
+"@storybook/addon-actions@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.6.6.tgz#37b183af6303db8b44a7d9e9620aaca991a51a62"
+  integrity sha512-mLJip9Evb2Chj7ymKbpaybe5NgDy3Du7oSWeURPy/0qXJ2cBqHWnhZ8CTK2DasrstsUhQSJaZVXHhaENT+fn+g==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
+    "@storybook/core-events" "7.6.6"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@types/uuid" "^9.0.1"
     dequal "^2.0.2"
-    lodash "^4.17.21"
     polished "^4.2.2"
-    prop-types "^15.7.2"
-    react-inspector "^6.0.0"
-    telejson "^7.0.3"
-    ts-dedent "^2.0.0"
     uuid "^9.0.0"
 
-"@storybook/addon-backgrounds@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.0.24.tgz#568196858d926228c982d58000d2cd83fecd2d5f"
-  integrity sha512-vThKkrSj+J7matGowxIJ4eV+kAF8iUHGQjlaW0J7vhzmVkNnxBvNn/DGOWWQLAJPCTmLVelLaBZEWcMNoKJiVA==
+"@storybook/addon-backgrounds@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-7.6.6.tgz#e4e5edb5dc6ea61bb19d259660800ee588f9ab21"
+  integrity sha512-w5dZ/0cOe55M2G/Lx9f+Ptk4txUPb+Ng+KqEvTaTNqHoh0Xw4QxEn/ciJwmh1u1g3aMZsOgOvwPwug7ykmLgsA==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
     memoizerific "^1.11.3"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-controls@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.0.24.tgz#3899664baf72d3af112aafd009a35ad5eb7745cd"
-  integrity sha512-x05Ng4wyBRkrupgSkBHKZSGPyUbvIDGiBseA/AjA/BNAMUMWy3t8ll9f7tlKzyDPaUeBSv8peP21r/Ry26Eqhw==
-  dependencies:
-    "@storybook/blocks" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+"@storybook/addon-controls@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-7.6.6.tgz#a8b4619fb4b7672cceeb7744d78eadab9434e434"
+  integrity sha512-VAXXfPLi1M3RXhBf3uIBZ2hrD9UPDe7yvXHIlCzgj1HIJELODCFyUc+RtvN0mPc/nnlEfzhGfJtenZou5LYwIw==
+  dependencies:
+    "@storybook/blocks" "7.6.6"
     lodash "^4.17.21"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.0.24.tgz#b437172433787b702eba411a3e6eb9e3c36cfd34"
-  integrity sha512-O5S+E6+8c/EHEQc5WcrNQ8dOVg9Q2ONIOYxlbSAcfMUA/d+tRR9xXTZog7nv1tj4U0G29+Vr4pKgsGh3Ya5qcw==
+"@storybook/addon-docs@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-7.6.6.tgz#3224071f6ea44b00727e344a8020ddc4313ccdae"
+  integrity sha512-l4gtoNTn1wHE11x44te1cDkqfm+/w+eNonHe56bwgSqETclS5z18wvM9bQZF32G6C9fpSefaJW3cxVvcuJL1fg==
   dependencies:
-    "@babel/core" "^7.20.2"
-    "@babel/plugin-transform-react-jsx" "^7.19.0"
     "@jest/transform" "^29.3.1"
     "@mdx-js/react" "^2.1.5"
-    "@storybook/blocks" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/csf-plugin" "7.0.24"
-    "@storybook/csf-tools" "7.0.24"
+    "@storybook/blocks" "7.6.6"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/components" "7.6.6"
+    "@storybook/csf-plugin" "7.6.6"
+    "@storybook/csf-tools" "7.6.6"
     "@storybook/global" "^5.0.0"
     "@storybook/mdx2-csf" "^1.0.0"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/postinstall" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/react-dom-shim" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/postinstall" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
+    "@storybook/react-dom-shim" "7.6.6"
+    "@storybook/theming" "7.6.6"
+    "@storybook/types" "7.6.6"
     fs-extra "^11.1.0"
     remark-external-links "^8.0.0"
     remark-slug "^6.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-essentials@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.0.24.tgz#a1f17db5efdba0a0c52057483dfdec42adc1d551"
-  integrity sha512-OL27TNQYUJv/FprFCU7Q9RQYrgGdM+4SH+XmsQCcuQuGa67s6/eRKyERwOdy4Pli3Payo76+Vz1DAeJZJ0F8oA==
-  dependencies:
-    "@storybook/addon-actions" "7.0.24"
-    "@storybook/addon-backgrounds" "7.0.24"
-    "@storybook/addon-controls" "7.0.24"
-    "@storybook/addon-docs" "7.0.24"
-    "@storybook/addon-highlight" "7.0.24"
-    "@storybook/addon-measure" "7.0.24"
-    "@storybook/addon-outline" "7.0.24"
-    "@storybook/addon-toolbars" "7.0.24"
-    "@storybook/addon-viewport" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
+"@storybook/addon-essentials@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-7.6.6.tgz#116b03fded21d1178a3f96e18d76e67820bc5812"
+  integrity sha512-OQ8A6r06mg/HvyIk/j2Gt9DK5Qtqgtwq2Ydm5IgVW6gZsuRnv1FAeUG6okf8oXowAzpYoHdsDmCVwNOAGWGO7w==
+  dependencies:
+    "@storybook/addon-actions" "7.6.6"
+    "@storybook/addon-backgrounds" "7.6.6"
+    "@storybook/addon-controls" "7.6.6"
+    "@storybook/addon-docs" "7.6.6"
+    "@storybook/addon-highlight" "7.6.6"
+    "@storybook/addon-measure" "7.6.6"
+    "@storybook/addon-outline" "7.6.6"
+    "@storybook/addon-toolbars" "7.6.6"
+    "@storybook/addon-viewport" "7.6.6"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/manager-api" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-highlight@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.0.24.tgz#fb8e47a0b175ea373a7cc35f89da63b821651bbf"
-  integrity sha512-IoCJHiX5Ai+7S08isxt7BH4baNF2RsjuGUA/iMoJtto/rMc5u0xftVeIjh6oVqV3tjckowXpezI3oStnrLWuRw==
+"@storybook/addon-highlight@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-highlight/-/addon-highlight-7.6.6.tgz#f39e174addfc97c44e1cfee6edbb0fd43b9356cd"
+  integrity sha512-B85UaCts2uMpa0yHBSnupzy2WCdW4vfB+lfaBug9beyOyZQdel07BumblE0KwSJftYgdCNPUZ5MRlqEDzMLTWQ==
   dependencies:
-    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.0.24"
 
-"@storybook/addon-interactions@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.0.24.tgz#ccd2bcb48819cadb2da035d700922a84ccfc368f"
-  integrity sha512-N0BWt13T8lA+L0pAcC3xwhVMWQhrwHaXFqC6aJ1OxJb9pkA85S6Pk7VJRATDpmu9C3JO0OU3EOBB2YVVwcmD0A==
+"@storybook/addon-interactions@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-interactions/-/addon-interactions-7.6.6.tgz#e69bf9de4a5be55282189de905254a4d45a0b71d"
+  integrity sha512-EJWx6ciJPgv1c75tB/M4smWDpPDGM/L24v4DZxGpl1eV3oQOSQCKImG5btwoy6QcIi68ozroUHdUti/kzCKS1w==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/instrumenter" "7.0.24"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/types" "7.6.6"
     jest-mock "^27.0.6"
     polished "^4.2.2"
     ts-dedent "^2.2.0"
 
-"@storybook/addon-links@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.0.24.tgz#b70d754e1640f149a0eb4f2595438bd760f8286a"
-  integrity sha512-/Hse4IC3ov2dVzpZiIpf2QNFczi4pxdjZdmR0FhKeRlFldEJyywgT8a/gzeEahXO9v1jsEDa7j7f8JQcu/+04w==
+"@storybook/addon-links@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-7.6.6.tgz#9343bcbece713e1499e219a5a0cfc174d6b89f9b"
+  integrity sha512-NEcqOz6zZ1dJnCcVmYdaQTAMAGIb8NFAZGnr9DU0q+t4B1fTaWUgqLtBM5V6YqIrXGSC/oKLpjWUkS5UpswlHA==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/router" "7.0.24"
-    "@storybook/types" "7.0.24"
-    prop-types "^15.7.2"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-measure@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.0.24.tgz#4f409b9539a9bfaa25d9e591ff90484194c487a9"
-  integrity sha512-4VNs4rjdz+YFiJCz9DfCmBJwFuoa3pLhcEsAAdT3B+Hrkae+hvLtnQWIvAMsOlSWdl4tiuEWssDf4cjCEne87w==
+"@storybook/addon-measure@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-7.6.6.tgz#890867470a82d5d1a6b248a46f5dba5d6b5d1e5a"
+  integrity sha512-b4hyCudlhsbYN1We8pfZHZJ0i0sfC8+GJvrqZQqdSqGicUmA00mggY1GE+gEoHziQ5/4auxFRS3HfUgaQWUNjg==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/types" "7.0.24"
+    tiny-invariant "^1.3.1"
 
-"@storybook/addon-outline@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.0.24.tgz#2f00acc0ea374edd141265ad7212e29f41466fcf"
-  integrity sha512-YwSfs8bsmh7mEF+rlmL7zBsebWA5e/Rsf09vVqt6/k3fpopgBrq44zQlMwo1dCWV/0YhhXQF21OGzeJ1dSb8fA==
+"@storybook/addon-outline@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-7.6.6.tgz#f0878972c050fe2d07d2ab1bf23a5237e6ed8c0c"
+  integrity sha512-BMjpjzNEnN8LC7JK92WCXyWgmJwAaEQjRDinr7eD4cBt4Uas5kbciw1g8PtTnh0GbYUsImKao0nzakSVObAdzg==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/types" "7.0.24"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-toolbars@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.0.24.tgz#7ca37e9ffbbbd972fea9ee822f4733527d9a55d8"
-  integrity sha512-+nDVahs2kAojzF6RbChowJmN0z7cyD/5BGMEhBemhBWSuMVnQLLEgtQi/kOY5fUxq3z1BkqcE4LV98u5CIKgKg==
-  dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
+"@storybook/addon-toolbars@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-7.6.6.tgz#eb669ecff9035644a4d7aeab2e9e7e0f08358986"
+  integrity sha512-sQm5+FcoSMSGn1ioXHoukO6OhUlcNZil0/fonAY50uvp6Z4DyI0FTU7BKIm/NoMqAExQk3sZRfAC/nZZ9Epb0Q==
 
-"@storybook/addon-viewport@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.0.24.tgz#4f6777589e2484a7dad56f57982ca586bde9000b"
-  integrity sha512-bc3TR+feemGxVP1QQT6OsFSldHjLToJNuQAGd5EEBsDFhcMTsmitiGVoxIylqIhfioL9zauLIsk5eLZ/TYxuXQ==
+"@storybook/addon-viewport@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-7.6.6.tgz#814c1461ac56de0285e7ac843d2f0725419fd928"
+  integrity sha512-/ijbzDf1Iq30LvZW2NE8cO4TeHusw0N+jTDUK1+vhxGNMFo9DUIgRkAi6VpFEfS0aQ5d82523WSWzVso7b/Hmg==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
     memoizerific "^1.11.3"
-    prop-types "^15.7.2"
-
-"@storybook/addons@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-7.0.24.tgz#7834401931d3a15b43895ca714514e356a9b027a"
-  integrity sha512-e15hORnOD0ugvOVOTyZyLJhbDTWa4G1OHVUlboazy8O4TSvAXNBdLV1wOdY5RGoGD6Z5A4iR/gZXM0qc6Fh9xg==
-  dependencies:
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/types" "7.0.24"
-
-"@storybook/api@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-7.0.24.tgz#9c9b6f8a1883ca90226ea8bf2bc9c64a428c65ce"
-  integrity sha512-rjWZgBbt43Ma5Vg2RwK9FtiF9ZkLRT+vOfDFtRL1PQkOIUlYlm33dOdPTh+HrW5QMO9cj/cchqmzU2AtgEZCyw==
-  dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/manager-api" "7.0.24"
 
-"@storybook/blocks@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.0.24.tgz#43696ea35ca2d4b20feb9837a0663333aec21da5"
-  integrity sha512-76pe4QC3WZBVxBt/RomGubW5xzbh4uF7LVn1Vonfujf4GaHgIDzu7KtLIjgM3NmDJCsp3PNfbgA1EKzWrPQz2A==
-  dependencies:
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/docs-tools" "7.0.24"
+"@storybook/blocks@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/blocks/-/blocks-7.6.6.tgz#19bde920298b16ac31525ae321f15912f102fe8c"
+  integrity sha512-QLqkiSNrtGnh8RK9ipD63jVAUenkRu+72xR31DViZWRV9V8G2hzky5E/RoZWPEx+DfmBIUJ7Tcef6cCRcxEj9A==
+  dependencies:
+    "@storybook/channels" "7.6.6"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/components" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/docs-tools" "7.6.6"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/manager-api" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
+    "@storybook/theming" "7.6.6"
+    "@storybook/types" "7.6.6"
     "@types/lodash" "^4.14.167"
     color-convert "^2.0.1"
     dequal "^2.0.2"
@@ -3800,25 +4445,26 @@
     memoizerific "^1.11.3"
     polished "^4.2.2"
     react-colorful "^5.1.2"
-    telejson "^7.0.3"
+    telejson "^7.2.0"
+    tocbot "^4.20.1"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/builder-manager@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.0.24.tgz#0a88b6583de68d9cfc3107c4a5250a193f454ad8"
-  integrity sha512-qSehfB1yS1ch/XSUdqNaTXitboNry4aKASte+kFhM5wSJcAgGBeB5akz8pc+JiRPWozqyceYkIdTG/KcRDeojg==
+"@storybook/builder-manager@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-manager/-/builder-manager-7.6.6.tgz#50628c51b163d792001f4cd1dbe035bdb99b809e"
+  integrity sha512-96vmtUqh016H2n80xhvBZU2w5flTOzY7S0nW9nfxbY4UY4b39WajgwJ5wpg8l0YmCwQTrxCwY9/VE2Pd6CCqPA==
   dependencies:
     "@fal-works/esbuild-plugin-global-externals" "^2.1.2"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/manager" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/manager" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
     "@types/ejs" "^3.1.1"
     "@types/find-cache-dir" "^3.2.1"
     "@yarnpkg/esbuild-plugin-pnp" "^3.0.0-rc.10"
     browser-assert "^1.2.1"
     ejs "^3.1.8"
-    esbuild "^0.17.0"
+    esbuild "^0.18.0"
     esbuild-plugin-alias "^0.2.1"
     express "^4.17.3"
     find-cache-dir "^3.0.0"
@@ -3826,98 +4472,81 @@
     process "^0.11.10"
     util "^0.12.4"
 
-"@storybook/builder-webpack5@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-7.0.24.tgz#82bdd20e71f4c4ab9302cc310ce87ae9711f32c9"
-  integrity sha512-gA4otfsq9yTRT2IdYKkyqUdy+60a09CRDUtM1JB8a1eLmyL4az02qZv/l6D9Ccj/w5JNcJndtJX+3thOowOWOQ==
-  dependencies:
-    "@babel/core" "^7.12.10"
-    "@storybook/addons" "7.0.24"
-    "@storybook/api" "7.0.24"
-    "@storybook/channel-postmessage" "7.0.24"
-    "@storybook/channel-websocket" "7.0.24"
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-api" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/components" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/core-webpack" "7.0.24"
-    "@storybook/global" "^5.0.0"
-    "@storybook/manager-api" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/preview" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/router" "7.0.24"
-    "@storybook/store" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@types/node" "^16.0.0"
+"@storybook/builder-webpack5@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-7.6.6.tgz#da705b50ff462e436011c8770ee37772f5640080"
+  integrity sha512-V3pVdhlhqBdVhrE1M3ip07X8Ma6FXBeTtcZsT+oFVX7A+wxMfA9fhGWVjL6yOB/E+87jF5SvlvYbo+18Xw6hqg==
+  dependencies:
+    "@babel/core" "^7.23.2"
+    "@storybook/channels" "7.6.6"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/core-webpack" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/preview" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
+    "@swc/core" "^1.3.82"
+    "@types/node" "^18.0.0"
     "@types/semver" "^7.3.4"
     babel-loader "^9.0.0"
-    babel-plugin-named-exports-order "^0.0.2"
     browser-assert "^1.2.1"
     case-sensitive-paths-webpack-plugin "^2.4.0"
+    constants-browserify "^1.0.0"
     css-loader "^6.7.1"
+    es-module-lexer "^1.4.1"
     express "^4.17.3"
-    fork-ts-checker-webpack-plugin "^7.2.8"
+    fork-ts-checker-webpack-plugin "^8.0.0"
     fs-extra "^11.1.0"
     html-webpack-plugin "^5.5.0"
+    magic-string "^0.30.5"
     path-browserify "^1.0.1"
     process "^0.11.10"
     semver "^7.3.7"
     style-loader "^3.3.1"
+    swc-loader "^0.2.3"
     terser-webpack-plugin "^5.3.1"
     ts-dedent "^2.0.0"
+    url "^0.11.0"
     util "^0.12.4"
     util-deprecate "^1.0.2"
     webpack "5"
-    webpack-dev-middleware "^5.3.1"
+    webpack-dev-middleware "^6.1.1"
     webpack-hot-middleware "^2.25.1"
-    webpack-virtual-modules "^0.4.3"
+    webpack-virtual-modules "^0.5.0"
 
-"@storybook/channel-postmessage@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-7.0.24.tgz#789bd121cf64e306737ec0f3b096ea0ac6f47bf5"
-  integrity sha512-QLtLXjEeTEwBN/7pB888mBaykmRU9Jy2BitvZuLJWyHHygTYm3vYZOaGR37DT+q/6Ob5GaZ0tURZmCSNDe8IIA==
+"@storybook/channels@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.6.6.tgz#c3de381a88897ae62043430a9c469aa37c0de41d"
+  integrity sha512-vvo7fBe2WffPonNNOA7Xx7jcHAto8qJYlq+VMysfheXrsRRbhHl3WQOA18Vm8hV9txtqdqk0hwQiXOWvhYVpeQ==
   dependencies:
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-events" "7.0.24"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-events" "7.6.6"
     "@storybook/global" "^5.0.0"
     qs "^6.10.0"
-    telejson "^7.0.3"
-
-"@storybook/channel-websocket@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-7.0.24.tgz#8c58698eda89e1b4dfee822e5f9106453b637e6c"
-  integrity sha512-GKSlWx5FgMQM0TKRCSGNTxLh0YU7xmg7m6FH8b/mvhH0Uido487qcJap2Ma/WOLe8aRiZo9jJpfcbUsKBWhuMg==
-  dependencies:
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/global" "^5.0.0"
-    telejson "^7.0.3"
-
-"@storybook/channels@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-7.0.24.tgz#fcfe7a1a5599265506f07fe81d03b0585303fc15"
-  integrity sha512-NZVLwMhtzy6cZrNRjshFvMAD9mQTmJDNwhohodSkM/YFCDVFhmxQk9tgizVGh9MwY3CYGJ1SI96RUejGosb49Q==
+    telejson "^7.2.0"
+    tiny-invariant "^1.3.1"
 
-"@storybook/cli@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.0.24.tgz#8b01bb5b59aff34742d71e145c0f577ae20271fa"
-  integrity sha512-TmHPJrcqUMAGpPKqw0PHI82m+Tyh6J8LgWjyZENpOGJlQH6SJ5caA/ho9R3pqVuMRRcnGgWt0xq1YJtDlYBN9g==
+"@storybook/cli@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/cli/-/cli-7.6.6.tgz#401c1e9fd04bcc4b1f1486a7582e3c5317c0af3f"
+  integrity sha512-FLmWrbmGOqe1VYwqyIWxU2lJcYPssORmSbSVVPw6OqQIXx3NrNBrmZDLncMwbVCDQ8eU54J1zb+MyDmSqMbVFg==
   dependencies:
-    "@babel/core" "^7.20.2"
-    "@babel/preset-env" "^7.20.2"
+    "@babel/core" "^7.23.2"
+    "@babel/preset-env" "^7.23.2"
+    "@babel/types" "^7.23.0"
     "@ndelangen/get-tarball" "^3.0.7"
-    "@storybook/codemod" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/core-server" "7.0.24"
-    "@storybook/csf-tools" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/telemetry" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/codemod" "7.6.6"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/core-server" "7.6.6"
+    "@storybook/csf-tools" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/telemetry" "7.6.6"
+    "@storybook/types" "7.6.6"
     "@types/semver" "^7.3.4"
+    "@yarnpkg/fslib" "2.10.3"
+    "@yarnpkg/libzip" "2.3.0"
     chalk "^4.1.0"
     commander "^6.2.1"
     cross-spawn "^7.0.3"
@@ -3931,7 +4560,7 @@
     get-port "^5.1.1"
     giget "^1.0.0"
     globby "^11.0.2"
-    jscodeshift "^0.14.0"
+    jscodeshift "^0.15.1"
     leven "^3.1.0"
     ora "^5.4.1"
     prettier "^2.8.0"
@@ -3939,87 +4568,83 @@
     puppeteer-core "^2.1.1"
     read-pkg-up "^7.0.1"
     semver "^7.3.7"
-    shelljs "^0.8.5"
-    simple-update-notifier "^1.0.0"
+    simple-update-notifier "^2.0.0"
     strip-json-comments "^3.0.1"
     tempy "^1.0.1"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-7.0.24.tgz#873d4ce9e46ef7f790063166b69490a763656d58"
-  integrity sha512-D9brib29aET1peRq6Nu7iBFgE+9W7ia3KCua5/AS980RFnXgGPE9x07knTbaAOuiHxHFrmQpdFF9BvVms1GS4A==
-  dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-
-"@storybook/client-logger@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.0.24.tgz#7be57ce1f90e65c6e9da7a88ed9ca7c5ce3c6536"
-  integrity sha512-4zRTb+QQ1hWaRqad/UufZNRfi2d/cf5a40My72Ct97VwjhJFE6aQ3K+hl1Xt6hh8dncDL2JK3cgziw6ElqjT0w==
+"@storybook/client-logger@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-7.6.6.tgz#a8bc9568a1763c34d16d7154498bea971a181b06"
+  integrity sha512-WEvVyuQR5oNF8jcMmGA13zDjxP/l46kOBBvB6JSc8toUdtLZ/kZWSnU0ioNM8+ECpFqXHjBcF2K6uSJOEb6YEg==
   dependencies:
     "@storybook/global" "^5.0.0"
 
-"@storybook/codemod@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.0.24.tgz#5cc64eb45b3d46cbd7cd6d66899b5538b7a64bad"
-  integrity sha512-PukV4GRPIISuVxpMMlTilwlGXdZ7E+JZWHNVb1tTwntmxMNcby8UxyWSHjbOpA2fxXGeUCjgCpcfTymJ+hxoYw==
-  dependencies:
-    "@babel/core" "~7.21.0"
-    "@babel/preset-env" "~7.21.0"
-    "@babel/types" "~7.21.2"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/csf-tools" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/types" "7.0.24"
+"@storybook/codemod@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/codemod/-/codemod-7.6.6.tgz#d8ebf6ad22e3a6da19410be5e2205a99d364e1e4"
+  integrity sha512-6QwW6T6ZgwwbTkEoZ7CAoX7lUUob7Sy7bRkMHhSjJe2++wEVFOYLvzHcLUJCupK59+WhmsJU9PpUMlXEKi40TQ==
+  dependencies:
+    "@babel/core" "^7.23.2"
+    "@babel/preset-env" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/csf-tools" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/types" "7.6.6"
+    "@types/cross-spawn" "^6.0.2"
     cross-spawn "^7.0.3"
     globby "^11.0.2"
-    jscodeshift "^0.14.0"
+    jscodeshift "^0.15.1"
     lodash "^4.17.21"
     prettier "^2.8.0"
     recast "^0.23.1"
 
-"@storybook/components@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.0.24.tgz#0676fa8d2085217786ccf994bc890dab0fa3d9c2"
-  integrity sha512-Pu7zGurCyWyiuFl2Pb5gybHA0f4blmHuVqccbMqnUw4Ew80BRu8AqfhNqN2hNdxFCx0mmy0baRGVftx76rNZ0w==
+"@storybook/components@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-7.6.6.tgz#14c9e9c876cb7b930c9bfc64ea0442dd89868351"
+  integrity sha512-FSfcRxdmV4+LJHjMk0eodGVnZdb2qrKKmbtsn0O/434z586zPA287/wJJsm4JS/Xr1WS9oTvU6mYMDChkcxgeQ==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/csf" "^0.1.0"
+    "@radix-ui/react-select" "^1.2.2"
+    "@radix-ui/react-toolbar" "^1.0.4"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/theming" "7.6.6"
+    "@storybook/types" "7.6.6"
     memoizerific "^1.11.3"
     use-resize-observer "^9.1.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-client@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.0.24.tgz#eb1e6f239ca8bc3a9cce77295463c6712a2b9829"
-  integrity sha512-uToMHbi5EnOk+8Z941j0hrRE1h9u/QWqCmqS2FBIWrBOeREwy0AAib1/hqihzhO7OzekY5mtLTANiCpIpLHAHQ==
+"@storybook/core-client@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-7.6.6.tgz#738173e13728020303530532789ff54102a3e294"
+  integrity sha512-P100aNf+WpvzlfULZp1NPd60/nxsppLmft2DdIyAx1j4QPMZvUJyJB+hdBMzTFiPEhIUncIMoIVf2R3UXC5DfA==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
 
-"@storybook/core-common@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.0.24.tgz#2828323f9e0de2cec093f42773324ab0826fa1f3"
-  integrity sha512-FHjL2dpwDHnicLTePkiZMfO5eFxJxpTP2xmGWFQnWFTyEgh+ipcWnLVoYYXiKcc6EzKED0yebk8rAIalbzpICg==
+"@storybook/core-common@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-7.6.6.tgz#8df954f783d1de6c4064c8dcee8fe34f6fb69ad8"
+  integrity sha512-DpbFSYw8LHuwpeU2ec5uWryxrSqslFJnWTfNA7AvpzCviWXkz4kq+YYrDee9XExF6OozNwILmG6m52SnraysBA==
   dependencies:
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/types" "7.0.24"
-    "@types/node" "^16.0.0"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/types" "7.6.6"
+    "@types/find-cache-dir" "^3.2.1"
+    "@types/node" "^18.0.0"
     "@types/node-fetch" "^2.6.4"
     "@types/pretty-hrtime" "^1.0.0"
     chalk "^4.1.0"
-    esbuild "^0.17.0"
-    esbuild-register "^3.4.0"
+    esbuild "^0.18.0"
+    esbuild-register "^3.5.0"
     file-system-cache "2.3.0"
+    find-cache-dir "^3.0.0"
     find-up "^5.0.0"
     fs-extra "^11.1.0"
-    glob "^8.1.0"
-    glob-promise "^6.0.2"
+    glob "^10.0.0"
     handlebars "^4.7.7"
     lazy-universal-dotenv "^4.0.0"
     node-fetch "^2.0.0"
@@ -4029,36 +4654,38 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/core-events@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.0.24.tgz#3fa4b2b3af64a86525b4cf07f49a7410125ef810"
-  integrity sha512-xkf/rihCkhqMeh5EA8lVp90/mzbb2gcg6I3oeFWw2hognVcTnPXg6llhWdU4Spqd0cals7GEFmQugIILCmH8GA==
+"@storybook/core-events@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-7.6.6.tgz#64b911db989acc05058e45400a2f8bad602113cd"
+  integrity sha512-7+q9HiZiLxaQcwpaSLQrLdjHNHBoOoUY9ZcZXI9iNFSopOgb/ItDnzzlpv08NC7CbKae1hVKJM/t5aSTl7tCMw==
+  dependencies:
+    ts-dedent "^2.0.0"
 
-"@storybook/core-server@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.0.24.tgz#f1f5f223fc0bc40eff15495450b4fc8bf544f644"
-  integrity sha512-FJgdbtLgppFMd/RedF728I+v45TRG7s5/3RJfwgRgbq4ZEhKFzZN66MwWFeq3i5Q8ETHVwAxyVvC/JrRqAJxoA==
+"@storybook/core-server@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-7.6.6.tgz#7816b98ab9b2dd02a11876f5113e7bcf713685b1"
+  integrity sha512-QFVahaExgGtq9swBXgQAMUiCqpCcyVXOiKTIy1j+1uAhPVqhpCxBkkFoXruih5hbIMZyohE4mLPCAr/ivicoDg==
   dependencies:
-    "@aw-web-design/x-default-browser" "1.4.88"
+    "@aw-web-design/x-default-browser" "1.4.126"
     "@discoveryjs/json-ext" "^0.5.3"
-    "@storybook/builder-manager" "7.0.24"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/csf-tools" "7.0.24"
+    "@storybook/builder-manager" "7.6.6"
+    "@storybook/channels" "7.6.6"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/csf-tools" "7.6.6"
     "@storybook/docs-mdx" "^0.1.0"
     "@storybook/global" "^5.0.0"
-    "@storybook/manager" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/telemetry" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/manager" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
+    "@storybook/telemetry" "7.6.6"
+    "@storybook/types" "7.6.6"
     "@types/detect-port" "^1.3.0"
-    "@types/node" "^16.0.0"
-    "@types/node-fetch" "^2.5.7"
+    "@types/node" "^18.0.0"
     "@types/pretty-hrtime" "^1.0.0"
     "@types/semver" "^7.3.4"
-    better-opn "^2.1.1"
+    better-opn "^3.0.2"
     chalk "^4.1.0"
     cli-table3 "^0.6.1"
     compression "^1.7.4"
@@ -4068,57 +4695,57 @@
     globby "^11.0.2"
     ip "^2.0.0"
     lodash "^4.17.21"
-    node-fetch "^2.6.7"
     open "^8.4.0"
     pretty-hrtime "^1.0.3"
     prompts "^2.4.0"
     read-pkg-up "^7.0.1"
     semver "^7.3.7"
-    serve-favicon "^2.5.0"
-    telejson "^7.0.3"
+    telejson "^7.2.0"
+    tiny-invariant "^1.3.1"
     ts-dedent "^2.0.0"
+    util "^0.12.4"
     util-deprecate "^1.0.2"
     watchpack "^2.2.0"
     ws "^8.2.3"
 
-"@storybook/core-webpack@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-7.0.24.tgz#a8bbb3f82788578924403a06b8d5997965cdc1b0"
-  integrity sha512-sM0hX55uNFXfQdRMthFdY6luWmi9MG+dIj6bNPiVY2SxNenxj62P/0/R/1Ime27X/vzFbi12pqUijzPNUwiwQw==
+"@storybook/core-webpack@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-webpack/-/core-webpack-7.6.6.tgz#119f5f7b565409161f00544046993106a4682992"
+  integrity sha512-VQyA6nb7K5uAWp/bqntW9Dtv2mVQWOp99v52ilHI/aCR9gEIC2XKBB7PTs/l5L9PKTcES6UJTcFJmOp+s7kFOA==
   dependencies:
-    "@storybook/core-common" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/types" "7.0.24"
-    "@types/node" "^16.0.0"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/types" "7.6.6"
+    "@types/node" "^18.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/csf-plugin@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.0.24.tgz#e312d032f7a7b107246cacfda305dcb967cb7e30"
-  integrity sha512-+oIZCIhrRFbvplXUwJn671ZM0kgNqZ59jM9RmehJGgu5N5h1JSbBcz1edXgStNsMk9e2NJopuOKrzZGTGyi0XA==
+"@storybook/csf-plugin@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-plugin/-/csf-plugin-7.6.6.tgz#3420003d78921bfc974b372eb7d07a91ef416eb0"
+  integrity sha512-SqdffT14+XNpf+7vA29Elur28VArXtFv4cXMlsCbswbRuY+a0A8vYNwVIfCUy9u4WHTcQX1/tUkDAMh80lrVRQ==
   dependencies:
-    "@storybook/csf-tools" "7.0.24"
-    unplugin "^0.10.2"
+    "@storybook/csf-tools" "7.6.6"
+    unplugin "^1.3.1"
 
-"@storybook/csf-tools@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.0.24.tgz#ba35a537a2d6cca46f9c5ac9c0c6bdf5e3d0aa7b"
-  integrity sha512-RBNiXY3ht6XpcIyVgxBo7mK2t32tJuC93OO/HgcoRFClcdA8HUnlva297XpJpMqCgrcF8fPqRo+ZcLeC7vjzvw==
-  dependencies:
-    "@babel/generator" "~7.21.1"
-    "@babel/parser" "~7.21.2"
-    "@babel/traverse" "~7.21.2"
-    "@babel/types" "~7.21.2"
-    "@storybook/csf" "^0.1.0"
-    "@storybook/types" "7.0.24"
+"@storybook/csf-tools@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-7.6.6.tgz#b143f68d660a8418e2cfa2653a589376e47ac092"
+  integrity sha512-VXOZCzfSVJL832u17pPhFu1x3PPaAN9d8VXNFX+t/2raga7tK3T7Qhe7lWfP7EZcrVvSCEEp0aMRz2EzzDGVtw==
+  dependencies:
+    "@babel/generator" "^7.23.0"
+    "@babel/parser" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    "@storybook/csf" "^0.1.2"
+    "@storybook/types" "7.6.6"
     fs-extra "^11.1.0"
     recast "^0.23.1"
     ts-dedent "^2.0.0"
 
-"@storybook/csf@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.1.tgz#abccc8c3e49aed0a6a7e87beb0d1c262b1921c06"
-  integrity sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg==
+"@storybook/csf@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.2.tgz#8e7452f0097507f5841b5ade3f5da1525bc9afb2"
+  integrity sha512-ePrvE/pS1vsKR9Xr+o+YwdqNgHUyXvg+1Xjx0h9LrVx7Zq4zNe06pd63F5EvzTbCbJsHj7GHr9tkiaqm7U8WRA==
   dependencies:
     type-fest "^2.19.0"
 
@@ -4127,16 +4754,16 @@
   resolved "https://registry.yarnpkg.com/@storybook/docs-mdx/-/docs-mdx-0.1.0.tgz#33ba0e39d1461caf048b57db354b2cc410705316"
   integrity sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==
 
-"@storybook/docs-tools@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.0.24.tgz#388a0bab7c2d179b571045929f264a2b984e38ee"
-  integrity sha512-vmDHmHB1B5CWsYQ7CEtfz4vdf36VK/EZdNQUox9kdN935Dks7KSuGcDdXiRlWc78e94/A9+1mJQpyfwtn3E8fQ==
+"@storybook/docs-tools@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-7.6.6.tgz#9abd981fb6197010c7ae0f06b7ff5de6eba2a011"
+  integrity sha512-nc5ZjN2s8SC2PtsZoFf9Wm6gD8TcSlkYbF/mjtyLCGN+Fi+k5B5iudqoa65H19hwiLlzBdcnpQ8C89AiK33J9Q==
   dependencies:
-    "@babel/core" "^7.12.10"
-    "@storybook/core-common" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/preview-api" "7.6.6"
+    "@storybook/types" "7.6.6"
     "@types/doctrine" "^0.0.3"
+    assert "^2.1.0"
     doctrine "^3.0.0"
     lodash "^4.17.21"
 
@@ -4145,110 +4772,93 @@
   resolved "https://registry.yarnpkg.com/@storybook/global/-/global-5.0.0.tgz#b793d34b94f572c1d7d9e0f44fac4e0dbc9572ed"
   integrity sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==
 
-"@storybook/instrumenter@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/instrumenter/-/instrumenter-7.0.24.tgz#fbc81250f25b0d5f3da3a3aa9dad48cdc82642f9"
-  integrity sha512-XQ4Whq0rqW9eFMTtRpLxcl6bCf+KO3UZYcm+H63EDn9TstDyopmqv1fDg2tmJOpqLo143F8qLVC89rI7M/lO6w==
-  dependencies:
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.0.24"
-
-"@storybook/manager-api@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.0.24.tgz#29a357a35c661a0e86567ef6f0f8afeca3b3bced"
-  integrity sha512-cBpgDWq8reFgyrv4fBZlZJQyWYb9cDW0LDe476rWn/29uXNvYMNsHRwveLNgSA8Oy1NdyQCgf4ZgcYvY3wpvMA==
+"@storybook/manager-api@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-api/-/manager-api-7.6.6.tgz#8001e1cb756bde85cd639e69025ea005b8b36509"
+  integrity sha512-euRAbSZAUzHDt6z1Pq/g45N/RNqta9RaQAym18zt/oLWiYOIrkLmdf7kCuFYsmuA5XQBytiJqwkAD7uF1aLe0g==
   dependencies:
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/csf" "^0.1.0"
+    "@storybook/channels" "7.6.6"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/router" "7.0.24"
-    "@storybook/theming" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/router" "7.6.6"
+    "@storybook/theming" "7.6.6"
+    "@storybook/types" "7.6.6"
     dequal "^2.0.2"
     lodash "^4.17.21"
     memoizerific "^1.11.3"
     semver "^7.3.7"
     store2 "^2.14.2"
-    telejson "^7.0.3"
+    telejson "^7.2.0"
     ts-dedent "^2.0.0"
 
-"@storybook/manager@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.0.24.tgz#7c9420d448a88574b696d2bd9c2ae11e7d33de22"
-  integrity sha512-LsQd2cFJViwoPJ7K0A/XBWrBBhJv7F0J6+aa7qHszNmIZHVbMXyZfiX7JS3RHVs4I2kLuNpSk4X+iDG0QAafEQ==
+"@storybook/manager@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/manager/-/manager-7.6.6.tgz#03a831aa99da2ea096eec34cdf3358821d1f81fb"
+  integrity sha512-Ga3LcSu/xxSyg+cLlO9AS8QjW+D667V+c9qQPmsFyU6qfFc6m6mVqcRLSmFVD5e7P/o0FL7STOf9jAKkDcW8xw==
 
 "@storybook/mdx2-csf@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@storybook/mdx2-csf/-/mdx2-csf-1.1.0.tgz#97f6df04d0bf616991cc1005a073ac004a7281e5"
   integrity sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw==
 
-"@storybook/node-logger@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.0.24.tgz#dc260cbce5cd5187b131e4d1d08fe750f748f5ad"
-  integrity sha512-gjcYnreYBBtZVF6p/cHMas4FEafPddjsLMrAfB+0lLGoRdUwWVto46BZTHQ9seY5gPW0JQydAdDGHko8/kEOXA==
-  dependencies:
-    "@types/npmlog" "^4.1.2"
-    chalk "^4.1.0"
-    npmlog "^5.0.1"
-    pretty-hrtime "^1.0.3"
+"@storybook/node-logger@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-7.6.6.tgz#800ebdd67fadc79f2a453ad2c9ee5f54225c6644"
+  integrity sha512-b2OF9GRNI01MlBlnDGS8S6/yOpBNl8eH/0ONafuMPzFEZs5PouHGsFflJvQwwcdVTknMjF5uVS2eSmnLZ8spvA==
 
-"@storybook/postinstall@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.0.24.tgz#c24e8ba032313d7776d2501435fa3c9a6685e055"
-  integrity sha512-UYMXyEU4nVIKyrlUdIs3NHQmILzrN+EkEDbmeQC2WMMPw+t4GY2cDVmpx90JYYZcn7gY+cNDgQ55iiqbvlamLQ==
+"@storybook/postinstall@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-7.6.6.tgz#7da3810db566c20fa7c234939612e9ea27cf60bd"
+  integrity sha512-jamn7QNTJPZiu22nu25LqfSTJohugFhCu4b48yqP+pdMdkQ3qVd3NdDYhBlgkH/Btar+kppiJP1gRtoiJF761w==
 
-"@storybook/preset-create-react-app@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-7.0.24.tgz#56aa3a2f6514e9d5a02bdc12d2fa1193653bdc75"
-  integrity sha512-IlMWxZjy+MovnHCz/06UAjIpP9jYPuLbZkEbiEX8/uhSwcdA8Z8c7KDUX6TSwXvu0u2oUwTKHX+110T2zGHGqg==
+"@storybook/preset-create-react-app@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-7.6.6.tgz#3b8b914838e5fe8d04db591540a1bd486a0d6d02"
+  integrity sha512-u1oFGTtslZIaJIHLcfPlJbymZ02zSq69GWtUdMbfYoLsZfPa1/cGec02rA8Taho6Xb8p8N3X2HL7vqEhBL+nDg==
   dependencies:
     "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1"
     "@storybook/react-docgen-typescript-plugin" "1.0.6--canary.9.0c3f3b7.0"
-    "@storybook/types" "7.0.24"
+    "@storybook/types" "7.6.6"
     "@types/babel__core" "^7.1.7"
-    babel-plugin-react-docgen "^4.1.0"
     pnp-webpack-plugin "^1.7.0"
     semver "^7.3.5"
 
-"@storybook/preset-react-webpack@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-7.0.24.tgz#b5922e629f71ec6b8663dcc8c2d74c5e43bc11bb"
-  integrity sha512-9BI243TMv5f+CjzGVB3CFA82E2kWYhQTaRoeNKxxk7NvgiascFMATkgBjIwtGYVXL9umk8mytzulOq/oXPnscQ==
-  dependencies:
-    "@babel/preset-flow" "^7.18.6"
-    "@babel/preset-react" "^7.18.6"
-    "@pmmmwh/react-refresh-webpack-plugin" "^0.5.5"
-    "@storybook/core-webpack" "7.0.24"
-    "@storybook/docs-tools" "7.0.24"
-    "@storybook/node-logger" "7.0.24"
-    "@storybook/react" "7.0.24"
+"@storybook/preset-react-webpack@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/preset-react-webpack/-/preset-react-webpack-7.6.6.tgz#db00543a3a38da551198eebb2674e18f574e6d14"
+  integrity sha512-spOEPePPiKJQIVFARVUPfJ3cT8mBWFMlb3iS54MO4IW55aQRPWw1HQYt7uZ3NwZVT49Npwn4D1x81rWMu9ikPg==
+  dependencies:
+    "@babel/preset-flow" "^7.22.15"
+    "@babel/preset-react" "^7.22.15"
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.5.11"
+    "@storybook/core-webpack" "7.6.6"
+    "@storybook/docs-tools" "7.6.6"
+    "@storybook/node-logger" "7.6.6"
+    "@storybook/react" "7.6.6"
     "@storybook/react-docgen-typescript-plugin" "1.0.6--canary.9.0c3f3b7.0"
-    "@types/node" "^16.0.0"
+    "@types/node" "^18.0.0"
     "@types/semver" "^7.3.4"
     babel-plugin-add-react-displayname "^0.0.5"
-    babel-plugin-react-docgen "^4.2.1"
     fs-extra "^11.1.0"
-    react-refresh "^0.11.0"
+    magic-string "^0.30.5"
+    react-docgen "^7.0.0"
+    react-refresh "^0.14.0"
     semver "^7.3.7"
     webpack "5"
 
-"@storybook/preview-api@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.0.24.tgz#93634c060aa43bb10fb233f28ae83b7d74b98aad"
-  integrity sha512-psycU07tuB5nyJvfAJiDN/9e8cjOdJ+5lrCSYC3vPzH86LxADDIN0/8xFb1CaQWcXZsADEFJGpHKWbRhjym5ew==
-  dependencies:
-    "@storybook/channel-postmessage" "7.0.24"
-    "@storybook/channels" "7.0.24"
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-events" "7.0.24"
-    "@storybook/csf" "^0.1.0"
+"@storybook/preview-api@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/preview-api/-/preview-api-7.6.6.tgz#72a3d214f1e40e4ca70377ded028e313cebbfe4f"
+  integrity sha512-Bt6xIAR5yZ/JWc90X4BbLOA97iL65glZ1SOBgFFv2mHrdZ1lcdKhAlQr2aeJAf1mLvBtalPjvKzi9EuVY3FZ4w==
+  dependencies:
+    "@storybook/channels" "7.6.6"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-events" "7.6.6"
+    "@storybook/csf" "^0.1.2"
     "@storybook/global" "^5.0.0"
-    "@storybook/types" "7.0.24"
+    "@storybook/types" "7.6.6"
     "@types/qs" "^6.9.5"
     dequal "^2.0.2"
     lodash "^4.17.21"
@@ -4258,10 +4868,10 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/preview@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.0.24.tgz#2657c36f7de9c13958333b25b395a798f5be3e43"
-  integrity sha512-rej4Wz8Qy4gVuyvg4cpQGkR4wJc3b+0Uv6EYylbmpdj2585cOhFtRBykagDVZteVU4xaLMT7YHIZRnoLmJKIgw==
+"@storybook/preview@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/preview/-/preview-7.6.6.tgz#0099ed0297a8d3b5311450e10c8b0ca4275cf284"
+  integrity sha512-Rl+Pom2bNwzc0MdlbFALmvxsbCkbIwlpTZlRZZTh5Ah8JViV9htQgP9e8uwo3NZA2BhjbDLkmnZeloWxQnI5Ig==
 
 "@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0":
   version "1.0.6--canary.9.0c3f3b7.0"
@@ -4276,78 +4886,69 @@
     react-docgen-typescript "^2.2.2"
     tslib "^2.0.0"
 
-"@storybook/react-dom-shim@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.0.24.tgz#987378ef01a550778ac8c6b16c89ad5271ad02ef"
-  integrity sha512-YOP1C3dWTLYP5mPb7hNuDRIhADzz+ppfb+S22JNJ3kqm+tsyE/YtAbRf80k6QIG1LzukMpGoEnjjOPOsWsyvFQ==
-
-"@storybook/react-webpack5@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-7.0.24.tgz#22e4d5101ecc0e5918badd56772389cf8b449edc"
-  integrity sha512-z5TwjpLeNXyNAPVGvTsHcXa9sjOop4lorWa++prJAY5Bpx+2//dq/O8poQat7KivtwCBmAlgYWqW52AcxXwYXA==
-  dependencies:
-    "@storybook/builder-webpack5" "7.0.24"
-    "@storybook/preset-react-webpack" "7.0.24"
-    "@storybook/react" "7.0.24"
-    "@types/node" "^16.0.0"
-
-"@storybook/react@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.0.24.tgz#21ce8a0b09dceac7193bb0f1463b3cb9bd13ead6"
-  integrity sha512-JAgSs8ANysBl3+cOAjFSVG3bA2V/wP6jyu7oK0jSATRQhHRjRS/tHFMA82j0j98G2sr3JXQUxNt55Qq3k2mUcg==
-  dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-client" "7.0.24"
-    "@storybook/docs-tools" "7.0.24"
+"@storybook/react-dom-shim@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/react-dom-shim/-/react-dom-shim-7.6.6.tgz#77dffcfa5b969a401b6ad9fecd6ce0c0275ceb44"
+  integrity sha512-WWNlXtCVoBWXX/kLNulUeMgzmlAEHi2aBrdIv2jz0DScPf0YxeWAkWmgK7F0zMot9mdwYncr+pk1AILbTBJSyg==
+
+"@storybook/react-webpack5@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/react-webpack5/-/react-webpack5-7.6.6.tgz#08026cab492db99cd47bb89265c54bc2914c55a3"
+  integrity sha512-YGzSf4rMjlMNU4/7pYtFGS1YxwlEtUOx6cyifKM8/Q7qMi6YJEpcwQpxw9V64YUpLU2aoOXSEc6Ox00AG0+5AA==
+  dependencies:
+    "@storybook/builder-webpack5" "7.6.6"
+    "@storybook/preset-react-webpack" "7.6.6"
+    "@storybook/react" "7.6.6"
+    "@types/node" "^18.0.0"
+
+"@storybook/react@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-7.6.6.tgz#6eaaebb788d8b8d7a38513c40b2ebd6452ed25cc"
+  integrity sha512-pE6GJ4hPGJIsX6AREjW6HibshwZE6rFhWRtjeX5MV0eKMmQgoRWRgiRfg9/YB6Z0tRtuptI83Uaszimmif1BKg==
+  dependencies:
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-client" "7.6.6"
+    "@storybook/docs-tools" "7.6.6"
     "@storybook/global" "^5.0.0"
-    "@storybook/preview-api" "7.0.24"
-    "@storybook/react-dom-shim" "7.0.24"
-    "@storybook/types" "7.0.24"
+    "@storybook/preview-api" "7.6.6"
+    "@storybook/react-dom-shim" "7.6.6"
+    "@storybook/types" "7.6.6"
     "@types/escodegen" "^0.0.6"
     "@types/estree" "^0.0.51"
-    "@types/node" "^16.0.0"
+    "@types/node" "^18.0.0"
     acorn "^7.4.1"
     acorn-jsx "^5.3.1"
     acorn-walk "^7.2.0"
-    escodegen "^2.0.0"
+    escodegen "^2.1.0"
     html-tags "^3.1.0"
     lodash "^4.17.21"
     prop-types "^15.7.2"
     react-element-to-jsx-string "^15.0.0"
     ts-dedent "^2.0.0"
-    type-fest "^2.19.0"
+    type-fest "~2.19"
     util-deprecate "^1.0.2"
 
-"@storybook/router@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.0.24.tgz#510b91d161d822f276300fded7b254ed3e2594f3"
-  integrity sha512-SRCV+srCZUbko/V0phVN8jY8ilrxQWWAY/gegwNlIYaNqLJSyYqIj739VDmX+deXl6rOEpFLZreClVXWiDU9+w==
+"@storybook/router@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-7.6.6.tgz#f97e77297eb4f17b2d4fb42bfcbc4132dac7e529"
+  integrity sha512-dkn81MtxrG7JMDbOHEcVZkTDVKsneg72CyqJ8ELZfC81iKQcDMQkV9mdmnMl45aKn6UrscudI4K23OxQmsevkw==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
+    "@storybook/client-logger" "7.6.6"
     memoizerific "^1.11.3"
     qs "^6.10.0"
 
-"@storybook/store@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/store/-/store-7.0.24.tgz#987f622477464b505335a4926363cce48ace0eca"
-  integrity sha512-T6BOXpiIAiGpQcfe0Hyu3d+8Gd0sUaVTSDXJLadfr7tqC6qmMpOuyApFu1qRfgJqh4aykUb75ESCvYWoEjwm+A==
-  dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/preview-api" "7.0.24"
-
-"@storybook/telemetry@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.0.24.tgz#bc5e510559e02fe85449ab48388feacf43911d57"
-  integrity sha512-mLGwm3yeWlM9Srrcecrpce4m8uyazIMkHIYcBC0cD2L/JzIRzeRS3Na8QlLKz4/+Hxawm7K/pE/DBrVjvBbm8A==
+"@storybook/telemetry@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-7.6.6.tgz#c317e61385bca02b877ed7a8d5940d8f832d0f47"
+  integrity sha512-2WdDcrMrt1bPVgdMVO0tFmVxT6YIjiPRfKbH/7wwYMOGmV75m4mJ9Ha2gzZc/oXTSK1M4/fiK12IgW+S3ErcMg==
   dependencies:
-    "@storybook/client-logger" "7.0.24"
-    "@storybook/core-common" "7.0.24"
+    "@storybook/client-logger" "7.6.6"
+    "@storybook/core-common" "7.6.6"
+    "@storybook/csf-tools" "7.6.6"
     chalk "^4.1.0"
     detect-package-manager "^2.0.1"
     fetch-retry "^5.0.2"
     fs-extra "^11.1.0"
-    isomorphic-unfetch "^3.1.0"
-    nanoid "^3.3.1"
     read-pkg-up "^7.0.1"
 
 "@storybook/testing-library@0.2.2":
@@ -4359,22 +4960,22 @@
     "@testing-library/user-event" "^14.4.0"
     ts-dedent "^2.2.0"
 
-"@storybook/theming@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.0.24.tgz#5e74f20bda1cdb9ba2a4a0c7a96ca014cdee5532"
-  integrity sha512-CMeCCfqffJ/D5rBl1HpAM/e5Vw0h7ucT+CLzP0ALtLrguz9ZzOiIZYgMj17KpfvWqje7HT+DwEtNkSrnJ01FNQ==
+"@storybook/theming@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-7.6.6.tgz#9eb190982c7e3f6f1383bfdf38a24c677d1803ee"
+  integrity sha512-hNZOOxaF55iAGUEM0dvAIP6LfGMgPKCJQIk/qyotFk+SKkg3PBqzph89XfFl9yCD3KiX5cryqarULgVuNawLJg==
   dependencies:
     "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
-    "@storybook/client-logger" "7.0.24"
+    "@storybook/client-logger" "7.6.6"
     "@storybook/global" "^5.0.0"
     memoizerific "^1.11.3"
 
-"@storybook/types@7.0.24":
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.0.24.tgz#22b2f6658f9a091ff584e1a0643ee1ea9a54ed39"
-  integrity sha512-SZh/XBHP1TT5bmEk0W52nT0v6fUnYwmZVls3da5noutdgOAiwL7TANtl41XrNjG+UDr8x0OE3PVVJi+LhwUaNA==
+"@storybook/types@7.6.6":
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@storybook/types/-/types-7.6.6.tgz#46159522742b6c00816ad3f5d213a9e949f24b52"
+  integrity sha512-77vbQp3GX93OD8UzFkY4a0fAmkZrqLe61XVo6yABrwbVDY0EcAwaCF5gcXRhOHldlH7KYbLfEQkDkkKTBjX7ow==
   dependencies:
-    "@storybook/channels" "7.0.24"
+    "@storybook/channels" "7.6.6"
     "@types/babel__core" "^7.0.0"
     "@types/express" "^4.7.0"
     file-system-cache "2.3.0"
@@ -4492,6 +5093,85 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@swc/core-darwin-arm64@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.101.tgz#9ffdc0e77c31b20877fa7405c82905e0c76738d0"
+  integrity sha512-mNFK+uHNPRXSnfTOG34zJOeMl2waM4hF4a2NY7dkMXrPqw9CoJn4MwTXJcyMiSz1/BnNjjTCHF3Yhj0jPxmkzQ==
+
+"@swc/core-darwin-x64@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.101.tgz#e50130e21e3cfd3029fd6cea43e8309b58ad9fa6"
+  integrity sha512-B085j8XOx73Fg15KsHvzYWG262bRweGr3JooO1aW5ec5pYbz5Ew9VS5JKYS03w2UBSxf2maWdbPz2UFAxg0whw==
+
+"@swc/core-linux-arm-gnueabihf@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.101.tgz#8cd36328e794b3c42b6c8e578bb1f42e59ba0231"
+  integrity sha512-9xLKRb6zSzRGPqdz52Hy5GuB1lSjmLqa0lST6MTFads3apmx4Vgs8Y5NuGhx/h2I8QM4jXdLbpqQlifpzTlSSw==
+
+"@swc/core-linux-arm64-gnu@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.101.tgz#d15e3885eb13a1512ba62f00ce4f5bb19f710a0c"
+  integrity sha512-oE+r1lo7g/vs96Weh2R5l971dt+ZLuhaUX+n3BfDdPxNHfObXgKMjO7E+QS5RbGjv/AwiPCxQmbdCp/xN5ICJA==
+
+"@swc/core-linux-arm64-musl@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.101.tgz#851d4cc1079b091fee36f5f64335232210749d7a"
+  integrity sha512-OGjYG3H4BMOTnJWJyBIovCez6KiHF30zMIu4+lGJTCrxRI2fAjGLml3PEXj8tC3FMcud7U2WUn6TdG0/te2k6g==
+
+"@swc/core-linux-x64-gnu@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.101.tgz#3a2a7c584db2e05a798e28361440424914563fa3"
+  integrity sha512-/kBMcoF12PRO/lwa8Z7w4YyiKDcXQEiLvM+S3G9EvkoKYGgkkz4Q6PSNhF5rwg/E3+Hq5/9D2R+6nrkF287ihg==
+
+"@swc/core-linux-x64-musl@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.101.tgz#45d1d53945994f08e93703b8de24ccac88538d0c"
+  integrity sha512-kDN8lm4Eew0u1p+h1l3JzoeGgZPQ05qDE0czngnjmfpsH2sOZxVj1hdiCwS5lArpy7ktaLu5JdRnx70MkUzhXw==
+
+"@swc/core-win32-arm64-msvc@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.101.tgz#b2610b8354e5fbca7cc5be3f728e61b046227fa8"
+  integrity sha512-9Wn8TTLWwJKw63K/S+jjrZb9yoJfJwCE2RV5vPCCWmlMf3U1AXj5XuWOLUX+Rp2sGKau7wZKsvywhheWm+qndQ==
+
+"@swc/core-win32-ia32-msvc@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.101.tgz#c919175bb4cd5e9fcfa56fbd3708167c1d445c68"
+  integrity sha512-onO5KvICRVlu2xmr4//V2je9O2XgS1SGKpbX206KmmjcJhXN5EYLSxW9qgg+kgV5mip+sKTHTAu7IkzkAtElYA==
+
+"@swc/core-win32-x64-msvc@1.3.101":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.101.tgz#17743fe425caffc596fde5965c9c4cf9a48aa26a"
+  integrity sha512-T3GeJtNQV00YmiVw/88/nxJ/H43CJvFnpvBHCVn17xbahiVUOPOduh3rc9LgAkKiNt/aV8vU3OJR+6PhfMR7UQ==
+
+"@swc/core@^1.3.82":
+  version "1.3.101"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.101.tgz#4e8f1583094a73c410e48a0bebdeccdc6c66d4a5"
+  integrity sha512-w5aQ9qYsd/IYmXADAnkXPGDMTqkQalIi+kfFf/MHRKTpaOL7DHjMXwPp/n8hJ0qNjRvchzmPtOqtPBiER50d8A==
+  dependencies:
+    "@swc/counter" "^0.1.1"
+    "@swc/types" "^0.1.5"
+  optionalDependencies:
+    "@swc/core-darwin-arm64" "1.3.101"
+    "@swc/core-darwin-x64" "1.3.101"
+    "@swc/core-linux-arm-gnueabihf" "1.3.101"
+    "@swc/core-linux-arm64-gnu" "1.3.101"
+    "@swc/core-linux-arm64-musl" "1.3.101"
+    "@swc/core-linux-x64-gnu" "1.3.101"
+    "@swc/core-linux-x64-musl" "1.3.101"
+    "@swc/core-win32-arm64-msvc" "1.3.101"
+    "@swc/core-win32-ia32-msvc" "1.3.101"
+    "@swc/core-win32-x64-msvc" "1.3.101"
+
+"@swc/counter@^0.1.1":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.2.tgz#bf06d0770e47c6f1102270b744e17b934586985e"
+  integrity sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==
+
+"@swc/types@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.5.tgz#043b731d4f56a79b4897a3de1af35e75d56bc63a"
+  integrity sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==
+
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -4579,6 +5259,17 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
+"@types/babel__core@^7.18.0":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
 "@types/babel__generator@*":
   version "7.6.4"
   resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
@@ -4601,6 +5292,13 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@types/babel__traverse@^7.18.0":
+  version "7.20.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.4.tgz#ec2c06fed6549df8bc0eb4615b683749a4a92e1b"
+  integrity sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==
+  dependencies:
+    "@babel/types" "^7.20.7"
+
 "@types/blake2b@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/blake2b/-/blake2b-2.1.0.tgz#d906320255d84f9c05fc6f3a28db81c952ee989b"
@@ -4667,6 +5365,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cross-spawn@^6.0.2":
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.6.tgz#0163d0b79a6f85409e0decb8dcca17147f81fd22"
+  integrity sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/debug@^4.1.6":
   version "4.1.8"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
@@ -4689,6 +5394,11 @@
   resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.3.tgz#e892d293c92c9c1d3f9af72c15a554fbc7e0895a"
   integrity sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==
 
+"@types/doctrine@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.9.tgz#d86a5f452a15e3e3113b99e39616a9baa0f9863f"
+  integrity sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==
+
 "@types/ejs@^3.1.1":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.2.tgz#75d277b030bc11b3be38c807e10071f45ebc78d9"
@@ -4706,6 +5416,11 @@
   dependencies:
     "@types/bn.js" "*"
 
+"@types/emscripten@^1.39.6":
+  version "1.39.10"
+  resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.39.10.tgz#da6e58a6171b46a41d3694f812d845d515c77e18"
+  integrity sha512-TB/6hBkYQJxsZHSqyeuO1Jt0AB/bW6G7rHt9g7lML7SOF6lbgcHvw/Lr+69iqN0qxgXLhWKScAon73JNnptuDw==
+
 "@types/enzyme-adapter-react-16@1.0.9":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.9.tgz#337d85f0e91be2654b246ec11701dcf75af30afc"
@@ -4797,7 +5512,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*", "@types/glob@^8.0.0":
+"@types/glob@*":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
   integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
@@ -5026,7 +5741,7 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node-fetch@^2.5.7", "@types/node-fetch@^2.6.4":
+"@types/node-fetch@^2.6.4":
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
   integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
@@ -5046,16 +5761,18 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
   integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==
 
-"@types/node@18.16.18", "@types/node@^18.11.18":
+"@types/node@18.19.3", "@types/node@^18.0.0":
+  version "18.19.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.3.tgz#e4723c4cb385641d61b983f6fe0b716abd5f8fc0"
+  integrity sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/node@^18.11.18":
   version "18.16.18"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.18.tgz#85da09bafb66d4bc14f7c899185336d0c1736390"
   integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==
 
-"@types/node@^16.0.0":
-  version "16.18.37"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.37.tgz#a1f8728e4dc30163deb41e9b7aba65d0c2d4eda1"
-  integrity sha512-ql+4dw4PlPFBP495k8JzUX/oMNRI2Ei4PrMHgj8oT4VhGlYUzF4EYr0qk2fW+XBVGIrq8Zzk13m4cvyXZuv4pA==
-
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -5068,11 +5785,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/npmlog@^4.1.2":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.4.tgz#30eb872153c7ead3e8688c476054ddca004115f6"
-  integrity sha512-WKG4gTr8przEZBiJ5r3s8ZIAoMXNbOgQ+j/d5O4X3x6kZJRLNvyUJuUK/KoG3+8BaOHPhp2m7WC6JKKeovDSzQ==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -5116,12 +5828,12 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@17.0.25":
-  version "17.0.25"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
-  integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
+"@types/react-dom@18.2.18":
+  version "18.2.18"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.18.tgz#16946e6cd43971256d874bc3d0a72074bb8571dd"
+  integrity sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==
   dependencies:
-    "@types/react" "^17"
+    "@types/react" "*"
 
 "@types/react-router-dom@5.3.3":
   version "5.3.3"
@@ -5140,10 +5852,10 @@
     "@types/history" "^4.7.11"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.71", "@types/react@>=16", "@types/react@^16", "@types/react@^17":
-  version "17.0.71"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.71.tgz#3673d446ad482b1564e44bf853b3ab5bcbc942c4"
-  integrity sha512-lfqOu9mp16nmaGRrS8deS2Taqhd5Ih0o92Te5Ws6I1py4ytHBcXLqh0YIqVsViqwVI5f+haiFM6hju814BzcmA==
+"@types/react@*", "@types/react@18.2.45", "@types/react@>=16", "@types/react@^16":
+  version "18.2.45"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.45.tgz#253f4fac288e7e751ab3dc542000fb687422c15c"
+  integrity sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -5156,6 +5868,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/resolve@^1.20.2":
+  version "1.20.6"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.6.tgz#e6e60dad29c2c8c206c026e6dd8d6d1bdda850b8"
+  integrity sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==
+
 "@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -5221,10 +5938,10 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
-"@types/styled-components@5.1.32":
-  version "5.1.32"
-  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.32.tgz#58718971519c4562229ba85face98e8530d21bfd"
-  integrity sha512-DqVpl8R0vbhVSop4120UHtGrFmHuPeoDwF4hDT0kPJTY8ty0SI38RV3VhCMsWigMUXG+kCXu7vMRqMFNy6eQgA==
+"@types/styled-components@5.1.34":
+  version "5.1.34"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.34.tgz#4107df8ef8a7eaba4fa6b05f78f93fba4daf0300"
+  integrity sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA==
   dependencies:
     "@types/hoist-non-react-statics" "*"
     "@types/react" "*"
@@ -5245,6 +5962,11 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
   integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
 
+"@types/uuid@^9.0.1":
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.7.tgz#b14cebc75455eeeb160d5fe23c2fcc0c64f724d8"
+  integrity sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==
+
 "@types/verror@^1.10.3":
   version "1.10.6"
   resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
@@ -5300,7 +6022,23 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
   integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
 
-"@typescript-eslint/eslint-plugin@5.60.1", "@typescript-eslint/eslint-plugin@^5.5.0":
+"@typescript-eslint/eslint-plugin@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+  dependencies:
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/eslint-plugin@^5.5.0":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz#81382d6ecb92b8dda70e91f9035611cb2fecd1c3"
   integrity sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==
@@ -5323,7 +6061,17 @@
   dependencies:
     "@typescript-eslint/utils" "5.60.1"
 
-"@typescript-eslint/parser@5.60.1", "@typescript-eslint/parser@^5.5.0":
+"@typescript-eslint/parser@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/parser@^5.5.0":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.60.1.tgz#0f2f58209c0862a73e3d5a56099abfdfa21d0fd3"
   integrity sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==
@@ -5341,6 +6089,14 @@
     "@typescript-eslint/types" "5.60.1"
     "@typescript-eslint/visitor-keys" "5.60.1"
 
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+
 "@typescript-eslint/type-utils@5.60.1":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz#17770540e98d65ab4730c7aac618003f702893f4"
@@ -5351,11 +6107,26 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/types@5.60.1":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.1.tgz#a17473910f6b8d388ea83c9d7051af89c4eb7561"
   integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==
 
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+
 "@typescript-eslint/typescript-estree@5.60.1":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz#8c71824b7165b64d5ebd7aa42968899525959834"
@@ -5369,6 +6140,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.60.1", "@typescript-eslint/utils@^5.58.0":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.1.tgz#6861ebedbefba1ac85482d2bdef6f2ff1eb65b80"
@@ -5383,6 +6167,20 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
 "@typescript-eslint/visitor-keys@5.60.1":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz#19a877358bf96318ec35d90bfe6bd1445cce9434"
@@ -5391,6 +6189,14 @@
     "@typescript-eslint/types" "5.60.1"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@uifabric/foundation@^7.10.16":
   version "7.10.16"
   resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.10.16.tgz#4f4f3b1fc7bd42d5529850ec75162bc4bee88adb"
@@ -5630,6 +6436,22 @@
   dependencies:
     tslib "^2.4.0"
 
+"@yarnpkg/fslib@2.10.3":
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/fslib/-/fslib-2.10.3.tgz#a8c9893df5d183cf6362680b9f1c6d7504dd5717"
+  integrity sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==
+  dependencies:
+    "@yarnpkg/libzip" "^2.3.0"
+    tslib "^1.13.0"
+
+"@yarnpkg/libzip@2.3.0", "@yarnpkg/libzip@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/libzip/-/libzip-2.3.0.tgz#fe1e762e47669f6e2c960fc118436608d834e3be"
+  integrity sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==
+  dependencies:
+    "@types/emscripten" "^1.39.6"
+    tslib "^1.13.0"
+
 "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -5750,16 +6572,16 @@ acorn@^7.1.1, acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.11.2, acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+
 acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
   integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
-acorn@^8.9.0:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
-
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -6054,6 +6876,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-hidden@^1.1.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.3.tgz#14aeb7fb692bbb72d69bebfa47279c1fd725e954"
+  integrity sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==
+  dependencies:
+    tslib "^2.0.0"
+
 aria-query@5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
@@ -6292,6 +7121,17 @@ assert@^2.0.0:
     object-is "^1.0.1"
     util "^0.12.0"
 
+assert@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.1.0.tgz#6d92a238d05dc02e7427c881fb8be81c8448b2dd"
+  integrity sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==
+  dependencies:
+    call-bind "^1.0.2"
+    is-nan "^1.3.2"
+    object-is "^1.1.5"
+    object.assign "^4.1.4"
+    util "^0.12.5"
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -6302,20 +7142,6 @@ ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
-ast-types@0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
-  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
-  dependencies:
-    tslib "^2.0.1"
-
-ast-types@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
-  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
-  dependencies:
-    tslib "^2.0.1"
-
 ast-types@^0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
@@ -6521,20 +7347,6 @@ babel-plugin-named-asset-import@^0.3.8:
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2"
   integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==
 
-babel-plugin-named-exports-order@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz#ae14909521cf9606094a2048239d69847540cb09"
-  integrity sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==
-
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
-
 babel-plugin-polyfill-corejs2@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd"
@@ -6544,13 +7356,14 @@ babel-plugin-polyfill-corejs2@^0.4.3:
     "@babel/helper-define-polyfill-provider" "^0.4.0"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz#679d1b94bf3360f7682e11f2cb2708828a24fe8c"
+  integrity sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
+    semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.8.1:
   version "0.8.1"
@@ -6560,12 +7373,13 @@ babel-plugin-polyfill-corejs3@^0.8.1:
     "@babel/helper-define-polyfill-provider" "^0.4.0"
     core-js-compat "^3.30.1"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04"
+  integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
+    core-js-compat "^3.33.1"
 
 babel-plugin-polyfill-regenerator@^0.5.0:
   version "0.5.0"
@@ -6574,14 +7388,12 @@ babel-plugin-polyfill-regenerator@^0.5.0:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.4.0"
 
-babel-plugin-react-docgen@^4.1.0, babel-plugin-react-docgen@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-4.2.1.tgz#7cc8e2f94e8dc057a06e953162f0810e4e72257b"
-  integrity sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz#c6fc8eab610d3a11eb475391e52584bacfc020f4"
+  integrity sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==
   dependencies:
-    ast-types "^0.14.2"
-    lodash "^4.17.15"
-    react-docgen "^5.0.0"
+    "@babel/helper-define-polyfill-provider" "^0.4.4"
 
 babel-plugin-transform-react-remove-prop-types@^0.4.24:
   version "0.4.24"
@@ -6704,12 +7516,12 @@ before-after-hook@^2.2.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
-better-opn@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
-  integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
+better-opn@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-3.0.2.tgz#f96f35deaaf8f34144a4102651babcf00d1d8817"
+  integrity sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==
   dependencies:
-    open "^7.0.3"
+    open "^8.0.4"
 
 bfj@^7.0.2:
   version "7.0.2"
@@ -6917,15 +7729,15 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4
     node-releases "^2.0.12"
     update-browserslist-db "^1.0.11"
 
-browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.22.2:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
+  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001565"
+    electron-to-chromium "^1.4.601"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -7061,24 +7873,6 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-c8@^7.6.0:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/c8/-/c8-7.14.0.tgz#f368184c73b125a80565e9ab2396ff0be4d732f3"
-  integrity sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@istanbuljs/schema" "^0.1.3"
-    find-up "^5.0.0"
-    foreground-child "^2.0.0"
-    istanbul-lib-coverage "^3.2.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-reports "^3.1.4"
-    rimraf "^3.0.2"
-    test-exclude "^6.0.0"
-    v8-to-istanbul "^9.0.0"
-    yargs "^16.2.0"
-    yargs-parser "^20.2.9"
-
 cacache@^15.2.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
@@ -7223,10 +8017,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001508.tgz#4461bbc895c692a96da399639cc1e146e7302a33"
   integrity sha512-sdQZOJdmt3GJs1UMNpCCCyeuS2IEGLXnHyAo9yIO5JJDjbjoVRij4M1qep6P6gFpptD1PqIYgzM+gwJbOi92mw==
 
-caniuse-lite@^1.0.30001517:
-  version "1.0.30001527"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba"
-  integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ==
+caniuse-lite@^1.0.30001565:
+  version "1.0.30001570"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca"
+  integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==
 
 canvg@2.0.0:
   version "2.0.0"
@@ -7769,6 +8563,11 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
+
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -7879,13 +8678,20 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.25.1, core-js-compat@^3.30.1, core-js-compat@^3.30.2:
+core-js-compat@^3.30.1, core-js-compat@^3.30.2:
   version "3.31.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
   integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
   dependencies:
     browserslist "^4.21.5"
 
+core-js-compat@^3.31.0, core-js-compat@^3.33.1:
+  version "3.34.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.34.0.tgz#61a4931a13c52f8f08d924522bba65f8c94a5f17"
+  integrity sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA==
+  dependencies:
+    browserslist "^4.22.2"
+
 core-js-pure@^3.23.3:
   version "3.31.0"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.0.tgz#052fd9e82fbaaf86457f5db1fadcd06f15966ff2"
@@ -8487,6 +9293,11 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+detect-node-es@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
+  integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -8876,10 +9687,10 @@ electron-to-chromium@^1.4.431:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.442.tgz#455f4c5bd6ae73afb634dcffee6f356c26c8e294"
   integrity sha512-RkrZF//Ya+0aJq2NM3OdisNh5ZodZq1rdXOS96G8DdDgpDKqKE81yTbbQ3F/4CKm1JBPsGu1Lp/akkna2xO06Q==
 
-electron-to-chromium@^1.4.477:
-  version "1.4.510"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.510.tgz#446c50d7533c1e71a84b00a3b37ab06dd601d890"
-  integrity sha512-xPfLIPFcN/WLXBpQ/K4UgE98oUBO5Tia6BD4rkSR0wE7ep/PwBVlgvPJQrIBpmJGVAmUzwPKuDbVt9XV6+uC2g==
+electron-to-chromium@^1.4.601:
+  version "1.4.612"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.612.tgz#350c6fd4201d677307519b931949fa64dae6a5cc"
+  integrity sha512-dM8BMtXtlH237ecSMnYdYuCkib2QHq0kpWfUnavjdYsyr/6OsAwg5ZGUfnQ9KD1Ga4QgB2sqXlB2NT8zy2GnVg==
 
 electron-updater@4.6.5:
   version "4.6.5"
@@ -9228,6 +10039,11 @@ es-module-lexer@^1.2.1:
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f"
   integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==
 
+es-module-lexer@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
+  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
+
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
@@ -9268,40 +10084,40 @@ esbuild-plugin-alias@^0.2.1:
   resolved "https://registry.yarnpkg.com/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz#45a86cb941e20e7c2bc68a2bea53562172494fcb"
   integrity sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==
 
-esbuild-register@^3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.4.2.tgz#1e39ee0a77e8f320a9790e68c64c3559620b9175"
-  integrity sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==
+esbuild-register@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/esbuild-register/-/esbuild-register-3.5.0.tgz#449613fb29ab94325c722f560f800dd946dc8ea8"
+  integrity sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==
   dependencies:
     debug "^4.3.4"
 
-esbuild@^0.17.0:
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
-  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+esbuild@^0.18.0:
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
+  integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.19"
-    "@esbuild/android-arm64" "0.17.19"
-    "@esbuild/android-x64" "0.17.19"
-    "@esbuild/darwin-arm64" "0.17.19"
-    "@esbuild/darwin-x64" "0.17.19"
-    "@esbuild/freebsd-arm64" "0.17.19"
-    "@esbuild/freebsd-x64" "0.17.19"
-    "@esbuild/linux-arm" "0.17.19"
-    "@esbuild/linux-arm64" "0.17.19"
-    "@esbuild/linux-ia32" "0.17.19"
-    "@esbuild/linux-loong64" "0.17.19"
-    "@esbuild/linux-mips64el" "0.17.19"
-    "@esbuild/linux-ppc64" "0.17.19"
-    "@esbuild/linux-riscv64" "0.17.19"
-    "@esbuild/linux-s390x" "0.17.19"
-    "@esbuild/linux-x64" "0.17.19"
-    "@esbuild/netbsd-x64" "0.17.19"
-    "@esbuild/openbsd-x64" "0.17.19"
-    "@esbuild/sunos-x64" "0.17.19"
-    "@esbuild/win32-arm64" "0.17.19"
-    "@esbuild/win32-ia32" "0.17.19"
-    "@esbuild/win32-x64" "0.17.19"
+    "@esbuild/android-arm" "0.18.20"
+    "@esbuild/android-arm64" "0.18.20"
+    "@esbuild/android-x64" "0.18.20"
+    "@esbuild/darwin-arm64" "0.18.20"
+    "@esbuild/darwin-x64" "0.18.20"
+    "@esbuild/freebsd-arm64" "0.18.20"
+    "@esbuild/freebsd-x64" "0.18.20"
+    "@esbuild/linux-arm" "0.18.20"
+    "@esbuild/linux-arm64" "0.18.20"
+    "@esbuild/linux-ia32" "0.18.20"
+    "@esbuild/linux-loong64" "0.18.20"
+    "@esbuild/linux-mips64el" "0.18.20"
+    "@esbuild/linux-ppc64" "0.18.20"
+    "@esbuild/linux-riscv64" "0.18.20"
+    "@esbuild/linux-s390x" "0.18.20"
+    "@esbuild/linux-x64" "0.18.20"
+    "@esbuild/netbsd-x64" "0.18.20"
+    "@esbuild/openbsd-x64" "0.18.20"
+    "@esbuild/sunos-x64" "0.18.20"
+    "@esbuild/win32-arm64" "0.18.20"
+    "@esbuild/win32-ia32" "0.18.20"
+    "@esbuild/win32-x64" "0.18.20"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -9340,6 +10156,17 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+escodegen@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
@@ -9417,10 +10244,10 @@ eslint-plugin-flowtype@^8.0.3:
     lodash "^4.17.21"
     string-natural-compare "^3.0.1"
 
-eslint-plugin-import@2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
-  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+eslint-plugin-import@2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
   dependencies:
     array-includes "^3.1.7"
     array.prototype.findlastindex "^1.2.3"
@@ -9438,7 +10265,7 @@ eslint-plugin-import@2.29.0:
     object.groupby "^1.0.1"
     object.values "^1.1.7"
     semver "^6.3.1"
-    tsconfig-paths "^3.14.2"
+    tsconfig-paths "^3.15.0"
 
 eslint-plugin-import@^2.25.3:
   version "2.27.5"
@@ -9580,15 +10407,15 @@ eslint-webpack-plugin@^3.1.1:
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
 
-eslint@8.54.0:
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
-  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
+eslint@8.56.0:
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
+  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.3"
-    "@eslint/js" "8.54.0"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.56.0"
     "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
@@ -9716,15 +10543,6 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-to-babel@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/estree-to-babel/-/estree-to-babel-3.2.1.tgz#82e78315275c3ca74475fdc8ac1a5103c8a75bf5"
-  integrity sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==
-  dependencies:
-    "@babel/traverse" "^7.1.6"
-    "@babel/types" "^7.2.0"
-    c8 "^7.6.0"
-
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
@@ -10212,14 +11030,6 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
-foreground-child@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-2.0.0.tgz#71b32800c9f15aa8f2f83f4a6bd9bff35d861a53"
-  integrity sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^3.0.2"
-
 foreground-child@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
@@ -10247,10 +11057,10 @@ fork-ts-checker-webpack-plugin@^6.5.0:
     semver "^7.3.2"
     tapable "^1.0.0"
 
-fork-ts-checker-webpack-plugin@^7.2.8:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.3.0.tgz#a9c984a018493962360d7c7e77a67b44a2d5f3aa"
-  integrity sha512-IN+XTzusCjR5VgntYFgxbxVx3WraPRnKehBFrf00cMSrtUuW9MsG9dhL6MWpY6MkjC3wVwoujfCDgZZCQwbswA==
+fork-ts-checker-webpack-plugin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz#dae45dfe7298aa5d553e2580096ced79b6179504"
+  integrity sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==
   dependencies:
     "@babel/code-frame" "^7.16.7"
     chalk "^4.1.2"
@@ -10479,6 +11289,11 @@ get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
+get-nonce@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"
+  integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==
+
 get-npm-tarball-url@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz#67dff908d699e9e2182530ae6e939a93e5f8dfdb"
@@ -10630,13 +11445,6 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob-promise@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-6.0.3.tgz#e6b3ab02d350b3f4b3e15b57e4485986e41ba2fe"
-  integrity sha512-m+kxywR5j/2Z2V9zvHKfwwL5Gp7gIFEBX+deTB9w2lJB+wSuw9kcS43VfvTAMk8TXL5JCl/cCjsR+tgNVspGyA==
-  dependencies:
-    "@types/glob" "^8.0.0"
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -10666,6 +11474,17 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^10.0.0:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
 glob@^10.2.2:
   version "10.3.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.1.tgz#9789cb1b994515bedb811a6deca735b5c37d2bf4"
@@ -10677,7 +11496,7 @@ glob@^10.2.2:
     minipass "^5.0.0 || ^6.0.2"
     path-scurry "^1.10.0"
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -10689,7 +11508,7 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1, glob@^8.1.0:
+glob@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -11256,6 +12075,13 @@ i18next@21.10.0:
   dependencies:
     "@babel/runtime" "^7.17.2"
 
+i18next@23.7.11:
+  version "23.7.11"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.7.11.tgz#ee4dfa58f9b27807ebf57d7c33a6c4a0bb4bf7c8"
+  integrity sha512-A/vOkw8vY99YHU9A1Td3I1dcTiYaPnwBWzrpVzfXUXSYgogK3cmBcmop/0cnXPc6QpUWIyqaugKNxRUEZVk9Nw==
+  dependencies:
+    "@babel/runtime" "^7.23.2"
+
 iconv-corefoundation@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
@@ -11441,10 +12267,12 @@ internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
+invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
 
 ip@^2.0.0:
   version "2.0.0"
@@ -11687,7 +12515,7 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
-is-nan@^1.2.1:
+is-nan@^1.2.1, is-nan@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
   integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
@@ -11902,7 +12730,7 @@ is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -11948,14 +12776,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-isomorphic-unfetch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
-  integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
-  dependencies:
-    node-fetch "^2.6.1"
-    unfetch "^4.2.0"
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -11990,7 +12810,7 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.1.3, istanbul-reports@^3.1.4:
+istanbul-reports@^3.1.3:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
   integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
@@ -12007,6 +12827,15 @@ jackspeak@^2.0.3:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.7"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
@@ -12681,9 +13510,9 @@ jiti@^1.18.2:
   integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
 
 joi@^17.7.0:
-  version "17.9.2"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.2.tgz#8b2e4724188369f55451aebd1d0b1d9482470690"
-  integrity sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==
+  version "17.11.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.11.0.tgz#aa9da753578ec7720e6f0ca2c7046996ed04fc1a"
+  integrity sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
@@ -12726,20 +13555,21 @@ jsbi@^4.1.0:
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
   integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
 
-jscodeshift@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881"
-  integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==
-  dependencies:
-    "@babel/core" "^7.13.16"
-    "@babel/parser" "^7.13.16"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
-    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
-    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
-    "@babel/preset-flow" "^7.13.13"
-    "@babel/preset-typescript" "^7.13.0"
-    "@babel/register" "^7.13.16"
+jscodeshift@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.15.1.tgz#6c7a9572acdfa4f54098e958f71a05716a4e546b"
+  integrity sha512-hIJfxUy8Rt4HkJn/zZPU9ChKfKZM1342waJ1QC2e2YsPcWhM+3BJ4dcfQCzArTrk1jJeNLB341H+qOcEHRxJZg==
+  dependencies:
+    "@babel/core" "^7.23.0"
+    "@babel/parser" "^7.23.0"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/preset-flow" "^7.22.15"
+    "@babel/preset-typescript" "^7.23.0"
+    "@babel/register" "^7.22.15"
     babel-core "^7.0.0-bridge.0"
     chalk "^4.1.2"
     flow-parser "0.*"
@@ -12747,7 +13577,7 @@ jscodeshift@^0.14.0:
     micromatch "^4.0.4"
     neo-async "^2.5.0"
     node-dir "^0.1.17"
-    recast "^0.21.0"
+    recast "^0.23.3"
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
@@ -13403,7 +14233,7 @@ log-update@^5.0.1:
     strip-ansi "^7.0.1"
     wrap-ansi "^8.0.1"
 
-loose-envify@^1.1.0, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -13463,6 +14293,13 @@ magic-string@^0.25.0, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+magic-string@^0.30.5:
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
+  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 make-dir@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
@@ -13606,7 +14443,7 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.1.2, memfs@^3.4.1, memfs@^3.4.3:
+memfs@^3.1.2, memfs@^3.4.1, memfs@^3.4.12, memfs@^3.4.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
   integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
@@ -13726,7 +14563,7 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
-min-indent@^1.0.0:
+min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
@@ -13884,6 +14721,11 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81"
   integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -13937,11 +14779,6 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -14000,7 +14837,7 @@ nanoassert@^2.0.0:
   resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-2.0.0.tgz#a05f86de6c7a51618038a620f88878ed1e490c09"
   integrity sha512-7vO7n28+aYO4J+8w96AzhmU8G+Y/xpPDJz/se19ICsqj/momRbb9mh9ZUtkoJ5X3nTnPdhEJyc0qnM6yAsHBaA==
 
-nanoid@^3.3.1, nanoid@^3.3.6:
+nanoid@^3.3.6:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
@@ -14062,7 +14899,7 @@ negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -14112,7 +14949,7 @@ node-addon-api@^6.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
   integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
 
-node-dir@^0.1.10, node-dir@^0.1.17:
+node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
   integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==
@@ -14131,7 +14968,7 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.0.0, node-fetch@^2.6.1, node-fetch@^2.6.11:
+node-fetch@^2.0.0, node-fetch@^2.6.11:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
   integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
@@ -14217,10 +15054,10 @@ node-releases@^2.0.12:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
   integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
 
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -14695,15 +15532,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-open@^7.0.3:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
-  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
-  dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
-
-open@^8.0.9, open@^8.4.0:
+open@^8.0.4, open@^8.0.9, open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -15068,6 +15897,14 @@ path-scurry@^1.10.0:
     lru-cache "^9.1.1 || ^10.0.0"
     minipass "^5.0.0 || ^6.0.2"
 
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-scurry@^1.6.1:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63"
@@ -15990,6 +16827,11 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
@@ -16028,7 +16870,7 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.10.0:
+qs@^6.10.0, qs@^6.11.2:
   version "6.11.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
   integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
@@ -16176,30 +17018,29 @@ react-docgen-typescript@^2.2.2:
   resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz#4611055e569edc071204aadb20e1c93e1ab1659c"
   integrity sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==
 
-react-docgen@^5.0.0:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-5.4.3.tgz#7d297f73b977d0c7611402e5fc2a168acf332b26"
-  integrity sha512-xlLJyOlnfr8lLEEeaDZ+X2J/KJoe6Nr9AzxnkdQWush5hz2ZSu66w6iLMOScMmxoSHWpWMn+k3v5ZiyCfcWsOA==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/generator" "^7.12.11"
-    "@babel/runtime" "^7.7.6"
-    ast-types "^0.14.2"
-    commander "^2.19.0"
+react-docgen@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-7.0.1.tgz#b6528fe45385908645ffbee1ec0d65709e1e047c"
+  integrity sha512-rCz0HBIT0LWbIM+///LfRrJoTKftIzzwsYDf0ns5KwaEjejMHQRtphcns+IXFHDNY9pnz6G8l/JbbI6pD4EAIA==
+  dependencies:
+    "@babel/core" "^7.18.9"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+    "@types/babel__core" "^7.18.0"
+    "@types/babel__traverse" "^7.18.0"
+    "@types/doctrine" "^0.0.9"
+    "@types/resolve" "^1.20.2"
     doctrine "^3.0.0"
-    estree-to-babel "^3.1.0"
-    neo-async "^2.6.1"
-    node-dir "^0.1.10"
-    strip-indent "^3.0.0"
+    resolve "^1.22.1"
+    strip-indent "^4.0.0"
 
-react-dom@17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+react-dom@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.23.0"
 
 react-element-to-jsx-string@^15.0.0:
   version "15.0.0"
@@ -16215,7 +17056,7 @@ react-error-overlay@^6.0.11:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
-react-i18next@12.1.5, react-i18next@>=11.16.4:
+react-i18next@13.5.0, react-i18next@>=11.16.4:
   version "13.5.0"
   resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.5.0.tgz#44198f747628267a115c565f0c736a50a76b1ab0"
   integrity sha512-CFJ5NDGJ2MUyBohEHxljOq/39NQ972rh1ajnadG9BjTk+UXbHLq4z5DKEbEQBDoIhUmmbuS/fIMJKo6VOax1HA==
@@ -16223,7 +17064,7 @@ react-i18next@12.1.5, react-i18next@>=11.16.4:
     "@babel/runtime" "^7.22.5"
     html-parse-stringify "^3.0.1"
 
-react-inspector@^6.0.0, react-inspector@^6.0.1:
+react-inspector@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.2.tgz#aa3028803550cb6dbd7344816d5c80bf39d07e9d"
   integrity sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==
@@ -16233,7 +17074,7 @@ react-is@18.1.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
   integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
 
-"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0:
+"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
@@ -16253,20 +17094,44 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
-react-router-dom@6.14.0:
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.14.0.tgz#7ce6c3f73549e4d40216ba150253d3bf30812b33"
-  integrity sha512-YEwlApKwzMMMbGbhh+Q7MsloTldcwMgHxUY/1g0uA62+B1hZo2jsybCWIDCL8zvIDB1FA0pBKY9chHbZHt+2dQ==
+react-refresh@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
+  integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
+
+react-remove-scroll-bar@^2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
+  integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
+  dependencies:
+    react-style-singleton "^2.2.1"
+    tslib "^2.0.0"
+
+react-remove-scroll@2.5.5:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
+  integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==
+  dependencies:
+    react-remove-scroll-bar "^2.3.3"
+    react-style-singleton "^2.2.1"
+    tslib "^2.1.0"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
+react-router-dom@6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.21.0.tgz#aa4c6bc046a8e8723095bc09b3c0ab2254532712"
+  integrity sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==
   dependencies:
-    "@remix-run/router" "1.7.0"
-    react-router "6.14.0"
+    "@remix-run/router" "1.14.0"
+    react-router "6.21.0"
 
-react-router@6.14.0:
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.14.0.tgz#1c3e8e922d934d43a253fd862c72c82167c0a7f1"
-  integrity sha512-OD+vkrcGbvlwkspUFDgMzsu1RXwdjNh83YgG/28lBnDzgslhCgxIqoExLlxsfTpIygp7fc+Hd3esloNwzkm2xA==
+react-router@6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.21.0.tgz#6fe3e59877aca3dccceec1801d26991ddf42d12b"
+  integrity sha512-hGZ0HXbwz3zw52pLZV3j3+ec+m/PQ9cTpBvqjFQmy2XVUWGn5MD+31oXHb6dVTxYzmAeaiUBYjkoNz66n3RGCg==
   dependencies:
-    "@remix-run/router" "1.7.0"
+    "@remix-run/router" "1.14.0"
 
 react-scripts@5.0.1:
   version "5.0.1"
@@ -16323,7 +17188,7 @@ react-scripts@5.0.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
-react-shallow-renderer@^16.13.1:
+react-shallow-renderer@^16.13.1, react-shallow-renderer@^16.15.0:
   version "16.15.0"
   resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457"
   integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==
@@ -16331,7 +17196,25 @@ react-shallow-renderer@^16.13.1:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
-react-test-renderer@16.14.0, react-test-renderer@^16.0.0-0:
+react-style-singleton@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4"
+  integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==
+  dependencies:
+    get-nonce "^1.0.0"
+    invariant "^2.2.4"
+    tslib "^2.0.0"
+
+react-test-renderer@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e"
+  integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==
+  dependencies:
+    react-is "^18.2.0"
+    react-shallow-renderer "^16.15.0"
+    scheduler "^0.23.0"
+
+react-test-renderer@^16.0.0-0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz#e98360087348e260c56d4fe2315e970480c228ae"
   integrity sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==
@@ -16361,13 +17244,12 @@ react-transition-group@4.4.5:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+react@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -16494,16 +17376,6 @@ realpath-native@^2.0.0:
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866"
   integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==
 
-recast@^0.21.0:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
-  integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==
-  dependencies:
-    ast-types "0.15.2"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
 recast@^0.23.1:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.2.tgz#d3dda3e8f0a3366860d7508c00e34a338ac52b41"
@@ -16515,12 +17387,16 @@ recast@^0.23.1:
     source-map "~0.6.1"
     tslib "^2.0.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
+recast@^0.23.3:
+  version "0.23.4"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.4.tgz#ca1bac7bfd3011ea5a28dfecb5df678559fb1ddf"
+  integrity sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==
   dependencies:
-    resolve "^1.1.6"
+    assert "^2.0.0"
+    ast-types "^0.16.1"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tslib "^2.0.1"
 
 recursive-readdir@^2.2.2:
   version "2.2.3"
@@ -16576,6 +17452,13 @@ regenerator-transform@^0.15.1:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -16735,7 +17618,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
   integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -16931,11 +17814,6 @@ safe-array-concat@^1.0.1:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -17002,10 +17880,10 @@ sass-loader@^12.3.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@1.63.6:
-  version "1.63.6"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea"
-  integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==
+sass@1.69.5:
+  version "1.69.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
+  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -17039,6 +17917,13 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
+  dependencies:
+    loose-envify "^1.1.0"
+
 schema-utils@2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
@@ -17167,17 +18052,6 @@ serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serve-favicon@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
-  integrity sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==
-  dependencies:
-    etag "~1.8.1"
-    fresh "0.5.2"
-    ms "2.1.1"
-    parseurl "~1.3.2"
-    safe-buffer "5.1.1"
-
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -17301,15 +18175,6 @@ shell-quote@^1.7.3, shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
-shelljs@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
-  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -17353,13 +18218,20 @@ simple-get@^4.0.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-update-notifier@^1.0.0, simple-update-notifier@^1.0.7:
+simple-update-notifier@^1.0.7:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
   integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
   dependencies:
     semver "~7.0.0"
 
+simple-update-notifier@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
+  integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
+  dependencies:
+    semver "^7.5.3"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -17725,12 +18597,12 @@ storybook-addon-react-router-v6@1.0.2:
   dependencies:
     react-inspector "^6.0.1"
 
-storybook@7.0.24:
-  version "7.0.24"
-  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.0.24.tgz#5194d7b72964669985b8c2227772e882e6ae2563"
-  integrity sha512-ilQDM4+KaNO8s5jU4EnS68JWb9KaLR0+xTNa/BEXQa18SnSt/qZYORXtqispwkyuL/9xwaMVwtS+st7JOucNWA==
+storybook@7.6.6:
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/storybook/-/storybook-7.6.6.tgz#df0b7cd268adc6178686179ef020b1b12563d1e3"
+  integrity sha512-PmJxpjGdLvDOHaRzqLOvcJ3ALQPaNeW6D5Lv7rPPVbuO24wdDzd/75dPRP7gJKYcGE0NnDZ6cLQq3UlCfbkIBA==
   dependencies:
-    "@storybook/cli" "7.0.24"
+    "@storybook/cli" "7.6.6"
 
 stream-shift@^1.0.0:
   version "1.0.1"
@@ -17923,6 +18795,13 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
+strip-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
+  integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
+  dependencies:
+    min-indent "^1.0.1"
+
 strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -18058,6 +18937,11 @@ svgo@^2.7.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
+swc-loader@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/swc-loader/-/swc-loader-0.2.3.tgz#6792f1c2e4c9ae9bf9b933b3e010210e270c186d"
+  integrity sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==
+
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -18152,10 +19036,10 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-telejson@^7.0.3:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-7.1.0.tgz#1ef7a0dd57eeb52cde933126f61bcc296c170f52"
-  integrity sha512-jFJO4P5gPebZAERPkJsqMAQ0IMA1Hi0AoSfxpnUaV6j6R2SZqlpkbS20U6dEUtA3RUYt2Ak/mTlkQzHH9Rv/hA==
+telejson@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-7.2.0.tgz#3994f6c9a8f8d7f2dba9be2c7c5bbb447e876f32"
+  integrity sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==
   dependencies:
     memoizerific "^1.11.3"
 
@@ -18290,6 +19174,11 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+tiny-invariant@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
+  integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
+
 tmp-promise@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
@@ -18353,6 +19242,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+tocbot@^4.20.1:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/tocbot/-/tocbot-4.23.0.tgz#5d3788ccf5a8b0ae2c00819b1ed0c127013e2e34"
+  integrity sha512-5DWuSZXsqG894mkGb8ZsQt9myyQyVxE50AiGRZ0obV0BVUTVkaZmc9jbgpknaAAPUm4FIrzGkEseD6FuQJYJDQ==
+
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -18438,7 +19332,7 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
+tsconfig-paths@^3.14.1:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
   integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
@@ -18448,6 +19342,16 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tsconfig-paths@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
@@ -18467,7 +19371,7 @@ tslib@2.6.2:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -18564,7 +19468,7 @@ type-fest@^1.0.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
-type-fest@^2.19.0:
+type-fest@^2.19.0, type-fest@~2.19:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
@@ -18676,18 +19580,18 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undici@5.26.2:
-  version "5.26.2"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.2.tgz#fa61bfe40f732540d15e58b0c1271872d8e3c995"
-  integrity sha512-a4PDLQgLTPHVzOK+x3F79/M4GtyYPl+aX9AAK7aQxpwxDwCqkeZCScy7Gk5kWT3JtdFq1uhO3uZJdLtHI4dK9A==
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+undici@5.28.2:
+  version "5.28.2"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.2.tgz#fea200eac65fc7ecaff80a023d1a0543423b4c91"
+  integrity sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
-unfetch@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
-  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -18803,15 +19707,15 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-unplugin@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-0.10.2.tgz#0f7089c3666f592cc448d746e39e7f41e9afb01a"
-  integrity sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==
+unplugin@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.5.1.tgz#806688376fa3dcca4d2fa2c5d27cf6cd0370fbef"
+  integrity sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.11.2"
     chokidar "^3.5.3"
     webpack-sources "^3.2.3"
-    webpack-virtual-modules "^0.4.5"
+    webpack-virtual-modules "^0.6.0"
 
 unquote@~1.1.1:
   version "1.1.1"
@@ -18858,6 +19762,14 @@ update-browserslist-db@^1.0.11:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -18878,6 +19790,14 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url@^0.11.0:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.3.tgz#6f495f4b935de40ce4a0a52faee8954244f3d3ad"
+  integrity sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==
+  dependencies:
+    punycode "^1.4.1"
+    qs "^6.11.2"
+
 usb@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/usb/-/usb-2.9.0.tgz#8ae3b175f93bee559400bff33491eee63406b6a2"
@@ -18887,6 +19807,13 @@ usb@2.9.0:
     node-addon-api "^6.0.0"
     node-gyp-build "^4.5.0"
 
+use-callback-ref@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5"
+  integrity sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==
+  dependencies:
+    tslib "^2.0.0"
+
 use-resize-observer@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/use-resize-observer/-/use-resize-observer-9.1.0.tgz#14735235cf3268569c1ea468f8a90c5789fc5c6c"
@@ -18894,6 +19821,14 @@ use-resize-observer@^9.1.0:
   dependencies:
     "@juggle/resize-observer" "^3.3.1"
 
+use-sidecar@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2"
+  integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==
+  dependencies:
+    detect-node-es "^1.1.0"
+    tslib "^2.0.0"
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -18919,7 +19854,7 @@ util.promisify@~1.0.0:
     has-symbols "^1.0.1"
     object.getownpropertydescriptors "^2.1.0"
 
-util@^0.12.0, util@^0.12.4:
+util@^0.12.0, util@^0.12.4, util@^0.12.5:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
@@ -18964,15 +19899,6 @@ v8-to-istanbul@^8.1.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
-v8-to-istanbul@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
-  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-
 validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -19099,6 +20025,17 @@ webpack-dev-middleware@^5.3.1:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
+webpack-dev-middleware@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz#6bbc257ec83ae15522de7a62f995630efde7cc3d"
+  integrity sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==
+  dependencies:
+    colorette "^2.0.10"
+    memfs "^3.4.12"
+    mime-types "^2.1.31"
+    range-parser "^1.2.1"
+    schema-utils "^4.0.0"
+
 webpack-dev-server@^4.6.0:
   version "4.15.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
@@ -19173,10 +20110,15 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack-virtual-modules@^0.4.3, webpack-virtual-modules@^0.4.5:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz#3e4008230731f1db078d9cb6f68baf8571182b45"
-  integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==
+webpack-virtual-modules@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c"
+  integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==
+
+webpack-virtual-modules@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz#ac6fdb9c5adb8caecd82ec241c9631b7a3681b6f"
+  integrity sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==
 
 webpack@5, webpack@^5.64.4:
   version "5.88.0"
@@ -19208,10 +20150,10 @@ webpack@5, webpack@^5.64.4:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-webpack@5.88.2:
-  version "5.88.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e"
-  integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
+webpack@5.89.0:
+  version "5.89.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
+  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -19720,7 +20662,7 @@ yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20.2.9:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==

From b75762e52cb7741c8bffa6d5759b1aa0e6d8aab9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:32:55 +0900
Subject: [PATCH 15/68] chore(deps): bump @babel/traverse from 7.22.5 to 7.23.6
 (#2996)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9fad12f853..33fe536a08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2055,7 +2055,7 @@
     "@babel/parser" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/traverse@^7.18.9", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.6":
+"@babel/traverse@^7.18.9", "@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.23.6", "@babel/traverse@^7.7.2":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5"
   integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==
@@ -2071,22 +2071,6 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
-  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
 "@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"

From 432f0ec47dfed77d29b7f3f1a0a277b215d802a1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 09:55:24 +0800
Subject: [PATCH 16/68] Update ckb client versions (#2998)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-light-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ckb-light-version b/.ckb-light-version
index 7becae11d1..600e6fd31c 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1 +1 @@
-v0.3.2
+v0.3.3

From 4f7d117833c79a67238b7eb702ba36fa551edc60 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Tue, 26 Dec 2023 09:38:14 +0800
Subject: [PATCH 17/68] fix: Pop up window can be rolled when error message is
 long (#2995)

fix: issue 337
---
 .../neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
index ac08941983..28a879e2b2 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
+++ b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
@@ -23,7 +23,9 @@
     line-height: 28px;
     margin: 0;
     color: var(--dialog-secondary-text-color);
-    word-break: break-word;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
   }
 
   .actions {

From 4af44eac23481d31296d4b2e11df6cd3b94b3521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Tue, 26 Dec 2023 15:23:11 +0800
Subject: [PATCH 18/68] feat: Remove rebuild index of separated indexer (#2990)

feat: Remove rebuild indexer
---
 .../src/components/ClearCache/index.tsx       | 69 ++-----------------
 .../src/components/DataSetting/index.tsx      |  7 +-
 packages/neuron-ui/src/locales/en.json        | 19 +----
 packages/neuron-ui/src/locales/zh-tw.json     | 19 +----
 packages/neuron-ui/src/locales/zh.json        | 19 +----
 packages/neuron-ui/src/services/remote/app.ts |  2 +-
 .../neuron-ui/src/types/Controller/index.d.ts |  8 ---
 packages/neuron-wallet/src/controllers/api.ts |  4 +-
 .../neuron-wallet/src/services/indexer.ts     | 12 +---
 .../tests/services/indexer.test.ts            | 40 +----------
 10 files changed, 17 insertions(+), 182 deletions(-)

diff --git a/packages/neuron-ui/src/components/ClearCache/index.tsx b/packages/neuron-ui/src/components/ClearCache/index.tsx
index 54511334c8..1007687528 100644
--- a/packages/neuron-ui/src/components/ClearCache/index.tsx
+++ b/packages/neuron-ui/src/components/ClearCache/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback, useState } from 'react'
+import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Spinner from 'widgets/Spinner'
 import Dialog from 'widgets/Dialog'
@@ -9,59 +9,23 @@ import { cacheClearDate } from 'services/localCache'
 import { isSuccessResponse, uniformTimeFormatter } from 'utils'
 import styles from './clearCache.module.scss'
 
-const I18N_PATH = 'settings.clear-cache'
-const IDs = {
-  submitClearCache: 'submit-clear-cache',
-  refreshCacheOption: 'refresh-cache-option',
-  rebuildCacheOption: 'rebuild-cache-option',
-}
-
 const ClearCacheDialog = ({
   dispatch,
   className,
   btnClassName,
-  hideRebuild,
 }: {
   dispatch: StateDispatch
   className?: string
   btnClassName?: string
-  hideRebuild?: boolean
 }) => {
   const [t] = useTranslation()
   const [clearedDate, setClearedDate] = useState(cacheClearDate.load())
   const [isClearing, setIsClearing] = useState(false)
-  const [isDialogOpen, setIsDialogOpen] = useState(false)
-  const [isRebuild, setIsRebuild] = useState(false)
   const [notice, setNotice] = useState('')
 
-  const showDialog = useCallback(() => {
-    setIsDialogOpen(true)
-  }, [setIsDialogOpen])
-
-  const dismissDialog = useCallback(() => {
-    setIsDialogOpen(false)
-  }, [setIsDialogOpen])
-
-  const toggleIsRebuild = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      setIsRebuild(e.target.checked)
-    },
-    [setIsRebuild]
-  )
-
-  useEffect(() => {
-    if (isDialogOpen) {
-      /* eslint-disable-next-line no-unused-expressions */
-      document.querySelector<HTMLButtonElement>(`#${IDs.submitClearCache}`)?.focus()
-    } else {
-      setIsRebuild(false)
-    }
-  }, [isDialogOpen, setIsRebuild])
-
   const handleSubmit = useCallback(() => {
-    setIsDialogOpen(false)
     setIsClearing(true)
-    clearCellCache({ resetIndexerData: isRebuild })
+    clearCellCache()
       .then(res => {
         if (isSuccessResponse(res) && res.result) {
           addPopup('clear-cache-successfully')(dispatch)
@@ -74,7 +38,7 @@ const ClearCacheDialog = ({
       .finally(() => {
         setIsClearing(false)
       })
-  }, [dispatch, setClearedDate, setIsDialogOpen, isRebuild])
+  }, [dispatch, setClearedDate])
 
   return (
     <>
@@ -83,10 +47,10 @@ const ClearCacheDialog = ({
         <button
           type="button"
           className={`${btnClassName} ${styles.clearBtn}`}
-          onClick={showDialog}
+          onClick={handleSubmit}
           disabled={isClearing}
         >
-          {t('settings.data.clear-cache')}
+          {t('settings.data.refresh')}
         </button>
       </div>
 
@@ -96,29 +60,6 @@ const ClearCacheDialog = ({
           <p>{t('settings.data.clearing-cache')}</p>
         </div>
       </Dialog>
-
-      <Dialog
-        show={isDialogOpen}
-        title={t(`${I18N_PATH}.title`)}
-        onConfirm={handleSubmit}
-        onCancel={dismissDialog}
-        confirmText={t('settings.data.confirm-clear')}
-        confirmProps={{ id: IDs.submitClearCache }}
-      >
-        <div className={styles.options}>
-          <label htmlFor={IDs.refreshCacheOption}>
-            <input type="checkbox" id={IDs.refreshCacheOption} checked disabled />
-            <span className={styles.highlight}>{t(`${I18N_PATH}.options.refresh.label`)}</span>
-          </label>
-          {hideRebuild ? null : (
-            <label htmlFor={IDs.rebuildCacheOption}>
-              <input type="checkbox" id={IDs.rebuildCacheOption} checked={isRebuild} onChange={toggleIsRebuild} />
-              <span>{t(`${I18N_PATH}.options.rebuild.label`)}</span>
-            </label>
-          )}
-        </div>
-      </Dialog>
-
       <Toast content={notice} onDismiss={() => setNotice('')} />
     </>
   )
diff --git a/packages/neuron-ui/src/components/DataSetting/index.tsx b/packages/neuron-ui/src/components/DataSetting/index.tsx
index 4b3d9709c6..19448cccd6 100644
--- a/packages/neuron-ui/src/components/DataSetting/index.tsx
+++ b/packages/neuron-ui/src/components/DataSetting/index.tsx
@@ -97,12 +97,7 @@ const DataSetting = () => {
         </div>
         <div className={styles.rightContainer}>
           {hiddenDataPath ? null : <PathItem path={prevPath} openPath={openPath} handleClick={onSetting} />}
-          <ClearCache
-            className={styles.item}
-            btnClassName={styles.itemBtn}
-            dispatch={dispatch}
-            hideRebuild={isLightClient}
-          />
+          <ClearCache className={styles.item} btnClassName={styles.itemBtn} dispatch={dispatch} />
         </div>
       </div>
 
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 032be96f9f..c66755a57d 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -413,28 +413,13 @@
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)"
       },
-      "clear-cache": {
-        "title": "Clear Cache",
-        "options": {
-          "refresh": {
-            "label": "Refresh"
-          },
-          "rebuild": {
-            "label": "Fully rebuild index (cost extra 30 ~ 50 min)"
-          }
-        },
-        "buttons": {
-          "cancel": "Cancel",
-          "ok": "OK"
-        }
-      },
       "data": {
         "ckb-node-data": "CKB Node Config & Storage",
         "set": "Set",
         "cache": "Cache",
         "clear-cache-description": "Clear cache if you encounter data sync or balance display problems. Neuron will rescan block data.",
-        "cache-cleared-on": "Cache cleared on {{date}}",
-        "clear-cache": "Clear Cache",
+        "cache-cleared-on": "Refreshed cache on {{date}}",
+        "refresh": "Refresh",
         "clearing-cache": "Clearing Cache, please wait a moment",
         "clear-success": "Cache Cleared",
         "set-path": "Set Path",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 675eaf99f3..77fe4fc8a3 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -407,28 +407,13 @@
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)"
       },
-      "clear-cache": {
-        "title": "清理緩存",
-        "options": {
-          "refresh": {
-            "label": "刷新緩存"
-          },
-          "rebuild": {
-            "label": "重建索引 (需要 30 ~ 50 分鐘)"
-          }
-        },
-        "buttons": {
-          "cancel": "取消",
-          "ok": "確認"
-        }
-      },
       "data": {
         "ckb-node-data": "節點配置和數據",
         "set": "設置",
         "cache": "緩存",
         "clear-cache-description": "當資料同步或餘額顯示出現問題時，可以清理緩存，Neuron 會重新同步所有塊數據。",
-        "cache-cleared-on": "上次清理緩存時間 {{date}}",
-        "clear-cache": "清理緩存",
+        "cache-cleared-on": "上次刷新緩存時間 {{date}}",
+        "refresh": "刷新",
         "clearing-cache": "正在清除緩存中，請稍候",
         "clear-success": "已清除緩存",
         "set-path": "設置路徑",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 339302dfe7..8d2a559241 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -406,28 +406,13 @@
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)"
       },
-      "clear-cache": {
-        "title": "清除缓存",
-        "options": {
-          "refresh": {
-            "label": "刷新缓存"
-          },
-          "rebuild": {
-            "label": "重建索引 (需要 30 ~ 50 分钟)"
-          }
-        },
-        "buttons": {
-          "cancel": "取消",
-          "ok": "确认"
-        }
-      },
       "data": {
         "ckb-node-data": "节点配置和数据",
         "set": "设置",
         "cache": "缓存",
         "clear-cache-description": "当数据同步或余额显示出现问题时，可以清空缓存，Neuron 会重新同步所有块数据。",
-        "cache-cleared-on": "上次清空缓存时间 {{date}}",
-        "clear-cache": "清空缓存",
+        "cache-cleared-on": "上次刷新缓存时间 {{date}}",
+        "refresh": "刷新",
         "clearing-cache": "正在清除缓存中，请稍候",
         "clear-success": "已清除缓存",
         "set-path": "设置路径",
diff --git a/packages/neuron-ui/src/services/remote/app.ts b/packages/neuron-ui/src/services/remote/app.ts
index 5a0c65ae4a..1924b6331e 100644
--- a/packages/neuron-ui/src/services/remote/app.ts
+++ b/packages/neuron-ui/src/services/remote/app.ts
@@ -33,7 +33,7 @@ export type VerifyExternalCkbNodeRes =
   | undefined
 export const verifyExternalCkbNode = remoteApi<void, VerifyExternalCkbNodeRes>('verify-external-ckb-node')
 
-export const clearCellCache = remoteApi<Controller.ClearCache.Params>('clear-cache')
+export const clearCellCache = remoteApi<void, boolean>('clear-cache')
 
 export const invokeShowErrorMessage = remoteApi<{ title: string; content: string }>('show-error-message')
 export const invokeShowOpenDialog = remoteApi<OpenDialogOptions, OpenDialogReturnValue>('show-open-dialog')
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 33b3aab3b8..35ecc4f87b 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -311,14 +311,6 @@ declare namespace Controller {
     }
     type Response = TokenInfo[]
   }
-
-  namespace ClearCache {
-    interface Params {
-      resetIndexerData: boolean
-    }
-    type Response = boolean
-  }
-
   namespace GetSUDTTokenInfo {
     interface Params {
       tokenID: string
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 239e9b36e1..0d92bb8294 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -596,8 +596,8 @@ export default class ApiController {
       new UpdateController(false).quitAndInstall()
     })
 
-    handle('clear-cache', async (_, params: { resetIndexerData: boolean } | null) => {
-      await IndexerService.clearCache(params?.resetIndexerData)
+    handle('clear-cache', async () => {
+      await IndexerService.clearCache()
       return { status: ResponseCode.Success, result: true }
     })
 
diff --git a/packages/neuron-wallet/src/services/indexer.ts b/packages/neuron-wallet/src/services/indexer.ts
index 19a5928f7e..6d37967b60 100644
--- a/packages/neuron-wallet/src/services/indexer.ts
+++ b/packages/neuron-wallet/src/services/indexer.ts
@@ -1,12 +1,9 @@
 import path from 'path'
 import fs from 'fs'
 import logger from '../utils/logger'
-import SyncedBlockNumber from '../models/synced-block-number'
 import { clean as cleanChain } from '../database/chain'
 import SettingsService from './settings'
-import startMonitor, { stopMonitor } from './monitor'
 import { resetSyncTaskQueue } from '../block-sync-renderer'
-import NetworksService from './networks'
 
 export default class IndexerService {
   private constructor() {}
@@ -19,15 +16,8 @@ export default class IndexerService {
     return IndexerService.instance
   }
 
-  static clearCache = async (clearIndexerFolder = false) => {
+  static clearCache = async () => {
     await cleanChain()
-
-    if (NetworksService.getInstance().getCurrent().readonly && clearIndexerFolder) {
-      await stopMonitor('ckb')
-      IndexerService.getInstance().clearData()
-      await new SyncedBlockNumber().setNextBlock(BigInt(0))
-      await startMonitor('ckb', true)
-    }
     resetSyncTaskQueue.asyncPush(true)
   }
 
diff --git a/packages/neuron-wallet/tests/services/indexer.test.ts b/packages/neuron-wallet/tests/services/indexer.test.ts
index 5f1dad9236..36dc23b8aa 100644
--- a/packages/neuron-wallet/tests/services/indexer.test.ts
+++ b/packages/neuron-wallet/tests/services/indexer.test.ts
@@ -2,8 +2,6 @@ import IndexerService from '../../src/services/indexer'
 
 const existsSyncMock = jest.fn()
 const rmSyncMock = jest.fn()
-const stopMonitorMock = jest.fn()
-const getCurrentWalletMock = jest.fn()
 
 jest.mock('fs', () => {
   return {
@@ -48,20 +46,6 @@ jest.mock('../../src/database/chain', () => ({
   clean: () => jest.fn(),
 }))
 
-jest.mock('../../src/services/monitor', () => {
-  function mockMonitor() {}
-  mockMonitor.stopMonitor = () => stopMonitorMock()
-  return mockMonitor
-})
-
-jest.mock('../../src/services/networks', () => ({
-  getInstance() {
-    return {
-      getCurrent: getCurrentWalletMock,
-    }
-  },
-}))
-
 const resetSyncTaskQueueAsyncPushMock = jest.fn()
 jest.mock('../../src/block-sync-renderer', () => ({
   resetSyncTaskQueue: {
@@ -75,8 +59,6 @@ describe('test IndexerService', () => {
     rmSyncMock.mockReset()
     setIndexerDataPathMock.mockReset()
     getIndexerDataPathMock.mockReset()
-    getCurrentWalletMock.mockReset()
-    stopMonitorMock.mockReset()
   })
   describe('test remove old indexer data', () => {
     it('old indexer data path exist', () => {
@@ -103,28 +85,8 @@ describe('test IndexerService', () => {
     beforeEach(() => {
       resetSyncTaskQueueAsyncPushMock.mockReset()
     })
-    it('is external ckb node', async () => {
-      getCurrentWalletMock.mockReturnValue({ readonly: false })
+    it('clear cache success', async () => {
       await IndexerService.clearCache()
-      expect(stopMonitorMock).toBeCalledTimes(0)
-      expect(resetSyncTaskQueueAsyncPushMock).toBeCalledTimes(1)
-    })
-    it('is internal ckb node', async () => {
-      getCurrentWalletMock.mockReturnValue({ readonly: true })
-      await IndexerService.clearCache()
-      expect(stopMonitorMock).toBeCalledTimes(0)
-      expect(resetSyncTaskQueueAsyncPushMock).toBeCalledTimes(1)
-    })
-    it('clear indexer data with internal ckb node', async () => {
-      getCurrentWalletMock.mockReturnValue({ readonly: true })
-      await IndexerService.clearCache(true)
-      expect(stopMonitorMock).toBeCalledTimes(1)
-      expect(resetSyncTaskQueueAsyncPushMock).toBeCalledTimes(1)
-    })
-    it('clear indexer data with external ckb node', async () => {
-      getCurrentWalletMock.mockReturnValue({ readonly: false })
-      await IndexerService.clearCache(true)
-      expect(stopMonitorMock).toBeCalledTimes(0)
       expect(resetSyncTaskQueueAsyncPushMock).toBeCalledTimes(1)
     })
   })

From ce12c83eea56cfa27cb17221652f05c090d8be38 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 28 Dec 2023 12:42:17 +0900
Subject: [PATCH 19/68] Bump dependencies (#3003)

* chore(deps): update dependency @types/npmlog to v7

* chore(deps): update dependency electron-builder to v24

* chore(deps): update dependency electron to v28 (#357)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Keith <keithwhisper@gmail.com>
Co-authored-by: yanguoyu <841185308@qq.com>

* chore(deps): update dependency eslint-config-prettier to v9

* chore(deps): update dependency lint-staged to v15

* chore(deps): update dependency lerna to v8

* chore(deps): update dependency react-i18next to v14

* fix(deps): update dependency react-router-dom to v6.21.1

* chore(deps): update dependency electron to v28.1.0 (#367)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency react-i18next to v14 (#368)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency storybook-addon-react-router-v6 to v2

* chore(deps): update github/codeql-action action to v3 (#370)

      Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update node.js to v20 (#371)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update peter-evans/commit-comment action to v3 (#372)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update tj-actions/changed-files action to v41 (#373)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: revert wait-on

* fix(deps): update dependency archiver to v6 (#375)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update typescript-eslint monorepo to v6 (#374)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: yanguoyu <841185308@qq.com>
---
 .github/workflows/check-code-style.yml      |    2 +-
 .github/workflows/check_checksums.yml       |    2 +-
 .github/workflows/codeql-analysis.yml       |    6 +-
 .github/workflows/package_for_test.yml      |    2 +-
 package.json                                |   16 +-
 packages/neuron-ui/package.json             |   10 +-
 packages/neuron-ui/src/services/subjects.ts |    4 +-
 packages/neuron-wallet/package.json         |    8 +-
 yarn.lock                                   | 1593 +++++++++++--------
 9 files changed, 946 insertions(+), 697 deletions(-)

diff --git a/.github/workflows/check-code-style.yml b/.github/workflows/check-code-style.yml
index ca0b73c5ce..87de0e3831 100644
--- a/.github/workflows/check-code-style.yml
+++ b/.github/workflows/check-code-style.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@v37
+        uses: tj-actions/changed-files@v41
         with:
           files: "packages/**/*.{js,cjs,mjs,jsx,ts,tsx,css,scss}"
 
diff --git a/.github/workflows/check_checksums.yml b/.github/workflows/check_checksums.yml
index 14a52723ae..4c047f4754 100644
--- a/.github/workflows/check_checksums.yml
+++ b/.github/workflows/check_checksums.yml
@@ -33,7 +33,7 @@ jobs:
           body="${body//$'\r'/'%0D'}"
           echo "body=$body" >> $GITHUB_OUTPUT
 
-      - uses: peter-evans/commit-comment@v2
+      - uses: peter-evans/commit-comment@v3
         with:
           body: ${{ steps.comment_body.outputs.body }}
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cc8a8c740b..0042cf6c7c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
index 19ce1af5ac..d73e821810 100644
--- a/.github/workflows/package_for_test.yml
+++ b/.github/workflows/package_for_test.yml
@@ -211,7 +211,7 @@ jobs:
     steps:
       - name: Comment by push event
         if: ${{ github.event_name == 'push' }}
-        uses: peter-evans/commit-comment@v2
+        uses: peter-evans/commit-comment@v3
         with:
           body: |
             Packaging for test is done in [${{ github.run_id }}](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})
diff --git a/package.json b/package.json
index 6eb94d735a..d52255be37 100644
--- a/package.json
+++ b/package.json
@@ -43,18 +43,18 @@
   "devDependencies": {
     "@babel/core": "7.23.6",
     "@types/jest": "27.5.2",
-    "@types/node": "18.19.3",
-    "@types/npmlog": "4.1.6",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@types/node": "20.10.5",
+    "@types/npmlog": "7.0.0",
+    "@typescript-eslint/eslint-plugin": "6.16.0",
+    "@typescript-eslint/parser": "6.16.0",
     "concurrently": "8.2.2",
     "cross-env": "7.0.3",
     "eslint": "8.56.0",
-    "eslint-config-prettier": "8.10.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
-    "lerna": "7.4.2",
-    "lint-staged": "13.3.0",
+    "lerna": "8.0.1",
+    "lint-staged": "15.2.0",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
     "ts-jest": "29.1.1",
@@ -67,6 +67,6 @@
     "react-i18next": ">=11.16.4"
   },
   "volta": {
-    "node": "18.19.0"
+    "node": "20.10.0"
   }
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 540fe4d81f..512984e473 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -63,7 +63,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-i18next": "13.5.0",
-    "react-router-dom": "6.21.0",
+    "react-router-dom": "6.21.1",
     "react-transition-group": "4.4.5",
     "sass": "1.69.5",
     "tslib": "2.6.2"
@@ -83,14 +83,14 @@
     "@storybook/testing-library": "0.2.2",
     "@types/enzyme": "3.10.18",
     "@types/enzyme-adapter-react-16": "1.0.9",
-    "@types/node": "18.19.3",
+    "@types/node": "20.10.5",
     "@types/react": "18.2.45",
     "@types/react-dom": "18.2.18",
     "@types/react-router-dom": "5.3.3",
     "@types/styled-components": "5.1.34",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "24.8.8",
+    "electron": "28.1.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",
@@ -102,10 +102,10 @@
     "react-scripts": "5.0.1",
     "react-test-renderer": "18.2.0",
     "storybook": "7.6.6",
-    "storybook-addon-react-router-v6": "1.0.2",
+    "storybook-addon-react-router-v6": "2.0.10",
     "webpack": "5.89.0"
   },
   "resolutions": {
-    "react-i18next": "12.3.1"
+    "react-i18next": "14.0.0"
   }
 }
diff --git a/packages/neuron-ui/src/services/subjects.ts b/packages/neuron-ui/src/services/subjects.ts
index b78aebf9d2..a9e36665c9 100644
--- a/packages/neuron-ui/src/services/subjects.ts
+++ b/packages/neuron-ui/src/services/subjects.ts
@@ -1,5 +1,5 @@
 import { CONSTANTS } from 'utils'
-import { ipcRenderer } from 'electron'
+import { ipcRenderer, type IpcRendererEvent } from 'electron'
 
 const { LOCALES } = CONSTANTS
 
@@ -37,7 +37,7 @@ const SubjectConstructor = <T>(
   return ipcRenderer
     ? {
         subscribe: (handler: (data: T) => void) => {
-          const handlerWrap = (_e: Event, data: T) => {
+          const handlerWrap = (_e: IpcRendererEvent, data: T) => {
             handler(data)
           }
           ipcRenderer.on(channel, handlerWrap)
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 73b45ea269..ff7b802bd8 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -54,7 +54,7 @@
     "@iarna/toml": "2.2.5",
     "@ledgerhq/hw-transport-node-hid": "6.27.22",
     "@spore-sdk/core": "0.1.0-beta.9",
-    "archiver": "5.3.2",
+    "archiver": "6.0.1",
     "async": "3.2.5",
     "bn.js": "4.12.0",
     "chalk": "3.0.0",
@@ -80,7 +80,7 @@
   "devDependencies": {
     "@electron/notarize": "2.2.0",
     "@nervosnetwork/ckb-types": "0.109.0",
-    "@types/archiver": "3.1.1",
+    "@types/archiver": "6.0.2",
     "@types/async": "3.2.24",
     "@types/electron-devtools-installer": "2.2.5",
     "@types/elliptic": "6.4.18",
@@ -93,9 +93,9 @@
     "@types/sqlite3": "3.1.11",
     "@types/uuid": "8.3.4",
     "devtron": "1.4.0",
-    "electron": "24.8.8",
+    "electron": "28.1.0",
     "electron-build-env": "0.2.0",
-    "electron-builder": "23.6.0",
+    "electron-builder": "24.9.1",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.6.0",
     "neuron-ui": "0.112.0",
diff --git a/yarn.lock b/yarn.lock
index 33fe536a08..dcadc9fc24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"7zip-bin@~5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
-  integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
+"7zip-bin@~5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d"
+  integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==
 
 "@aashutoshrathi/word-wrap@^1.2.3":
   version "1.2.5"
@@ -2023,20 +2023,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.13.10", "@babel/runtime@^7.23.2":
+"@babel/runtime@^7.13.10", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"
   integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.22.5":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.4.tgz#36fa1d2b36db873d25ec631dcc4923fdc1cf2e2e"
-  integrity sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
 "@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
@@ -2484,6 +2477,15 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@electron/asar@^3.2.1":
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.8.tgz#2ea722f3452583dbd4ffdcc4b4f5dc903f1d8178"
+  integrity sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==
+  dependencies:
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+
 "@electron/get@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
@@ -2499,6 +2501,15 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
+"@electron/notarize@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3"
+  integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==
+  dependencies:
+    debug "^4.1.1"
+    fs-extra "^9.0.1"
+    promise-retry "^2.0.1"
+
 "@electron/notarize@2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657"
@@ -2508,15 +2519,27 @@
     fs-extra "^9.0.1"
     promise-retry "^2.0.1"
 
-"@electron/universal@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
-  integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ==
+"@electron/osx-sign@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
+  integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
   dependencies:
+    compare-version "^0.1.2"
+    debug "^4.3.4"
+    fs-extra "^10.0.0"
+    isbinaryfile "^4.0.8"
+    minimist "^1.2.6"
+    plist "^3.0.5"
+
+"@electron/universal@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.4.1.tgz#3fbda2a5ed9ff9f3304c8e8316b94c1e3a7b3785"
+  integrity sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==
+  dependencies:
+    "@electron/asar" "^3.2.1"
     "@malept/cross-spawn-promise" "^1.1.0"
-    asar "^3.1.0"
     debug "^4.3.1"
-    dir-compare "^2.4.0"
+    dir-compare "^3.0.0"
     fs-extra "^9.0.1"
     minimatch "^3.0.4"
     plist "^3.0.4"
@@ -2636,7 +2659,7 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
-"@eslint-community/eslint-utils@^4.2.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
@@ -2648,7 +2671,7 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
   integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
-"@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
@@ -3353,23 +3376,13 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@lerna/child-process@7.4.2":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.4.2.tgz#a2fd013ac2150dc288270d3e0d0b850c06bec511"
-  integrity sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==
-  dependencies:
-    chalk "^4.1.0"
-    execa "^5.0.0"
-    strong-log-transformer "^2.1.0"
-
-"@lerna/create@7.4.2":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.4.2.tgz#f845fad1480e46555af98bd39af29571605dddc9"
-  integrity sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==
+"@lerna/create@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-8.0.1.tgz#cc0ab19163c67269552292d95f23568468fa9921"
+  integrity sha512-PDYNUF8Nv5j7DbGvVbizEuYuQbNFZ0+wVOtRPvBQOkC2dMNryi3dJjktEd1QeDX6Wa/JkJWvZ5SMHyr+7H3Rtg==
   dependencies:
-    "@lerna/child-process" "7.4.2"
-    "@npmcli/run-script" "6.0.2"
-    "@nx/devkit" ">=16.5.1 < 17"
+    "@npmcli/run-script" "7.0.2"
+    "@nx/devkit" ">=17.1.2 < 18"
     "@octokit/plugin-enterprise-rest" "6.0.1"
     "@octokit/rest" "19.0.11"
     byte-size "8.1.1"
@@ -3406,12 +3419,12 @@
     npm-packlist "5.1.1"
     npm-registry-fetch "^14.0.5"
     npmlog "^6.0.2"
-    nx ">=16.5.1 < 17"
+    nx ">=17.1.2 < 18"
     p-map "4.0.0"
     p-map-series "2.1.0"
     p-queue "6.6.2"
     p-reduce "^2.1.0"
-    pacote "^15.2.0"
+    pacote "^17.0.5"
     pify "5.0.0"
     read-cmd-shim "4.0.0"
     read-package-json "6.0.4"
@@ -3430,8 +3443,8 @@
     validate-npm-package-name "5.0.0"
     write-file-atomic "5.0.1"
     write-pkg "4.0.0"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
+    yargs "17.7.2"
+    yargs-parser "21.1.1"
 
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
@@ -3550,6 +3563,17 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/agent@^2.0.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.0.tgz#e81f00fdb2a670750ff7731bbefb47ecbf0ccf44"
+  integrity sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==
+  dependencies:
+    agent-base "^7.1.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.1"
+    lru-cache "^10.0.1"
+    socks-proxy-agent "^8.0.1"
+
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
@@ -3565,19 +3589,19 @@
   dependencies:
     semver "^7.3.5"
 
-"@npmcli/git@^4.0.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.1.0.tgz#ab0ad3fd82bc4d8c1351b6c62f0fa56e8fe6afa6"
-  integrity sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==
+"@npmcli/git@^5.0.0":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-5.0.3.tgz#ad3ede0994bcf716ddb63d361f3ea16cb72d878c"
+  integrity sha512-UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw==
   dependencies:
-    "@npmcli/promise-spawn" "^6.0.0"
-    lru-cache "^7.4.4"
-    npm-pick-manifest "^8.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    lru-cache "^10.0.1"
+    npm-pick-manifest "^9.0.0"
     proc-log "^3.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
-    which "^3.0.0"
+    which "^4.0.0"
 
 "@npmcli/installed-package-contents@^2.0.1":
   version "2.0.2"
@@ -3600,45 +3624,45 @@
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
   integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
 
-"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
-  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
+"@npmcli/promise-spawn@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz#fd1c64ed4ff2341e503e1f390c62640a6540df09"
+  integrity sha512-wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ==
   dependencies:
-    which "^3.0.0"
+    which "^4.0.0"
 
-"@npmcli/run-script@6.0.2", "@npmcli/run-script@^6.0.0":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885"
-  integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==
+"@npmcli/run-script@7.0.2", "@npmcli/run-script@^7.0.0":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-7.0.2.tgz#497e7f058799497889df65900c711312252276d3"
+  integrity sha512-Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w==
   dependencies:
     "@npmcli/node-gyp" "^3.0.0"
-    "@npmcli/promise-spawn" "^6.0.0"
-    node-gyp "^9.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    node-gyp "^10.0.0"
     read-package-json-fast "^3.0.0"
-    which "^3.0.0"
+    which "^4.0.0"
 
-"@nrwl/devkit@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.10.0.tgz#ac8c5b4db00f12c4b817c937be2f7c4eb8f2593c"
-  integrity sha512-fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ==
+"@nrwl/devkit@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-17.2.6.tgz#ab283bc16fde0b3c4a73ce59c1364b89d9b73468"
+  integrity sha512-uZVqc2qhi+WdSqLV9aIcE+5ck+IUSQ47Cc5bslWrssQjBncqGavHYDuU4ZLuKK5HxCuZqlQjvo7TsF7LeOjNiA==
   dependencies:
-    "@nx/devkit" "16.10.0"
+    "@nx/devkit" "17.2.6"
 
-"@nrwl/tao@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.10.0.tgz#94642a0380709b8e387e1e33705a5a9624933375"
-  integrity sha512-QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q==
+"@nrwl/tao@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-17.2.6.tgz#eab09ad1c5751e4310bb8c21796e25df1e8310b1"
+  integrity sha512-cgtUKTRSxDZ94S9IpC27/qYZJ1YttJDET+veKrtRYvwnHFgkq1peyeTTtnM25yJon7PRdm2lYrlIVdPm0vXupw==
   dependencies:
-    nx "16.10.0"
+    nx "17.2.6"
     tslib "^2.3.0"
 
-"@nx/devkit@16.10.0", "@nx/devkit@>=16.5.1 < 17":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.10.0.tgz#7e466be2dee2dcb1ccaf286786ca2a0a639aa007"
-  integrity sha512-IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w==
+"@nx/devkit@17.2.6", "@nx/devkit@>=17.1.2 < 18":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-17.2.6.tgz#e65d8386ca7467d49de2193bc963a78561134623"
+  integrity sha512-a9GPw0KiLhvv2RBLPlWgaVDZRvgww4ANBwv7LuGvk8FNgxF5vkQMM5WyKpvxKJhmh1EZ+T9JsGWAFrK7skW9Bw==
   dependencies:
-    "@nrwl/devkit" "16.10.0"
+    "@nrwl/devkit" "17.2.6"
     ejs "^3.1.7"
     enquirer "~2.3.6"
     ignore "^5.0.4"
@@ -3646,55 +3670,55 @@
     tmp "~0.2.1"
     tslib "^2.3.0"
 
-"@nx/nx-darwin-arm64@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz#0c73010cac7a502549483b12bad347da9014e6f1"
-  integrity sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==
-
-"@nx/nx-darwin-x64@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz#2ccf270418d552fd0a8e0d6089aee4944315adaa"
-  integrity sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==
-
-"@nx/nx-freebsd-x64@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz#c3ee6914256e69493fed9355b0d6661d0e86da44"
-  integrity sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==
-
-"@nx/nx-linux-arm-gnueabihf@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz#a961eccbb38acb2da7fc125b29d1fead0b39152f"
-  integrity sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==
-
-"@nx/nx-linux-arm64-gnu@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz#795f20072549d03822b5c4639ef438e473dbb541"
-  integrity sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==
-
-"@nx/nx-linux-arm64-musl@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz#f2428ee6dbe2b2c326e8973f76c97666def33607"
-  integrity sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==
-
-"@nx/nx-linux-x64-gnu@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.10.0.tgz#d36c2bcf94d49eaa24e3880ddaf6f1f617de539b"
-  integrity sha512-134PW/u/arNFAQKpqMJniC7irbChMPz+W+qtyKPAUXE0XFKPa7c1GtlI/wK2dvP9qJDZ6bKf0KtA0U/m2HMUOA==
-
-"@nx/nx-linux-x64-musl@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.10.0.tgz#78bd2ab97a583b3d4ea3387b67fd7b136907493c"
-  integrity sha512-q8sINYLdIJxK/iUx9vRk5jWAWb/2O0PAbOJFwv4qkxBv4rLoN7y+otgCZ5v0xfx/zztFgk/oNY4lg5xYjIso2Q==
-
-"@nx/nx-win32-arm64-msvc@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz#ef20ec8d0c83d66e73e20df12d2c788b8f866396"
-  integrity sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==
-
-"@nx/nx-win32-x64-msvc@16.10.0":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz#7410a51d0f8be631eec9552f01b2e5946285927c"
-  integrity sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==
+"@nx/nx-darwin-arm64@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-17.2.6.tgz#8f5a4cc579158388ec98e0bf26996d9c0457da00"
+  integrity sha512-ezU5u7hkEwI2xzsFSjyr53uNURBvga40LQlpEnS/CbqRifHHhTKisCy+r2+kRhiOwTeR+I+/2D3zPyIyN3aEHQ==
+
+"@nx/nx-darwin-x64@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-17.2.6.tgz#4ca7b4fb5ab03b786d8bcdfb9e5780abd1f31faf"
+  integrity sha512-wUIwbM/7LMxlFkEOlbxR/s2qaRuD69yXc70f2rtxsskwJ4GOF5kfc1jk2YaDs9qswI+FgQVgbeZu8pgF+slY7Q==
+
+"@nx/nx-freebsd-x64@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-17.2.6.tgz#59e0189d14f9b021644b123c16315ba1e09a808b"
+  integrity sha512-uBKEGqG4txVCpBirRzt1QwuOLzfA0s9dlUP7n5t4qJuaf9OXuVcDXay8g84WT1jx4PPtipyv/wyIFu3r7v8kZw==
+
+"@nx/nx-linux-arm-gnueabihf@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-17.2.6.tgz#e1bebfb4bf8e24b7d4f2072bde077de988317461"
+  integrity sha512-dSDVz2BktaPHMkrJojFCx+V+QFLDF0KzoHorESzZmHZTfumr0xtJ1COWCU+gYmLptc+8OgwCzCPWXHhcDgji/A==
+
+"@nx/nx-linux-arm64-gnu@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-17.2.6.tgz#b830f581ab5afc2ae30ec2f8bd27a750c1a66753"
+  integrity sha512-AD99Kk47Yxn3IJ89aCT1oVpNX1XNECAYay97yhqf2tiBsDv9hC43PppOdjI0dNP5VRBTrr6EsWdhvE0uNJ3RJw==
+
+"@nx/nx-linux-arm64-musl@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-17.2.6.tgz#c3865d4386097190f3c7fd1840999e3cc6fbb8cf"
+  integrity sha512-MOX/EJyzseEnzbFxY7V6es/xta6WQ0cDDrl6i6qjCRnoRTFFVMsL0Fb4dtVbv7fd75O41P+OBGpG70MYx2SOxw==
+
+"@nx/nx-linux-x64-gnu@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-17.2.6.tgz#3520364998256a628a861ad1427754504fc585a6"
+  integrity sha512-16xTSszGPY25INDUr4pzLXWcO3va1764iVFiHRTuJr5siDymY7zSj+DPKFmewzqF2358Y5m8AtMotY0FqKciYg==
+
+"@nx/nx-linux-x64-musl@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-17.2.6.tgz#f3c89d7d5c5336735bf31eb2ae0dd2e5ab6a9f25"
+  integrity sha512-F/nIq8bcZd2cNuBiQbyJwur7CpeRBCt0qKDF38HQ2l3HhQv+jwk4T6115LMQqwZb9e6kt6BAFsY+6O7I6t3pCw==
+
+"@nx/nx-win32-arm64-msvc@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-17.2.6.tgz#1e432cdbf55ba816d04fec776227e7d459dc4cc4"
+  integrity sha512-1lAKKKiH7eduzqcPDB03iPz38yNXn3Y4Q/3jULjaRc3EFAplfBsYVwJ9kGjXPZSrpt/AY7w5ATY55/r5B3gQnA==
+
+"@nx/nx-win32-x64-msvc@17.2.6":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-17.2.6.tgz#07fde42a0fe1f8f103aa7afd1db83cb76a72951f"
+  integrity sha512-LrJySMWrO5oWMrP4VOWM1hr3c4rtxHGCcRy19VwqvaAPDrnsg0qfPjv4q1C9YyIU8sj+T3oJs1yZdnNntlN8ew==
 
 "@octokit/auth-token@^3.0.0":
   version "3.0.4"
@@ -3812,14 +3836,6 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@parcel/watcher@2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
-  integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
-  dependencies:
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -4145,10 +4161,10 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
-"@remix-run/router@1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7"
-  integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==
+"@remix-run/router@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.1.tgz#6d2dd03d52e604279c38911afc1079d58c50a755"
+  integrity sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==
 
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
@@ -4209,11 +4225,32 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
+"@sigstore/bundle@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-2.1.0.tgz#c6140ca97b68815edf7c4fb7bdbf58d656525c39"
+  integrity sha512-89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.1"
+
 "@sigstore/protobuf-specs@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4"
   integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==
 
+"@sigstore/protobuf-specs@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-2.2.0.tgz#4918207d8356877ab42d85d360d5729e9b3ec65a"
+  integrity sha512-AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA==
+  dependencies:
+    "@sigstore/bundle" "^2.1.0"
+    "@sigstore/protobuf-specs" "^0.2.1"
+    make-fetch-happen "^13.0.0"
+
 "@sigstore/tuf@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.0.tgz#13b69323e7bf8de458cd6c952c57acd1169772a5"
@@ -4223,6 +4260,14 @@
     make-fetch-happen "^11.0.1"
     tuf-js "^1.1.3"
 
+"@sigstore/tuf@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-2.2.0.tgz#ef636239687e41af3f2ce10667ab88f5ca6165b3"
+  integrity sha512-KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.1"
+    tuf-js "^2.1.0"
+
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
@@ -5202,6 +5247,11 @@
   resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
   integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
 
+"@tufjs/canonical-json@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz#a52f61a3d7374833fca945b2549bc30a2dd40d0a"
+  integrity sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==
+
 "@tufjs/models@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
@@ -5210,17 +5260,25 @@
     "@tufjs/canonical-json" "1.0.0"
     minimatch "^9.0.0"
 
+"@tufjs/models@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-2.0.0.tgz#c7ab241cf11dd29deb213d6817dabb8c99ce0863"
+  integrity sha512-c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg==
+  dependencies:
+    "@tufjs/canonical-json" "2.0.0"
+    minimatch "^9.0.3"
+
 "@types/abstract-leveldown@*":
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/@types/abstract-leveldown/-/abstract-leveldown-7.2.1.tgz#bb16403c17754b0c4d5772d71d03b924a03d4c80"
   integrity sha512-YK8irIC+eMrrmtGx0H4ISn9GgzLd9dojZWJaMbjp1YHLl2VqqNFBNrL5Q3KjGf4VE3sf/4hmq6EhQZ7kZp1NoQ==
 
-"@types/archiver@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-3.1.1.tgz#10cc1be44af8911e57484342c7b3b32a5f178a1a"
-  integrity sha512-TzVZ9204sH1TuFylfr1cw/AA/3/VldAAXswEwKLXUOzA9mDg+m6gHF9EaqKNlozcjc6knX5m1KAqJzksPLSEfw==
+"@types/archiver@6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/archiver/-/archiver-6.0.2.tgz#0daf8c83359cbde69de1e4b33dcade6a48a929e2"
+  integrity sha512-KmROQqbQzKGuaAbmK+ZcytkJ51+YqDa7NmbXjmtC5YBLSyQYo21YaUnQ3HbaPFKL1ooo6RQ6OPYPIDyxfpDDXw==
   dependencies:
-    "@types/glob" "*"
+    "@types/readdir-glob" "*"
 
 "@types/aria-query@^5.0.1":
   version "5.0.1"
@@ -5489,29 +5547,13 @@
   resolved "https://registry.yarnpkg.com/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz#7b959a4b9643a1e6a1a5fe49032693cc36773501"
   integrity sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==
 
-"@types/fs-extra@^9.0.11":
+"@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11":
   version "9.0.13"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
   integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
-  dependencies:
-    "@types/minimatch" "^5.1.2"
-    "@types/node" "*"
-
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3":
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
@@ -5616,6 +5658,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
+"@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -5705,11 +5752,6 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/minimatch@*", "@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -5745,7 +5787,14 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
   integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==
 
-"@types/node@18.19.3", "@types/node@^18.0.0":
+"@types/node@20.10.5":
+  version "20.10.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.5.tgz#47ad460b514096b7ed63a1dae26fad0914ed3ab2"
+  integrity sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/node@^18.0.0":
   version "18.19.3"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.3.tgz#e4723c4cb385641d61b983f6fe0b716abd5f8fc0"
   integrity sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==
@@ -5762,10 +5811,10 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/npmlog@4.1.6":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.6.tgz#792341665000209ee76997df8a16300fda6d77cb"
-  integrity sha512-0l3z16vnlJGl2Mi/rgJFrdwfLZ4jfNYgE6ZShEpjqhHuGTqdEzNles03NpYHwUMVYZa+Tj46UxKIEpE78lQ3DQ==
+"@types/npmlog@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-7.0.0.tgz#76602f187ee5f36f77c1a221b2cc9391c76f3dfd"
+  integrity sha512-hJWbrKFvxKyWwSUXjZMYTINsSOY6IclhvGOZ97M8ac2tmR9hMwmTnYaMdpGhvju9ctWLTPhCS+eLfQNluiEjQQ==
   dependencies:
     "@types/node" "*"
 
@@ -5845,6 +5894,13 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/readdir-glob@*":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@types/readdir-glob/-/readdir-glob-1.1.5.tgz#21a4a98898fc606cb568ad815f2a0eedc24d412a"
+  integrity sha512-raiuEPUYqXu+nvtY2Pe8s8FEmZ3x5yAH4VkLdihcPdalvsHltomrRC9BzuStrJ9yk06470hS0Crw0f1pXqD+Hg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/resolve@1.17.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -5879,6 +5935,11 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
   integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
 
+"@types/semver@^7.5.0":
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
+  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
+
 "@types/send@*":
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
@@ -5987,7 +6048,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yargs@^17.0.1", "@types/yargs@^17.0.8":
+"@types/yargs@^17.0.8":
   version "17.0.24"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
   integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
@@ -6006,21 +6067,22 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
   integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
 
-"@typescript-eslint/eslint-plugin@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+"@typescript-eslint/eslint-plugin@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.16.0.tgz#cc29fbd208ea976de3db7feb07755bba0ce8d8bc"
+  integrity sha512-O5f7Kv5o4dLWQtPX4ywPPa+v9G+1q1x8mz0Kr0pXUtKsevo+gIJHLkGc8RxaZWtP8RrhwhSNIWThnW42K9/0rQ==
   dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.16.0"
+    "@typescript-eslint/type-utils" "6.16.0"
+    "@typescript-eslint/utils" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/eslint-plugin@^5.5.0":
   version "5.60.1"
@@ -6045,14 +6107,15 @@
   dependencies:
     "@typescript-eslint/utils" "5.60.1"
 
-"@typescript-eslint/parser@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
-  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
+"@typescript-eslint/parser@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.16.0.tgz#36f39f63b126aa25af2ad2df13d9891e9fd5b40c"
+  integrity sha512-H2GM3eUo12HpKZU9njig3DF5zJ58ja6ahj1GoHEHOgQvYxzoFJJEvC1MQ7T2l9Ha+69ZSOn7RTxOdpC/y3ikMw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/scope-manager" "6.16.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/typescript-estree" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.5.0":
@@ -6073,13 +6136,13 @@
     "@typescript-eslint/types" "5.60.1"
     "@typescript-eslint/visitor-keys" "5.60.1"
 
-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+"@typescript-eslint/scope-manager@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.16.0.tgz#f3e9a00fbc1d0701356359cd56489c54d9e37168"
+  integrity sha512-0N7Y9DSPdaBQ3sqSCwlrm9zJwkpOuc6HYm7LpzLAPqBL7dmzAUimr4M29dMkOP/tEwvOCC/Cxo//yOfJD3HUiw==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
 
 "@typescript-eslint/type-utils@5.60.1":
   version "5.60.1"
@@ -6091,25 +6154,25 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+"@typescript-eslint/type-utils@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.16.0.tgz#5f21c3e49e540ad132dc87fc99af463c184d5ed1"
+  integrity sha512-ThmrEOcARmOnoyQfYkHw/DX2SEYBalVECmoldVuH6qagKROp/jMnfXpAU/pAIWub9c4YTxga+XwgAkoA0pxfmg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@typescript-eslint/typescript-estree" "6.16.0"
+    "@typescript-eslint/utils" "6.16.0"
     debug "^4.3.4"
-    tsutils "^3.21.0"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/types@5.60.1":
   version "5.60.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.1.tgz#a17473910f6b8d388ea83c9d7051af89c4eb7561"
   integrity sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==
 
-"@typescript-eslint/types@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
-  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+"@typescript-eslint/types@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.16.0.tgz#a3abe0045737d44d8234708d5ed8fef5d59dc91e"
+  integrity sha512-hvDFpLEvTJoHutVl87+MG/c5C8I6LOgEx05zExTSJDEVU7hhR3jhV8M5zuggbdFCw98+HhZWPHZeKS97kS3JoQ==
 
 "@typescript-eslint/typescript-estree@5.60.1":
   version "5.60.1"
@@ -6124,18 +6187,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+"@typescript-eslint/typescript-estree@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.16.0.tgz#d6e0578e4f593045f0df06c4b3a22bd6f13f2d03"
+  integrity sha512-VTWZuixh/vr7nih6CfrdpmFNLEnoVBF1skfjdyGnNwXOH1SLeHItGdZDHhhAIzd3ACazyY2Fg76zuzOVTaknGA==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/utils@5.60.1", "@typescript-eslint/utils@^5.58.0":
   version "5.60.1"
@@ -6151,19 +6215,18 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+"@typescript-eslint/utils@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.16.0.tgz#1c291492d34670f9210d2b7fcf6b402bea3134ae"
+  integrity sha512-T83QPKrBm6n//q9mv7oiSvy/Xq/7Hyw9SzSEhMHJwznEmQayfBM87+oAlkNAMEO7/MjIwKyOHgBJbxB0s7gx2A==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.16.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/typescript-estree" "6.16.0"
+    semver "^7.5.4"
 
 "@typescript-eslint/visitor-keys@5.60.1":
   version "5.60.1"
@@ -6173,13 +6236,13 @@
     "@typescript-eslint/types" "5.60.1"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
-  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+"@typescript-eslint/visitor-keys@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.16.0.tgz#d50da18a05d91318ed3e7e8889bda0edc35f3a10"
+  integrity sha512-QSFQLruk7fhs91a/Ep/LqRdbJCZ1Rq03rqBdKT5Ky17Sz8zRLUksqIe9DW0pKtg/Z35/ztbLQ6qpOCN6rOC11A==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
+    "@typescript-eslint/types" "6.16.0"
+    eslint-visitor-keys "^3.4.1"
 
 "@uifabric/foundation@^7.10.16":
   version "7.10.16"
@@ -6403,6 +6466,11 @@
     object.fromentries "^2.0.0"
     prop-types "^15.7.0"
 
+"@xmldom/xmldom@^0.8.8":
+  version "0.8.10"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
+  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -6469,11 +6537,16 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@^1.0.0:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abbrev@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"
+  integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==
+
 abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -6596,6 +6669,13 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
+  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
+  dependencies:
+    debug "^4.3.4"
+
 agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.3.0.tgz#bb999ff07412653c1803b3ced35e50729830a255"
@@ -6679,12 +6759,12 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-escapes@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6"
-  integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==
+ansi-escapes@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-6.2.0.tgz#8a13ce75286f417f1963487d86ba9f90dccf9947"
+  integrity sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==
   dependencies:
-    type-fest "^1.0.2"
+    type-fest "^3.0.0"
 
 ansi-html-community@0.0.8, ansi-html-community@^0.0.8:
   version "0.0.8"
@@ -6720,7 +6800,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0, ansi-styles@^6.1.0:
+ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -6751,36 +6831,38 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8"
-  integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA==
+app-builder-lib@24.9.1:
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.9.1.tgz#bf3568529298b4de8595ed1acbb351fe27db5ba4"
+  integrity sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==
   dependencies:
-    "7zip-bin" "~5.1.1"
+    "7zip-bin" "~5.2.0"
     "@develar/schema-utils" "~2.6.5"
-    "@electron/universal" "1.2.1"
+    "@electron/notarize" "2.1.0"
+    "@electron/osx-sign" "1.0.5"
+    "@electron/universal" "1.4.1"
     "@malept/flatpak-bundler" "^0.4.0"
+    "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "23.6.0"
-    builder-util-runtime "9.1.1"
+    builder-util "24.8.1"
+    builder-util-runtime "9.2.3"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
-    ejs "^3.1.7"
-    electron-osx-sign "^0.6.0"
-    electron-publish "23.6.0"
+    ejs "^3.1.8"
+    electron-publish "24.8.1"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
-    isbinaryfile "^4.0.10"
+    isbinaryfile "^5.0.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
-    minimatch "^3.1.2"
-    read-config-file "6.2.0"
+    minimatch "^5.1.1"
+    read-config-file "6.3.2"
     sanitize-filename "^1.6.3"
-    semver "^7.3.7"
-    tar "^6.1.11"
+    semver "^7.3.8"
+    tar "^6.1.12"
     temp-file "^3.4.0"
 
 app-root-dir@^1.0.2:
@@ -6798,34 +6880,30 @@ app-root-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-archiver-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
-  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+archiver-utils@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-4.0.1.tgz#66ad15256e69589a77f706c90c6dbcc1b2775d2a"
+  integrity sha512-Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg==
   dependencies:
-    glob "^7.1.4"
+    glob "^8.0.0"
     graceful-fs "^4.2.0"
     lazystream "^1.0.0"
-    lodash.defaults "^4.2.0"
-    lodash.difference "^4.5.0"
-    lodash.flatten "^4.4.0"
-    lodash.isplainobject "^4.0.6"
-    lodash.union "^4.6.0"
+    lodash "^4.17.15"
     normalize-path "^3.0.0"
-    readable-stream "^2.0.0"
+    readable-stream "^3.6.0"
 
-archiver@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.2.tgz#99991d5957e53bd0303a392979276ac4ddccf3b0"
-  integrity sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==
+archiver@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-6.0.1.tgz#d56968d4c09df309435adb5a1bbfc370dae48133"
+  integrity sha512-CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ==
   dependencies:
-    archiver-utils "^2.1.0"
+    archiver-utils "^4.0.1"
     async "^3.2.4"
     buffer-crc32 "^0.2.1"
     readable-stream "^3.6.0"
     readdir-glob "^1.1.2"
-    tar-stream "^2.2.0"
-    zip-stream "^4.1.0"
+    tar-stream "^3.0.0"
+    zip-stream "^5.0.1"
 
 are-we-there-yet@^2.0.0:
   version "2.0.0"
@@ -7078,18 +7156,6 @@ asap@~2.0.6:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
-asar@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221"
-  integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
 assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -7210,10 +7276,10 @@ axios@0.27.2, axios@^0.27.2:
     follow-redirects "^1.14.9"
     form-data "^4.0.0"
 
-axios@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
-  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+axios@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2"
+  integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -7226,7 +7292,7 @@ axobject-query@^3.1.1:
   dependencies:
     dequal "^2.0.3"
 
-b4a@^1.0.1:
+b4a@^1.0.1, b4a@^1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
   integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
@@ -7583,7 +7649,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -7737,33 +7803,15 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
+buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-buffer-equal@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+buffer-equal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
+  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -7794,31 +7842,30 @@ builder-util-runtime@8.9.2:
     debug "^4.3.2"
     sax "^1.2.4"
 
-builder-util-runtime@9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60"
-  integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==
+builder-util-runtime@9.2.3:
+  version "9.2.3"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c"
+  integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9"
-  integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ==
+builder-util@24.8.1:
+  version "24.8.1"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.8.1.tgz#594d45b0c86d1d17f5c7bebbb77405080b2571c2"
+  integrity sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==
   dependencies:
-    "7zip-bin" "~5.1.1"
+    "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
-    "@types/fs-extra" "^9.0.11"
     app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.1.1"
-    chalk "^4.1.1"
+    builder-util-runtime "9.2.3"
+    chalk "^4.1.2"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
-    fs-extra "^10.0.0"
+    fs-extra "^10.1.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
     source-map-support "^0.5.19"
@@ -7899,6 +7946,24 @@ cacache@^17.0.0:
     tar "^6.1.11"
     unique-filename "^3.0.0"
 
+cacache@^18.0.0:
+  version "18.0.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.1.tgz#b026d56ad569e4f73cc07c813b3c66707d0fb142"
+  integrity sha512-g4Uf2CFZPaxtJKre6qr4zqLDOOPU7bNVhWjlNhvzc51xaTOx2noMOLhfFkTAqwtrAZAKQUuDfyjitzilpA8WsQ==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^10.0.1"
+    minipass "^7.0.3"
+    minipass-collect "^2.0.1"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -8244,13 +8309,13 @@ cli-truncate@^2.1.0:
     slice-ansi "^3.0.0"
     string-width "^4.2.0"
 
-cli-truncate@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"
-  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
+cli-truncate@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a"
+  integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==
   dependencies:
     slice-ansi "^5.0.0"
-    string-width "^5.0.0"
+    string-width "^7.0.0"
 
 cli-width@^3.0.0:
   version "3.0.0"
@@ -8367,11 +8432,6 @@ colorette@^2.0.10, colorette@^2.0.19, colorette@^2.0.20:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==
-
 columnify@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
@@ -8387,17 +8447,10 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
-  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
-
-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==
-  dependencies:
-    graceful-readlink ">= 1.0.0"
+commander@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
+  integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
 
 commander@^2.19.0, commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
@@ -8457,18 +8510,23 @@ compare-version@^0.1.2:
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
   integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==
 
+compare-versions@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-6.1.0.tgz#3f2131e3ae93577df111dba133e6db876ffe127a"
+  integrity sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==
+
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compress-commons@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"
-  integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==
+compress-commons@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-5.0.1.tgz#e46723ebbab41b50309b27a0e0f6f3baed2d6590"
+  integrity sha512-MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag==
   dependencies:
-    buffer-crc32 "^0.2.13"
-    crc32-stream "^4.0.2"
+    crc-32 "^1.2.0"
+    crc32-stream "^5.0.0"
     normalize-path "^3.0.0"
     readable-stream "^3.6.0"
 
@@ -8532,6 +8590,14 @@ concurrently@8.2.2:
     tree-kill "^1.2.2"
     yargs "^17.7.2"
 
+config-file-ts@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.4.tgz#6c0741fbe118a7cf786c65f139030f0448a2cc99"
+  integrity sha512-cKSW0BfrSaAUnxpgvpXPLaaW/umg4bqg4k3GO1JqlRfpx+d5W0GDXznCMkWotJQek5Mmz1MJVChQnz3IVaeMZQ==
+  dependencies:
+    glob "^7.1.6"
+    typescript "^4.0.2"
+
 confusing-browser-globals@^1.0.10, confusing-browser-globals@^1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
@@ -8733,10 +8799,10 @@ crc-32@^1.2.0:
   resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
   integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
 
-crc32-stream@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"
-  integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==
+crc32-stream@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-5.0.0.tgz#a97d3a802c8687f101c27cc17ca5253327354720"
+  integrity sha512-B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw==
   dependencies:
     crc-32 "^1.2.0"
     readable-stream "^3.4.0"
@@ -9019,7 +9085,7 @@ dateformat@^3.0.3:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -9339,15 +9405,13 @@ diff-sequences@^29.6.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
-dir-compare@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
-  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
+dir-compare@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
+  integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
   dependencies:
-    buffer-equal "1.0.0"
-    colors "1.0.3"
-    commander "2.9.0"
-    minimatch "3.0.4"
+    buffer-equal "^1.0.0"
+    minimatch "^3.0.4"
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -9366,15 +9430,15 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
-dmg-builder@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948"
-  integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA==
+dmg-builder@24.9.1:
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.9.1.tgz#04bf6c0dcd235f6214511f2358a78ed2b9379421"
+  integrity sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==
   dependencies:
-    app-builder-lib "23.6.0"
-    builder-util "23.6.0"
-    builder-util-runtime "9.1.1"
-    fs-extra "^10.0.0"
+    app-builder-lib "24.9.1"
+    builder-util "24.8.1"
+    builder-util-runtime "9.2.3"
+    fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
   optionalDependencies:
@@ -9608,23 +9672,22 @@ electron-build-env@0.2.0:
     commander "^2.9.0"
     mkdirp "^0.5.1"
 
-electron-builder@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b"
-  integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==
+electron-builder@24.9.1:
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.9.1.tgz#4aee03947963b829a7f48a850fe02c219311ef63"
+  integrity sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==
   dependencies:
-    "@types/yargs" "^17.0.1"
-    app-builder-lib "23.6.0"
-    builder-util "23.6.0"
-    builder-util-runtime "9.1.1"
-    chalk "^4.1.1"
-    dmg-builder "23.6.0"
-    fs-extra "^10.0.0"
+    app-builder-lib "24.9.1"
+    builder-util "24.8.1"
+    builder-util-runtime "9.2.3"
+    chalk "^4.1.2"
+    dmg-builder "24.9.1"
+    fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
-    read-config-file "6.2.0"
-    simple-update-notifier "^1.0.7"
-    yargs "^17.5.1"
+    read-config-file "6.3.2"
+    simple-update-notifier "2.0.0"
+    yargs "^17.6.2"
 
 electron-devtools-installer@3.2.0:
   version "3.2.0"
@@ -9641,28 +9704,16 @@ electron-log@4.4.8:
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a"
   integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==
 
-electron-osx-sign@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
-  integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
-  dependencies:
-    bluebird "^3.5.0"
-    compare-version "^0.1.2"
-    debug "^2.6.8"
-    isbinaryfile "^3.0.2"
-    minimist "^1.2.0"
-    plist "^3.0.1"
-
-electron-publish@23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9"
-  integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg==
+electron-publish@24.8.1:
+  version "24.8.1"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.8.1.tgz#4216740372bf4297a429543402a1a15ce8c3560b"
+  integrity sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "23.6.0"
-    builder-util-runtime "9.1.1"
-    chalk "^4.1.1"
-    fs-extra "^10.0.0"
+    builder-util "24.8.1"
+    builder-util-runtime "9.2.3"
+    chalk "^4.1.2"
+    fs-extra "^10.1.0"
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
@@ -9698,10 +9749,10 @@ electron-window-state@5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@24.8.8:
-  version "24.8.8"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-24.8.8.tgz#b369e8f8910d41e94817b79ea3d37e0f0822e884"
-  integrity sha512-0A2tGwG/0hxnD32Lil9wgSydQ0HCP5AdkgcH+qee3QgaC2jVq55YIbrj/0ZAq4L7yiZvQTzYIrc6kie7OahJKQ==
+electron@28.1.0:
+  version "28.1.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.0.tgz#9de1ecdaafcb0ec5753827f14dfb199e6c84545e"
+  integrity sha512-82Y7o4PSWPn1o/aVwYPsgmBw6Gyf2lVHpaBu3Ef8LrLWXxytg7ZRZr/RtDqEMOzQp3+mcuy3huH84MyjdmP50Q==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
@@ -9730,6 +9781,11 @@ emittery@^0.8.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
   integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
 
+emoji-regex@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
+  integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -10170,10 +10226,10 @@ eslint-config-airbnb@19.0.4:
     object.assign "^4.1.2"
     object.entries "^1.1.5"
 
-eslint-config-prettier@8.10.0:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
-  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
+eslint-config-prettier@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
 
 eslint-config-react-app@^7.0.1:
   version "7.0.1"
@@ -10582,19 +10638,19 @@ execa@5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
-  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
+execa@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
   dependencies:
     cross-spawn "^7.0.3"
-    get-stream "^6.0.1"
-    human-signals "^4.3.0"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
     is-stream "^3.0.0"
     merge-stream "^2.0.0"
     npm-run-path "^5.1.0"
     onetime "^6.0.0"
-    signal-exit "^3.0.7"
+    signal-exit "^4.1.0"
     strip-final-newline "^3.0.0"
 
 execa@^1.0.0:
@@ -10790,6 +10846,11 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
+fast-fifo@^1.1.0, fast-fifo@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
 fast-glob@^3.2.12, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -11253,6 +11314,11 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-east-asian-width@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz#5e6ebd9baee6fb8b7b6bd505221065f0cd91f64e"
+  integrity sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==
+
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
@@ -11327,11 +11393,16 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^6.0.0, get-stream@^6.0.1:
+get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -11458,7 +11529,7 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^10.0.0:
+glob@^10.0.0, glob@^10.3.10:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
   integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
@@ -11492,7 +11563,7 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
+glob@^8.0.0, glob@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -11606,11 +11677,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
-
 grapheme-splitter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
@@ -11826,6 +11892,13 @@ hosted-git-info@^6.0.0:
   dependencies:
     lru-cache "^7.5.1"
 
+hosted-git-info@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.1.tgz#9985fcb2700467fecf7f33a4d4874e30680b5322"
+  integrity sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==
+  dependencies:
+    lru-cache "^10.0.1"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -11971,6 +12044,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
+  integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
@@ -12015,15 +12096,23 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
+  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-human-signals@^4.3.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
-  integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
 humanize-ms@^1.2.1:
   version "1.2.1"
@@ -12117,10 +12206,10 @@ ignore-walk@^5.0.1:
   dependencies:
     minimatch "^5.0.1"
 
-ignore-walk@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.3.tgz#0fcdb6decaccda35e308a7b0948645dd9523b7bb"
-  integrity sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==
+ignore-walk@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.4.tgz#89950be94b4f522225eb63a13c56badb639190e9"
+  integrity sha512-t7sv42WkwFkyKbivUCglsQW5YWMskWtbEf4MNKX5u/CCWHKSPzN4FtBQGsQZgCLbxOzpVlcbWVK5KB3auIOjSw==
   dependencies:
     minimatch "^9.0.0"
 
@@ -12129,6 +12218,11 @@ ignore@^5.0.4, ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.2.4:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
+  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
+
 immediate@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
@@ -12455,6 +12549,13 @@ is-fullwidth-code-point@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
   integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
 
+is-fullwidth-code-point@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704"
+  integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==
+  dependencies:
+    get-east-asian-width "^1.0.0"
+
 is-generator-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -12731,23 +12832,26 @@ isarray@^2.0.5:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
-isbinaryfile@^4.0.10:
+isbinaryfile@^4.0.8:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
+isbinaryfile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234"
+  integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -13801,15 +13905,14 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lerna@7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.4.2.tgz#03497125d7b7c8d463eebfe17a701b16bde2ad09"
-  integrity sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==
+lerna@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-8.0.1.tgz#cc705467c5507c38c76ae293fe976e5d438aa876"
+  integrity sha512-ZxFMmOqwkP4e+q6BrMzxkAhixi6n0GVD2jAAnAfDkIFnwumB4/7X5/If6fqTlXXshtB2dQtN5OAtzafqVq8cwA==
   dependencies:
-    "@lerna/child-process" "7.4.2"
-    "@lerna/create" "7.4.2"
-    "@npmcli/run-script" "6.0.2"
-    "@nx/devkit" ">=16.5.1 < 17"
+    "@lerna/create" "8.0.1"
+    "@npmcli/run-script" "7.0.2"
+    "@nx/devkit" ">=17.1.2 < 18"
     "@octokit/plugin-enterprise-rest" "6.0.1"
     "@octokit/rest" "19.0.11"
     byte-size "8.1.1"
@@ -13852,14 +13955,14 @@ lerna@7.4.2:
     npm-packlist "5.1.1"
     npm-registry-fetch "^14.0.5"
     npmlog "^6.0.2"
-    nx ">=16.5.1 < 17"
+    nx ">=17.1.2 < 18"
     p-map "4.0.0"
     p-map-series "2.1.0"
     p-pipe "3.1.0"
     p-queue "6.6.2"
     p-reduce "2.1.0"
     p-waterfall "2.1.1"
-    pacote "^15.2.0"
+    pacote "^17.0.5"
     pify "5.0.0"
     read-cmd-shim "4.0.0"
     read-package-json "6.0.4"
@@ -13879,8 +13982,8 @@ lerna@7.4.2:
     validate-npm-package-name "5.0.0"
     write-file-atomic "5.0.1"
     write-pkg "4.0.0"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
+    yargs "17.7.2"
+    yargs-parser "21.1.1"
 
 level-codec@^9.0.0:
   version "9.0.2"
@@ -14006,7 +14109,12 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lilconfig@2.1.0, lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.1.0:
+lilconfig@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc"
+  integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==
+
+lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
@@ -14021,33 +14129,33 @@ lines-and-columns@~2.0.3:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
   integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==
 
-lint-staged@13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.3.0.tgz#7965d72a8d6a6c932f85e9c13ccf3596782d28a5"
-  integrity sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==
+lint-staged@15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.0.tgz#3111534ca58096a3c8f70b044b6e7fe21b36f859"
+  integrity sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==
   dependencies:
     chalk "5.3.0"
-    commander "11.0.0"
+    commander "11.1.0"
     debug "4.3.4"
-    execa "7.2.0"
-    lilconfig "2.1.0"
-    listr2 "6.6.1"
+    execa "8.0.1"
+    lilconfig "3.0.0"
+    listr2 "8.0.0"
     micromatch "4.0.5"
     pidtree "0.6.0"
     string-argv "0.3.2"
-    yaml "2.3.1"
+    yaml "2.3.4"
 
-listr2@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"
-  integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==
+listr2@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.0.0.tgz#aa7c230995f8ce378585f7c96c0c6d1cefa4700d"
+  integrity sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==
   dependencies:
-    cli-truncate "^3.1.0"
+    cli-truncate "^4.0.0"
     colorette "^2.0.20"
     eventemitter3 "^5.0.1"
-    log-update "^5.0.1"
+    log-update "^6.0.0"
     rfdc "^1.3.0"
-    wrap-ansi "^8.1.0"
+    wrap-ansi "^9.0.0"
 
 load-json-file@6.2.0:
   version "6.2.0"
@@ -14123,16 +14231,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.defaults@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
-
-lodash.difference@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
-  integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==
-
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
@@ -14143,11 +14241,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==
 
-lodash.flatten@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
-
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -14163,11 +14256,6 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
 lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -14183,11 +14271,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash.union@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
-  integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -14206,16 +14289,16 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-log-update@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09"
-  integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==
+log-update@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.0.0.tgz#0ddeb7ac6ad658c944c1de902993fce7c33f5e59"
+  integrity sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==
   dependencies:
-    ansi-escapes "^5.0.0"
+    ansi-escapes "^6.2.0"
     cli-cursor "^4.0.0"
-    slice-ansi "^5.0.0"
-    strip-ansi "^7.0.1"
-    wrap-ansi "^8.0.1"
+    slice-ansi "^7.0.0"
+    strip-ansi "^7.1.0"
+    wrap-ansi "^9.0.0"
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
@@ -14236,6 +14319,11 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lru-cache@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
+  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -14250,7 +14338,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+lru-cache@^7.5.1, lru-cache@^7.7.1:
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
@@ -14311,7 +14399,7 @@ make-error@1.x:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.0.3, make-fetch-happen@^11.1.0:
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
   integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
@@ -14332,6 +14420,23 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.0.3,
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
+make-fetch-happen@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0"
+  integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==
+  dependencies:
+    "@npmcli/agent" "^2.0.0"
+    cacache "^18.0.0"
+    http-cache-semantics "^4.1.1"
+    is-lambda "^1.0.1"
+    minipass "^7.0.2"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    ssri "^10.0.0"
+
 make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
@@ -14569,13 +14674,6 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@3.0.5:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
@@ -14583,6 +14681,13 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@9.0.3, minimatch@^9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -14590,7 +14695,7 @@ minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatc
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.0.1, minimatch@^5.1.0, minimatch@^5.1.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
@@ -14632,6 +14737,13 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass-collect@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-2.0.1.tgz#1621bc77e12258a12c60d34e2276ec5c20680863"
+  integrity sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==
+  dependencies:
+    minipass "^7.0.3"
+
 minipass-fetch@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
@@ -14705,7 +14817,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81"
   integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
   integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
@@ -14918,7 +15030,7 @@ node-addon-api@^1.6.3:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-addon-api@^3.0.2, node-addon-api@^3.2.1:
+node-addon-api@^3.0.2:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
@@ -14997,22 +15109,21 @@ node-gyp@8.x:
     tar "^6.1.2"
     which "^2.0.2"
 
-node-gyp@^9.0.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
-  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
+node-gyp@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966"
+  integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
-    glob "^7.1.4"
+    glob "^10.3.10"
     graceful-fs "^4.2.6"
-    make-fetch-happen "^11.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
+    make-fetch-happen "^13.0.0"
+    nopt "^7.0.0"
+    proc-log "^3.0.0"
     semver "^7.3.5"
     tar "^6.1.2"
-    which "^2.0.2"
+    which "^4.0.0"
 
 node-hid@^2.1.2:
   version "2.1.2"
@@ -15050,12 +15161,12 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+nopt@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
+  integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==
   dependencies:
-    abbrev "^1.0.0"
+    abbrev "^2.0.0"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -15087,6 +15198,16 @@ normalize-package-data@^5.0.0:
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
 
+normalize-package-data@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.0.tgz#68a96b3c11edd462af7189c837b6b1064a484196"
+  integrity sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==
+  dependencies:
+    hosted-git-info "^7.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -15159,6 +15280,16 @@ npm-package-arg@^10.0.0, npm-package-arg@^10.1.0:
     semver "^7.3.5"
     validate-npm-package-name "^5.0.0"
 
+npm-package-arg@^11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.1.tgz#f208b0022c29240a1c532a449bdde3f0a4708ebc"
+  integrity sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==
+  dependencies:
+    hosted-git-info "^7.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
+
 npm-packlist@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
@@ -15169,24 +15300,24 @@ npm-packlist@5.1.1:
     npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
 
-npm-packlist@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
-  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
+npm-packlist@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-8.0.1.tgz#97d1eb2a9a90e10ce1b028d058da3740c91b89ab"
+  integrity sha512-MQpL27ZrsJQ2kiAuQPpZb5LtJwydNRnI15QWXsf3WHERu4rzjRj6Zju/My2fov7tLuu3Gle/uoIX/DDZ3u4O4Q==
   dependencies:
-    ignore-walk "^6.0.0"
+    ignore-walk "^6.0.4"
 
-npm-pick-manifest@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f"
-  integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
+npm-pick-manifest@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz#f87a4c134504a2c7931f2bb8733126e3c3bb7e8f"
+  integrity sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==
   dependencies:
     npm-install-checks "^6.0.0"
     npm-normalize-package-bin "^3.0.0"
-    npm-package-arg "^10.0.0"
+    npm-package-arg "^11.0.0"
     semver "^7.3.5"
 
-npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0.5:
+npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0.5:
   version "14.0.5"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d"
   integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==
@@ -15199,6 +15330,19 @@ npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0
     npm-package-arg "^10.0.0"
     proc-log "^3.0.0"
 
+npm-registry-fetch@^16.0.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz#10227b7b36c97bc1cf2902a24e4f710cfe62803c"
+  integrity sha512-PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw==
+  dependencies:
+    make-fetch-happen "^13.0.0"
+    minipass "^7.0.2"
+    minipass-fetch "^3.0.0"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^11.0.0"
+    proc-log "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -15259,17 +15403,16 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
   integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
 
-nx@16.10.0, "nx@>=16.5.1 < 17":
-  version "16.10.0"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-16.10.0.tgz#b070461f7de0a3d7988bd78558ea84cda3543ace"
-  integrity sha512-gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg==
+nx@17.2.6, "nx@>=17.1.2 < 18":
+  version "17.2.6"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-17.2.6.tgz#717297e0757237aa010f2e07aa8fdf68e77ea104"
+  integrity sha512-lBHp0e0AMBwYwpT44a8b0j29szspmYUhY1okqNctz/3ifuonNFG9WGfbzRO4YKOrVkfNsuaomHVAE6gtqo55ng==
   dependencies:
-    "@nrwl/tao" "16.10.0"
-    "@parcel/watcher" "2.0.4"
+    "@nrwl/tao" "17.2.6"
     "@yarnpkg/lockfile" "^1.1.0"
     "@yarnpkg/parsers" "3.0.0-rc.46"
     "@zkochan/js-yaml" "0.0.6"
-    axios "^1.0.0"
+    axios "^1.5.1"
     chalk "^4.1.0"
     cli-cursor "3.1.0"
     cli-spinners "2.6.1"
@@ -15297,20 +15440,19 @@ nx@16.10.0, "nx@>=16.5.1 < 17":
     tmp "~0.2.1"
     tsconfig-paths "^4.1.2"
     tslib "^2.3.0"
-    v8-compile-cache "2.3.0"
     yargs "^17.6.2"
     yargs-parser "21.1.1"
   optionalDependencies:
-    "@nx/nx-darwin-arm64" "16.10.0"
-    "@nx/nx-darwin-x64" "16.10.0"
-    "@nx/nx-freebsd-x64" "16.10.0"
-    "@nx/nx-linux-arm-gnueabihf" "16.10.0"
-    "@nx/nx-linux-arm64-gnu" "16.10.0"
-    "@nx/nx-linux-arm64-musl" "16.10.0"
-    "@nx/nx-linux-x64-gnu" "16.10.0"
-    "@nx/nx-linux-x64-musl" "16.10.0"
-    "@nx/nx-win32-arm64-msvc" "16.10.0"
-    "@nx/nx-win32-x64-msvc" "16.10.0"
+    "@nx/nx-darwin-arm64" "17.2.6"
+    "@nx/nx-darwin-x64" "17.2.6"
+    "@nx/nx-freebsd-x64" "17.2.6"
+    "@nx/nx-linux-arm-gnueabihf" "17.2.6"
+    "@nx/nx-linux-arm64-gnu" "17.2.6"
+    "@nx/nx-linux-arm64-musl" "17.2.6"
+    "@nx/nx-linux-x64-gnu" "17.2.6"
+    "@nx/nx-linux-x64-musl" "17.2.6"
+    "@nx/nx-win32-arm64-msvc" "17.2.6"
+    "@nx/nx-win32-x64-msvc" "17.2.6"
 
 object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
@@ -15702,27 +15844,27 @@ p-waterfall@2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
-pacote@^15.2.0:
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
-  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
+pacote@^17.0.5:
+  version "17.0.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-17.0.5.tgz#e9854edee7a073635cdd36b0c07cd4f2ab1757b6"
+  integrity sha512-TAE0m20zSDMnchPja9vtQjri19X3pZIyRpm2TJVeI+yU42leJBBDTRYhOcWFsPhaMxf+3iwQkFiKz16G9AEeeA==
   dependencies:
-    "@npmcli/git" "^4.0.0"
+    "@npmcli/git" "^5.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
-    "@npmcli/promise-spawn" "^6.0.1"
-    "@npmcli/run-script" "^6.0.0"
-    cacache "^17.0.0"
+    "@npmcli/promise-spawn" "^7.0.0"
+    "@npmcli/run-script" "^7.0.0"
+    cacache "^18.0.0"
     fs-minipass "^3.0.0"
-    minipass "^5.0.0"
-    npm-package-arg "^10.0.0"
-    npm-packlist "^7.0.0"
-    npm-pick-manifest "^8.0.0"
-    npm-registry-fetch "^14.0.0"
+    minipass "^7.0.2"
+    npm-package-arg "^11.0.0"
+    npm-packlist "^8.0.0"
+    npm-pick-manifest "^9.0.0"
+    npm-registry-fetch "^16.0.0"
     proc-log "^3.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^6.0.0"
+    read-package-json "^7.0.0"
     read-package-json-fast "^3.0.0"
-    sigstore "^1.3.0"
+    sigstore "^2.0.0"
     ssri "^10.0.0"
     tar "^6.1.11"
 
@@ -16011,7 +16153,7 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-plist@^3.0.1, plist@^3.0.4:
+plist@^3.0.4:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
   integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==
@@ -16019,6 +16161,15 @@ plist@^3.0.1, plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
+plist@^3.0.5:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
+  integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
+  dependencies:
+    "@xmldom/xmldom" "^0.8.8"
+    base64-js "^1.5.1"
+    xmlbuilder "^15.1.1"
+
 pnp-webpack-plugin@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9"
@@ -16871,6 +17022,11 @@ queue-microtask@^1.2.2, queue-microtask@^1.2.3:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+queue-tick@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -17041,14 +17197,14 @@ react-error-overlay@^6.0.11:
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
 react-i18next@13.5.0, react-i18next@>=11.16.4:
-  version "13.5.0"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.5.0.tgz#44198f747628267a115c565f0c736a50a76b1ab0"
-  integrity sha512-CFJ5NDGJ2MUyBohEHxljOq/39NQ972rh1ajnadG9BjTk+UXbHLq4z5DKEbEQBDoIhUmmbuS/fIMJKo6VOax1HA==
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.0.0.tgz#eb39d2245fd1024237828c955f770e409a1ccb12"
+  integrity sha512-OCrS8rHNAmnr8ggGRDxjakzihrMW7HCbsplduTm3EuuQ6fyvWGT41ksZpqbduYoqJurBmEsEVZ1pILSUWkHZng==
   dependencies:
     "@babel/runtime" "^7.22.5"
     html-parse-stringify "^3.0.1"
 
-react-inspector@^6.0.1:
+react-inspector@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.2.tgz#aa3028803550cb6dbd7344816d5c80bf39d07e9d"
   integrity sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==
@@ -17102,20 +17258,20 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-router-dom@6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.21.0.tgz#aa4c6bc046a8e8723095bc09b3c0ab2254532712"
-  integrity sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==
+react-router-dom@6.21.1:
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.21.1.tgz#58b459d2fe1841388c95bb068f85128c45e27349"
+  integrity sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==
   dependencies:
-    "@remix-run/router" "1.14.0"
-    react-router "6.21.0"
+    "@remix-run/router" "1.14.1"
+    react-router "6.21.1"
 
-react-router@6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.21.0.tgz#6fe3e59877aca3dccceec1801d26991ddf42d12b"
-  integrity sha512-hGZ0HXbwz3zw52pLZV3j3+ec+m/PQ9cTpBvqjFQmy2XVUWGn5MD+31oXHb6dVTxYzmAeaiUBYjkoNz66n3RGCg==
+react-router@6.21.1:
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.21.1.tgz#8db7ee8d7cfc36513c9a66b44e0897208c33be34"
+  integrity sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==
   dependencies:
-    "@remix-run/router" "1.14.0"
+    "@remix-run/router" "1.14.1"
 
 react-scripts@5.0.1:
   version "5.0.1"
@@ -17247,11 +17403,12 @@ read-cmd-shim@4.0.0:
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"
   integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==
 
-read-config-file@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
-  integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg==
+read-config-file@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411"
+  integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==
   dependencies:
+    config-file-ts "^0.2.4"
     dotenv "^9.0.2"
     dotenv-expand "^5.1.0"
     js-yaml "^4.1.0"
@@ -17276,6 +17433,16 @@ read-package-json@6.0.4, read-package-json@^6.0.0:
     normalize-package-data "^5.0.0"
     npm-normalize-package-bin "^3.0.0"
 
+read-package-json@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-7.0.0.tgz#d605c9dcf6bc5856da24204aa4e9518ee9714be0"
+  integrity sha512-uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg==
+  dependencies:
+    glob "^10.2.2"
+    json-parse-even-better-errors "^3.0.0"
+    normalize-package-data "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -17425,9 +17592,9 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.9:
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
 regenerator-runtime@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
-  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
 regenerator-transform@^0.15.1:
   version "0.15.1"
@@ -17984,18 +18151,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@~7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -18178,7 +18340,12 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
   integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
 
-sigstore@^1.3.0, sigstore@^1.4.0:
+signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sigstore@^1.4.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.6.0.tgz#887a4007c6ee83f3ef3fd844be1a0840e849c301"
   integrity sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g==
@@ -18188,6 +18355,16 @@ sigstore@^1.3.0, sigstore@^1.4.0:
     make-fetch-happen "^11.0.1"
     tuf-js "^1.1.3"
 
+sigstore@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-2.1.0.tgz#c577b596642b3f360dc4135d476466e6edeb2364"
+  integrity sha512-kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw==
+  dependencies:
+    "@sigstore/bundle" "^2.1.0"
+    "@sigstore/protobuf-specs" "^0.2.1"
+    "@sigstore/sign" "^2.1.0"
+    "@sigstore/tuf" "^2.1.0"
+
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -18202,14 +18379,7 @@ simple-get@^4.0.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-update-notifier@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
-  integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
-  dependencies:
-    semver "~7.0.0"
-
-simple-update-notifier@^2.0.0:
+simple-update-notifier@2.0.0, simple-update-notifier@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
   integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
@@ -18248,6 +18418,14 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
+slice-ansi@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9"
+  integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==
+  dependencies:
+    ansi-styles "^6.2.1"
+    is-fullwidth-code-point "^5.0.0"
+
 smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
@@ -18310,7 +18488,16 @@ socks-proxy-agent@^7.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks@^2.6.2:
+socks-proxy-agent@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
+  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    socks "^2.7.1"
+
+socks@^2.6.2, socks@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -18574,12 +18761,13 @@ store2@^2.14.2:
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
   integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
 
-storybook-addon-react-router-v6@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/storybook-addon-react-router-v6/-/storybook-addon-react-router-v6-1.0.2.tgz#0f1239de31291821c93e8266079b8f6235a9c717"
-  integrity sha512-38W+9D2sIrYAi+oRSbsLhR/umNoLVw2DWF84Jp4f/ZoB8Cg0Qtbvwk043oHqzNOpZrfgj0FaV006oaJBVpE8Kw==
+storybook-addon-react-router-v6@2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/storybook-addon-react-router-v6/-/storybook-addon-react-router-v6-2.0.10.tgz#479bfa374a33d2cbbaf1d6a9ebddd6d35cdec812"
+  integrity sha512-HnrjbujAW1oGCdgvv7W6QKskETNXvt0U5qR2pKD8GXHlqkV9wmWa6HW3J0ks0aiBJBsRrPdEViatrhnRD5RZZw==
   dependencies:
-    react-inspector "^6.0.1"
+    compare-versions "^6.0.0"
+    react-inspector "6.0.2"
 
 storybook@7.6.6:
   version "7.6.6"
@@ -18593,6 +18781,14 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
+streamx@^2.15.0:
+  version "2.15.6"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.6.tgz#28bf36997ebc7bf6c08f9eba958735231b833887"
+  integrity sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw==
+  dependencies:
+    fast-fifo "^1.1.0"
+    queue-tick "^1.0.1"
+
 string-argv@0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
@@ -18628,7 +18824,7 @@ string-natural-compare@^3.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
+string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -18637,6 +18833,15 @@ string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
+string-width@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.0.0.tgz#14aa1b7aaa126d5b64fa79d3c894da8a9650ba06"
+  integrity sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==
+  dependencies:
+    emoji-regex "^10.3.0"
+    get-east-asian-width "^1.0.0"
+    strip-ansi "^7.1.0"
+
 string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
@@ -18735,7 +18940,7 @@ stringify-object@^3.3.0:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1:
+strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
@@ -18985,7 +19190,7 @@ tar-fs@^2.0.0, tar-fs@^2.1.1:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
-tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0:
+tar-stream@^2.1.4, tar-stream@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -18996,6 +19201,15 @@ tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar-stream@^3.0.0:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.6.tgz#6520607b55a06f4a2e2e04db360ba7d338cc5bab"
+  integrity sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==
+  dependencies:
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
+
 tar@6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
@@ -19020,6 +19234,18 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
+tar@^6.1.12:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 telejson@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/telejson/-/telejson-7.2.0.tgz#3994f6c9a8f8d7f2dba9be2c7c5bbb447e876f32"
@@ -19287,6 +19513,11 @@ tryer@^1.0.1:
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
 ts-dedent@^2.0.0, ts-dedent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
@@ -19381,6 +19612,15 @@ tuf-js@^1.1.3:
     debug "^4.3.4"
     make-fetch-happen "^11.1.0"
 
+tuf-js@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-2.1.0.tgz#87aa36d5a166e7522f1e2050eb502a3a9b0bde72"
+  integrity sha512-eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA==
+  dependencies:
+    "@tufjs/models" "2.0.0"
+    debug "^4.3.4"
+    make-fetch-happen "^13.0.0"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -19447,16 +19687,16 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-fest@^1.0.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
 type-fest@^2.19.0, type-fest@~2.19:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
+type-fest@^3.0.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706"
+  integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -19549,6 +19789,11 @@ typescript@5.3.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"
   integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==
 
+typescript@^4.0.2:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 uglify-js@^3.1.4:
   version "3.17.4"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
@@ -19869,11 +20114,6 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-v8-compile-cache@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 v8-to-istanbul@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
@@ -20284,12 +20524,12 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-which@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1"
-  integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==
+which@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a"
+  integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==
   dependencies:
-    isexe "^2.0.0"
+    isexe "^3.1.1"
 
 wide-align@^1.1.2, wide-align@^1.1.5:
   version "1.1.5"
@@ -20486,7 +20726,7 @@ workbox-window@6.6.1:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
+wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
   integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
@@ -20495,6 +20735,15 @@ wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
+wrap-ansi@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e"
+  integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==
+  dependencies:
+    ansi-styles "^6.2.1"
+    string-width "^7.0.0"
+    strip-ansi "^7.1.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -20626,20 +20875,20 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@2.3.1, yaml@^2.1.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
-  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+yaml@2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
+  integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
 
 yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yaml@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
+  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
 yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
@@ -20651,20 +20900,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@16.2.0, yargs@^16.0.0, yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
-yargs@^17.0.1, yargs@^17.5.1, yargs@^17.6.2, yargs@^17.7.2:
+yargs@17.7.2, yargs@^17.0.1, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -20677,6 +20913,19 @@ yargs@^17.0.1, yargs@^17.5.1, yargs@^17.6.2, yargs@^17.7.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^16.0.0, yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -20703,11 +20952,11 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
-zip-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"
-  integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==
+zip-stream@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-5.0.1.tgz#cf3293bba121cad98be2ec7f05991d81d9f18134"
+  integrity sha512-UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA==
   dependencies:
-    archiver-utils "^2.1.0"
-    compress-commons "^4.1.0"
+    archiver-utils "^4.0.1"
+    compress-commons "^5.0.1"
     readable-stream "^3.6.0"

From 745877a3aea026e29f59807a6545cb9fced8e2eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 08:27:37 +0800
Subject: [PATCH 20/68] Update ckb client versions (#3009)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-light-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ckb-light-version b/.ckb-light-version
index 600e6fd31c..f54b243046 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1 +1 @@
-v0.3.3
+v0.3.4

From 1eea69580b7c831bac50a145cf57c9ad70126d2d Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Fri, 5 Jan 2024 09:30:26 +0800
Subject: [PATCH 21/68] fix: Optimize the error of update Neuron (#3002)

* fix: issue 336

* fix: AlertDialog

---------

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 packages/neuron-ui/src/widgets/AlertDialog/index.tsx | 4 +---
 packages/neuron-wallet/src/controllers/update.ts     | 8 +++++++-
 packages/neuron-wallet/src/locales/en.ts             | 1 +
 packages/neuron-wallet/src/locales/zh-tw.ts          | 1 +
 packages/neuron-wallet/src/locales/zh.ts             | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
index 9d54be38c6..eaab451223 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
+++ b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
@@ -15,7 +15,6 @@ const AlertDialog = ({
   title,
   message,
   type,
-  onClose,
   onOk,
   onCancel,
   action,
@@ -24,14 +23,13 @@ const AlertDialog = ({
   title?: string
   message?: string
   type: AlertType
-  onClose?: () => void
   onOk?: () => void
   onCancel?: () => void
   action?: Action
 }) => {
   const [t] = useTranslation()
   const dialogRef = useRef<HTMLDialogElement | null>(null)
-  useDialog({ show, dialogRef, onClose: onClose || (() => {}) })
+  useDialog({ show, dialogRef, onClose: onCancel || (() => {}) })
   const actions = useMemo<('cancel' | 'ok')[]>(() => {
     if (action) {
       return action === 'all' ? ['cancel', 'ok'] : [action]
diff --git a/packages/neuron-wallet/src/controllers/update.ts b/packages/neuron-wallet/src/controllers/update.ts
index 2be6ea3c71..2df1b40ff7 100644
--- a/packages/neuron-wallet/src/controllers/update.ts
+++ b/packages/neuron-wallet/src/controllers/update.ts
@@ -1,4 +1,5 @@
 import { autoUpdater, UpdateInfo, CancellationToken, ProgressInfo } from 'electron-updater'
+import { t } from 'i18next'
 import AppUpdaterSubject, { AppUpdater } from '../models/subjects/app-updater'
 import logger from '../utils/logger'
 
@@ -64,11 +65,16 @@ export default class UpdateController {
 
     autoUpdater.on('error', error => {
       UpdateController.isChecking = false
+      let errorMsg = error == null ? 'unknown' : (error.stack || error).toString()
+      logger.error('Update Controller:\t autoUpdater fail:', errorMsg)
+      if (errorMsg.includes('net::ERR_INTERNET_DISCONNECTED') || errorMsg.includes('net::ERR_TIMED_OUT')) {
+        errorMsg = t('messages.could-not-connect-service')
+      }
       this.notify({
         version: '',
         releaseDate: '',
         releaseNotes: '',
-        errorMsg: error == null ? 'unknown' : (error.stack || error).toString(),
+        errorMsg,
       })
     })
 
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 2b919a62b2..5afd76c2f0 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -137,6 +137,7 @@ export default {
       'no-exist-ckb-node-data':
         '{{path}} has no CKB Node config and storage, press confirm to synchronize from scratch',
       'light-client-sudt-acp-error': "Light client mode doesn't support sending assets to other's asset account",
+      'could-not-connect-service': 'Could not connect to the service, please try again later.',
     },
     messageBox: {
       button: {
diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts
index 1c7d1d4ff1..2a33914e52 100644
--- a/packages/neuron-wallet/src/locales/zh-tw.ts
+++ b/packages/neuron-wallet/src/locales/zh-tw.ts
@@ -126,6 +126,7 @@ export default {
       'target-lock-error': 'CKB 資產只能轉賬到 secp256k1 或者 acp 地址',
       'no-exist-ckb-node-data': '{{path}} 目錄下沒有找到 CKB Node 配置和數據, 點擊確認重新同步',
       'light-client-sudt-acp-error': '輕節點模式不支持發送資產給其他用戶的資產賬戶',
+      'could-not-connect-service': '無法連接到服務，請稍後再試。',
     },
     messageBox: {
       button: {
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index b1a62625c2..803ac9a975 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -127,6 +127,7 @@ export default {
       'target-lock-error': 'CKB 资产只能转账到 secp256k1 或者 acp 地址',
       'no-exist-ckb-node-data': '{{path}} 目录下没有找到 CKB Node 配置和数据, 点击确认重新同步',
       'light-client-sudt-acp-error': '轻节点模式不支持发送资产给其他用户的资产账户',
+      'could-not-connect-service': '无法连接到服务，请稍后再试。',
     },
     messageBox: {
       button: {

From 5f9f76790301d563f3f9e42ecbb3a2faf492e55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Wed, 10 Jan 2024 01:24:52 +0000
Subject: [PATCH 22/68] fix: Fix light client sync miss some tx. (#2992)

* refactor: Rename connector to synchronizer

* fix: fix light sync logic

1. Use `partial` and `delete` for set_scripts
2. Sync the next block number after all addresses are synced to the block number
3. Rename `blockStartNumber` to `localSavedBlockNumber`, rename `blockEndNumber` to `syncedBlockNumber`
---
 .../src/components/MultisigAddress/hooks.ts   |   2 +-
 .../neuron-ui/src/services/remote/multisig.ts |   2 +-
 .../src/block-sync-renderer/index.ts          |   2 +-
 ...exer-connector.ts => full-synchronizer.ts} |   4 +-
 ...ght-connector.ts => light-synchronizer.ts} |  77 ++++---
 .../src/block-sync-renderer/sync/queue.ts     |  14 +-
 .../sync/{connector.ts => synchronizer.ts}    |   2 +-
 .../src/block-sync-renderer/task.ts           |   2 +-
 .../database/chain/entities/sync-progress.ts  |  12 +-
 ...90361215400-ResetSyncProgressPrimaryKey.ts |   8 +-
 .../1702781527414-RenameSyncProgress.ts       |  21 ++
 .../src/database/chain/ormconfig.ts           |   2 +
 .../src/models/chain/live-cell.ts             |   2 +-
 .../src/services/live-cell-service.ts         |   2 +-
 .../neuron-wallet/src/services/multisig.ts    |   2 +-
 .../src/services/sync-progress.ts             |  25 ++-
 packages/neuron-wallet/src/utils/ckb-rpc.ts   |   2 +-
 ...ctor.test.ts => full-synchronizer.test.ts} |  20 +-
 ...tor.test.ts => light-synchronizer.test.ts} | 198 +++++++++---------
 .../tests/block-sync-renderer/queue.test.ts   |   4 +-
 ...connector.test.ts => synchronizer.test.ts} |  48 +++--
 .../tests/models/chain/live-cell.test.ts      |   2 +-
 .../services/tx/transaction-generator.test.ts |   2 +-
 23 files changed, 258 insertions(+), 197 deletions(-)
 rename packages/neuron-wallet/src/block-sync-renderer/sync/{indexer-connector.ts => full-synchronizer.ts} (95%)
 rename packages/neuron-wallet/src/block-sync-renderer/sync/{light-connector.ts => light-synchronizer.ts} (80%)
 rename packages/neuron-wallet/src/block-sync-renderer/sync/{connector.ts => synchronizer.ts} (99%)
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
 rename packages/neuron-wallet/tests/block-sync-renderer/{indexer-connector.test.ts => full-synchronizer.test.ts} (96%)
 rename packages/neuron-wallet/tests/block-sync-renderer/{light-connector.test.ts => light-synchronizer.test.ts} (66%)
 rename packages/neuron-wallet/tests/block-sync-renderer/{connector.test.ts => synchronizer.test.ts} (88%)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index c302ce905e..c2e0613d4b 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -335,7 +335,7 @@ export const useSubscription = ({
         const tmp: Record<string, number> = {}
         res.result.forEach(v => {
           if (hashToPayload[v.hash]) {
-            tmp[hashToPayload[v.hash]] = v.blockStartNumber
+            tmp[hashToPayload[v.hash]] = v.localSavedBlockNumber
           }
         })
         setMultisigSyncProgress(tmp)
diff --git a/packages/neuron-ui/src/services/remote/multisig.ts b/packages/neuron-ui/src/services/remote/multisig.ts
index 4ac2b4aa2b..79332443d4 100644
--- a/packages/neuron-ui/src/services/remote/multisig.ts
+++ b/packages/neuron-ui/src/services/remote/multisig.ts
@@ -49,6 +49,6 @@ export const generateMultisigSendAllTx = remoteApi<{
   multisigConfig: MultisigConfig
 }>('generate-multisig-send-all-tx')
 export const loadMultisigTxJson = remoteApi<string, OfflineSignJSON>('load-multisig-tx-json')
-export const getMultisigSyncProgress = remoteApi<string[], { hash: string; blockStartNumber: number }[]>(
+export const getMultisigSyncProgress = remoteApi<string[], { hash: string; localSavedBlockNumber: number }[]>(
   'get-sync-progress-by-addresses'
 )
diff --git a/packages/neuron-wallet/src/block-sync-renderer/index.ts b/packages/neuron-wallet/src/block-sync-renderer/index.ts
index f6e0e0ac95..95576c84a7 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/index.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/index.ts
@@ -9,7 +9,7 @@ import DataUpdateSubject from '../models/subjects/data-update'
 import AddressCreatedSubject from '../models/subjects/address-created-subject'
 import WalletDeletedSubject from '../models/subjects/wallet-deleted-subject'
 import TxDbChangedSubject from '../models/subjects/tx-db-changed-subject'
-import { LumosCellQuery, LumosCell } from './sync/connector'
+import { LumosCellQuery, LumosCell } from './sync/synchronizer'
 import { WorkerMessage, StartParams, QueryIndexerParams } from './task'
 import logger from '../utils/logger'
 import CommonUtils from '../utils/common'
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
similarity index 95%
rename from packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
rename to packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
index cec772ad50..972d37e5f0 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/full-synchronizer.ts
@@ -3,11 +3,11 @@ import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import RpcService from '../../services/rpc-service'
 import { Address } from '../../models/address'
-import { Connector } from './connector'
+import { Synchronizer } from './synchronizer'
 import { NetworkType } from '../../models/network'
 import IndexerCacheService from './indexer-cache-service'
 
-export default class IndexerConnector extends Connector {
+export default class FullSynchronizer extends Synchronizer {
   private rpcService: RpcService
 
   constructor(addresses: Address[], nodeUrl: string, indexerUrl: string, nodeType: NetworkType) {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
similarity index 80%
rename from packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
rename to packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index 9a02faa48d..00ad630bea 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -4,7 +4,7 @@ import { Address } from '../../models/address'
 import AddressMeta from '../../database/address/meta'
 import { scheduler } from 'timers/promises'
 import SyncProgressService from '../../services/sync-progress'
-import { Connector, AppendScript } from './connector'
+import { Synchronizer, AppendScript } from './synchronizer'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { FetchTransactionReturnType, LightRPC, LightScriptFilter } from '../../utils/ckb-rpc'
 import Multisig from '../../services/multisig'
@@ -24,7 +24,7 @@ import NetworksService from '../../services/networks'
 
 const unpackGroup = molecule.vector(blockchain.OutPoint)
 
-export default class LightConnector extends Connector {
+export default class LightSynchronizer extends Synchronizer {
   private lightRpc: LightRPC
   private addressMetas: AddressMeta[]
 
@@ -87,7 +87,7 @@ export default class LightConnector extends Connector {
   private async synchronize() {
     const syncScripts = await this.upsertTxHashes()
     await this.updateSyncedBlockOfScripts(syncScripts)
-    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinBlockNumber()
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
     const hasNextBlock = await this.notifyAndSyncNext(minSyncBlockNumber)
     if (!hasNextBlock) {
       await this.updateBlockStartNumber(minSyncBlockNumber)
@@ -138,7 +138,7 @@ export default class LightConnector extends Connector {
         const txs = await this.getTransactions({
           script: syncScript.script,
           scriptType: syncScript.scriptType,
-          blockRange: [BI.from(syncStatus.blockEndNumber).toHexString(), syncScript.blockNumber],
+          blockRange: [BI.from(syncStatus.syncedBlockNumber).toHexString(), syncScript.blockNumber],
         })
         insertTxCaches.push(
           ...txs.map(v => ({
@@ -164,7 +164,7 @@ export default class LightConnector extends Connector {
     syncScripts.forEach(v => {
       const currentSyncProgress = syncStatusMap.get(scriptToHash(v.script))
       if (currentSyncProgress) {
-        currentSyncProgress.blockEndNumber = parseInt(v.blockNumber)
+        currentSyncProgress.syncedBlockNumber = parseInt(v.blockNumber)
         updatedSyncProgress.push(currentSyncProgress)
       }
     })
@@ -196,35 +196,42 @@ export default class LightConnector extends Connector {
         }))
       })
       .flat()
-    const walletMinBlockNumber = await SyncProgressService.getWalletMinBlockNumber()
+    const walletMinBlockNumber = await SyncProgressService.getWalletMinLocalSavedBlockNumber()
     const wallets = await WalletService.getInstance().getAll()
     const walletStartBlockMap = wallets.reduce<Record<string, string | undefined>>(
       (pre, cur) => ({ ...pre, [cur.id]: cur.startBlockNumber }),
       {}
     )
     const otherTypeSyncBlockNumber = await SyncProgressService.getOtherTypeSyncBlockNumber()
-    const setScriptsParams = [
-      ...allScripts.map(v => {
-        const blockNumber = Math.max(
-          parseInt(walletStartBlockMap[v.walletId] ?? '0x0'),
-          walletMinBlockNumber?.[v.walletId] ?? 0,
-          parseInt(existSyncscripts[scriptToHash(v.script)]?.blockNumber ?? '0x0')
-        )
-        return {
+    const addScripts = [
+      ...allScripts
+        .filter(v => !existSyncscripts[scriptToHash(v.script)])
+        .map(v => {
+          const blockNumber = Math.max(
+            parseInt(walletStartBlockMap[v.walletId] ?? '0x0'),
+            walletMinBlockNumber?.[v.walletId] ?? 0
+          )
+          return {
+            ...v,
+            blockNumber: `0x${blockNumber.toString(16)}`,
+          }
+        }),
+      ...appendScripts
+        .filter(v => !existSyncscripts[scriptToHash(v.script)])
+        .map(v => ({
           ...v,
-          blockNumber: `0x${blockNumber.toString(16)}`,
-        }
-      }),
-      ...appendScripts.map(v => ({
-        ...v,
-        blockNumber:
-          existSyncscripts[scriptToHash(v.script)]?.blockNumber ??
-          `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
-      })),
+          blockNumber: `0x${(otherTypeSyncBlockNumber[scriptToHash(v.script)] ?? 0).toString(16)}`,
+        })),
     ]
-    await this.lightRpc.setScripts(setScriptsParams)
+    await this.lightRpc.setScripts(addScripts, 'partial')
+    const allScriptHashes = new Set([
+      ...allScripts.map(v => scriptToHash(v.script)),
+      ...appendScripts.map(v => scriptToHash(v.script)),
+    ])
+    const deleteScript = syncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
+    await this.lightRpc.setScripts(deleteScript, 'delete')
     const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
-    await SyncProgressService.resetSyncProgress(setScriptsParams)
+    await SyncProgressService.resetSyncProgress(addScripts)
     await SyncProgressService.updateSyncProgressFlag(walletIds)
     await SyncProgressService.removeByHashesAndAddressType(
       SyncAddressType.Multisig,
@@ -281,9 +288,25 @@ export default class LightConnector extends Connector {
     this.initSyncProgress(scripts)
   }
 
+  private async checkTxExist(txHashes: string[]) {
+    const transactions = await this.lightRpc
+      .createBatchRequest<'getTransaction', string[], TransactionWithStatus[]>(txHashes.map(v => ['getTransaction', v]))
+      .exec()
+    return transactions.every(v => !!v.transaction)
+  }
+
   async processTxsInNextBlockNumber() {
     const [nextBlockNumber, txHashesInNextBlock] = await this.getTxHashesWithNextUnprocessedBlockNumber()
-    if (nextBlockNumber !== undefined && txHashesInNextBlock.length) {
+    const minSyncBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
+    if (
+      nextBlockNumber !== undefined &&
+      txHashesInNextBlock.length &&
+      // For light client, if tx hash has been called with fetch_transaction, the tx can not return by get_transactions
+      // So before derived address synced to bigger than next synced block number, do not sync the next block number
+      minSyncBlockNumber >= parseInt(nextBlockNumber) &&
+      // check whether the tx is sync from light client, after split the light client and full DB file, this check will remove
+      (await this.checkTxExist(txHashesInNextBlock))
+    ) {
       this.processingBlockNumber = nextBlockNumber
       await this.fetchPreviousOutputs(txHashesInNextBlock)
       this.transactionsSubject.next({ txHashes: txHashesInNextBlock, params: this.processingBlockNumber })
@@ -296,7 +319,7 @@ export default class LightConnector extends Connector {
     } else {
       return
     }
-    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinBlockNumber()
+    const minCachedBlockNumber = await SyncProgressService.getCurrentWalletMinSyncedBlockNumber()
     await this.updateBlockStartNumber(Math.min(parseInt(blockNumber), minCachedBlockNumber))
     this.processNextBlockNumber()
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
index 36944d7dcc..a09055eb58 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts
@@ -12,13 +12,13 @@ import AddressParser from '../../models/address-parser'
 import Multisig from '../../models/multisig'
 import BlockHeader from '../../models/chain/block-header'
 import TxAddressFinder from './tx-address-finder'
-import IndexerConnector from './indexer-connector'
+import FullSynchronizer from './full-synchronizer'
 import IndexerCacheService from './indexer-cache-service'
 import logger from '../../utils/logger'
 import CommonUtils from '../../utils/common'
 import { ShouldInChildProcess } from '../../exceptions'
-import { AppendScript, BlockTips, Connector } from './connector'
-import LightConnector from './light-connector'
+import { AppendScript, BlockTips, Synchronizer } from './synchronizer'
+import LightSynchronizer from './light-synchronizer'
 import { generateRPC } from '../../utils/ckb-rpc'
 import { BUNDLED_LIGHT_CKB_URL } from '../../utils/const'
 import { NetworkType } from '../../models/network'
@@ -30,7 +30,7 @@ export default class Queue {
   #indexerUrl: string
   #addresses: AddressInterface[]
   #rpcService: RpcService
-  #indexerConnector: Connector | undefined
+  #indexerConnector: Synchronizer | undefined
   #checkAndSaveQueue: QueueObject<{ txHashes: CKBComponents.Hash[]; params: unknown }> | undefined
   #lockArgsSet: Set<string> = new Set()
 
@@ -67,9 +67,9 @@ export default class Queue {
     logger.info('Queue:\tstart')
     try {
       if (this.#url === BUNDLED_LIGHT_CKB_URL) {
-        this.#indexerConnector = new LightConnector(this.#addresses, this.#url)
+        this.#indexerConnector = new LightSynchronizer(this.#addresses, this.#url)
       } else {
-        this.#indexerConnector = new IndexerConnector(this.#addresses, this.#url, this.#indexerUrl, this.#nodeType)
+        this.#indexerConnector = new FullSynchronizer(this.#addresses, this.#url, this.#indexerUrl, this.#nodeType)
       }
       await this.#indexerConnector!.connect()
     } catch (error) {
@@ -110,7 +110,7 @@ export default class Queue {
     })
   }
 
-  getIndexerConnector = (): Connector => this.#indexerConnector!
+  getIndexerConnector = (): Synchronizer => this.#indexerConnector!
 
   stop = () => this.#indexerConnector!.stop()
 
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
similarity index 99%
rename from packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
rename to packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
index fd19a734f2..7b1fd0b4e8 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/connector.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/synchronizer.ts
@@ -49,7 +49,7 @@ export interface AppendScript {
   scriptType: CKBRPC.ScriptType
 }
 
-export abstract class Connector {
+export abstract class Synchronizer {
   public readonly blockTipsSubject: Subject<BlockTips> = new Subject<BlockTips>()
   public readonly transactionsSubject = new Subject<{ txHashes: CKBComponents.Hash[]; params: string }>()
   protected indexer: CkbIndexer
diff --git a/packages/neuron-wallet/src/block-sync-renderer/task.ts b/packages/neuron-wallet/src/block-sync-renderer/task.ts
index 0706e72e64..b0e0cc6c27 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/task.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/task.ts
@@ -1,4 +1,4 @@
-import type { LumosCellQuery } from './sync/connector'
+import type { LumosCellQuery } from './sync/synchronizer'
 import initConnection from '../database/chain/ormconfig'
 import { register as registerTxStatusListener } from './tx-status-listener'
 import SyncQueue from './sync/queue'
diff --git a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
index abacf26067..75229b5ec4 100644
--- a/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/sync-progress.ts
@@ -28,10 +28,13 @@ export default class SyncProgress {
   walletId!: string
 
   @Column()
-  blockStartNumber: number = 0
+  lightStartBlockNumber: number = 0
 
   @Column()
-  blockEndNumber: number = 0
+  localSavedBlockNumber: number = 0
+
+  @Column()
+  syncedBlockNumber: number = 0
 
   @Column({ type: 'varchar' })
   cursor?: HexString
@@ -58,8 +61,9 @@ export default class SyncProgress {
     res.scriptType = obj.scriptType
     res.delete = false
     res.addressType = obj.addressType ?? SyncAddressType.Default
-    res.blockStartNumber = parseInt(obj.blockNumber)
-    res.blockEndNumber = parseInt(obj.blockNumber)
+    res.lightStartBlockNumber = parseInt(obj.blockNumber)
+    res.localSavedBlockNumber = parseInt(obj.blockNumber)
+    res.syncedBlockNumber = parseInt(obj.blockNumber)
     return res
   }
 }
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1690361215400-ResetSyncProgressPrimaryKey.ts b/packages/neuron-wallet/src/database/chain/migrations/1690361215400-ResetSyncProgressPrimaryKey.ts
index 17bbd1cef2..99c3ab1888 100644
--- a/packages/neuron-wallet/src/database/chain/migrations/1690361215400-ResetSyncProgressPrimaryKey.ts
+++ b/packages/neuron-wallet/src/database/chain/migrations/1690361215400-ResetSyncProgressPrimaryKey.ts
@@ -1,15 +1,15 @@
 import {MigrationInterface, QueryRunner} from "typeorm";
-import SyncProgress from "../entities/sync-progress";
 
+const chunk = 100
 export class ResetSyncProgressPrimaryKey1690361215400 implements MigrationInterface {
     name = 'ResetSyncProgressPrimaryKey1690361215400'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        const syncProgresses = await queryRunner.manager.find(SyncProgress)
+        const syncProgresses = await queryRunner.manager.query('select * from sync_progress')
         await queryRunner.query(`DROP TABLE "sync_progress"`)
         await queryRunner.query(`CREATE TABLE "sync_progress" ("hash" varchar NOT NULL, "args" varchar NOT NULL, "codeHash" varchar NOT NULL, "hashType" varchar NOT NULL, "scriptType" varchar NOT NULL, "walletId" varchar NOT NULL, "blockStartNumber" integer NOT NULL, "blockEndNumber" integer, "cursor" varchar, "delete" boolean, "addressType" integer, PRIMARY KEY ("hash", "walletId"))`)
-        for (let index = 0; index < syncProgresses.length; index += 500) {
-          await queryRunner.manager.save(syncProgresses.slice(index, index + 500))
+        for (let index = 0; index < syncProgresses.length; index += chunk) {
+          await queryRunner.manager.query(`INSERT INTO sync_progress VALUES ${syncProgresses.slice(index, index + chunk).reduce((pre: string, cur: any) => `${pre ? `${pre},` : ''}("${cur.hash}","${cur.args}","${cur.codeHash}","${cur.hashType}","${cur.scriptType}","${cur.walletId}",${cur.blockStartNumber},${cur.blockEndNumber},${cur.cursor ? `"${cur.cursor}"` : 'NULL'},${cur.delete},${cur.addressType})`, '')};`)
         }
     }
 
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
new file mode 100644
index 0000000000..4a6c4b78d8
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1702781527414-RenameSyncProgress.ts
@@ -0,0 +1,21 @@
+import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+
+export class RenameSyncProgress1702781527414 implements MigrationInterface {
+    name = 'RenameSyncProgress1702781527414'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.renameColumn('sync_progress', 'blockStartNumber', 'localSavedBlockNumber')
+        await queryRunner.renameColumn('sync_progress', 'blockEndNumber', 'syncedBlockNumber')
+        await queryRunner.addColumn('sync_progress', new TableColumn({
+          name: 'lightStartBlockNumber',
+          type: 'integer',
+          default: 0
+        }))
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.renameColumn('sync_progress', 'localSavedBlockNumber', 'blockStartNumber')
+        await queryRunner.renameColumn('sync_progress', 'syncedBlockNumber', 'blockEndNumber')
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index d87ac1cbd0..f7667901a4 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -58,6 +58,7 @@ import { ResetSyncProgressPrimaryKey1690361215400 } from './migrations/169036121
 import { TxLockAddArgs1694746034975 } from './migrations/1694746034975-TxLockAddArgs'
 import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234043431-IndexerTxHashCacheRemoveField'
 import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
+import { RenameSyncProgress1702781527414 } from './migrations/1702781527414-RenameSyncProgress'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -132,6 +133,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       TxLockAddArgs1694746034975,
       IndexerTxHashCacheRemoveField1701234043431,
       CreateCellLocalInfo1701234043432,
+      RenameSyncProgress1702781527414,
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/src/models/chain/live-cell.ts b/packages/neuron-wallet/src/models/chain/live-cell.ts
index 83d156be7f..c57fb25fed 100644
--- a/packages/neuron-wallet/src/models/chain/live-cell.ts
+++ b/packages/neuron-wallet/src/models/chain/live-cell.ts
@@ -1,6 +1,6 @@
 import Script, { ScriptHashType } from './script'
 import OutPoint from './out-point'
-import { LumosCell } from '../../block-sync-renderer/sync/connector'
+import { LumosCell } from '../../block-sync-renderer/sync/synchronizer'
 
 const LUMOS_HASH_TYPE_MAP: Record<string, ScriptHashType> = {
   type: ScriptHashType.Type,
diff --git a/packages/neuron-wallet/src/services/live-cell-service.ts b/packages/neuron-wallet/src/services/live-cell-service.ts
index 8c6694e935..4b7766d3db 100644
--- a/packages/neuron-wallet/src/services/live-cell-service.ts
+++ b/packages/neuron-wallet/src/services/live-cell-service.ts
@@ -1,7 +1,7 @@
 import Script from '../models/chain/script'
 import LiveCell from '../models/chain/live-cell'
 import { queryIndexer } from '../block-sync-renderer/index'
-import { LumosCell, LumosCellQuery } from '../block-sync-renderer/sync/connector'
+import { LumosCell, LumosCellQuery } from '../block-sync-renderer/sync/synchronizer'
 
 export default class LiveCellService {
   private static instance: LiveCellService
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index 922fbf7161..d26b678b17 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -270,7 +270,7 @@ export default class MultisigService {
         .where({ hash: In(multisigScriptHashList) })
         .getMany()
       const syncBlockNumbersMap: Record<string, number> = syncBlockNumbers.reduce(
-        (pre, cur) => ({ ...pre, [cur.hash]: cur.blockStartNumber }),
+        (pre, cur) => ({ ...pre, [cur.hash]: cur.localSavedBlockNumber }),
         {}
       )
       await getConnection()
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 962f5ad287..2d42843bab 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -50,8 +50,8 @@ export default class SyncProgressService {
     await getConnection()
       .createQueryBuilder()
       .update(SyncProgress)
-      .set({ blockStartNumber: blockNumber })
-      .where({ args: In(blake160s), blockStartNumber: LessThan(blockNumber) })
+      .set({ localSavedBlockNumber: blockNumber })
+      .where({ args: In(blake160s), localSavedBlockNumber: LessThan(blockNumber) })
       .execute()
   }
 
@@ -78,7 +78,7 @@ export default class SyncProgressService {
     return result
   }
 
-  static async getCurrentWalletMinBlockNumber() {
+  static async getCurrentWalletMinSyncedBlockNumber() {
     const currentWallet = WalletService.getInstance().getCurrent()
     const item = await getConnection()
       .getRepository(SyncProgress)
@@ -88,27 +88,30 @@ export default class SyncProgressService {
         addressType: SyncAddressType.Default,
         ...(currentWallet ? { walletId: currentWallet.id } : {}),
       })
-      .orderBy('blockEndNumber', 'ASC')
+      .orderBy('syncedBlockNumber', 'ASC')
       .getOne()
-    return item?.blockEndNumber || 0
+    return item?.syncedBlockNumber || 0
   }
 
-  static async getWalletMinBlockNumber() {
+  static async getWalletMinLocalSavedBlockNumber() {
     const items = await getConnection()
       .getRepository(SyncProgress)
       .createQueryBuilder()
-      .select('MIN(blockStartNumber) as blockStartNumber, walletId')
+      .select('MIN(localSavedBlockNumber) as localSavedBlockNumber, walletId')
       .where({ addressType: SyncAddressType.Default })
       .groupBy('walletId')
-      .getRawMany<{ blockStartNumber: number; walletId: string }>()
-    return items.reduce<Record<string, number>>((pre, cur) => ({ ...pre, [cur.walletId]: cur.blockStartNumber }), {})
+      .getRawMany<{ localSavedBlockNumber: number; walletId: string }>()
+    return items.reduce<Record<string, number>>(
+      (pre, cur) => ({ ...pre, [cur.walletId]: cur.localSavedBlockNumber }),
+      {}
+    )
   }
 
   static async getOtherTypeSyncBlockNumber() {
     const items = await getConnection().getRepository(SyncProgress).find({
       addressType: SyncAddressType.Multisig,
     })
-    return items.reduce<Record<string, number>>((pre, cur) => ({ ...pre, [cur.hash]: cur.blockStartNumber }), {})
+    return items.reduce<Record<string, number>>((pre, cur) => ({ ...pre, [cur.hash]: cur.localSavedBlockNumber }), {})
   }
 
   static async getSyncProgressByHashes(hashes: string[]) {
@@ -123,7 +126,7 @@ export default class SyncProgressService {
     await getConnection()
       .createQueryBuilder()
       .update(SyncProgress)
-      .set({ blockStartNumber: 0, blockEndNumber: 0 })
+      .set({ localSavedBlockNumber: 0, syncedBlockNumber: 0 })
       .execute()
   }
 }
diff --git a/packages/neuron-wallet/src/utils/ckb-rpc.ts b/packages/neuron-wallet/src/utils/ckb-rpc.ts
index 0d4c69b4d2..fc33fbefe7 100644
--- a/packages/neuron-wallet/src/utils/ckb-rpc.ts
+++ b/packages/neuron-wallet/src/utils/ckb-rpc.ts
@@ -144,7 +144,7 @@ export type FetchTransactionReturnType = {
 }
 
 export class LightRPC extends Base {
-  setScripts: (params: LightScriptFilter[]) => Promise<null>
+  setScripts: (params: LightScriptFilter[], setScriptCommand: 'all' | 'partial' | 'delete') => Promise<null>
   getScripts: () => Promise<LightScriptSyncStatus[]>
   // TODO: the type is not the same as full node here
   // @ts-ignore
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
similarity index 96%
rename from packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts
rename to packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
index b79147f525..19a6ef6f18 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/indexer-connector.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/full-synchronizer.test.ts
@@ -3,7 +3,7 @@ import { when } from 'jest-when'
 import { AddressType } from '../../src/models/keys/address'
 import { Address, AddressVersion } from '../../src/models/address'
 import SystemScriptInfo from '../../src/models/system-script-info'
-import IndexerConnector from '../../src/block-sync-renderer/sync/indexer-connector'
+import FullSynchronizer from '../../src/block-sync-renderer/sync/full-synchronizer'
 import { flushPromises } from '../test-utils'
 
 const stubbedTipFn = jest.fn()
@@ -15,8 +15,8 @@ const stubbedLoggerErrorFn = jest.fn()
 const stubbedNextUnprocessedBlock = jest.fn()
 const stubbedCellCellectFn = jest.fn()
 
-const connectIndexer = async (indexerConnector: IndexerConnector) => {
-  const connectPromise = indexerConnector.connect()
+const connectIndexer = async (synchronizer: FullSynchronizer) => {
+  const connectPromise = synchronizer.connect()
   const errSpy = jest.fn()
   connectPromise.catch(err => {
     errSpy(err)
@@ -27,7 +27,7 @@ const connectIndexer = async (indexerConnector: IndexerConnector) => {
 
 describe('unit tests for IndexerConnector', () => {
   const nodeUrl = 'http://nodeurl:8114'
-  let stubbedIndexerConnector: any
+  let stubbedFullSynchronizer: any
 
   let stubbedIndexerConstructor: any
   let stubbedIndexerCacheService: any
@@ -76,7 +76,7 @@ describe('unit tests for IndexerConnector', () => {
       upsertTxHashes: stubbedUpsertTxHashesFn,
     }))
   })
-  stubbedIndexerConnector = require('../../src/block-sync-renderer/sync/indexer-connector').default
+  stubbedFullSynchronizer = require('../../src/block-sync-renderer/sync/full-synchronizer').default
 
   beforeEach(() => {
     resetMocks()
@@ -91,7 +91,7 @@ describe('unit tests for IndexerConnector', () => {
 
     describe('when init with indexer folder path', () => {
       beforeEach(() => {
-        new stubbedIndexerConnector([], nodeUrl, STUB_URI)
+        new stubbedFullSynchronizer([], nodeUrl, STUB_URI)
       })
       it('inits lumos indexer with a node url and indexer folder path', () => {
         expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
@@ -99,7 +99,7 @@ describe('unit tests for IndexerConnector', () => {
     })
     describe('when init without indexer folder path', () => {
       beforeEach(() => {
-        new stubbedIndexerConnector([], nodeUrl)
+        new stubbedFullSynchronizer([], nodeUrl)
       })
       it('inits mercury indexer with a node url and a default port', () => {
         expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
@@ -141,7 +141,7 @@ describe('unit tests for IndexerConnector', () => {
       blockTimestamp: fakeTx3.transaction.blockTimestamp,
     }
 
-    let indexerConnector: IndexerConnector
+    let indexerConnector: FullSynchronizer
     const shortAddressInfo = {
       lock: SystemScriptInfo.generateSecpScript('0x36c329ed630d6ce750712a477543672adab57f4c'),
     }
@@ -179,7 +179,7 @@ describe('unit tests for IndexerConnector', () => {
     const addressesToWatch = [addressObj1, addressObj2]
 
     beforeEach(() => {
-      indexerConnector = new stubbedIndexerConnector(addressesToWatch, '', '')
+      indexerConnector = new stubbedFullSynchronizer(addressesToWatch, '', '')
     })
     describe('polls for new data', () => {
       describe('#transactionsSubject', () => {
@@ -187,7 +187,7 @@ describe('unit tests for IndexerConnector', () => {
         beforeEach(() => {
           stubbedTipFn.mockReturnValueOnce(fakeTip1)
 
-          indexerConnector = new stubbedIndexerConnector(addressesToWatch, '', '')
+          indexerConnector = new stubbedFullSynchronizer(addressesToWatch, '', '')
           transactionsSubject = indexerConnector.transactionsSubject
         })
 
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
similarity index 66%
rename from packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts
rename to packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
index e02ec508e5..4b23436501 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-connector.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
@@ -1,14 +1,14 @@
 import type { Script } from '@ckb-lumos/base'
-import LightConnector from '../../src/block-sync-renderer/sync/light-connector'
+import LightSynchronizer from '../../src/block-sync-renderer/sync/light-synchronizer'
 import AddressMeta from '../../src/database/address/meta'
 
 const getSyncStatusMock = jest.fn()
-const getCurrentWalletMinBlockNumberMock = jest.fn()
+const getCurrentWalletMinSyncedBlockNumberMock = jest.fn()
 const getAllSyncStatusToMapMock = jest.fn()
 const resetSyncProgressMock = jest.fn()
 const updateSyncStatusMock = jest.fn()
 const updateSyncProgressFlagMock = jest.fn()
-const getWalletMinBlockNumberMock = jest.fn()
+const getWalletMinLocalSavedBlockNumberMock = jest.fn()
 const removeByHashesAndAddressType = jest.fn()
 const getOtherTypeSyncProgressMock = jest.fn()
 const getOtherTypeSyncBlockNumberMock = jest.fn()
@@ -26,11 +26,11 @@ const walletGetAllMock = jest.fn()
 
 function mockReset() {
   getSyncStatusMock.mockReset()
-  getCurrentWalletMinBlockNumberMock.mockReset()
+  getCurrentWalletMinSyncedBlockNumberMock.mockReset()
   getAllSyncStatusToMapMock.mockReset()
   resetSyncProgressMock.mockReset()
   updateSyncStatusMock.mockReset()
-  getWalletMinBlockNumberMock.mockReset()
+  getWalletMinLocalSavedBlockNumberMock.mockReset()
   getOtherTypeSyncProgressMock.mockReset()
   getOtherTypeSyncBlockNumberMock.mockReset()
 
@@ -50,12 +50,12 @@ function mockReset() {
 jest.mock('../../src/services/sync-progress', () => {
   return class {
     static getSyncStatus: any = () => getSyncStatusMock()
-    static getCurrentWalletMinBlockNumber: any = () => getCurrentWalletMinBlockNumberMock()
+    static getCurrentWalletMinSyncedBlockNumber: any = () => getCurrentWalletMinSyncedBlockNumberMock()
     static getAllSyncStatusToMap: any = () => getAllSyncStatusToMapMock()
     static resetSyncProgress: any = (arg: any) => resetSyncProgressMock(arg)
     static updateSyncStatus: any = (hash: string, update: any) => updateSyncStatusMock(hash, update)
     static updateSyncProgressFlag: any = (walletIds: string[]) => updateSyncProgressFlagMock(walletIds)
-    static getWalletMinBlockNumber: any = () => getWalletMinBlockNumberMock()
+    static getWalletMinLocalSavedBlockNumber: any = () => getWalletMinLocalSavedBlockNumberMock()
     static removeByHashesAndAddressType: any = (type: number, scripts: Script[]) =>
       removeByHashesAndAddressType(type, scripts)
 
@@ -103,7 +103,7 @@ const script: Script = {
 // const scriptHash = scriptToHash(script)
 const address = 'ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2q8ux5aqem92xnwfmj5cl6e233phlwlysqhjx5w'
 
-describe('test light connector', () => {
+describe('test light synchronizer', () => {
   beforeEach(() => {
     walletGetAllMock.mockReturnValue([])
     createBatchRequestMock.mockResolvedValue([])
@@ -116,21 +116,23 @@ describe('test light connector', () => {
 
   describe('test initSyncProgress', () => {
     it('there is not exist addressmata', async () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       //@ts-ignore
       await connect.initSyncProgress()
       expect(getScriptsMock).toBeCalledTimes(0)
     })
     it('append multisig script', async () => {
       getScriptsMock.mockResolvedValue([])
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       getOtherTypeSyncBlockNumberMock.mockResolvedValueOnce({})
       //@ts-ignore
       await connect.initSyncProgress([{ walletId: 'walletId', script, addressType: 1, scriptType: 'lock' }])
       expect(getScriptsMock).toBeCalledTimes(1)
-      expect(setScriptsMock).toBeCalledWith([
-        { script, scriptType: 'lock', walletId: 'walletId', blockNumber: '0x0', addressType: 1 },
-      ])
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [{ script, scriptType: 'lock', walletId: 'walletId', blockNumber: '0x0', addressType: 1 }],
+        'partial'
+      )
     })
     it('there is not exist sync scripts with light client', async () => {
       getScriptsMock.mockResolvedValue([{ script, blockNumber: '0xaa' }])
@@ -142,36 +144,29 @@ describe('test light connector', () => {
         addressType: 0,
         blake160: script.args,
       })
-      const connect = new LightConnector([addressMeta], '')
+      const connect = new LightSynchronizer([addressMeta], '')
       //@ts-ignore
       await connect.initSyncProgress()
-      expect(setScriptsMock).toBeCalledWith([
-        {
-          script: addressMeta.generateDefaultLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-        {
-          script: addressMeta.generateACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0x0',
-        },
-        {
-          script: addressMeta.generateLegacyACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0x0',
-        },
-      ])
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [
+          {
+            script: addressMeta.generateACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0x0',
+          },
+          {
+            script: addressMeta.generateLegacyACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0x0',
+          },
+        ],
+        'partial'
+      )
+      expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
       expect(resetSyncProgressMock).toBeCalledWith([
-        {
-          script: addressMeta.generateDefaultLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
         {
           script: addressMeta.generateACPLockScript().toSDK(),
           scriptType: 'lock',
@@ -197,30 +192,34 @@ describe('test light connector', () => {
         addressType: 0,
         blake160: script.args,
       })
-      getWalletMinBlockNumberMock.mockResolvedValue({ walletId: 170 })
-      const connect = new LightConnector([addressMeta], '')
+      getWalletMinLocalSavedBlockNumberMock.mockResolvedValue({ walletId: 170 })
+      const connect = new LightSynchronizer([addressMeta], '')
       //@ts-ignore
       await connect.initSyncProgress()
-      expect(setScriptsMock).toBeCalledWith([
-        {
-          script: addressMeta.generateDefaultLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-        {
-          script: addressMeta.generateACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-        {
-          script: addressMeta.generateLegacyACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-      ])
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [
+          {
+            script: addressMeta.generateDefaultLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+          {
+            script: addressMeta.generateACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+          {
+            script: addressMeta.generateLegacyACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+        ],
+        'partial'
+      )
     })
     it('set new script with start block number in wallet', async () => {
       getScriptsMock.mockResolvedValue([])
@@ -232,37 +231,42 @@ describe('test light connector', () => {
         addressType: 0,
         blake160: script.args,
       })
-      getWalletMinBlockNumberMock.mockResolvedValue({})
+      getWalletMinLocalSavedBlockNumberMock.mockResolvedValue({})
       walletGetAllMock.mockReturnValue([{ id: 'walletId', startBlockNumber: '0xaa' }])
-      const connect = new LightConnector([addressMeta], '')
+      const connect = new LightSynchronizer([addressMeta], '')
       //@ts-ignore
       await connect.initSyncProgress()
-      expect(setScriptsMock).toBeCalledWith([
-        {
-          script: addressMeta.generateDefaultLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-        {
-          script: addressMeta.generateACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-        {
-          script: addressMeta.generateLegacyACPLockScript().toSDK(),
-          scriptType: 'lock',
-          walletId: 'walletId',
-          blockNumber: '0xaa',
-        },
-      ])
+      expect(setScriptsMock).toHaveBeenNthCalledWith(
+        1,
+        [
+          {
+            script: addressMeta.generateDefaultLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+          {
+            script: addressMeta.generateACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+          {
+            script: addressMeta.generateLegacyACPLockScript().toSDK(),
+            scriptType: 'lock',
+            walletId: 'walletId',
+            blockNumber: '0xaa',
+          },
+        ],
+        'partial'
+      )
+      expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
     })
   })
 
   describe('test initSync', () => {
     it('pollingIndexer is false', async () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       //@ts-ignore
       connect.synchronize = jest.fn()
       //@ts-ignore
@@ -270,7 +274,7 @@ describe('test light connector', () => {
       expect(schedulerWaitMock).toBeCalledTimes(0)
     })
     it('pollingIndexer is true', async () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       schedulerWaitMock.mockImplementation(() => {
         connect.stop()
       })
@@ -290,14 +294,14 @@ describe('test light connector', () => {
       mockFn.mockReset()
     })
     it('connect success', async () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       //@ts-ignore
       connect.initSync = mockFn
       await connect.connect()
       expect(mockFn).toBeCalledTimes(1)
     })
     it('connect failed', async () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       //@ts-ignore
       connect.initSync = mockFn
       mockFn.mockImplementation(() => {
@@ -309,7 +313,7 @@ describe('test light connector', () => {
 
   describe('test stop', () => {
     it('test stop', () => {
-      const connect = new LightConnector([], '')
+      const connect = new LightSynchronizer([], '')
       //@ts-ignore
       connect.pollingIndexer = true
       connect.stop()
@@ -319,28 +323,28 @@ describe('test light connector', () => {
   })
 
   describe('#notifyCurrentBlockNumberProcessed', () => {
-    const connector = new LightConnector([], '')
+    const synchronizer = new LightSynchronizer([], '')
     const updateBlockStartNumberMock = jest.fn()
     beforeAll(() => {
       // @ts-ignore private property
-      connector.updateBlockStartNumber = updateBlockStartNumberMock
+      synchronizer.updateBlockStartNumber = updateBlockStartNumberMock
     })
     beforeEach(() => {
       updateBlockStartNumberMock.mockReset()
     })
     it('last process block number finish', async () => {
       // @ts-ignore private property
-      connector.processingBlockNumber = '0xaa'
-      getCurrentWalletMinBlockNumberMock.mockResolvedValueOnce(100)
-      await connector.notifyCurrentBlockNumberProcessed('0xaa')
+      synchronizer.processingBlockNumber = '0xaa'
+      getCurrentWalletMinSyncedBlockNumberMock.mockResolvedValueOnce(100)
+      await synchronizer.notifyCurrentBlockNumberProcessed('0xaa')
       // @ts-ignore private property
-      expect(connector.processingBlockNumber).toBeUndefined()
+      expect(synchronizer.processingBlockNumber).toBeUndefined()
       expect(updateBlockStartNumberMock).toBeCalledWith(100)
     })
     it('not last process block number finish', async () => {
       // @ts-ignore private property
-      connector.processingBlockNumber = undefined
-      await connector.notifyCurrentBlockNumberProcessed('0xaa')
+      synchronizer.processingBlockNumber = undefined
+      await synchronizer.notifyCurrentBlockNumberProcessed('0xaa')
       expect(updateBlockStartNumberMock).toBeCalledTimes(0)
     })
   })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
index 9886c3e881..d181a4ae5c 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/queue.test.ts
@@ -161,7 +161,7 @@ describe('queue', () => {
     jest.doMock('utils/logger', () => {
       return { error: stubbedLoggerErrorFn, info: jest.fn() }
     })
-    jest.doMock('../../src/block-sync-renderer/sync/indexer-connector', () => {
+    jest.doMock('../../src/block-sync-renderer/sync/full-synchronizer', () => {
       return stubbedIndexerConnector
     })
     jest.doMock('../../src/block-sync-renderer/sync/tx-address-finder', () => {
@@ -274,7 +274,7 @@ describe('queue', () => {
                 message: [fakeWalletId],
               })
             })
-            it('notify indexer connector of processed block number', () => {
+            it('notify full synchronizer of processed block number', () => {
               expect(stubbedNotifyCurrentBlockNumberProcessedFn).toHaveBeenCalledWith(
                 fakeTxs[0].transaction.blockNumber
               )
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
similarity index 88%
rename from packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
rename to packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
index acc7b37354..e3b610763c 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
@@ -2,7 +2,7 @@ import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 import { AddressType } from '../../src/models/keys/address'
 import { Address, AddressVersion } from '../../src/models/address'
 import SystemScriptInfo from '../../src/models/system-script-info'
-import { Connector, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/connector'
+import { Synchronizer, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/synchronizer'
 import AddressMeta from '../../src/database/address/meta'
 import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
 import { ScriptHashType } from '../../src/models/chain/script'
@@ -15,7 +15,7 @@ const stubbedCellCollectorConstructor = jest.fn()
 const stubbedBlockTipsSubscribe = jest.fn()
 const stubbedCellCellectFn = jest.fn()
 
-class TestConnector extends Connector {
+class TestSynchronizer extends Synchronizer {
   async connect() {}
   async processTxsInNextBlockNumber(): Promise<void> {
     return stubbedProcessTxsInNextBlockNumberFn()
@@ -113,7 +113,7 @@ describe('unit tests for IndexerConnector', () => {
     const STUB_URI = 'stub_uri'
 
     it('inits lumos indexer with a node url and indexer folder path', () => {
-      new TestConnector({
+      new TestSynchronizer({
         addresses: [],
         nodeUrl,
         indexerUrl: STUB_URI,
@@ -122,18 +122,22 @@ describe('unit tests for IndexerConnector', () => {
     })
 
     it('init with addresses', () => {
-      const connector = new TestConnector({
+      const synchronizer = new TestSynchronizer({
         addresses: [addressObj1, addressObj2],
         nodeUrl,
         indexerUrl: STUB_URI,
       })
-      expect(connector.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj1))
-      expect(connector.getAddressesByWalletId().get(walletId2)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj2))
+      expect(synchronizer.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(
+        AddressMeta.fromObject(addressObj1)
+      )
+      expect(synchronizer.getAddressesByWalletId().get(walletId2)?.[0]).toStrictEqual(
+        AddressMeta.fromObject(addressObj2)
+      )
     })
   })
 
   describe('#getTxHashesWithNextUnprocessedBlockNumber', () => {
-    const connector = new TestConnector({
+    const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
       indexerUrl: '',
@@ -141,7 +145,7 @@ describe('unit tests for IndexerConnector', () => {
     it('no cached tx', async () => {
       stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockResolvedValue([])
       // @ts-ignore private method
-      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
+      const result = await synchronizer.getTxHashesWithNextUnprocessedBlockNumber()
       expect(result).toStrictEqual([undefined, []])
     })
     it('get cached tx and sort by block number', async () => {
@@ -167,25 +171,25 @@ describe('unit tests for IndexerConnector', () => {
             ]
       )
       // @ts-ignore private method
-      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
+      const result = await synchronizer.getTxHashesWithNextUnprocessedBlockNumber()
       expect(result).toStrictEqual(['2', ['hash2']])
     })
   })
 
   describe('#notifyAndSyncNext', () => {
-    const connector = new TestConnector({
+    const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
       indexerUrl: '',
     })
-    connector.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
+    synchronizer.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
 
     it('exist unprocessed block and no current process block', async () => {
       //@ts-ignore private property
-      connector.processingBlockNumber = undefined
+      synchronizer.processingBlockNumber = undefined
       stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
       //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
+      await synchronizer.notifyAndSyncNext(100)
       expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
         cacheTipNumber: 10,
         indexerTipNumber: 100,
@@ -194,10 +198,10 @@ describe('unit tests for IndexerConnector', () => {
     })
     it('exist unprocessed block and has current process block', async () => {
       //@ts-ignore private property
-      connector.processingBlockNumber = '5'
+      synchronizer.processingBlockNumber = '5'
       stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
       //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
+      await synchronizer.notifyAndSyncNext(100)
       expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
         cacheTipNumber: 10,
         indexerTipNumber: 100,
@@ -206,10 +210,10 @@ describe('unit tests for IndexerConnector', () => {
     })
     it('no unprocessed block', async () => {
       //@ts-ignore private property
-      connector.processingBlockNumber = '5'
+      synchronizer.processingBlockNumber = '5'
       stubbedNextUnprocessedBlockFn.mockResolvedValue(undefined)
       //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
+      await synchronizer.notifyAndSyncNext(100)
       expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
         cacheTipNumber: 100,
         indexerTipNumber: 100,
@@ -263,7 +267,7 @@ describe('unit tests for IndexerConnector', () => {
     }
     const fakeCells = [fakeCell1, fakeCell2]
 
-    const connector = new TestConnector({
+    const synchronizer = new TestSynchronizer({
       addresses: [addressObj1, addressObj2],
       nodeUrl,
       indexerUrl: '',
@@ -291,7 +295,7 @@ describe('unit tests for IndexerConnector', () => {
         ])
 
         //@ts-ignore
-        cells = await connector.getLiveCellsByScript(query)
+        cells = await synchronizer.getLiveCellsByScript(query)
       })
       it('transform the query parameter', () => {
         expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
@@ -373,13 +377,13 @@ describe('unit tests for IndexerConnector', () => {
 
         const promises = Promise.all([
           new Promise<void>(resolve => {
-            connector.getLiveCellsByScript(query1).then(cells => {
+            synchronizer.getLiveCellsByScript(query1).then(cells => {
               results.push(cells)
               resolve()
             })
           }),
           new Promise<void>(resolve => {
-            connector.getLiveCellsByScript(query2).then(cells => {
+            synchronizer.getLiveCellsByScript(query2).then(cells => {
               results.push(cells)
               resolve()
             })
@@ -399,7 +403,7 @@ describe('unit tests for IndexerConnector', () => {
         it('throws error', async () => {
           let err
           try {
-            await connector.getLiveCellsByScript({ lock: null, type: null, data: null })
+            await synchronizer.getLiveCellsByScript({ lock: null, type: null, data: null })
           } catch (error) {
             err = error
           }
diff --git a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
index 9385e21de1..84a9b97830 100644
--- a/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
+++ b/packages/neuron-wallet/tests/models/chain/live-cell.test.ts
@@ -1,5 +1,5 @@
 import Script, { ScriptHashType } from '../../../src/models/chain/script'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/connector'
+import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
 import LiveCell from '../../../src/models/chain/live-cell'
 
 describe('LiveCell Test', () => {
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index 46551c7a02..8a87127ffa 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -87,7 +87,7 @@ import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-
 import AssetAccount from '../../../src/models/asset-account'
 import MultisigConfigModel from '../../../src/models/multisig-config'
 import MultisigOutput from '../../../src/database/chain/entities/multisig-output'
-import { LumosCell } from '../../../src/block-sync-renderer/sync/connector'
+import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
 
 describe('TransactionGenerator', () => {
   beforeAll(async () => {

From 8c0d834d27a48e29d5baacc314983826de95ccb8 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Wed, 10 Jan 2024 10:46:32 +0800
Subject: [PATCH 23/68] fix: Actions on receive address is confusing (#2999)

* fix: issue 305

* fix: add clearTimeout

* fix: AddressQrCodeWithCopyZone

* fix: CopyQrCode

---------

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../src/components/Receive/index.tsx          | 107 ++++++++++--------
 .../components/Receive/receive.module.scss    |  36 ++++--
 .../components/SUDTReceiveDialog/index.tsx    |  45 ++------
 .../sUDTReceiveDialog.module.scss             |  19 +---
 4 files changed, 95 insertions(+), 112 deletions(-)

diff --git a/packages/neuron-ui/src/components/Receive/index.tsx b/packages/neuron-ui/src/components/Receive/index.tsx
index 6c02d5eaf1..5387b873d0 100644
--- a/packages/neuron-ui/src/components/Receive/index.tsx
+++ b/packages/neuron-ui/src/components/Receive/index.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback } from 'react'
+import React, { useMemo, useCallback, useState, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState } from 'states'
 import Dialog from 'widgets/Dialog'
@@ -7,7 +7,7 @@ import Button from 'widgets/Button'
 import CopyZone from 'widgets/CopyZone'
 import QRCode from 'widgets/QRCode'
 import Tooltip from 'widgets/Tooltip'
-import { AddressTransform, Download, Copy, Attention } from 'widgets/Icons/icon'
+import { AddressTransform, Download, Copy, Attention, SuccessNoBorder } from 'widgets/Icons/icon'
 import VerifyHardwareAddress from './VerifyHardwareAddress'
 import styles from './receive.module.scss'
 import { useCopyAndDownloadQrCode, useSwitchAddress } from './hooks'
@@ -15,42 +15,74 @@ import { useCopyAndDownloadQrCode, useSwitchAddress } from './hooks'
 type AddressTransformWithCopyZoneProps = {
   showAddress: string
   isInShortFormat: boolean
-  className?: string
   onClick: () => void
 }
 
-export const AddressTransformWithCopyZone = ({
+export const AddressQrCodeWithCopyZone = ({
   showAddress,
   isInShortFormat,
   onClick,
-  className,
 }: AddressTransformWithCopyZoneProps) => {
   const [t] = useTranslation()
   const transformLabel = t(
     isInShortFormat ? 'receive.turn-into-full-version-format' : 'receive.turn-into-deprecated-format'
   )
 
+  const [isCopySuccess, setIsCopySuccess] = useState(false)
+  const timer = useRef<ReturnType<typeof setTimeout>>()
+  const { ref, onCopyQrCode, onDownloadQrCode, showCopySuccess } = useCopyAndDownloadQrCode()
+
   const stopPropagation = useCallback((e: React.SyntheticEvent) => {
     e.stopPropagation()
   }, [])
+  const onCopy = useCallback(() => {
+    onCopyQrCode()
+    setIsCopySuccess(true)
+
+    clearTimeout(timer.current!)
+    timer.current = setTimeout(() => {
+      setIsCopySuccess(false)
+    }, 1000)
+  }, [showAddress, setIsCopySuccess, timer])
 
   return (
-    <div className={className}>
-      <CopyZone content={showAddress} className={styles.showAddress}>
-        {showAddress}
-      </CopyZone>
-      <button
-        type="button"
-        className={styles.addressToggle}
-        onClick={onClick}
-        title={transformLabel}
-        onFocus={stopPropagation}
-        onMouseOver={stopPropagation}
-        onMouseUp={stopPropagation}
-      >
-        <AddressTransform />
-        {transformLabel}
-      </button>
+    <div className={styles.addressRoot}>
+      <div className={styles.qrCode} data-copy-success-text={t('common.copied')}>
+        <QRCode value={showAddress} size={128} includeMargin ref={ref} />
+        <div className={styles.actions}>
+          <Button type="text" className={styles.actionBtn} onClick={onDownloadQrCode}>
+            <Download />
+          </Button>
+          {isCopySuccess ? (
+            <Button type="text">
+              <SuccessNoBorder />
+            </Button>
+          ) : (
+            <Button type="text" className={styles.actionBtn} onClick={onCopy}>
+              <Copy />
+            </Button>
+          )}
+        </div>
+        {showCopySuccess && <Toast content={t('common.copied')} />}
+      </div>
+
+      <div className={styles.copyAddress}>
+        <CopyZone content={showAddress} className={styles.showAddress}>
+          {showAddress}
+        </CopyZone>
+        <button
+          type="button"
+          className={styles.addressToggle}
+          onClick={onClick}
+          title={transformLabel}
+          onFocus={stopPropagation}
+          onMouseOver={stopPropagation}
+          onMouseUp={stopPropagation}
+        >
+          <AddressTransform />
+          {transformLabel}
+        </button>
+      </div>
     </div>
   )
 }
@@ -73,7 +105,6 @@ const Receive = ({ onClose, address }: { onClose?: () => void; address?: string
   }
 
   const { isInShortFormat, setIsInShortFormat, address: showAddress } = useSwitchAddress(accountAddress)
-  const { ref, onCopyQrCode, onDownloadQrCode, showCopySuccess } = useCopyAndDownloadQrCode()
 
   return (
     <Dialog
@@ -90,35 +121,15 @@ const Receive = ({ onClose, address }: { onClose?: () => void; address?: string
       showFooter={false}
       className={styles.dialog}
     >
-      <div className={styles.addressRoot}>
-        <div className={styles.qrCode} data-copy-success-text={t('common.copied')}>
-          <QRCode value={showAddress} size={128} includeMargin ref={ref} />
-        </div>
-
-        <div className={styles.actions}>
-          <Button type="text" onClick={onDownloadQrCode}>
-            <Tooltip tip={t('receive.save-qr-code')} placement="top">
-              <Download />
-            </Tooltip>
-          </Button>
-          <Button type="text" onClick={onCopyQrCode}>
-            <Tooltip tip={t('receive.copy-address')} placement="top">
-              <Copy />
-            </Tooltip>
-          </Button>
-        </div>
-        <div className={styles.copyAddress}>
-          <AddressTransformWithCopyZone
-            showAddress={showAddress}
-            isInShortFormat={isInShortFormat}
-            onClick={() => setIsInShortFormat(is => !is)}
-          />
-        </div>
+      <div>
+        <AddressQrCodeWithCopyZone
+          showAddress={showAddress}
+          isInShortFormat={isInShortFormat}
+          onClick={() => setIsInShortFormat(is => !is)}
+        />
 
         {isSingleAddress && <VerifyHardwareAddress address={accountAddress} wallet={wallet} onClose={onClose} />}
       </div>
-
-      {showCopySuccess && <Toast content={t('common.copied')} />}
     </Dialog>
   )
 }
diff --git a/packages/neuron-ui/src/components/Receive/receive.module.scss b/packages/neuron-ui/src/components/Receive/receive.module.scss
index d07aff7ecc..68b6ab7a56 100644
--- a/packages/neuron-ui/src/components/Receive/receive.module.scss
+++ b/packages/neuron-ui/src/components/Receive/receive.module.scss
@@ -24,24 +24,41 @@
   margin: 4px 0;
 
   .actions {
+    position: absolute;
+    width: 128px;
+    height: 128px;
+    top: 0;
+    left: 46px;
     display: flex;
     justify-content: center;
-    gap: 16px;
-    margin-top: 8px;
+    align-items: center;
+    gap: 24px;
+    &:hover {
+      background: rgba(0, 0, 0, 0.5);
+      & > button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
     & > button {
+      display: none;
       min-width: 0;
       width: 24px;
       height: 24px;
       border-radius: 50%;
       color: var(--primary-color);
       background: var(--tag-green-bg-color);
-      & {
-        svg {
-          width: 12px;
-          g,
-          path {
-            fill: var(--primary-color);
-          }
+      svg {
+        width: 12px;
+      }
+    }
+
+    .actionBtn {
+      svg {
+        g,
+        path {
+          fill: var(--primary-color);
         }
       }
     }
@@ -94,6 +111,7 @@
 
 .copyAddress {
   width: 424px;
+  margin-top: 16px;
 }
 
 .showAddress {
diff --git a/packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx b/packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx
index 371e2db970..cf9b2915ca 100644
--- a/packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx
+++ b/packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx
@@ -1,11 +1,9 @@
-import React, { useCallback, useRef, useState } from 'react'
+import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { addressToScript, bech32Address, AddressPrefix } from '@nervosnetwork/ckb-sdk-utils'
 import SUDTAvatar from 'widgets/SUDTAvatar'
-import { AddressTransformWithCopyZone } from 'components/Receive'
-import QRCode, { copyCanvas, downloadCanvas } from 'widgets/QRCode'
+import { AddressQrCodeWithCopyZone } from 'components/Receive'
 import Dialog from 'widgets/Dialog'
-import Button from 'widgets/Button'
 import Alert from 'widgets/Alert'
 
 import { CONSTANTS } from 'utils'
@@ -37,24 +35,6 @@ const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () =>
   const [t] = useTranslation()
   const [isInShortFormat, setIsInShortFormat] = useState(false)
   const { address, accountName, tokenName, symbol } = data
-  const ref = useRef<HTMLDivElement | null>(null)
-  const onDownloadQrCode = useCallback(() => {
-    const canvasElement = ref.current?.querySelector('canvas')
-    if (canvasElement) {
-      downloadCanvas(canvasElement)
-    }
-  }, [ref])
-  const [showCopySuccess, setShowCopySuccess] = useState(false)
-  const onCopyQrCode = useCallback(() => {
-    setShowCopySuccess(false)
-    const canvasElement = ref.current?.querySelector('canvas')
-    if (canvasElement) {
-      copyCanvas(canvasElement)
-      setTimeout(() => {
-        setShowCopySuccess(true)
-      }, 1)
-    }
-  }, [ref])
 
   const displayedAddr = isInShortFormat ? toShortAddr(address) : address
 
@@ -82,21 +62,12 @@ const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () =>
             </div>
           </div>
         </div>
-        <div className={styles.qrCode} data-copy-success={showCopySuccess} data-copy-success-text={t('common.copied')}>
-          <QRCode value={displayedAddr} size={128} includeMargin ref={ref} />
-        </div>
-        <div className={styles.copyContainer}>
-          <AddressTransformWithCopyZone
-            className={styles.copyTransformWrapper}
-            showAddress={displayedAddr}
-            isInShortFormat={isInShortFormat}
-            onClick={() => setIsInShortFormat(is => !is)}
-          />
-        </div>
-        <div className={styles.actions}>
-          <Button type="default" label={t('receive.copy-qr-code')} onClick={onCopyQrCode} />
-          <Button type="confirm" label={t('receive.save-qr-code')} onClick={onDownloadQrCode} />
-        </div>
+
+        <AddressQrCodeWithCopyZone
+          showAddress={displayedAddr}
+          isInShortFormat={isInShortFormat}
+          onClick={() => setIsInShortFormat(is => !is)}
+        />
       </div>
     </Dialog>
   )
diff --git a/packages/neuron-ui/src/components/SUDTReceiveDialog/sUDTReceiveDialog.module.scss b/packages/neuron-ui/src/components/SUDTReceiveDialog/sUDTReceiveDialog.module.scss
index 0c8359a35e..0f96d5495a 100644
--- a/packages/neuron-ui/src/components/SUDTReceiveDialog/sUDTReceiveDialog.module.scss
+++ b/packages/neuron-ui/src/components/SUDTReceiveDialog/sUDTReceiveDialog.module.scss
@@ -10,6 +10,7 @@
 
 .container {
   width: 680px;
+  padding-bottom: 24px;
 }
 
 .info {
@@ -75,18 +76,6 @@
   }
 }
 
-.copyContainer {
-  text-align: center;
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  margin-top: 16px;
-
-  .copyTransformWrapper {
-    width: 452px;
-  }
-}
-
 .qrCode {
   position: relative;
   @keyframes fade-away {
@@ -125,9 +114,3 @@
     }
   }
 }
-
-.actions {
-  margin: 16px 0 24px;
-  @include dialog-footer;
-  column-gap: 24px;
-}

From 1a647368704d6c418f0376b3543fb9baefa9a261 Mon Sep 17 00:00:00 2001
From: Natixe <49234582+Natixe@users.noreply.github.com>
Date: Wed, 10 Jan 2024 04:32:52 +0100
Subject: [PATCH 24/68] Adds French 'fr' translation for wallet and UI
 functions (#3012)

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 _typos.toml                                   |    2 +-
 packages/neuron-ui/.storybook/electron.js     |    2 +-
 packages/neuron-ui/src/locales/en.json        |    3 +-
 packages/neuron-ui/src/locales/fr.json        | 1191 +++++++++++++++++
 packages/neuron-ui/src/locales/zh-tw.json     |    3 +-
 packages/neuron-ui/src/locales/zh.json        |    3 +-
 .../src/tests/calendar/index.test.ts          |   29 +-
 packages/neuron-ui/src/utils/const.ts         |    2 +-
 packages/neuron-ui/src/utils/i18n.ts          |    2 +
 packages/neuron-wallet/src/locales/fr.ts      |  303 +++++
 packages/neuron-wallet/src/locales/i18n.ts    |    2 +
 .../neuron-wallet/src/services/settings.ts    |    2 +-
 .../tests/services/setting.test.ts            |    2 +
 13 files changed, 1538 insertions(+), 8 deletions(-)
 create mode 100644 packages/neuron-ui/src/locales/fr.json
 create mode 100644 packages/neuron-wallet/src/locales/fr.ts

diff --git a/_typos.toml b/_typos.toml
index 369e09719d..78683d1960 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -6,4 +6,4 @@ numer = "numer"
 lastest = "lastest"
 
 [files]
-extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts"]
+extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts", "**/fr.{ts,json}"]
diff --git a/packages/neuron-ui/.storybook/electron.js b/packages/neuron-ui/.storybook/electron.js
index 78003d8100..9978d578ce 100644
--- a/packages/neuron-ui/.storybook/electron.js
+++ b/packages/neuron-ui/.storybook/electron.js
@@ -1,5 +1,5 @@
 const sendSyncValues = {
-  'get-locale': 'zh',
+  'get-locale': ('zh', 'fr'),
   'get-version': '0.103.1',
 }
 
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index c66755a57d..e0d6782f8f 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -411,7 +411,8 @@
         "en": "English",
         "en-US": "English(United States)",
         "zh": "中文(简体)",
-        "zh-TW": "中文(繁體)"
+        "zh-TW": "中文(繁體)",
+        "fr": "Français"
       },
       "data": {
         "ckb-node-data": "CKB Node Config & Storage",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
new file mode 100644
index 0000000000..e7445298cc
--- /dev/null
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -0,0 +1,1191 @@
+{
+  "translation": {
+    "launch-screen": {
+      "loading-wallets": "Chargement des Wallets"
+    },
+    "contextmenu": {
+      "cut": "Couper",
+      "copy": "Copier",
+      "paste": "Coller",
+      "selectall": "Tout sélectionner"
+    },
+    "navbar": {
+      "overview": "Aperçu",
+      "wallet": "Wallet",
+      "send": "Envoyer",
+      "receive": "Recevoir",
+      "history": "Historique",
+      "addresses": "Adresses",
+      "nervos-dao": "Nervos DAO",
+      "settings": "Paramètres",
+      "special-assets": "Actifs personnalisés",
+      "sync-not-start": "Synchronisation pas encore démarrée",
+      "connecting": "Connexion",
+      "experimental-functions": "Expérimental",
+      "s-udt": "Comptes d'actifs",
+      "update-neuron-with-ckb": "La version du noeud CKB ne correspond pas à Neuron (v{{ version }}), ce qui peut entraîner des problèmes de compatibilité. Veuillez mettre à jour vers la dernière version de Neuron.",
+      "ckb-node-compatible": "Le noeud CKB n'est pas compatible avec Neuron (v{{ version }}), veuillez vérifier avant toute opération ultérieure.",
+      "ckb-without-indexer": "Veuillez ajouter l'option '--indexer' pour démarrer le noeud local"
+    },
+    "network-status": {
+      "tooltip": {
+        "block-synced": "Bloc synchronisé",
+        "looking-valid-target": "Recherche de la cible valide présumée",
+        "set-start-block-number": "Définir le numéro de bloc de départ"
+      },
+      "migrating": "migration en cours..."
+    },
+    "import-hardware": {
+      "title": {
+        "select-model": "Veuillez connecter votre appareil et sélectionner le modèle",
+        "detect-device": "Détection de l'appareil",
+        "name-wallet": "Nommer le Wallet",
+        "choose-address": "Choisissez une adresse de l'appareil"
+      },
+      "actions": {
+        "confirm": "Veuillez confirmer sur votre appareil...",
+        "success": "Importation réussie !",
+        "next": "Suivant",
+        "cancel": "Annuler",
+        "back": "Retour",
+        "rescan": "Rescan",
+        "close": "fermer",
+        "finish": "fin de la création"
+      },
+      "errors": {
+        "multi-device" : "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté",
+        "device-not-found" : "Aucun appareil n'a été détecté. Veuillez connecter votre appareil.",
+        "ckb-app-not-found" : "L'application CKB ne s'ouvre pas. Veuillez ouvrir l'application CKB sur votre appareil."
+      },
+      "waiting" : "Waiting for CKB app...",
+      "abort" : "En attente de l'application CKB... Action annulée",
+      "app-version" : "CKB App v{{version}} en cours d'exécution",
+      "firmware-version" : "Firmware v{{version}} détecté",
+      "wallet-name" : "Nom du portefeuille",
+      "select-model" : "Select Model",
+      "other-device" : "Autres"
+    },
+    "hardware-sign": {
+      "annuler" : "Annuler",
+      "title" : "Signer via le portefeuille matériel",
+      "device" : "Appareil :",
+      "status" : {
+        "label" : "Status :",
+        "connect" : "Connecté, prêt à signer",
+        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+      },
+      "inputs": "Inputs(signing {{index}} of {{length}})",
+      "outputs": "Outputs({{length}})",
+      "actions": {
+        "close": "Fermer",
+        "success": "Transaction réussie !",
+        "rescan": "Rescan"
+      }
+    },
+    "hardware-verify-address": {
+      "title": "Verify address via hardware wallet",
+      "device": "Appareil:",
+      "address": "Address:",
+      "verified": "Vérifié",
+      "invalid": "Invalid",
+      "status": {
+        "label" : "Status :",
+        "connect" : "Connecté, prêt pour la vérification",
+        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+      },
+      "actions": {
+        "close": "Fermer",
+        "reconnect": "Reconnecter",
+        "copy-address": "Copier l'adresse",
+        "verify": "Vérifier l'adresse",
+        "finish": "Ok"
+      }
+    },  
+    "offline-sign": {
+      "title": "Signature hors ligne",
+      "json-file": "Fichier JSON :",
+      "status": {
+        "label": "Statut :",
+        "unsigned": "Non signé",
+        "partially-signed": "Partiellement signé",
+        "signed": "Signé"
+      },
+      "wallet": "Wallet :",
+      "content": "Contenu :",
+      "export": "Exporter Tx",
+      "sign-and-export": "Signer et exporter",
+      "sign-and-broadcast": "Signer et diffuser",
+      "actions": {
+        "broadcast": "Diffuser",
+        "sign": "Signer et exporter",
+        "cancel": "Annuler"
+      }
+    },
+    "overview": {
+      "date": "Date",
+      "type": "Type",
+      "balance": "Solde",
+      "recent-activities": "Activités récentes",
+      "no-recent-activities": "Aucune activité récente",
+      "activity": "Activité",
+      "datetime": "Date et heure",
+      "status": "Statut",
+      "amount": "Montant",
+      "address": "Adresse",
+      "sent": "Envoyé",
+      "sending": "Envoi",
+      "received": "Reçu",
+      "receiving": "Réception",
+      "more": "Plus",
+      "copy-balance": "Copier le solde",
+      "create": "Créer un compte d'actif {{name}}",
+      "destroy": "Détruire le compte d'actif {{name}}",
+      "createSUDT": "Créer un compte d'actif <0></0>",
+      "destroySUDT": "Détruire le compte d'actif <0></0>",
+      "wallet-ready": "Le Wallet est prêt, bienvenue",
+      "send": "Envoyer",
+      "receive": "Recevoir",
+      "locked": "Montant verrouillé",
+      "locked-balance": "Solde verrouillé"
+    },
+    "wizard": {
+      "welcome-to-nervos-neuron": "Bienvenue sur Neuron",
+      "create-or-import-your-first-wallet": "Créez ou importez votre premier Wallet",
+      "create-new-wallet": "Créer un Wallet",
+      "import-mnemonic": "Importer la graine du Wallet",
+      "import-keystore": "Importer depuis le fichier Keystore",
+      "import-wallet": "Importer un Wallet",
+      "import-hardware-wallet": "Importer un Wallet matériel",
+      "new-wallet": "Nouveau Wallet",
+      "wallet-seed": "Graine du Wallet",
+      "keystore": "Fichier Keystore",
+      "hardware-wallet": "Wallet matériel",
+      "next": "Suivant",
+      "back": "Retour",
+      "name": "Nom",
+      "your-wallet-seed-is": "Votre nouvelle graine de Wallet a été générée",
+      "input-your-seed": "Veuillez entrer votre graine de Wallet",
+      "password": "Mot de passe",
+      "confirm-password": "Confirmer le mot de passe",
+      "set-wallet-name-and-password": "Nommez votre nouveau Wallet et choisissez un mot de passe fort pour le protéger",
+      "set-wallet-name": "Donnez un nom à votre nouveau Wallet",
+      "set-a-strong-password-to-protect-your-wallet": "Créez un mot de passe fort pour protéger votre Wallet",
+      "wallet-suffix": "Wallet {{suffix}}",
+      "write-down-seed": "Notez votre graine de Wallet et enregistrez-la dans un endroit sûr",
+      "new-name": "Utilisez un nom inutilisé pour le nouveau Wallet",
+      "complex-password": "Le mot de passe doit contenir entre 8 et 50 caractères, comprenant au moins trois catégories parmi les suivantes : lettres majuscules, lettres minuscules, chiffres et symboles spéciaux.",
+      "same-password": "Le mot de passe et la confirmation du mot de passe doivent correspondre",
+      "input-seed-verify": "Saisissez la graine créée pour vérification",
+      "no-wallet": "Pas de Wallet ?",
+      "create-wallet": "Créer un Wallet",
+      "repeat-password": "Répéter le mot de passe",
+      "finish-create": "Terminer la création",
+      "creating-wallet": "Le Wallet est en cours de préparation, veuillez patienter",
+      "add-one": "Ajouter un autre"
+    },
+    "import-keystore": {
+      "title": "Importer le fichier Keystore",
+      "select-file": "Choisir le fichier",
+      "label": {
+        "path": "Fichier Keystore",
+        "name": "Nom du Wallet",
+        "password": "Mot de passe"
+      },
+      "placeholder": {
+        "path": "Cliquez pour sélectionner le fichier Keystore",
+        "name": "Nom pour le nouveau Wallet",
+        "password": "Mot de passe pour vérifier le fichier Keystore"
+      },
+      "button": {
+        "back": "Retour",
+        "submit": "Soumettre"
+      }
+    },
+    "detail": {
+      "more-transactions": "Plus"
+    },
+    "send": {
+      "address": "Envoyer à",
+      "input-address": "Veuillez saisir l'adresse de réception",
+      "amount": "Montant (CKB)",
+      "input-amount": "Veuillez saisir le montant",
+      "send": "Envoyer",
+      "reset": "Réinitialiser",
+      "confirm-password": "Confirmer le mot de passe",
+      "to": "À",
+      "add-receiving-address": "Ajouter une adresse de réception",
+      "input-password-to-confirm": "Saisissez le mot de passe pour confirmer",
+      "scan-to-get-address": "Scanner le code QR pour lire l'adresse à laquelle envoyer",
+      "total-amount": "Montant total (CKB)",
+      "description": "Description",
+      "description-optional": "Veuillez saisir une description, facultatif",
+      "balance": "Solde",
+      "add-one": "Ajouter une autre",
+      "remove-this": "Supprimer ceci",
+      "fee": "Frais de transaction (CKB)",
+      "advanced-fee-settings": "Paramètres avancés des frais",
+      "price": "Prix",
+      "pick-price": "Choix rapide du prix",
+      "custom-price": "Prix personnalisé",
+      "slow": "Lent",
+      "standard": "Standard",
+      "fast": "Rapide",
+      "total-cycles": "Total des cycles RISC-V",
+      "scan-screen-qr-code": "Scanner le code QR à l'écran",
+      "set-locktime": "Définir le verrouillage temporel",
+      "remove-receiving-address": "Supprimer l'adresse de réception",
+      "remove-receiving-address-msg": "Êtes-vous sûr de vouloir supprimer l'adresse de réception sélectionnée ?",
+      "locktime-notice-content": "Selon la hauteur de bloc réelle, il peut y avoir des variations temporelles dans le verrouillage temporel.",
+      "release-on": "Libération le",
+      "locktime-warning": "Veuillez vous assurer que le Wallet du destinataire peut prendre en charge le déverrouillage par expiration. (Remarque : 1. Les échanges ne prennent généralement pas en charge le déverrouillage par expiration {{extraNote}})",
+      "allow-use-sent-cell": "Les sorties non confirmées sont autorisées dans cette transaction.",
+      "submit-transaction": "Soumettre la transaction"
+    },
+    "receive": {
+      "title": "Recevoir",
+      "address-book": "Carnet d'adresses",
+      "click-to-copy": "Cliquez pour copier l'adresse",
+      "copy-address": "Copier l'adresse",
+      "address-not-found": "Adresse non trouvée",
+      "prompt": "Neuron choisit une nouvelle adresse de réception pour une meilleure confidentialité. Veuillez consulter le carnet d'adresses si vous souhaitez utiliser une adresse de réception précédemment utilisée.",
+      "address-qrcode": "Code QR de l'adresse",
+      "address": "Adresse {{network}}",
+      "verify-address": "Vérifier l'adresse",
+      "turn-into-full-version-format": "Convertir en format version complète",
+      "turn-into-deprecated-format": "Convertir en format obsolète",
+      "save-qr-code": "Télécharger",
+      "copy-qr-code": "Copier"
+    },
+    "transaction-status": {
+      "pending": "En attente",
+      "success": "Succès",
+      "failed": "Échec",
+      "confirming": "Confirmation en cours"
+    },
+    "confirmationsCount_one": "{{count}} Confirmation",
+    "confirmationsCount_other": "{{count}} Confirmations",
+    "history": {
+      "title": "Historique",
+      "title-detail": "Détail de l'historique",
+      "meta": "Méta",
+      "type": "Type",
+      "date": "Date",
+      "timestamp": "Heure",
+      "amount": "Montant",
+      "transaction-hash": "Hash de transaction",
+      "send": "Envoyer",
+      "receive": "Recevoir",
+      "other": "Autre",
+      "more-actions": "Plus d'actions",
+      "detail": "Détail",
+      "explorer": "Explorateur",
+      "first": "Premier",
+      "previous": "Précédent",
+      "next": "Suivant",
+      "last": "Dernier",
+      "description": "Description",
+      "status": "Statut",
+      "blockNumber": "Numéro de bloc",
+      "basic-information": "Informations de base",
+      "search": {
+        "button": "Rechercher",
+        "placeholder": "Rechercher le hash de transaction, l'adresse ou la date (aaaa-mm-jj)"
+     },
+      "table": {
+        "name": "Nom du Wallet",
+        "type": "Type",
+        "amount": "Montant",
+        "timestamp": "Heure",
+        "status": "Statut",
+        "operation": "Opération"
+      },
+      "export-history": "Exporter l'historique des transactions",
+      "confirmationTimes": "Confirmations",
+      "confirming-with-count": "{{confirmations}} Confirmations",
+      "view-on-explorer": "Voir sur l'explorateur",
+      "no-txs": "Aucun historique de transaction",
+      "view-in-explorer": "Voir sur l'explorateur",
+      "view-in-explorer-button-title": "Voir sur l'explorateur",
+      "view-detail": "Détail",
+      "view-detail-button-title": "Voir les détails",
+      "opening": "Ouverture",
+      "copy-tx-hash": "Copier le hash de la transaction",
+      "copy-balance": "Copier le solde",
+      "copy-address": "Copier l'adresse",
+      "create": "Créer le compte d'actif {{name}}",
+      "destroy": "Détruire le compte d'actif {{name}}"
+    },  
+    "transaction": {
+        "window-title": "Transaction : {{hash}}",
+        "date": "Date",
+        "transaction-hash": "Hash de transaction",
+        "block-number": "Numéro de bloc",
+        "goBack": "Retour",
+        "index": "Index",
+        "address": "Adresse",
+        "income": "Revenu",
+        "amount": "Montant",
+        "inputs": "Entrées",
+        "outputs": "Sorties",
+        "cell-from-cellbase": "De cellbase",
+        "lock-script": "Script de verrouillage",
+        "lock-script-title": "Informations sur l'adresse",
+        "deprecated-address-format": "Adresse au format obsolète"
+      },
+      "addresses": {
+        "title": "Carnet d'adresses",
+        "addresses": "Adresses",
+        "type": "Type",
+        "address": "Adresse",
+        "identifier": "Identifiant",
+        "description": "Description",
+        "balance": "Solde",
+        "transactions": "TXs",
+        "receiving-address": "Réception",
+        "change-address": "Changement",
+        "copy-address": "Copier l'adresse",
+        "request-payment": "Demander un paiement",
+        "view-on-explorer": "Voir sur l'explorateur",
+        "default-description": "Aucun",
+        "all-address": "Toutes"
+    },
+    "settings":{
+      "title": {
+        "normal": "Paramètres",
+        "mac": "Préférences"
+      },
+      "go-to-overview": "Aller à l'aperçu",
+      "setting-tabs": {
+        "general": "Général",
+        "wallets": "Wallets",
+        "network": "Réseau",
+        "data": "Data"
+      },
+      "general": {
+        "show": "Afficher",
+        "hide": "Masquer",
+        "version": "Version",
+        "language": "Langue",
+        "select-language": "Sélectionner la langue",
+        "apply": "Appliquer"
+      },
+      "wallet-manager": {
+        "edit-wallet": {
+          "wallet-name": "Nom du Wallet",
+          "password": "Mot de passe",
+          "new-password": "Nouveau mot de passe",
+          "confirm-password": "Confirmer le mot de passe",
+          "edit-wallet": "Éditer le Wallet"
+        },
+        "edit-success": "Informations du Wallet mises à jour avec succès",
+        "delete-wallet-title": "Veuillez entrer le mot de passe de {{name}}",
+        "password": "Mot de passe",
+        "wallet-detail": {
+          "balance": "Solde"
+        }
+      },
+      "network": {
+       "online": "En ligne",
+       "offline": "Hors ligne",
+       "add-network": "Ajouter un réseau",
+       "remove-network": "Supprimer le réseau",
+       "remove-network-msg": "Êtes-vous sûr de vouloir supprimer le réseau sélectionné ?",
+        "edit-network": {
+         "title": "Modifier le réseau",
+         "rpc-url": "URL RPC",
+         "name": "Nom du réseau",
+         "input-rpc": "Veuillez entrer rpc",
+         "input-network": "Veuillez entrer le nom" 
+        },
+        "edit-success": "Modification réussie du réseau",
+        "mainnet": "Mainnet",
+        "testnet": "Testnet",
+        "lightTestnet": "Testnet léger",
+        "lightMainnet": "Mainnet léger",
+        "devnet": "Devnet",
+        "switch-network-type": "Basculer vers {{type}}"
+      },  
+        "locale": {
+        "en": "Anglais",
+        "en-US": "Anglais (États-Unis)",
+        "zh": "中文(简体)",
+        "zh-TW": "中文(繁體)",
+        "fr": "Français"
+      },
+      "data": {
+        "ckb-node-data": "Configuration & stockage du noeud CKB",
+        "set": "Définir",
+        "cache": "Cache",
+        "clear-cache-description": "Effacez le cache si vous rencontrez des problèmes de synchronisation des données ou d'affichage du solde. Neuron effectuera une nouvelle analyse des données de bloc.",
+        "cache-cleared-on": "Cache actualisé le {{date}}",
+        "refresh": "Actualiser",
+        "clearing-cache": "Effacement du cache en cours, veuillez patienter",
+        "clear-success": "Cache effacé",
+        "set-path": "Définir le chemin",
+        "remove-ckb-data-tip": "Veuillez déplacer les données du noeud CKB de 【{{prevPath}}】 vers 【{{currentPath}}】 puis cliquer sur \"Les données ont été déplacées\" pour démarrer à partir du bloc synchronisé précédemment ; ou cliquez sur \"Synchroniser depuis le début\" pour démarrer une synchronisation complète.",
+        "resync-ckb-node-describe": "Attention : Synchroniser depuis le début ne supprimera pas les données du noeud CKB déjà téléchargées.",
+        "cancel": "Annuler",
+        "confirm-clear": "Confirmer",
+        "move-data-finish": "Les données ont été déplacées",
+        "re-sync": "Synchroniser depuis le début",
+        "disabled-set-path": "Lorsque le noeud CKB est démarré manuellement, la configuration du chemin du noeud CKB ne prend pas effet.",
+        "ckb-node-storage": "Stockage du noeud CKB"
+      }
+    },    
+    "password-request": {
+      "wallet-not-found": "Le Wallet n'a pas été trouvé",
+      "password": "Entrez le mot de passe",
+      "placeholder": "Veuillez entrer le mot de passe du Wallet",
+      "send": {
+        "title": "Soumettre la transaction"
+      },
+      "send-nft": {
+        "title": "Envoyer NFT"
+      },
+      "delete": {
+        "title": "Supprimer le Wallet"
+      },
+      "backup": {
+        "title": "Sauvegarder le Wallet"
+      },
+      "unlock": {
+        "title": "Veuillez entrer le mot de passe du Wallet pour réclamer l'actif"
+      },
+      "create-sudt-account": {
+        "title": "Créer un compte d'actif"
+      },
+      "send-sudt": {
+        "title": "Envoyer sUDT"
+      },
+      "transfer-to-sudt": {
+        "title": "Envoyer vers le compte sUDT"
+      },
+      "send-ckb-asset": {
+        "title": "Envoyer CKB"
+      },
+      "send-acp": {
+        "title": "Envoyer CKB"
+      },
+      "send-acp-sudt-to-new-cell": {
+        "title": "Envoyer sUDT"
+      },
+      "send-acp-ckb-to-new-cell": {
+        "title": "Envoyer CKB"
+      },
+      "migrate-acp": {
+        "title": "Mettre à niveau les comptes d'actif"
+      },
+      "send-cheque": {
+        "title": "Envoyer l'actif chèque"
+      },
+      "withdraw-cheque": {
+        "title": "Retirer l'actif chèque"
+      },
+      "claim-cheque": {
+        "title": "Réclamer l'actif chèque"
+      },
+      "create-account-to-claim-cheque": {
+        "title": "Réclamer l'actif chèque avec un nouveau compte"
+      },
+      "destroy-asset-account": {
+        "title": "Détruire le compte d'actif"
+      },
+      "send-from-multisig": {
+        "title": "Envoyer du CKB depuis une adresse multisig"
+      },
+      "send-from-multisig-need-one": {
+        "title": "Envoyer du CKB depuis une adresse multisig"
+      },
+      "xpub-notice": "Pour un Wallet en mode lecture seule, seules les transactions exportées sont prises en charge"
+    },
+    "qrcode": {
+      "copy": "Copier l'image",
+      "save": "Enregistrer l'image"
+    },  
+    "common": {
+      "or": "ou",
+      "ok": "Ok",
+      "dismiss": "Rejeter",
+      "confirm": "Confirmer",
+      "open": "Ouvrir",
+      "cancel": "Annuler",
+      "save": "Enregistrer",
+      "toggle": {
+        "on": "Activé",
+        "off": "Désactivé"
+      },
+      "copy-tx-hash": "Copier le hachage de transaction",
+      "copy-address": "Copier l'adresse",
+      "select": "Sélectionner",
+      "backup": "Sauvegarder",
+      "edit": "Éditer",
+      "delete": "Supprimer",
+      "click-to-edit": "Cliquez pour éditer",
+      "notice": "Avis",
+      "experimental": "Expérimental",
+      "close": "Fermer",
+      "copy": "Copier",
+      "copied": "Copié",
+      "verification-failure": "Échec de la vérification",
+      "back": "Retour",
+      "switch-to-light": "Passer en mode clair",
+      "switch-to-dark": "Passer en mode sombre"
+    },
+    "notification-panel": {
+      "title": "Notifications"
+    },
+    "message-types": {
+      "warning": "Avertissement",
+      "alert": "Alerte",
+      "success": "Succès"
+    },
+    "messages": {
+      "error": "Erreur",
+      "unknown-error": "Erreur inconnue",
+      "update-wallet-successfully": "Le Wallet a été mis à jour avec succès",
+      "delete-wallet-successfully": "Le Wallet a été supprimé avec succès",
+      "create-network-successfully": "Le réseau a été créé avec succès",
+      "update-network-successfully": "Le réseau a été mis à jour avec succès",
+      "clear-cache-successfully": "Le cache a été effacé avec succès",
+      "addr-copied": "L'adresse a été copiée dans le presse-papiers",
+      "qrcode-copied": "Le code QR a été copié dans le presse-papiers",
+      "view-the-run-node-doc": "Consultez le guide dans le navigateur",
+      "remain-ckb-for-withdraw": "Il est conseillé de réserver quelques CKBytes pour l'opération de retrait",
+      "no-valid-addresses-found": "Aucune adresse valide trouvée",
+      "decimal-range": "La décimale doit être un entier de {{range}} (inclus)",
+      "experimental-message-hardware": "Il s'agit d'une fonctionnalité expérimentale. Veuillez prêter attention aux risques et l'utiliser avec précaution.",
+      "experimental-message": "Il s'agit d'une fonctionnalité expérimentale, elle peut changer à tout moment. Veuillez utiliser avec précaution.",
+      "rebuild-sync": "Pour une meilleure expérience utilisateur, Neuron a adopté un nouveau stockage, nécessitant une migration des données (estimée entre 20 et 60 minutes).\nDésolé pour le désagrément.",
+      "migrate-warning": "Avertissement : Le processus de migration peut échouer pour des raisons inconnues, entraînant une resynchronisation. Veuillez effectuer une sauvegarde manuelle et lancer la migration !",
+      "migrate-ckb-data": "Migrer",
+      "migrate": "Migrer",
+      "secp256k1/blake160-address-required": "L'adresse Secp256k1/Blake160 est requise",
+      "light-client-locktime-warning": "2. Le mode client léger ne prend pas en charge l'affichage des CKBytes avec un temps de verrouillage.",
+      "light-client-cheque-warning": "Avertissement : Le mode client léger ne prend pas en charge l'affichage des actifs Cheque.",
+      "fields": {
+        "wallet": "Wallet",
+        "name": "Nom",
+        "password": "Mot de passe",
+        "remote": "URL RPC",
+        "network": "Réseau",
+        "address": "Adresse",
+        "amount": "Montant",
+        "transaction": "Transaction",
+        "default-address": "Adresse par défaut",
+        "mnemonic": "Mnémonique",
+        "keystore-path": "Fichier de clés",
+        "keystore-name": "Nom du Wallet",
+        "keystore-password": "Mot de passe",
+        "deposit": "Dépôt",
+        "account-name": "Nom du compte",
+        "token-name": "Nom du token",
+        "token-id": "ID du token",
+        "symbol": "Symbole",
+        "decimal": "Décimale"
+      },
+      "codes": {
+        "-3": "",
+        "100": "Le montant n'est pas suffisant.",
+        "101": "Le montant {{amount}} CKB est trop petit, veuillez saisir un montant d'au moins {{required}} CKB.",
+        "102": "$t(messages.fields.{{fieldName}}) est invalide.",
+        "103": "Le mot de passe $t(messages.fields.keystore-password) est incorrect",
+        "104": "Échec de la connexion au noeud, veuillez redémarrer Neuron.",
+        "105": "Vous avez besoin de plus de capacités pour le changement (plus de 61 CKBytes).",
+        "106": "Vous avez besoin de plus de capacités pour le changement (plus de 61 CKBytes), ou faites glisser jusqu'à la fin pour envoyer tout votre solde.",
+        "107": "Le montant {{amount}} CKB est trop petit, le transfert avec verrouillage nécessite un montant d'au moins 69 CKB.",
+        "108": "L'adresse fournie n'appartient pas au Wallet actuel. Veuillez vérifier votre Wallet ou attendre la fin de la synchronisation.",
+        "109": "Solde insuffisant.",
+        "110": "Solde disponible insuffisant, veuillez réessayer lorsque la dernière transaction a été confirmée.",
+        "111": "Le Wallet actuel n'est pas défini.",
+        "112": "Wallet {{id}} introuvable.",
+        "113": "La clé de stockage est invalide, veuillez vérifier l'intégrité de votre fichier.",
+        "114": "Le solde minimal de transfert est de {{bytes}} CKBytes.",
+        "115": "Vous avez besoin de plus de capacités pour le changement (plus de 61 CKBytes), ou cliquez sur le bouton 'Max' pour envoyer tout votre solde.",
+        "201": "$t(messages.fields.{{fieldName}}) est requis.",
+        "202": "$t(messages.fields.{{fieldName}}) est utilisé.",
+        "203": "$t(messages.fields.{{fieldName}}) doit être plus court ou égal à {{length}}",
+        "204": "$t(messages.fields.{{fieldName}}) est trop court, il doit être plus long ou égal à {{length}}.",
+        "205": "$t(messages.fields.{{fieldName}}) {{fieldValue}} est invalide.",
+        "206": "$t(messages.fields.{{fieldName}}) est invalide, veuillez entrer $t(messages.fields.{{fieldName}}) avec pas plus de {{length}} décimales.",
+        "207": "$t(messages.fields.{{fieldName}}) {{fieldValue}} est invalide, il ne peut pas être négatif.",
+        "208": "$t(messages.fields.{{fieldName}}) {{fieldValue}} est invalide, il doit commencer par http(s)://",
+        "209": "$t(messages.fields.{{fieldName}}) ne doit pas contenir d'espaces.",
+        "210": "\"{{value}}\" est réservé, veuillez en choisir un autre.",
+        "211": "Le montant ne peut pas être de 0",
+        "212": "$t(messages.fields.{{fieldName}}) est trop simple",
+        "301": "$t(messages.fields.{{fieldName}}) {{fieldValue}} ne peut pas être supprimé.",
+        "303": "$t(messages.fields.{{fieldName}}) est introuvable.",
+        "304": "La caméra n'est pas disponible ou désactivée.",
+        "305": "$t(messages.fields.address) ne peut pas être vide.",
+        "306": "Veuillez entrer une adresse principale",
+        "307": "Veuillez entrer une adresse de testnet",
+        "308": "Le montant n'est pas suffisant",
+        "309": "Le destinataire doit mettre à niveau son adresse de compte pour accepter davantage de transferts.",
+        "310": "Veuillez entrer une adresse {{tagName}}",
+        "402": "L'application CKB n'est pas ouverte. Veuillez ouvrir l'application CKB sur votre appareil.",
+        "403": "Aucun appareil détecté. Veuillez connecter votre appareil",
+        "404": "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté.",
+        "600": "Veuillez vous assurer que la synchronisation est finalisée avant d'effectuer toute opération liée à une transaction."
+      }
+    },
+    "sync": {
+      "synced": "Synchronisé à 100%",
+      "syncing": "Synchronisation {{ syncPercents }}",
+      "block-number": "numéro de bloc",
+      "syncing-balance": "La balance est en cours de mise à jour",
+      "slow": "La synchronisation est lente",
+      "sync-failed": "Échec de la synchronisation, veuillez vérifier le réseau",
+      "sync-not-start": "La synchronisation n'a pas encore commencé, veuillez essayer de redémarrer le Wallet Neuron",
+      "connecting": "Connexion en cours"
+    },
+    "pagination": {
+      "previous-page": "Page précédente",
+      "next-page": "Page suivante",
+      "first-page": "Première page",
+      "last-page": "Dernière page",
+      "page": "Page",
+      "selected": "Page actuelle",
+      "range": "{{start}} - {{end}} de {{count}}",
+      "page-no": "Page {{pageNo}}"
+    },
+    "nervos-dao": {
+      "free": "Disponible",
+      "locked": "Verrouillé",
+      "deposit": "Dépôt",
+      "deposit-rules": "Règles de dépôt",
+      "copy-balance": "Copier le solde",
+      "deposit-records": "Dépôts",
+      "completed-records": "Terminé",
+      "apc": "APC actuel",
+      "apc-tooltip": "Taux de Compensation Annuel Actuel",
+      "fee": "Frais de transaction : ",
+      "deposit-to-nervos-dao": "Déposer dans Nervos DAO",
+      "withdraw-from-nervos-dao": "Retirer de Nervos DAO",
+      "cancel": "Annuler",
+      "proceed": "Procéder",
+      "compensation": "Compensation",
+      "notice-wait-time": "Remarque : Vous initiez un retrait et le retrait final devra attendre {{epochs}} époques {{blocks}} blocs (environ {{days}} jours).",
+      "deposit-dialog-title": "Dépôt",
+      "deposit-terms": "Nervos DAO nécessite 102 CKBytes pour le stockage de la cellule de dépôt, qui n'est pas rémunéré. <br />Veuillez consulter le <0>Nervos DAO RFC</0> pour plus d'informations sur Nervos DAO",
+      "minimal-fee-required": "La capacité minimale de dépôt est de {{minimal}} CKBytes",
+      "compensation-accumulated": "{{blockNumber}} blocs de compensation accumulée",
+      "withdraw-alert": "Astuce : il ne reste que {{epochs}} époques (~{{hours}} heures) jusqu'à la fin de votre période de verrouillage actuelle. Si vous souhaitez retirer pendant cette période de verrouillage, veuillez envoyer une demande de retrait à temps. Il reste {{nextLeftEpochs}} époques (~{{days}} jours) jusqu'à la fin de votre prochaine période de verrouillage.",
+      "balance-not-reserved": "Ne pas réserver de CKBytes pour les futures opérations DAO (non recommandé)",
+      "deposit-amount": "Montant du dépôt (CKB)",
+      "deposit-record": {
+        "deposited-at": "Déposé",
+        "completed-at": "Terminé",
+        "deposit-pending": "En attente de dépôt",
+        "withdraw-action-label": "Retirer",
+        "unlock-action-label": "Déverrouiller",
+        "record": "Enregistrement",
+        "deposited": "Déposé",
+        "withdrawn": "Retiré",
+        "unlocked": "Déverrouillé",
+        "view-tx-detail": "Voir les détails de la transaction",
+        "locked-period": "Période de verrouillage",
+        "compensated-period": "Période de compensation",
+        "days-hours": "{{days}} jours {{hours}} heures",
+        "no-deposit": "Aucun dépôt",
+        "no-completed": "Aucun terminé"
+      },
+      "compensation-period": {
+        "tooltip": {
+          "compensated-period": "Période de compensation",
+          "days-hours": "{{days}} jours {{hours}} heures",
+          "immature-for-withdraw": "Il faut au moins environ 16 heures (4 époques) pour procéder à la prochaine action",
+          "normal": "Le montant de la compensation est faible, le retrait n'est pas recommandé",
+          "suggested": "Période de retrait suggérée pour une compensation maximisée",
+          "ending": "Le retrait demandé peut être reporté et verrouillé pour une période supplémentaire de 30 jours",
+          "withdrawn": "Retiré"
+        },
+        "stage-messages": {
+          "pending": "En attente...",
+          "immature-for-withdraw": "Les CKB ne peuvent pas être retirés pendant les {{ hours }} prochaines heures",
+          "immature-for-unlock": "Les CKB ne peuvent pas être déverrouillés pendant les {{ hours }} prochaines heures",
+          "next-compensation-cycle": "Le prochain cycle de compensation commencera dans environ {{days}} jours",
+          "withdrawing": "Retrait en cours...",
+          "compensation-cycle-will-end": "La période de compensation se termine dans environ {{days}} jours",
+          "compensation-cycle-has-ended": "Le cycle est terminé, les CKB sont prêts à être déverrouillés",
+          "unlocking": "Déverrouillage en cours..."
+        }
+      }
+    },
+    "nervos-dao-detail": {
+      "tx-detail": "Détail de la transaction",
+      "deposited": "Déposé",
+      "withdrawn": "Retiré",
+      "unlocked": "Déverrouillé",
+      "basic-information": "Informations de base",
+      "transaction-hash": "Hachage de la transaction",
+      "blockNumber": "Numéro de bloc",
+      "datetime": "Date et heure",
+      "income": "Revenu",
+      "index": "Index",
+      "address": "Adresse",
+      "amount": "Montant",
+      "cell-from-cellbase": "De cellbase",
+      "cancel": "Annuler",
+      "next": "Suivant"
+    },
+    "lock-info-dialog": {
+      "address-info": "Informations sur l'adresse",
+      "deprecated-address": "Adresse obsolète"
+    },
+    "updates": {
+      "check-updates": "Vérifier les mises à jour",
+      "checking-updates": "Vérification en cours...",
+      "update-available": "Des mises à jour sont actuellement disponibles.",
+      "downloading-update": "Téléchargement de la mise à jour...",
+      "update-not-available": "Aucune mise à jour n'est actuellement disponible.",
+      "updates-found-do-you-want-to-update": "Une mise à jour ({{version}}) est disponible",
+      "install-update": "Mise à jour immédiate",
+      "updates-downloaded-about-to-quit-and-install": "Mise à jour téléchargée. Prêt à installer et relancer.",
+      "quit-and-install": "Installer et relancer"
+    },
+    "datetime": {
+      "mon": {
+        "full": "Lundi",
+        "short": "Lun.",
+        "tag": "L"
+      },
+      "tue": {
+        "full": "Mardi",
+        "short": "Mar.",
+        "tag": "M"
+      },
+      "wed": {
+        "full": "Mercredi",
+        "short": "Mer.",
+        "tag": "M"
+      },
+      "thur": {
+        "full": "Jeudi",
+        "short": "Jeu.",
+        "tag": "J"
+      },
+      "fri": {
+        "full": "Vendredi",
+        "short": "Ven.",
+        "tag": "V"
+      },
+      "sat": {
+        "full": "Samedi",
+        "short": "Sam.",
+        "tag": "S"
+      },
+      "sun": {
+        "full": "Dimanche",
+        "short": "Dim.",
+        "tag": "D"
+      },
+      "jan": {
+        "full": "Janvier",
+        "short": "Jan.",
+        "tag": "J"
+      },
+      "feb": {
+        "full": "Février",
+        "short": "Fév.",
+        "tag": "F"
+      },
+      "mar": {
+        "full": "Mars",
+        "short": "Mar.",
+        "tag": "M"
+      },
+      "apr": {
+        "full": "Avril",
+        "short": "Avr.",
+        "tag": "A"
+      },
+      "may": {
+        "full": "Mai",
+        "short": "Mai.",
+        "tag": "M"
+      },
+      "june": {
+        "full": "Juin",
+        "short": "Jui.",
+        "tag": "J"
+      },
+      "july": {
+        "full": "Juillet",
+        "short": "Juil.",
+        "tag": "J"
+      },
+      "aug": {
+        "full": "Août",
+        "short": "Aoû.",
+        "tag": "A"
+      },
+      "sept": {
+        "full": "Septembre",
+        "short": "Sep.",
+        "tag": "S"
+      },
+      "oct": {
+        "full": "Octobre",
+        "short": "Oct.",
+        "tag": "O"
+      },
+      "nov": {
+        "full": "Novembre",
+        "short": "Nov.",
+        "tag": "N"
+      },
+      "dec": {
+        "full": "Décembre",
+        "short": "Déc.",
+        "tag": "D"
+      },
+      "timezone": "Fuseau horaire",
+      "previous-month": "mois précédent",
+      "next-month": "mois suivant",
+      "start-tomorrow": "L'heure sélectionnée devrait commencer à partir de demain."
+    },
+    "sign-and-verify": {
+      "window-title": "Signer ou Vérifier le message",
+      "sign-or-verify-message": "Signer ou Vérifier le message",
+      "message": "Message",
+      "address": "Adresse",
+      "signature": "Signature",
+      "cancel": "Annuler",
+      "sign": "Signer",
+      "verify": "Vérifier",
+      "password": "Mot de passe",
+      "confirm": "Confirmer",
+      "verification-success": "Vérification réussie",
+      "verification-failure": "Échec de la vérification",
+      "address-not-found": "L'adresse fournie n'appartient pas au Wallet actuel. Veuillez vérifier votre Wallet ou attendre la fin de la synchronisation.",
+      "sign-with-magic-byte": "Le message sera signé avec les octets magiques 'Nervos Message:'",
+      "verify-tip": "Peut être vérifié par Neuron à partir de la version 0.33.1",
+      "verify-old-sign-success": "Le message a été signé par Neuron avant la version 0.33.1",
+      "input-message": "Veuillez saisir le message",
+      "input-choose-address": "Veuillez saisir ou choisir une adresse",
+      "input-password": "Veuillez saisir le mot de passe"
+    },
+    "special-assets": {
+      "title": "Actifs personnalisés",
+      "date": "Date",
+      "assets": "Actifs",
+      "type-script-tooltip": "Type Script",
+      "data-tooltip": "Données",
+      "user-defined-asset": "Actif non répertorié",
+      "user-defined-asset-tooltip": "Il s'agit d'un actif non répertorié. Neuron ne peut pas le traiter pour le moment. Veuillez utiliser un logiciel tiers pour vérifier.",
+      "locked-asset": "Verrouillé",
+      "locked-asset-tooltip": "Le paramètre de verrouillage est de {{epochs}} époques, la date de libération estimée est le {{year}}-{{month}}-{{day}} (selon la hauteur de bloc réelle en cours d'exécution, il peut y avoir des variances de temps dans le verrouillage).",
+      "withdraw-asset-tooltip": "L'heure de libération estimée est le {{year}}-{{month}}-{{day}} à {{hour}}:{{minute}} (selon la hauteur de bloc réelle en cours d'exécution).",
+      "user-defined-token-tooltip": "Migrer l'actif sUDT vers un compte d'actif sUDT",
+      "claim-asset": "Réclamation",
+      "withdraw-asset": "Retrait",
+      "view-details": "Voir les détails",
+      "release-success": "L'actif a été libéré, consultez les détails dans l'historique.",
+      "no-special-assets": "Aucun actif personnalisé",
+      "experimental": "Expérimental",
+      "unknown-asset": "Actif inconnu",
+      "transfer-nft": "Envoyer",
+      "user-defined-token": "Migrer",
+      "transfer-nft-success": "Transfert d'actifs réussi",
+      "migrate-sudt-success": "Conversion en nouveau compte d'actif sUDT réussie",
+      "send-sudt-success": "Transfert vers le compte sUDT réussi",
+      "unlock-success": "Actif réclamé, consultez l'historique des transactions pour plus de détails",
+      "withdraw-cheque-success": "Actif retiré, consultez l'historique des transactions pour plus de détails",
+      "claim-cheque-success": "Actif réclamé, consultez l'historique des transactions pour plus de détails"
+    },
+    "migrate-sudt": {
+      "title": "Migrer vers un compte d'actif sUDT",
+      "choose-title": "Mode de migration",
+      "next": "Suivant",
+      "back": "Retour",
+      "input-token": "Veuillez saisir le nom du token",
+      "input-symbol": "Veuillez saisir le symbole",
+      "input-decimal": "Veuillez saisir la décimale",
+      "turn-into-new-account": {
+        "title": "Transformez en un nouveau compte d'actif sUDT",
+        "sub-title": "Transformez l'actif sUDT en un nouveau compte sUDT, occupe au moins 142 CKBytes",
+        "cancel": "Annuler",
+        "confirm": "Confirmer"
+      },
+      "transfer-to-exist-account": {
+        "title": "Transférer vers un compte d'actif sUDT",
+        "sub-title": "Transférez tout le solde sUDT vers un compte sUDT existant, assurez-vous que le compte cible est actif"
+      },
+      "cancel": "Annuler",
+      "confirm": "Confirmer",
+      "balance": "Solde",
+      "amount": "Montant",
+      "address": "Adresse"
+    },
+    "s-udt": {
+      "edit-account-success": "Modification des informations du compte réussie",
+      "create-account-success": "Création réussie du compte d'actif",
+      "account-list": {
+        "title": "Comptes d'actifs",
+        "no-asset-accounts": "Aucun actif sUDT n'a été détecté",
+        "search": "Nom du compte, Nom du token ou Symbole",
+        "syncing": "Synchronisation en cours, les données actuelles peuvent être inexactes",
+        "send": "Envoyer",
+        "receive": "Recevoir",
+        "set-account-info": "Définir les informations du compte"
+      },
+      "create-dialog": {
+        "create-asset-account": "Créer un compte d'actif",
+        "input-account-name": "Veuillez saisir le nom du compte",
+        "select-account-type": "Sélectionner le type de compte",
+        "account-name": "Nom du compte",
+        "sudt-account": "Compte sUDT",
+        "delete-failed": "Échec de la suppression de la configuration multisig, raison de l'échec : {{reason}}",
+        "ckb-account": "Compte CKB",
+        "set-token-info": "Définir les informations du token",
+        "token-id": "Identifiant du token",
+        "token-name": "Nom du token",
+        "symbol": "Symbole",
+        "decimal": "Décimale",
+        "confirm": "Confirmer",
+        "cancel": "Annuler",
+        "next": "Suivant",
+        "back": "Retour",
+        "occupy-142-ckb": "Occupe au moins 142 CKBytes",
+        "occupy-61-ckb": "Occupe au moins 61 CKBytes",
+        "input": {
+          "account-name": "Veuillez saisir le nom du compte",
+          "token-id": "Veuillez saisir l'identifiant du token",
+          "token-name": "Veuillez saisir le nom du token",
+          "symbol": "Veuillez saisir le symbole",
+          "decimal": "Veuillez saisir la décimale"
+        },
+        "placeholder": {
+          "token-id": "L'ID du token est l'argument du script de type sUDT, qui est identique au hachage de verrouillage de l'émetteur du token."
+        }
+      },
+      "send": {
+        "title": "Envoyer",
+        "address": "Envoyer à",
+        "address-placeholder": "Veuillez entrer l'adresse",
+        "input-address": "Veuillez entrer l'adresse",
+        "input-description": "Veuillez entrer la description, facultatif",
+        "amount": "Montant",
+        "amount-placeholder": "Veuillez entrer le montant",
+        "description": "Description",
+        "description-placeholder": "Veuillez entrer la description, facultatif",
+        "submit": "Soumettre",
+        "click-to-edit": "Cliquez pour éditer",
+        "cheque-address-hint": {
+          "label": "Verrouiller temporairement 162 CKBytes",
+          "tooltip": "162 CKBytes seront temporairement verrouillés pour initialiser le transfert de token, et seront automatiquement déverrouillés après que le token ait été réclamé par le destinataire."
+        },
+        "destroy": "Détruire",
+        "destroy-ckb-desc": "Retournera tous les CKB de ce compte CKB Asset à votre adresse de change.",
+        "destroy-sudt-desc": "Retournera les CKB occupés par le compte d'actif à votre adresse de change.",
+        "extra-ckb-send-to-secp256": {
+          "label": "Envoyer 142 CKBytes supplémentaires avec {{assetName}}",
+          "tooltip": "142 CKBytes supplémentaires seront envoyés avec {{assetName}} pour détenir l'actif."
+        },
+        "extra-ckb-send-to-acp": {
+          "label": "Envoyer {{extraCKB}} CKBytes supplémentaires pour créer un compte d'actif pour le destinataire"
+        },
+        "extra-ckb-send-to-unknow": {
+          "label": "L'adresse du destinataire a un script de verrouillage inconnu, assurez-vous que le destinataire sait comment le gérer, et {{extraCKB}} CKBytes supplémentaires seront envoyés avec {{assetName}} pour détenir l'actif"
+        },
+        "select-option": "Veuillez confirmer l'option ci-dessus avant de soumettre"
+      },
+      "receive": {
+        "notation": "Accepter uniquement {{symbol}}"
+      },
+      "update-dialog": {
+        "update-asset-account": "Détails du compte",
+        "account-name": "Nom du compte",
+        "token-id": "ID du token",
+        "token-name": "Nom du token",
+        "symbol": "Symbole",
+        "decimal": "Décimal",
+        "confirm": "Confirmer",
+        "cancel": "Annuler"
+      }
+    },
+    "multisig-address": {
+      "window-title": "Adresses Multisig",
+      "search": {
+        "placeholder": "recherche par adresse multisig, alias"
+      },
+      "add": {
+        "label": "Créer"
+      },
+      "import": {
+        "label": "Importer"
+      },
+      "export": {
+        "label": "Exporter"
+      },
+      "ok": "OK",
+      "no-data": "Pas d'adresse multisig",
+      "table": {
+        "address": "Adresse du signataire",
+        "alias": "Alias",
+        "type": "Type",
+        "balance": "Solde",
+        "copy-address": "Copier l'adresse",
+        "action": "Actions",
+        "more": "Plus",
+        "sync-block": "Bloc synchronisé",
+        "actions": {
+          "info": "Info",
+          "send": "Envoyer",
+          "approve": "Approuver",
+          "delete": "Supprimer"
+        }
+      },
+      "import-dialog": {
+        "actions": {
+          "cancel": "Annuler",
+          "confirm": "Confirmer"
+        },
+        "notice": "Une seule configuration peut être importée à la fois. Si le contenu du fichier est un tableau, le premier est importé par défaut."
+      },
+      "delete-failed": "Échec de la suppression de la configuration multisig",
+      "remove-multisig-address": "Supprimer l'adresse multisig",
+      "remove-multisig-address-msg": "Êtes-vous sûr de vouloir supprimer l'adresse multisig sélectionnée?",
+      "send-ckb": {
+        "title": "Envoyer des CKB depuis une adresse multisig",
+        "detail": "Envoyer des CKB depuis une adresse multisig {{m}}-sur-{{n}} : <0></0>",
+        "balance": "Solde",
+        "address": "Adresse",
+        "amount": "Montant",
+        "send": "Envoyer",
+        "cancel": "Annuler",
+        "export": "Exporter Tx"
+      },
+      "multi-details": "Détails de l'adresse multisig",
+      "create-dialog": {
+        "title": "Créer une adresse multisig",
+        "preview-title": "L'adresse multisig a été générée",
+        "index": "Index",
+        "required": "Requis",
+        "signer-address": "Adresse du signataire",
+        "copy-address": "Copier l'adresse",
+        "placeholder": "Veuillez entrer {{type}}(1-255)",
+        "m-n": {
+          "title": "Veuillez entrer la configuration d'adresse multisig en mode m-sur-n où m clés privées parmi un total possible de n sont nécessaires pour déplacer l'actif.",
+          "m-less-equal-n": "Pour une adresse multisig m-sur-n, m ne doit pas être supérieur à n",
+          "m-n-required": "Veuillez entrer m/n",
+          "m-n-between-0-256": "m/n doit être compris entre 0 et 256"
+        },
+        "multi-address-info": {
+          "title": "Veuillez entrer les signataires pour l'adresse multisig {{m}}-sur-{{n}}",
+          "view-title": "L'adresse multisig {{m}}-sur-{{n}}",
+          "ckb-address-placeholder": "Veuillez entrer l'adresse CKB"
+        },
+        "multi-list": "Liste des signataires",
+        "actions": {
+          "cancel": "Annuler",
+          "back": "Retour",
+          "next": "Suivant",
+          "generate-address": "Générer l'adresse",
+          "confirm": "Confirmer"
+        },
+        "duplicate-address-forbid": "L'adresse ne peut pas être dupliquée"
+      },
+      "approve-dialog": {
+        "title": "Approuver avec une adresse multisig",
+        "detail": "Approuver avec une adresse multisig {{m}}-sur-{{n}} <0></0>",
+        "transaction": "Transaction",
+        "cancel": "Annuler",
+        "signAndExport": "Signer & Exporter",
+        "export": "Exporter Tx",
+        "signAndBroadcast": "Signer & Diffuser",
+        "broadcast": "Diffuser",
+        "content": "Contenu :",
+        "status": "Statut",
+        "signerApprove": "Manque d'approbation de {{m}} signataire(s), dont {{r}} de signataire(s) spécifié(s)",
+        "noRSignerApprove": "Manque d'approbation de {{m}} signataire(s)",
+        "signed": "Signé",
+        "view-concise-data": "Données concises",
+        "view-raw-data": "Données"
+      }
+    },
+    "dropdown": {
+      "placeholder": "Veuillez sélectionner..."
+    },
+    "price-switch": {
+      "price": "Prix",
+      "customPrice": "Prix personnalisé",
+      "errorTip": "Le prix ne peut pas être inférieur à {{minPrice}} shannons/KB, veuillez le saisir à nouveau",
+      "hintTip": "Le prix suggéré est de {{suggestFeeRate}} shannons/KB",
+      "priceColumn": "Prix {{priceValue}} shannons/KB | Frais {{feeValue}} CKB",
+      "fast": "Rapide",
+      "standard": "Standard",
+      "slow": "Lent",
+      "countDownTip": "Le prix se rafraîchira après {{countDown}} secondes",
+      "switchToCustomPrice": "Basculer vers un prix personnalisé",
+      "switchToPrice": "Basculer vers le prix"
+    },
+    "set-start-block-number": {
+      "title": "Définir le numéro de bloc de départ",
+      "tip": "Le numéro de bloc de départ est une configuration lorsque vous utilisez le noeud CKB en mode client léger. Vous pouvez le définir et accélérer la synchronisation.",
+      "input-place-holder": "Veuillez entrer le numéro de bloc de départ pour la synchronisation, par exemple : 10, 100, 101",
+      "locate-first-tx": "Localiser la première transaction",
+      "view-block": "Voir le bloc"
+    },
+    "main": {
+      "external-node-detected-dialog": {
+        "title": "Détection d'un noeud externe",
+        "body-tips-without-network": "\"Noeud interne\" est réservé au noeud CKB intégré, veuillez ajouter une nouvelle option réseau pour le noeud externe.",
+        "body-tips-with-network": "\"Noeud interne\" est réservé au noeud CKB intégré, veuillez sélectionner parmi les options réseau suivantes ou en ajouter une nouvelle pour le noeud externe.",
+        "add-network": "Ajouter un réseau",
+        "ignore-external-node": "Ignorer le noeud externe"
+      }
+    },
+    "cell-manage": {
+      "title": "Gestion des cellules",
+      "wallet-balance": "Solde du Wallet",
+      "table": {
+        "head": {
+          "date": "Date",
+          "type": "Type",
+          "balance": "Solde",
+          "status": "Statut",
+          "description": "Description",
+          "action": "Opération"
+        },
+        "locked": "Verrouillé",
+        "unlocked": "Déverrouillé",
+        "default-description": "Aucune"
+      },
+      "cell-detail-dialog": {
+        "title": "Détail de la cellule",
+        "capacity-used": "Capacité utilisée",
+        "data": "Données",
+        "total": "Total",
+        "used": "Utilisé"
+      },
+      "locked-reason": {
+        "multi-locktime": "La cellule est verrouillée dans le temps et vous ne pouvez pas l'utiliser avant {{time}}.",
+        "multi-locktime-reached": "Le délai de verrouillage de cette cellule a expiré et vous devez la réclamer dans les actifs personnalisés avant de l'utiliser.",
+        "cheque-acp-multisig": "Il s'agit d'une cellule {{type}} et ne prend pas en charge le déverrouillage.",
+        "NFT-SUDT-DAO": "Il s'agit d'un actif {{type}} et ne prend pas en charge le déverrouillage.",
+        "Unknown": "Il s'agit d'un actif non répertorié, veuillez vérifier et confirmer avant de procéder."
+      },
+      "cell-lock-dialog": {
+        "title": "Verrouiller la cellule",
+        "capacity": "Verrouiller la cellule sélectionnée {{capacity}} CKB",
+        "locked-cell-can-not-use": "Attention, les cellules verrouillées ne peuvent pas être utilisées"
+      },
+      "cell-unlock-dialog": {
+        "title": "Déverrouiller la cellule",
+        "capacity": "Déverrouiller la cellule sélectionnée {{capacity}} CKB"
+      },
+      "cell-consume-dialog": {
+        "title": "Consommer la cellule",
+        "warn-consume": "La consommation de la cellule ne conservera aucune donnée et utilisera tout le CKB. Veuillez vous assurer qu'aucune donnée importante ne doit être conservée."
+      },
+      "enter-password": "Entrez le mot de passe",
+      "password-placeholder": "Veuillez entrer le mot de passe du Wallet",
+      "lock": "Verrouiller",
+      "unlock": "Déverrouiller",
+      "consume": "Consommer"
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 77fe4fc8a3..44b240120b 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -405,7 +405,8 @@
         "en": "English",
         "en-US": "English(United States)",
         "zh": "中文(简体)",
-        "zh-TW": "中文(繁體)"
+        "zh-TW": "中文(繁體)",
+        "fr": "Français"
       },
       "data": {
         "ckb-node-data": "節點配置和數據",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 8d2a559241..6a5b89f526 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -404,7 +404,8 @@
         "en": "English",
         "en-US": "English(United States)",
         "zh": "中文(简体)",
-        "zh-TW": "中文(繁體)"
+        "zh-TW": "中文(繁體)",
+        "fr": "Français"
       },
       "data": {
         "ckb-node-data": "节点配置和数据",
diff --git a/packages/neuron-ui/src/tests/calendar/index.test.ts b/packages/neuron-ui/src/tests/calendar/index.test.ts
index 27792b5cbc..cf7e24dea2 100644
--- a/packages/neuron-ui/src/tests/calendar/index.test.ts
+++ b/packages/neuron-ui/src/tests/calendar/index.test.ts
@@ -105,6 +105,11 @@ describe('Get Local Month Short Names', () => {
     const names = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.']
     expect(getLocalMonthShortNames('en')).toEqual(names)
   })
+
+  it('French', () => {
+    const names = ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.']
+    expect(getLocalMonthShortNames('fr')).toEqual(names)
+  })
 })
 
 describe('Get Local Month Names', () => {
@@ -112,7 +117,6 @@ describe('Get Local Month Names', () => {
     const names = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
     expect(getLocalMonthNames('zh')).toEqual(names)
   })
-
   it('English', () => {
     const names = [
       'January',
@@ -130,6 +134,24 @@ describe('Get Local Month Names', () => {
     ]
     expect(getLocalMonthNames('en')).toEqual(names)
   })
+
+  it('French', () => {
+    const names = [
+      'janvier',
+      'février',
+      'mars',
+      'avril',
+      'mai',
+      'juin',
+      'juillet',
+      'août',
+      'septembre',
+      'octobre',
+      'novembre',
+      'décembre',
+    ]
+    expect(getLocalMonthNames('fr')).toEqual(names)
+  })
 })
 
 describe('Get Local Week Names', () => {
@@ -143,6 +165,11 @@ describe('Get Local Week Names', () => {
     expect(getLocalWeekNames('en')).toEqual(names)
   })
 
+  it('French', () => {
+    const names = ['D', 'L', 'M', 'M', 'J', 'V', 'S']
+    expect(getLocalWeekNames('fr')).toEqual(names)
+  })
+
   it('Traditional Chinese', () => {
     const names = ['日', '一', '二', '三', '四', '五', '六']
     expect(getLocalWeekNames('zh-TW')).toEqual(names)
diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts
index 95db79fe67..624cf75931 100644
--- a/packages/neuron-ui/src/utils/const.ts
+++ b/packages/neuron-ui/src/utils/const.ts
@@ -49,7 +49,7 @@ export const DEFAULT_SUDT_FIELDS = {
   CKBSymbol: 'CKB',
   CKBDecimal: '8',
 }
-export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US'] as const
+export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'fr'] as const
 
 // address property
 export const SHORT_ADDR_LENGTH = 46
diff --git a/packages/neuron-ui/src/utils/i18n.ts b/packages/neuron-ui/src/utils/i18n.ts
index 28ebef475d..e422f4364d 100644
--- a/packages/neuron-ui/src/utils/i18n.ts
+++ b/packages/neuron-ui/src/utils/i18n.ts
@@ -5,10 +5,12 @@ import { getLocale } from 'services/remote'
 import zh from 'locales/zh.json'
 import en from 'locales/en.json'
 import zhTW from 'locales/zh-tw.json'
+import fr from 'locales/fr.json'
 
 i18n.use(initReactI18next).init({
   resources: {
     en,
+    fr,
     zh,
     'zh-TW': zhTW,
   },
diff --git a/packages/neuron-wallet/src/locales/fr.ts b/packages/neuron-wallet/src/locales/fr.ts
new file mode 100644
index 0000000000..892de7cb34
--- /dev/null
+++ b/packages/neuron-wallet/src/locales/fr.ts
@@ -0,0 +1,303 @@
+export default {
+  translation: {
+    keywords: {
+      wallet: 'Wallet',
+      password: 'Mot de passe',
+      'wallet-name': 'Nom du Wallet',
+    },
+    'application-menu': {
+      neuron: {
+        about: 'À propos de {{app}}',
+        preferences: 'Préférences...',
+        'check-updates': 'Vérifier les mises à jour...',
+        quit: 'Quitter {{app}}',
+      },
+      wallet: {
+        label: 'Wallet',
+        select: 'Sélectionner un Wallet',
+        'create-new': 'Créer un nouveau Wallet',
+        import: 'Importer un Wallet',
+        backup: 'Sauvegarder le Wallet actuel',
+        'export-xpubkey': 'Exporter la clé publique étendue',
+        delete: 'Supprimer le Wallet actuel',
+        'change-password': 'Changer de mot de passe',
+        'import-mnemonic': 'Importer la graine du Wallet',
+        'import-keystore': 'Importer depuis le fichier Keystore',
+        'import-xpubkey': 'Importer la clé publique étendue',
+        'import-hardware': 'Importer un Wallet matériel',
+      },
+      edit: {
+        label: 'Édition',
+        cut: 'Couper',
+        copy: 'Copier',
+        paste: 'Coller',
+        selectall: 'Sélectionner tout',
+      },
+      tools: {
+        label: 'Outils',
+        'sign-and-verify': 'Signer/Vérifier le message',
+        'multisig-address': 'Adresses multisig',
+        'offline-sign': 'Signature hors ligne',
+        'clear-sync-data': 'Effacer toutes les données synchronisées',
+      },
+      window: {
+        label: 'Fenêtre',
+        minimize: 'Réduire',
+        close: 'Fermer la fenêtre',
+      },
+      help: {
+        label: 'Aide',
+        'nervos-website': 'Site Web de Nervos',
+        'source-code': 'Code source',
+        'report-issue': 'Signaler un problème',
+        'contact-us': 'Contactez-nous',
+        'contact-us-message':
+          '> Veuillez ajouter les informations de débogage exportées via "Menu" -> "Aide" -> "Exporter les informations de débogage".',
+        documentation: 'Documentation',
+        settings: 'Paramètres',
+        'export-debug-info': 'Exporter les informations de débogage',
+      },
+      develop: {
+        develop: 'Développer',
+        'force-reload': 'Forcer le rechargement',
+        reload: 'Recharger',
+        'toggle-dev-tools': 'Basculer les outils de développement',
+      },
+    },
+    services: {
+      transactions: 'Transactions',
+      wallets: 'Wallets',
+    },
+    messages: {
+      'failed-to-load-networks': 'Échec du chargement des réseaux.',
+      'Networks-will-be-reset': 'Les réseaux seront réinitialisés.',
+      'wallet-password-less-than-min-length':
+        'Le mot de passe doit comporter au moins {{minPasswordLength}} caractères.',
+      'wallet-password-more-than-max-length':
+        "Le mot de passe doit comporter jusqu'à {{maxPasswordLength}} caractères.",
+      'wallet-password-letter-complexity':
+        'Le mot de passe doit contenir une combinaison de lettres majuscules et minuscules, de chiffres et de caractères spéciaux.',
+      'current-wallet-not-set': "Le Wallet actuel n'est pas défini.",
+      'incorrect-password': 'Le mot de passe est incorrect',
+      'invalid-address': "L'adresse {{address}} n'est pas valide.",
+      'codehash-not-loaded': "Le codehash n'est pas chargé.",
+      'wallet-not-found': 'Le Wallet {{id}} est introuvable.',
+      'failed-to-create-mnemonic': 'Échec de la création de la mnémonique.',
+      'network-not-found': "Le réseau de l'ID {{id}} n'a pas été trouvé.",
+      'invalid-name': "Le nom {{field}} n'est pas valide.",
+      'default-network-unremovable': 'Le réseau par défaut est irréparable.',
+      'lack-of-default-network': 'Manque de réseau par défaut.',
+      'current-network-not-set': "Le RPC du noeud CKB actuel n'a pas été défini.",
+      'transaction-not-found': 'La transaction {{hash}} est introuvable.',
+      'is-required': '{{field}} est requis.',
+      'invalid-format': '{{field}} est dans un format invalide.',
+      'used-name': 'Le nom {{field}} est utilisé, veuillez en choisir un autre.',
+      'missing-required-argument': 'Argument requis manquant.',
+      'save-keystore': 'Sauvegarder le fichier Keystore.',
+      'save-extended-public-key': 'Sauvegarder la clé publique étendue.',
+      'import-extended-public-key': 'Importer la clé publique étendue.',
+      'invalid-mnemonic': "La graine du Wallet n'est pas valide, veuillez la vérifier à nouveau.",
+      'unsupported-cipher': 'Chiffrement non pris en charge.',
+      'capacity-not-enough': 'Solde insuffisant.',
+      'capacity-not-enough-for-change':
+        'Vous avez besoin de plus de capacités pour la monnaie de rendu (plus de 61 CKBytes).',
+      'capacity-not-enough-for-change-by-transfer':
+        'Vous avez besoin de plus de capacités pour la monnaie de rendu (plus de 61 CKBytes), ou cliquez sur le bouton "Max" pour envoyer tout votre solde.',
+      'live-capacity-not-enough':
+        'Solde disponible insuffisant, veuillez réessayer lorsque la dernière transaction a été confirmée.',
+      'capacity-too-small': 'Le solde de transfert minimal est de {{bytes}} CKBytes.',
+      'should-be-type-of': '{{field}} doit être de type {{type}}.',
+      'invalid-keystore': "Le fichier Keystore n'est pas valide, veuillez vérifier l'intégrité de votre fichier.",
+      'invalid-json': "Fichier JSON non valide, veuillez vérifier l'intégrité de votre fichier.",
+      'cell-is-not-yet-live': 'Veuillez attendre que la dernière transaction soit confirmée par la chaîne.',
+      'transaction-is-not-committed-yet':
+        'Impossible de trouver les cellules requises sur la chaîne, veuillez vous assurer que les transactions liées ont été confirmées.',
+      'mainnet-address-required': "{{address}} n'est pas une adresse du réseau principal.",
+      'testnet-address-required': "{{address}} n'est pas une adresse du réseau de test.",
+      'address-not-found':
+        "L'adresse donnée ne fait pas partie du Wallet actuel. Veuillez vérifier votre Wallet ou attendre la fin de la synchronisation.",
+      'target-output-not-found': "Il n'y a pas de Wallet de compte associé à cette adresse.",
+      'acp-same-account': 'Le compte de paiement et le compte de réception ne doivent pas être les mêmes.',
+      'device-sign-canceled':
+        'Vous avez annulé la demande de signature. Sinon, assurez-vous que l\'application Nervos sur votre appareil a la configuration "autoriser les données de contrat" activée',
+      'connect-device-failed': "L'appareil ne peut pas être connecté, veuillez vérifier votre connexion.",
+      'unsupported-manufacturer': 'Les appareils de {{manufacturer}} ne sont pas encore pris en charge.',
+      'wallet-not-supported-function': 'Ce Wallet ne prend pas en charge la fonction {name}.',
+      'invalid-transaction-file': 'Fichier de transaction non valide.',
+      'offline-sign-failed': 'Échec de la signature, veuillez vérifier si vous signez avec le bon Wallet.',
+      'multisig-script-prefix-error': 'La configuration multisig est erronée',
+      'multisig-config-not-exist': "La configuration multisig n'existe pas",
+      'multisig-config-exist': 'La configuration multisig existe déjà',
+      'multisig-config-address-error': "Le paramètre d'adresse de la configuration multisig est incorrect",
+      'multisig-config-need-error': 'La génération de transactions multisig nécessite une configuration multisig',
+      'transaction-no-input-parameter': "Il manque un paramètre requis à l'entrée de la cellule de requête",
+      'migrate-sudt-no-type': "La cellule de migration n'a pas de script de type",
+      'multisig-not-signed': 'Des signatures partielles manquent pour les transactions multisig',
+      'multisig-lock-hash-mismatch': "L'adresse multisig actuelle ne correspond pas à la transaction à approuver",
+      'sudt-acp-have-data': 'Le compte acp sUDT à détruire contient une certaine quantité',
+      'no-match-address-for-sign': 'Aucune adresse correspondante trouvée',
+      'target-lock-error': "Le compte d'actifs CKB ne peut être transféré qu'à l'adresse secp256k1 ou acp",
+      'no-exist-ckb-node-data':
+        "{{path}} n'a pas de configuration et de stockage de noeud CKB, appuyez sur Confirmer pour synchroniser à partir de zéro",
+      'light-client-sudt-acp-error':
+        "Le mode client léger ne prend pas en charge l'envoi d'actifs vers le compte d'actifs d'autrui",
+    },
+    messageBox: {
+      button: {
+        confirm: 'OK',
+        discard: 'Annuler',
+      },
+      'clear-sync-data': {
+        title: 'Effacer toutes les données synchronisées',
+        message:
+          'Effacer toutes les données synchronisées supprimera toutes les données locales synchronisées et resynchronisera les données sur la chaîne. La synchronisation complète peut prendre beaucoup de temps.',
+      },
+      'send-capacity': {
+        title: 'Envoyer la transaction',
+      },
+      'remove-network': {
+        title: 'Supprimer le réseau',
+        message: 'Le réseau {{name}} (adresse : {{address}}) sera supprimé.',
+        alert: "C'est le réseau actuel. En le supprimant, la connexion passera au réseau par défaut",
+      },
+      'remove-wallet': {
+        title: 'Supprimer le Wallet',
+        password: 'Mot de passe',
+      },
+      'backup-keystore': {
+        title: 'Sauvegarder le fichier Keystore',
+        password: 'Mot de passe',
+      },
+      transaction: {
+        title: 'Transaction : {{hash}}',
+      },
+      'sign-and-verify': {
+        title: 'Signer/Vérifier le message',
+      },
+      'multisig-address': {
+        title: 'Adresses multisig',
+      },
+      'ckb-dependency': {
+        title: 'Noeud CKB inclus',
+        message: 'Dépendance requise',
+        detail: `Les noeuds réseau dans Neuron dépendent de composants C++, veuillez donc installer la dernière version de Microsoft Visual C++ Redistributable pour x64 pour garantir le bon fonctionnement du logiciel.`,
+        buttons: {
+          'install-and-exit': 'Installer et quitter',
+        },
+      },
+      'acp-migration': {
+        title: "Mise à niveau du compte d'actif",
+        message: "Mise à niveau du compte d'actif",
+        detail:
+          "Récemment, notre équipe de sécurité a identifié une vulnérabilité potentielle dans le script expérimental du compte d'actif. Nous avons déployé un nouveau script de compte d'actif avec une correction sur le réseau principal, et tous les futurs comptes d'actif utiliseront la nouvelle version. Nous vous recommandons de les mettre à niveau pour utiliser le nouveau script.",
+        buttons: {
+          migrate: 'Mise à niveau sécurisée maintenant',
+          skip: 'Je connais les risques, je mettrai à niveau plus tard',
+        },
+      },
+      'acp-migration-completed': {
+        title: 'Félicitations ! Vous avez terminé la mise à niveau sécurisée.',
+        message: 'Félicitations ! Vous avez terminé la mise à niveau sécurisée.',
+        buttons: {
+          ok: 'OK',
+        },
+      },
+      'hard-fork-migrate': {
+        message:
+          "Afin de s'adapter à la dernière version de CKB, Neuron va resynchroniser les données sur la chaîne, et la synchronisation complète peut prendre un certain temps.",
+      },
+      'mail-us': {
+        message:
+          'Veuillez nous envoyer un courriel avec les informations de débogage exportées par "Menu" -> "Aide" -> "Exporter les informations de débogage".',
+        'open-client': 'Ouvrir le client de messagerie',
+        'fail-message':
+          'Impossible de lancer le client de messagerie. Veuillez copier l\'adresse e-mail, ajouter les informations de débogage exportées par "Menu" -> "Aide" -> "Exporter les informations de débogage" et nous les envoyer.',
+        'copy-mail-addr': "Copier l'adresse e-mail",
+      },
+      'migrate-failed': {
+        title: 'Échec de la migration',
+        message:
+          "Échec de la migration. Appuyez sur OK pour supprimer les anciennes données et resynchroniser à partir de zéro, ou cliquez sur Annuler pour migrer ultérieurement en relançant Neuron. Raison de l'échec de la migration : {{ reason }}",
+        buttons: {
+          ok: 'OK',
+          cancel: 'Annuler',
+        },
+      },
+    },
+    prompt: {
+      password: {
+        label: 'Entrez votre mot de passe',
+        submit: 'Soumettre',
+        cancel: 'Annuler',
+      },
+    },
+    updater: {
+      'update-not-available': "Aucune mise à jour n'est actuellement disponible.",
+    },
+    common: {
+      yes: 'Oui',
+      no: 'Non',
+      ok: 'OK',
+      cancel: 'Annuler',
+      error: 'Erreur',
+    },
+    'export-debug-info': {
+      'export-debug-info': 'Exporter les informations de débogage',
+      'debug-info-exported': 'Les informations de débogage ont été exportées vers {{ file }}',
+    },
+    about: {
+      'app-version': '{{name}} Version : {{version}}',
+      'ckb-client-version': 'Version du client CKB : {{version}}',
+      'ckb-light-client-version': 'Version légère du client CKB : {{version}}',
+    },
+    settings: {
+      title: {
+        normal: 'Paramètres',
+        mac: 'Préférences',
+      },
+    },
+    'export-transactions': {
+      'export-transactions': "Exporter l'historique des transactions",
+      'export-success': 'Les transactions ont été exportées',
+      'transactions-exported': '{{total}} enregistrements de transactions ont été exportés vers {{file}}',
+      column: {
+        time: 'Heure',
+        'block-number': 'Numéro de bloc',
+        'tx-hash': 'hash de transaction',
+        'tx-type': 'Type de transaction',
+        amount: 'Montant de CKB',
+        'udt-amount': 'Montant UDT',
+        description: 'Description',
+      },
+      'tx-type': {
+        send: 'Envoyer',
+        receive: 'Recevoir',
+        'create-asset-account': "Créer un compte d'actif {{name}}",
+        'destroy-asset-account': "Détruire le compte d'actif {{name}}",
+      },
+    },
+    'offline-signature': {
+      'export-transaction': 'Exporter la transaction au format JSON',
+      'transaction-exported': 'La transaction a été exportée vers {{filePath}}.',
+      'load-transaction': 'Charger le fichier de transaction',
+    },
+    'multisig-config': {
+      'import-config': 'Importer une configuration multisig',
+      'export-config': 'Exporter une configuration multisig',
+      'config-exported': 'Les configurations multisig ont été exportées vers {{filePath}}.',
+      'import-duplicate': 'Veuillez vérifier les configurations en double',
+      'import-result': 'Importations réussies {{success}}, échecs {{fail}}.{{failCheck}}',
+      'confirm-delete': 'Confirmer la suppression de la configuration multisig ?',
+      'approve-tx': 'Confirmer la transaction multisig',
+      'delete-actions': {
+        ok: 'Confirmer',
+        cancel: 'Annuler',
+      },
+    },
+    'open-in-explorer': {
+      title: "Voir dans l'explorateur CKB",
+      transaction: 'transaction',
+      message: "Voir {{type}} {{key}} dans l'explorateur CKB",
+    },
+  },
+}
diff --git a/packages/neuron-wallet/src/locales/i18n.ts b/packages/neuron-wallet/src/locales/i18n.ts
index a7a9a69335..882ba31cfd 100644
--- a/packages/neuron-wallet/src/locales/i18n.ts
+++ b/packages/neuron-wallet/src/locales/i18n.ts
@@ -2,10 +2,12 @@ import i18n from 'i18next'
 import zh from './zh'
 import en from './en'
 import zhTW from './zh-tw'
+import fr from './fr'
 
 i18n.init({
   resources: {
     en,
+    fr,
     zh,
     'zh-TW': zhTW,
   },
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
index 02629f021e..89f82f35d6 100644
--- a/packages/neuron-wallet/src/services/settings.ts
+++ b/packages/neuron-wallet/src/services/settings.ts
@@ -9,7 +9,7 @@ import { LIGHT_CLIENT_MAINNET, LIGHT_CLIENT_TESTNET } from '../utils/const'
 
 const { app } = env
 
-export const locales = ['zh', 'zh-TW', 'en', 'en-US'] as const
+export const locales = ['zh', 'zh-TW', 'en', 'en-US', 'fr'] as const
 export type Locale = (typeof locales)[number]
 const settingKeys = {
   ckbDataPath: 'ckbDataPath',
diff --git a/packages/neuron-wallet/tests/services/setting.test.ts b/packages/neuron-wallet/tests/services/setting.test.ts
index 7d8c55e117..96f760ddac 100644
--- a/packages/neuron-wallet/tests/services/setting.test.ts
+++ b/packages/neuron-wallet/tests/services/setting.test.ts
@@ -72,7 +72,9 @@ describe('SettingsService', () => {
     })
     it('set', () => {
       SettingsService.getInstance().locale = 'zh'
+      SettingsService.getInstance().locale = 'fr'
       expect(writeSyncMock).toBeCalledWith('locale', 'zh')
+      expect(writeSyncMock).toBeCalledWith('locale', 'fr')
       expect(updateApplicationMenuMock).toHaveBeenCalled()
     })
     it('set exception', () => {

From 3a9160936ec4ffe815837d7d68f98e42518d99ab Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:54:03 +0800
Subject: [PATCH 25/68] Update ckb client versions (#3018)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-version    | 2 +-
 compatible.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.ckb-version b/.ckb-version
index bfe1211ecc..64a30f7e97 100644
--- a/.ckb-version
+++ b/.ckb-version
@@ -1 +1 @@
-v0.112.1
+v0.113.0
diff --git a/compatible.json b/compatible.json
index 204a2ddda4..a28669ae51 100644
--- a/compatible.json
+++ b/compatible.json
@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.113",
     "0.112",
     "0.111",
     "0.110",
@@ -18,6 +19,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",
@@ -30,6 +32,7 @@
     },
     "0.110": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",
@@ -58,6 +61,7 @@
     },
     "0.112": {
       "full": [
+        "0.113",
         "0.112",
         "0.111",
         "0.110",

From d4488a19b50c97cdb577e0de15aab6a7e0b4fdba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:02:21 +0800
Subject: [PATCH 26/68] chore(deps): bump follow-redirects from 1.15.2 to
 1.15.4 (#3017)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dcadc9fc24..eaf1fa0edc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11059,9 +11059,9 @@ flow-parser@0.*:
   integrity sha512-M0SdOwD0wZHhk6K/AOaPReBnw2vB7p9KUFUFZHJRsU3ZMl/+WVrMpmb8AfEM6GXZ5mEssCx9vHugxxJg1ieoew==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 for-each@^0.3.3:
   version "0.3.3"

From b823770900e9617ed14be735eef47019a629b489 Mon Sep 17 00:00:00 2001
From: homura <homura.dev@gmail.com>
Date: Fri, 12 Jan 2024 10:12:52 +0800
Subject: [PATCH 27/68] refactor: upgrade spore sdk (#3007)

---
 packages/neuron-wallet/package.json           |   2 +-
 packages/neuron-wallet/src/services/cells.ts  |   7 +-
 .../src/services/transaction-sender.ts        |   4 +-
 yarn.lock                                     | 177 ++++--------------
 4 files changed, 39 insertions(+), 151 deletions(-)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index ff7b802bd8..45828839f7 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -53,7 +53,7 @@
     "@ckb-lumos/rpc": "0.21.1",
     "@iarna/toml": "2.2.5",
     "@ledgerhq/hw-transport-node-hid": "6.27.22",
-    "@spore-sdk/core": "0.1.0-beta.9",
+    "@spore-sdk/core": "0.1.0-beta.14",
     "archiver": "6.0.1",
     "async": "3.2.5",
     "bn.js": "4.12.0",
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index 3959c4137a..6e41ac3d11 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -32,7 +32,7 @@ import MultisigConfigModel from '../models/multisig-config'
 import MultisigOutput from '../database/chain/entities/multisig-output'
 import { bytes } from '@ckb-lumos/codec'
 import { generateRPC } from '../utils/ckb-rpc'
-import { getClusterCellById, SporeData, unpackToRawClusterData } from '@spore-sdk/core'
+import { getClusterById, SporeData, unpackToRawClusterData } from '@spore-sdk/core'
 import NetworksService from './networks'
 import { LOCKTIME_ARGS_LENGTH, MIN_CELL_CAPACITY } from '../utils/const'
 import HdPublicKeyInfo from '../database/chain/entities/hd-public-key-info'
@@ -383,10 +383,7 @@ export default class CellsService {
             return
           }
 
-          const clusterCell = await getClusterCellById(
-            clusterId,
-            assetAccountInfo.getSporeConfig(currentNetwork.remote)
-          )
+          const clusterCell = await getClusterById(clusterId, assetAccountInfo.getSporeConfig(currentNetwork.remote))
           const { name, description } = unpackToRawClusterData(clusterCell.data)
           clusterInfos[clusterId] = { name, description }
         } catch {
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 9820c9c0e7..7c0195b5fe 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -43,7 +43,7 @@ import NetworksService from './networks'
 import { generateRPC } from '../utils/ckb-rpc'
 import CellsService from './cells'
 import hd from '@ckb-lumos/hd'
-import { getClusterCellByOutPoint } from '@spore-sdk/core'
+import { getClusterByOutPoint } from '@spore-sdk/core'
 import CellDep, { DepType } from '../models/chain/cell-dep'
 import { dao } from '@ckb-lumos/common-scripts'
 
@@ -606,7 +606,7 @@ export default class TransactionSender {
 
     // https://github.com/sporeprotocol/spore-sdk/blob/05f2cbe1c03d03e334ebd3b440b5b3b20ec67da7/packages/core/src/api/joints/spore.ts#L154-L158
     const clusterDep = await (async () => {
-      const clusterCell = await getClusterCellByOutPoint(outPoint, assetAccountInfo.getSporeConfig(rpcUrl)).then(
+      const clusterCell = await getClusterByOutPoint(outPoint, assetAccountInfo.getSporeConfig(rpcUrl)).then(
         _ => _,
         () => undefined
       )
diff --git a/yarn.lock b/yarn.lock
index eaf1fa0edc..365ad2a9db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2110,21 +2110,7 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@ckb-lumos/base@0.20.0", "@ckb-lumos/base@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.20.0.tgz#d18164ec60eae3f3a97a4bc48e1399e6e0c190d9"
-  integrity sha512-Zz4+iO7d7dJBMtn/7icD9uuld2fBUGI+RqoBumXW8mem3xDw41Vb4vL0knxVdOFF1EkuSX5yZ796f83h8Q/6zw==
-  dependencies:
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/codec" "0.20.0"
-    "@ckb-lumos/toolkit" "0.20.0"
-    "@types/blake2b" "^2.1.0"
-    "@types/lodash.isequal" "^4.5.5"
-    blake2b "^2.1.3"
-    js-xxhash "^1.0.4"
-    lodash.isequal "^4.5.0"
-
-"@ckb-lumos/base@0.21.1":
+"@ckb-lumos/base@0.21.1", "@ckb-lumos/base@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/base/-/base-0.21.1.tgz#1faf7909b5a68a124256d937cfb0fa03bb6b5457"
   integrity sha512-7O+jBl7pqMsRbYTMNnbpamgaQzvaLZq+ftMtnKZ3A+Zbs6hZcGbz/6nfbRZnyJitPXQHRPT5KAQz6g+TiYqJGg==
@@ -2138,32 +2124,13 @@
     js-xxhash "^1.0.4"
     lodash.isequal "^4.5.0"
 
-"@ckb-lumos/bi@0.20.0", "@ckb-lumos/bi@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.20.0.tgz#4fa3beca641737b7b83a64d56668067e38cc288d"
-  integrity sha512-cJtv1NnvC11oQbDC8f3jIGTYdyEs2m8GvSrZgGL5KjBoaHTWghH8v6Z2XkwFgHmmCwfX5KrdXekrsOWrcIXyqw==
-  dependencies:
-    jsbi "^4.1.0"
-
-"@ckb-lumos/bi@0.21.1":
+"@ckb-lumos/bi@0.21.1", "@ckb-lumos/bi@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/bi/-/bi-0.21.1.tgz#dfaa0968a9ffd990c1c4fcfc0711f20f09eb0485"
   integrity sha512-6q8uesvu3DAM7GReei9H5seino4tnakTeg8uXtZBPDC6rboMohLCPQvEwhl1iHmsybXvBYVQt4Te1BPPZtuaRw==
   dependencies:
     jsbi "^4.1.0"
 
-"@ckb-lumos/ckb-indexer@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.20.0.tgz#c6792821e3b903f998a891b14892ff67229d3957"
-  integrity sha512-bw5HiuAleTa9D4l3xW+0+kYh49CH3bjRNPHxv/ySVy1TxTAYEJA6qjcIOE81T8U6qSnUxY1KKiAjk2bO+mo05w==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/rpc" "0.20.0"
-    "@ckb-lumos/toolkit" "0.20.0"
-    cross-fetch "^3.1.5"
-    events "^3.3.0"
-
 "@ckb-lumos/ckb-indexer@0.21.1":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/ckb-indexer/-/ckb-indexer-0.21.1.tgz#a0e0ac3261c98181dc8c72e9e726030bb210779d"
@@ -2177,35 +2144,14 @@
     cross-fetch "^3.1.5"
     events "^3.3.0"
 
-"@ckb-lumos/codec@0.20.0", "@ckb-lumos/codec@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.20.0.tgz#bb07707c5976b3b706b78f253e680cdc431ca898"
-  integrity sha512-NHBPIaiNYz5yX0RGSM0Qz1effLnVTt0wJHPfLVAkuzNRBg5/xRZySjYOemOsogbX1t4s3Yk7N0Q17tr02AUh3A==
-  dependencies:
-    "@ckb-lumos/bi" "0.20.0"
-
-"@ckb-lumos/codec@0.21.1":
+"@ckb-lumos/codec@0.21.1", "@ckb-lumos/codec@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/codec/-/codec-0.21.1.tgz#160f21efa0cded6ea461eb6476f9af6010b682e0"
   integrity sha512-z6IUUxVZrx663iC7VM9CmaQZL8jsdM3ybgz0UCS24JgBXTNec+Uz0/Zrl7yeH6fBpVls44C2wObcHKigKaNVAA==
   dependencies:
     "@ckb-lumos/bi" "0.21.1"
 
-"@ckb-lumos/common-scripts@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.20.0.tgz#7f95fb91d3c275ff557197269225a15a634811b6"
-  integrity sha512-GSCayhyt+G0k9fNGK3bjVif2PDWbo47ovUEM0CiRuG0YrhvBYbuq69mpQ3nKezI1IKI3UZyYOax7SqhYBCJ5VQ==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/codec" "0.20.0"
-    "@ckb-lumos/config-manager" "0.20.0"
-    "@ckb-lumos/helpers" "0.20.0"
-    "@ckb-lumos/rpc" "0.20.0"
-    "@ckb-lumos/toolkit" "0.20.0"
-    immutable "^4.0.0-rc.12"
-
-"@ckb-lumos/common-scripts@0.21.1":
+"@ckb-lumos/common-scripts@0.21.1", "@ckb-lumos/common-scripts@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/common-scripts/-/common-scripts-0.21.1.tgz#64776b5ce55d8c66898a3ab592c7f77fe13d865e"
   integrity sha512-EfZQ9wdxPmEsxVVwtBjhpZVKbYCm1FJkMt59ABsIO1Ub7yi0qap7AQl0MMbuLwWIGKwS2w0U3wx/oJPm7z1RXg==
@@ -2219,18 +2165,7 @@
     "@ckb-lumos/toolkit" "0.21.1"
     immutable "^4.3.0"
 
-"@ckb-lumos/config-manager@0.20.0", "@ckb-lumos/config-manager@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.20.0.tgz#f24946971005f62df62e22c3306947b5e820c181"
-  integrity sha512-YNhowInBGuOVMRBuhDWznhcB+83vLzYSL6HAlGCBbm2yT7lDmIrrVWh731hISmuaXeMt4IFupLfGXxpelB6zCA==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/codec" "0.20.0"
-    "@types/deep-freeze-strict" "^1.1.0"
-    deep-freeze-strict "^1.1.1"
-
-"@ckb-lumos/config-manager@0.21.1":
+"@ckb-lumos/config-manager@0.21.1", "@ckb-lumos/config-manager@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/config-manager/-/config-manager-0.21.1.tgz#857050ebf2ca38096d8fae26b6a8927164798ca3"
   integrity sha512-BmrNqYyaksdCKHWagyC8+R8GUxhIO+sOM5S925jlkpjju2sUbH0Id2/zmdb7I9KxdKnbx3WsR+hqy7/bYqw1lA==
@@ -2241,19 +2176,6 @@
     "@types/deep-freeze-strict" "^1.1.0"
     deep-freeze-strict "^1.1.1"
 
-"@ckb-lumos/hd@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.20.0.tgz#4b51fb881313ca193a876ae93257f2d5a13df46c"
-  integrity sha512-vPzMFZwYpuOVEiQ8WeY6+TVGy0Hcdau7okbMX6mks87Kt1f8qEyW5uAP8xFWA0UmsOGucdJKirjRfSvsAPzbIw==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    bn.js "^5.1.3"
-    elliptic "^6.5.4"
-    scrypt-js "^3.0.1"
-    sha3 "^2.1.3"
-    uuid "^8.3.0"
-
 "@ckb-lumos/hd@0.21.1":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/hd/-/hd-0.21.1.tgz#406026ac2b570f72b4407149cb941d09bb8a0ab6"
@@ -2267,18 +2189,6 @@
     sha3 "^2.1.3"
     uuid "^8.3.0"
 
-"@ckb-lumos/helpers@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.20.0.tgz#bc0555aeaba146ce90726ac87acad7e2200112c7"
-  integrity sha512-UWxiJSljZcN1zH6Blv5HyjNGgA9VSXyXFh8VSYD7W1xEeHYK05LP00rRWtEr8Z+KSfuuZ0ASg2sJofBDv/UZ9w==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/config-manager" "0.20.0"
-    "@ckb-lumos/toolkit" "0.20.0"
-    bech32 "^2.0.0"
-    immutable "^4.0.0-rc.12"
-
 "@ckb-lumos/helpers@0.21.1":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/helpers/-/helpers-0.21.1.tgz#fffd455071f51556b2cd2539a255b3759893da08"
@@ -2292,33 +2202,22 @@
     bech32 "^2.0.0"
     immutable "^4.3.0"
 
-"@ckb-lumos/lumos@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/lumos/-/lumos-0.20.0.tgz#47cd173affa81051f8a8fa60c91c366001d82d6c"
-  integrity sha512-LIKf1tDNk0HkK3DQ+BV4dmj/B7nfkbVXlPbzqxwLRaqHTbAArXs8g3JXGfmjZIgpoU6sfXdArO1jVpGRN1xnYg==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@ckb-lumos/ckb-indexer" "0.20.0"
-    "@ckb-lumos/common-scripts" "0.20.0"
-    "@ckb-lumos/config-manager" "0.20.0"
-    "@ckb-lumos/hd" "0.20.0"
-    "@ckb-lumos/helpers" "0.20.0"
-    "@ckb-lumos/rpc" "0.20.0"
-    "@ckb-lumos/toolkit" "0.20.0"
-
-"@ckb-lumos/rpc@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.20.0.tgz#7da342c6db0403ecf654c0281e004653c1220dc0"
-  integrity sha512-vAH/rXMnKYcyKVW8/vg5EvY9roW46FlDod/efLGN5FQyROn0O5Y9PTO/7bs4U1KyPeceHQpRW0ZAQ/KEHBWEzA==
-  dependencies:
-    "@ckb-lumos/base" "0.20.0"
-    "@ckb-lumos/bi" "0.20.0"
-    "@vespaiach/axios-fetch-adapter" "^0.3.1"
-    axios "0.27.2"
-    tslib "2.3.1"
+"@ckb-lumos/lumos@^0.21.0-next.0":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@ckb-lumos/lumos/-/lumos-0.21.1.tgz#ff5a9a10859b305530026668bd14cdc12e5e7532"
+  integrity sha512-a5n8xaIUvmaPsw2fBki8Jamy6/6uQnLWDZM9SQX29cZ1YVoAk/slnBmEbCIGXmxDhcuAlLkTeJaiLDKEGrZ6pg==
+  dependencies:
+    "@ckb-lumos/base" "0.21.1"
+    "@ckb-lumos/bi" "0.21.1"
+    "@ckb-lumos/ckb-indexer" "0.21.1"
+    "@ckb-lumos/common-scripts" "0.21.1"
+    "@ckb-lumos/config-manager" "0.21.1"
+    "@ckb-lumos/hd" "0.21.1"
+    "@ckb-lumos/helpers" "0.21.1"
+    "@ckb-lumos/rpc" "0.21.1"
+    "@ckb-lumos/toolkit" "0.21.1"
 
-"@ckb-lumos/rpc@0.21.1":
+"@ckb-lumos/rpc@0.21.1", "@ckb-lumos/rpc@^0.21.0-next.0":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/rpc/-/rpc-0.21.1.tgz#f6a6b3ed6d76adfb84c148e4b4acadb7fbaa7d7a"
   integrity sha512-gZWXYCyQ98s84Pb+buOiYL3HOIxQPLHQdCyo96GFerNw9lB1XsbaGWzfHPYpZvOQqYtnJ1GUfTkQkADrQ7hmew==
@@ -2328,11 +2227,6 @@
     abort-controller "^3.0.0"
     cross-fetch "^3.1.5"
 
-"@ckb-lumos/toolkit@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.20.0.tgz#8f71043324e50c8a3e94c65414325482d874cfca"
-  integrity sha512-nLNXRPG20NqUdXwHAnKwr0T7nZyDrf4fGwIrsxo+7ffqWeg9wNEhZoqTBJLgxEpoe0I+WHRLwYLiwUbkkqR1SQ==
-
 "@ckb-lumos/toolkit@0.21.1":
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/@ckb-lumos/toolkit/-/toolkit-0.21.1.tgz#bcf4bf05615375087e3dd02fb087b797a8c67f37"
@@ -4302,16 +4196,18 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@spore-sdk/core@0.1.0-beta.9":
-  version "0.1.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@spore-sdk/core/-/core-0.1.0-beta.9.tgz#0ec68155367f72c5dcd40de7dcdbc12029a69e5d"
-  integrity sha512-Bku2Wrya1bFBAvBhWnzCnHMrZF1y4qWKES27dKYVOIZghBPK5WAYU2fDGWRCuU8YhueUOdqeUnkbVxc0mgyfuA==
-  dependencies:
-    "@ckb-lumos/base" "^0.20.0"
-    "@ckb-lumos/bi" "^0.20.0"
-    "@ckb-lumos/codec" "^0.20.0"
-    "@ckb-lumos/config-manager" "^0.20.0"
-    "@ckb-lumos/lumos" "^0.20.0"
+"@spore-sdk/core@0.1.0-beta.14":
+  version "0.1.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@spore-sdk/core/-/core-0.1.0-beta.14.tgz#1b7823e27180f7031fd12f641bbabcf52f78b3e3"
+  integrity sha512-pwD20Ft134aTUzJ3xZDEGtSNqJfuO5CoUGKqIbd/o+oQp1a7UpwdNKiqYxUKUBWEBF/JyBPPD2qvoBID/PycRw==
+  dependencies:
+    "@ckb-lumos/base" "^0.21.0-next.0"
+    "@ckb-lumos/bi" "^0.21.0-next.0"
+    "@ckb-lumos/codec" "^0.21.0-next.0"
+    "@ckb-lumos/common-scripts" "^0.21.0-next.0"
+    "@ckb-lumos/config-manager" "^0.21.0-next.0"
+    "@ckb-lumos/lumos" "^0.21.0-next.0"
+    "@ckb-lumos/rpc" "^0.21.0-next.0"
     lodash "^4.17.21"
     whatwg-mimetype "^3.0.0"
 
@@ -6318,11 +6214,6 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vespaiach/axios-fetch-adapter@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz#b0c08167bec9cc558f578a1b9ccff52ead1cf1cb"
-  integrity sha512-+1F52VWXmQHSRFSv4/H0wtnxfvjRMPK5531e880MIjypPdUSX6QZuoDgEVeCE1vjhzDdxCVX7rOqkub7StEUwQ==
-
 "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
   version "1.11.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
@@ -7268,7 +7159,7 @@ axios@0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@0.27.2, axios@^0.27.2:
+axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
   integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
@@ -12243,7 +12134,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
   integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
 
-immutable@^4.0.0-rc.12, immutable@^4.3.0:
+immutable@^4.3.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
   integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==

From 4907867165926ada3240b390e27c808c1103324b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 12 Jan 2024 08:22:46 +0000
Subject: [PATCH 28/68] chore: Remove `address` field from
 indexer-tx-hash-cache table (#3011)

---
 .../sync/indexer-cache-service.ts               |  4 +---
 .../chain/entities/indexer-tx-hash-cache.ts     | 10 +---------
 ...1704357651876-RemoveAddressInIndexerCache.ts | 17 +++++++++++++++++
 .../src/database/chain/ormconfig.ts             |  2 ++
 .../block-sync-renderer/synchronizer.test.ts    |  2 --
 5 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1704357651876-RemoveAddressInIndexerCache.ts

diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
index 4775f70a67..b58c3d1555 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
@@ -219,13 +219,12 @@ export default class IndexerCacheService {
         continue
       }
 
-      for (const { lockHash, address } of mappings) {
+      for (const { lockHash } of mappings) {
         indexerCaches.push(
           IndexerTxHashCache.fromObject({
             txHash: transaction.hash!,
             blockNumber: parseInt(transaction.blockNumber!),
             lockHash,
-            address,
             walletId: this.walletId,
           })
         )
@@ -267,7 +266,6 @@ export default class IndexerCacheService {
         txHash: v.txHash,
         blockNumber: parseInt(v.blockNumber!),
         lockHash: v.lockHash,
-        address: v.address,
         walletId: v.walletId,
       })
     )
diff --git a/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts b/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
index a2b3ce1530..57f998303b 100644
--- a/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/indexer-tx-hash-cache.ts
@@ -19,13 +19,6 @@ export default class IndexerTxHashCache extends BaseEntity {
   @Index()
   lockHash!: string
 
-  @Column({
-    type: 'character',
-    length: 32,
-  })
-  @Index()
-  address!: string
-
   @Column({
     type: 'character',
     length: 32,
@@ -54,12 +47,11 @@ export default class IndexerTxHashCache extends BaseEntity {
   })
   updatedAt!: Date
 
-  static fromObject(obj: { txHash: string; blockNumber: number; lockHash: string; address: string; walletId: string }) {
+  static fromObject(obj: { txHash: string; blockNumber: number; lockHash: string; walletId: string }) {
     const result = new IndexerTxHashCache()
     result.txHash = obj.txHash
     result.blockNumber = obj.blockNumber
     result.lockHash = obj.lockHash
-    result.address = obj.address
     result.walletId = obj.walletId
     result.isProcessed = false
     return result
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1704357651876-RemoveAddressInIndexerCache.ts b/packages/neuron-wallet/src/database/chain/migrations/1704357651876-RemoveAddressInIndexerCache.ts
new file mode 100644
index 0000000000..b6b0dba18c
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1704357651876-RemoveAddressInIndexerCache.ts
@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+
+export class RemoveAddressInIndexerCache1704357651876 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.dropColumn('indexer_tx_hash_cache', 'address')
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.addColumn('indexer_tx_hash_cache', new TableColumn({
+        name: 'address',
+        type: 'character(32)',
+        isNullable: false,
+      }))
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index f7667901a4..9a90ea6be6 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -59,6 +59,7 @@ import { TxLockAddArgs1694746034975 } from './migrations/1694746034975-TxLockAdd
 import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234043431-IndexerTxHashCacheRemoveField'
 import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
 import { RenameSyncProgress1702781527414 } from './migrations/1702781527414-RenameSyncProgress'
+import { RemoveAddressInIndexerCache1704357651876 } from './migrations/1704357651876-RemoveAddressInIndexerCache'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
@@ -134,6 +135,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       IndexerTxHashCacheRemoveField1701234043431,
       CreateCellLocalInfo1701234043432,
       RenameSyncProgress1702781527414,
+      RemoveAddressInIndexerCache1704357651876,
     ],
     logger: 'simple-console',
     logging,
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
index e3b610763c..95df115186 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/synchronizer.test.ts
@@ -156,7 +156,6 @@ describe('unit tests for IndexerConnector', () => {
                 txHash: 'hash1',
                 blockNumber: 10,
                 lockHash: script.computeHash(),
-                address,
                 walletId,
               }),
             ]
@@ -165,7 +164,6 @@ describe('unit tests for IndexerConnector', () => {
                 txHash: 'hash2',
                 blockNumber: 2,
                 lockHash: script.computeHash(),
-                address,
                 walletId,
               }),
             ]

From 27f2a370cd0d99a99d2bf635624f283c9a420d66 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:26:07 +0900
Subject: [PATCH 29/68] Update ckb client versions (#3027)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-light-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ckb-light-version b/.ckb-light-version
index f54b243046..03f2afa1b4 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1 +1 @@
-v0.3.4
+v0.3.5

From 7fe4b4d1610cc34fbdf2af3810d450d0fba2d6ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Wed, 17 Jan 2024 02:15:56 +0000
Subject: [PATCH 30/68] fix: Remove walletId for `get-multisig-config` API
 (#3010)

---
 .../src/components/MultisigAddress/hooks.ts      |  4 ++--
 .../src/components/MultisigAddress/index.tsx     |  9 ++++++---
 .../neuron-ui/src/services/remote/multisig.ts    |  2 +-
 packages/neuron-wallet/src/controllers/api.ts    |  4 ++--
 .../neuron-wallet/src/controllers/multisig.ts    |  4 ++--
 packages/neuron-wallet/src/services/multisig.ts  | 16 ++--------------
 .../neuron-wallet/src/services/sync-progress.ts  |  4 ++--
 .../tests/controllers/multisig.test.ts           |  4 ++--
 .../tests/services/multisig.test.ts              | 13 +++++--------
 9 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
index c2e0613d4b..a672164efd 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
+++ b/packages/neuron-ui/src/components/MultisigAddress/hooks.ts
@@ -73,12 +73,12 @@ export const useConfigManage = ({ walletId, isMainnet }: { walletId: string; isM
     [walletId, setEntities]
   )
   useEffect(() => {
-    getMultisigConfig(walletId).then(res => {
+    getMultisigConfig().then(res => {
       if (isSuccessResponse(res) && res.result) {
         setEntities(res.result)
       }
     })
-  }, [setEntities, walletId])
+  }, [setEntities])
   const updateConfig = useCallback(
     (id: number) => (e: React.SyntheticEvent<unknown>) => {
       const { value } = e.target as HTMLInputElement
diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index fdfd91c33a..d6d38e702f 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -28,10 +28,12 @@ import { ReactComponent as Edit } from 'widgets/Icons/Edit.svg'
 import { Download, Search } from 'widgets/Icons/icon'
 import { HIDE_BALANCE, NetworkType } from 'utils/const'
 import { onEnter } from 'utils/inputDevice'
+import getMultisigSignStatus from 'utils/getMultisigSignStatus'
 import { useSearch, useConfigManage, useExportConfig, useActions, useSubscription } from './hooks'
 
 import styles from './multisigAddress.module.scss'
 
+const ApproveKey = 'approve'
 const tableActions = [
   {
     key: 'info',
@@ -46,7 +48,7 @@ const tableActions = [
     icon: <Transfer />,
   },
   {
-    key: 'approve',
+    key: ApproveKey,
     icon: <Confirm />,
   },
 ]
@@ -56,7 +58,7 @@ const MultisigAddress = () => {
   useOnLocaleChange(i18n)
   useExitOnWalletChange()
   const {
-    wallet: { id: walletId },
+    wallet: { id: walletId, addresses },
     chain: { networkID },
     settings: { networks = [] },
   } = useGlobalState()
@@ -281,6 +283,7 @@ const MultisigAddress = () => {
                   dataIndex: 'action',
                   align: 'left',
                   render(_, __, item) {
+                    const { canSign } = getMultisigSignStatus({ multisigConfig: item, addresses })
                     return (
                       <div className={styles.action}>
                         <Tooltip
@@ -296,7 +299,7 @@ const MultisigAddress = () => {
                                   key={key}
                                   data-key={key}
                                   onClick={onClickItem(item)}
-                                  disabled={disabled}
+                                  disabled={key === ApproveKey ? !canSign || disabled : disabled}
                                 >
                                   {icon}
                                   <span>{t(label)}</span>
diff --git a/packages/neuron-ui/src/services/remote/multisig.ts b/packages/neuron-ui/src/services/remote/multisig.ts
index 79332443d4..5b5ce1579a 100644
--- a/packages/neuron-ui/src/services/remote/multisig.ts
+++ b/packages/neuron-ui/src/services/remote/multisig.ts
@@ -29,7 +29,7 @@ export type MultisigConfig = MultisigEntity & {
 }
 
 export const saveMultisigConfig = remoteApi<PartialSome<MultisigEntity, 'id'>, MultisigEntity>('save-multisig-config')
-export const getMultisigConfig = remoteApi<string, MultisigEntity[]>('get-multisig-config')
+export const getMultisigConfig = remoteApi<void, MultisigEntity[]>('get-multisig-config')
 export const importMultisigConfig = remoteApi<string, MultisigConfig[]>('import-multisig-config')
 export const exportMultisigConfig = remoteApi<MultisigConfig[]>('export-multisig-config')
 export const updateMultisigConfig = remoteApi<RequiredSome<Partial<MultisigEntity>, 'id'>, MultisigEntity>(
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 0d92bb8294..a9aa17f3a9 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -796,8 +796,8 @@ export default class ApiController {
       return this.#multisigController.deleteConfig(params)
     })
 
-    handle('get-multisig-config', async (_, walletId: string) => {
-      return this.#multisigController.getConfig(walletId)
+    handle('get-multisig-config', async () => {
+      return this.#multisigController.getConfig()
     })
 
     handle('import-multisig-config', async (_, walletId: string) => {
diff --git a/packages/neuron-wallet/src/controllers/multisig.ts b/packages/neuron-wallet/src/controllers/multisig.ts
index f77f4b52fc..ea41a69bb1 100644
--- a/packages/neuron-wallet/src/controllers/multisig.ts
+++ b/packages/neuron-wallet/src/controllers/multisig.ts
@@ -79,8 +79,8 @@ export default class MultisigController {
     }
   }
 
-  async getConfig(walletId: string) {
-    const result = await this.#multisigService.getMultisigConfig(walletId)
+  async getConfig() {
+    const result = await this.#multisigService.getMultisigConfig()
     return {
       status: ResponseCode.Success,
       result,
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index d26b678b17..9c28e92bba 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -11,7 +11,6 @@ import NetworksService from './networks'
 import Multisig from '../models/multisig'
 import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
 import { NetworkType } from '../models/network'
-import WalletService from './wallets'
 import logger from '../utils/logger'
 
 const max64Int = '0x' + 'f'.repeat(16)
@@ -21,7 +20,6 @@ export default class MultisigService {
       .getRepository(MultisigConfig)
       .createQueryBuilder()
       .where({
-        walletId: multisigConfig.walletId,
         r: multisigConfig.r,
         m: multisigConfig.m,
         n: multisigConfig.n,
@@ -69,13 +67,10 @@ export default class MultisigService {
     return { ...result, ...params }
   }
 
-  async getMultisigConfig(walletId: string) {
+  async getMultisigConfig() {
     const result = await getConnection()
       .getRepository(MultisigConfig)
       .createQueryBuilder()
-      .where({
-        walletId,
-      })
       .orderBy('id', 'DESC')
       .getMany()
     return result
@@ -340,14 +335,7 @@ export default class MultisigService {
   }
 
   static async getMultisigConfigForLight() {
-    const currentWallet = WalletService.getInstance().getCurrent()
-    const multisigConfigs = await getConnection()
-      .getRepository(MultisigConfig)
-      .createQueryBuilder()
-      .where({
-        walletId: currentWallet?.id,
-      })
-      .getMany()
+    const multisigConfigs = await getConnection().getRepository(MultisigConfig).createQueryBuilder().getMany()
     return multisigConfigs.map(v => ({
       walletId: v.walletId,
       script: Multisig.getMultisigScript(v.blake160s, v.r, v.m, v.n),
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 2d42843bab..7bef4e3fb3 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -27,13 +27,13 @@ export default class SyncProgressService {
       .createQueryBuilder()
       .update(SyncProgress)
       .set({ delete: true })
-      .where({ walletId: Not(In(existWalletIds)) })
+      .where({ walletId: Not(In(existWalletIds)), addressType: SyncAddressType.Default })
       .execute()
     await getConnection()
       .createQueryBuilder()
       .update(SyncProgress)
       .set({ delete: false })
-      .where({ walletId: In(existWalletIds) })
+      .where({ walletId: In(existWalletIds), addressType: SyncAddressType.Default })
       .execute()
   }
 
diff --git a/packages/neuron-wallet/tests/controllers/multisig.test.ts b/packages/neuron-wallet/tests/controllers/multisig.test.ts
index cd8eedc507..f502c461d5 100644
--- a/packages/neuron-wallet/tests/controllers/multisig.test.ts
+++ b/packages/neuron-wallet/tests/controllers/multisig.test.ts
@@ -160,8 +160,8 @@ describe('test for multisig controller', () => {
   })
 
   it('get config', async () => {
-    await multisigController.getConfig('abcd')
-    expect(MultiSigServiceMock.prototype.getMultisigConfig).toHaveBeenCalledWith('abcd')
+    await multisigController.getConfig()
+    expect(MultiSigServiceMock.prototype.getMultisigConfig).toHaveBeenCalledWith()
   })
 
   describe('import config', () => {
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index 67c459c820..a661e72b56 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -87,8 +87,10 @@ describe('multisig service', () => {
       await expect(multisigService.saveMultisigConfig(defaultMultisigConfig)).rejects.toThrow()
     })
     it('save success', async () => {
-      defaultMultisigConfig.walletId = 'walletId1'
-      const res = await multisigService.saveMultisigConfig(defaultMultisigConfig)
+      const anotherConfig = MultisigConfig.fromModel(multisigConfigModel)
+      anotherConfig.lastestBlockNumber = '0x0'
+      anotherConfig.r = 2
+      const res = await multisigService.saveMultisigConfig(anotherConfig)
       const count = await getConnection()
         .getRepository(MultisigConfig)
         .createQueryBuilder()
@@ -97,7 +99,6 @@ describe('multisig service', () => {
         })
         .getCount()
       expect(count).toBe(1)
-      defaultMultisigConfig.walletId = 'walletId'
     })
   })
 
@@ -127,12 +128,8 @@ describe('multisig service', () => {
   })
 
   describe('test get config', () => {
-    it('no config', async () => {
-      const configs = await multisigService.getMultisigConfig('noconfigwallet')
-      expect(configs).toHaveLength(0)
-    })
     it('has config wallet', async () => {
-      const configs = await multisigService.getMultisigConfig(multisigConfigModel.walletId)
+      const configs = await multisigService.getMultisigConfig()
       expect(configs).toHaveLength(1)
     })
   })

From 9a875f24155d65a41e1d76b984c963c5ccd93dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Wed, 17 Jan 2024 04:17:19 +0000
Subject: [PATCH 31/68] fix: Disable unlock when there is no ckb. (#3020)

---
 .../src/components/NervosDAO/index.tsx        |  1 +
 .../NervosDAORecord/daoRecordRow.module.scss  |  5 +++
 .../src/components/NervosDAORecord/index.tsx  | 41 +++++++++++++++----
 packages/neuron-ui/src/locales/en.json        |  3 +-
 packages/neuron-ui/src/locales/fr.json        |  3 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  3 +-
 packages/neuron-ui/src/locales/zh.json        |  3 +-
 .../src/controllers/app/index.ts              |  2 +
 8 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index 0246117032..24fcef51da 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -179,6 +179,7 @@ const NervosDAO = () => {
                 genesisBlockTimestamp,
                 connectionStatus,
                 isPrivacyMode,
+                hasCkbBalance: +wallet.balance > 0,
               }
               return <DAORecord key={key} {...props} />
             })}
diff --git a/packages/neuron-ui/src/components/NervosDAORecord/daoRecordRow.module.scss b/packages/neuron-ui/src/components/NervosDAORecord/daoRecordRow.module.scss
index a8ae72a98c..c533d52c3f 100644
--- a/packages/neuron-ui/src/components/NervosDAORecord/daoRecordRow.module.scss
+++ b/packages/neuron-ui/src/components/NervosDAORecord/daoRecordRow.module.scss
@@ -249,5 +249,10 @@
       line-height: 56px;
       padding: 0;
     }
+
+    .tip {
+      width: 220px;
+      white-space: normal;
+    }
   }
 }
diff --git a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
index 2dc5dca037..36256afcdb 100644
--- a/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAORecord/index.tsx
@@ -19,6 +19,7 @@ import { Clock } from 'widgets/Icons/icon'
 import { Link } from 'react-router-dom'
 import { HIDE_BALANCE } from 'utils/const'
 
+import Tooltip from 'widgets/Tooltip'
 import styles from './daoRecordRow.module.scss'
 import hooks from './hooks'
 
@@ -42,6 +43,7 @@ export interface DAORecordProps extends State.NervosDAORecord {
   tipBlockTimestamp: number // tip block timestamp, used to calculate apc, dovetails with current epoch
   genesisBlockTimestamp: number | undefined // genesis block timestamp, used to calculate apc
   isPrivacyMode?: boolean
+  hasCkbBalance?: boolean
 }
 
 export const DAORecord = ({
@@ -62,6 +64,7 @@ export const DAORecord = ({
   withdrawInfo,
   unlockInfo,
   isPrivacyMode,
+  hasCkbBalance,
 }: DAORecordProps) => {
   const [t] = useTranslation()
   const [withdrawEpoch, setWithdrawEpoch] = useState('')
@@ -143,8 +146,11 @@ export const DAORecord = ({
   const compensatedPeriod =
     withdrawInfo?.timestamp && depositInfo?.timestamp ? +withdrawInfo.timestamp - +depositInfo.timestamp : undefined
 
+  const isWithdrawnDisabled = CellStatus.Deposited === cellStatus && !hasCkbBalance
   const isActionAvailable =
-    connectionStatus === 'online' && [CellStatus.Deposited, CellStatus.Unlockable].includes(cellStatus)
+    connectionStatus === 'online' &&
+    [CellStatus.Deposited, CellStatus.Unlockable].includes(cellStatus) &&
+    !isWithdrawnDisabled
 
   const depositOutPointKey = depositOutPoint
     ? `${depositOutPoint.txHash}-${depositOutPoint.index}`
@@ -277,14 +283,31 @@ export const DAORecord = ({
           </div>
 
           <div className={styles.action}>
-            <Button
-              type="primary"
-              data-tx-hash={txHash}
-              data-index={index}
-              onClick={onClick}
-              disabled={!isActionAvailable}
-              label={t(`nervos-dao.deposit-record.${isWithdrawn ? 'unlock' : 'withdraw'}-action-label`)}
-            />
+            {isWithdrawnDisabled ? (
+              <Tooltip
+                tip={<div>{t('nervos-dao.deposit-record.insufficient-balance-to-unlock')}</div>}
+                placement="top"
+                tipClassName={styles.tip}
+              >
+                <Button
+                  type="primary"
+                  data-tx-hash={txHash}
+                  data-index={index}
+                  onClick={onClick}
+                  disabled={!isActionAvailable}
+                  label={t(`nervos-dao.deposit-record.${isWithdrawn ? 'unlock' : 'withdraw'}-action-label`)}
+                />
+              </Tooltip>
+            ) : (
+              <Button
+                type="primary"
+                data-tx-hash={txHash}
+                data-index={index}
+                onClick={onClick}
+                disabled={!isActionAvailable}
+                label={t(`nervos-dao.deposit-record.${isWithdrawn ? 'unlock' : 'withdraw'}-action-label`)}
+              />
+            )}
           </div>
         </div>
       )}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index e0d6782f8f..10f74f7f6c 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -689,7 +689,8 @@
         "compensated-period": "Compensation Period",
         "days-hours": "{{days}} days {{hours}} hours",
         "no-deposit": "No Deposit",
-        "no-completed": "No Completed"
+        "no-completed": "No Completed",
+        "insufficient-balance-to-unlock": "Balance is not enough for transaction fee to unlock the deposit"
       },
       "compensation-period": {
         "tooltip": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index e7445298cc..7a2189d3e2 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -689,7 +689,8 @@
         "compensated-period": "Période de compensation",
         "days-hours": "{{days}} jours {{hours}} heures",
         "no-deposit": "Aucun dépôt",
-        "no-completed": "Aucun terminé"
+        "no-completed": "Aucun terminé",
+        "insufficient-balance-to-unlock": "Le solde n'est pas suffisant pour payer les frais de transaction afin de débloquer le dépôt DAO."
       },
       "compensation-period": {
         "tooltip": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 44b240120b..c6ef72e6ab 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -682,7 +682,8 @@
         "compensated-period": "補貼時間",
         "days-hours": "{{days}} 天 {{hours}} 小時",
         "no-deposit": "沒有存入記錄",
-        "no-completed": "沒有解鎖記錄"
+        "no-completed": "沒有解鎖記錄",
+        "insufficient-balance-to-unlock": "沒有足夠余額支付交易費用以解鎖 DAO 存款"
       },
       "compensation-period": {
         "tooltip": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 6a5b89f526..7c68e910aa 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -682,7 +682,8 @@
         "compensated-period": "补贴时间",
         "days-hours": "{{days}} 天 {{hours}} 小时",
         "no-deposit": "没有存入记录",
-        "no-completed": "没有解锁记录"
+        "no-completed": "没有解锁记录",
+        "insufficient-balance-to-unlock": "没有足够余额支付交易费用以解锁 DAO 存款"
       },
       "compensation-period": {
         "tooltip": {
diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
index 888e087d19..30a0873f1a 100644
--- a/packages/neuron-wallet/src/controllers/app/index.ts
+++ b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -132,6 +132,8 @@ export default class AppController {
         devTools: env.isDevMode,
         contextIsolation: false,
         preload: path.join(__dirname, './preload.js'),
+        // disable webSecurity for dev, do not set webSecurity as true, because electron has default set other value when webSecurity is not set by developer
+        ...(app.isPackaged ? {} : { webSecurity: false }),
       },
     })
 

From ae34b2b6d4a42c548f600a1f2b5b013e0bbc6dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Wed, 17 Jan 2024 08:47:01 +0000
Subject: [PATCH 32/68] feat: Optimize the setting of sync start block in light
 client mode. (#2994)

---
 .../src/components/PageContainer/hooks.ts     | 76 +++++++++++++++----
 .../src/components/PageContainer/index.tsx    | 67 ++++++++++------
 .../PageContainer/pageContainer.module.scss   | 29 ++++++-
 .../src/components/SyncStatus/index.tsx       | 15 +++-
 .../SyncStatus/syncStatus.module.scss         | 19 +++--
 packages/neuron-ui/src/locales/en.json        |  6 +-
 packages/neuron-ui/src/locales/fr.json        |  6 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  6 +-
 packages/neuron-ui/src/locales/zh.json        |  6 +-
 .../src/services/remote/remoteApiWrapper.ts   |  1 +
 .../neuron-ui/src/services/remote/wallets.ts  |  3 +
 packages/neuron-ui/src/types/App/index.d.ts   |  1 +
 .../neuron-ui/src/types/Controller/index.d.ts |  6 +-
 packages/neuron-wallet/src/controllers/api.ts | 33 +++++++-
 14 files changed, 219 insertions(+), 55 deletions(-)

diff --git a/packages/neuron-ui/src/components/PageContainer/hooks.ts b/packages/neuron-ui/src/components/PageContainer/hooks.ts
index 9ebd050afe..7122c13905 100644
--- a/packages/neuron-ui/src/components/PageContainer/hooks.ts
+++ b/packages/neuron-ui/src/components/PageContainer/hooks.ts
@@ -1,34 +1,77 @@
-import { useCallback, useEffect, useState } from 'react'
+import { TFunction } from 'i18next'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { importedWalletDialogShown } from 'services/localCache'
-import { isDark, openExternal, updateWallet, setTheme as setThemeAPI } from 'services/remote'
+import { isDark, openExternal, setTheme as setThemeAPI, updateWalletStartBlockNumber } from 'services/remote'
 import { Migrate } from 'services/subjects'
 import { getExplorerUrl, isSuccessResponse } from 'utils'
 
+const waitConfirmTime = 5
+
+const useCountDown = (second: number) => {
+  const [countdown, setCountdown] = useState(0)
+  const countDecreaseIntervalRef = useRef<ReturnType<typeof setInterval>>()
+  const resetCountDown = useCallback(() => {
+    clearInterval(countDecreaseIntervalRef.current)
+    setCountdown(second)
+    const decrement = () => {
+      countDecreaseIntervalRef.current = setInterval(() => {
+        setCountdown(v => {
+          if (v > 0) {
+            return v - 1
+          }
+          clearInterval(countDecreaseIntervalRef.current)
+          return v
+        })
+      }, 1_000)
+    }
+    decrement()
+  }, [setCountdown, countDecreaseIntervalRef])
+  return {
+    countdown,
+    resetCountDown,
+  }
+}
+
 export const useSetBlockNumber = ({
   firstAddress,
   walletID,
   isMainnet,
   isLightClient,
   isHomePage,
+  initStartBlockNumber,
+  headerTipNumber,
+  t,
 }: {
   firstAddress: string
   walletID: string
   isMainnet: boolean
   isLightClient: boolean
   isHomePage?: boolean
+  initStartBlockNumber?: number
+  headerTipNumber: number
+  t: TFunction
 }) => {
   const [isSetStartBlockShown, setIsSetStartBlockShown] = useState(false)
   const [startBlockNumber, setStartBlockNumber] = useState('')
   const [blockNumberErr, setBlockNumberErr] = useState('')
-  const onChangeStartBlockNumber = useCallback((e: React.SyntheticEvent<HTMLInputElement>) => {
-    const { value } = e.currentTarget
-    const blockNumber = value.replace(/,/g, '')
-    if (Number.isNaN(+blockNumber) || /[^\d]/.test(blockNumber)) {
-      return
-    }
-    setStartBlockNumber(blockNumber)
-    setBlockNumberErr('')
-  }, [])
+  const isSetLessThanBefore = useMemo(
+    () => !!(startBlockNumber && initStartBlockNumber && +startBlockNumber < initStartBlockNumber),
+    [initStartBlockNumber, startBlockNumber]
+  )
+  const { countdown, resetCountDown } = useCountDown(waitConfirmTime)
+  const onChangeStartBlockNumber = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.currentTarget
+      const blockNumber = value.replaceAll(',', '')
+      if (Number.isNaN(+blockNumber)) {
+        return
+      }
+      setStartBlockNumber(+blockNumber > headerTipNumber ? headerTipNumber.toString() : blockNumber)
+      setBlockNumberErr(+blockNumber > headerTipNumber ? t('set-start-block-number.reset-to-header-tip-number') : '')
+      resetCountDown()
+    },
+    [resetCountDown, initStartBlockNumber, headerTipNumber, t]
+  )
   const onOpenAddressInExplorer = useCallback(() => {
     const explorerUrl = getExplorerUrl(isMainnet)
     openExternal(`${explorerUrl}/address/${firstAddress}`)
@@ -38,7 +81,10 @@ export const useSetBlockNumber = ({
     openExternal(`${explorerUrl}/block/${startBlockNumber}`)
   }, [startBlockNumber, isMainnet])
   const onConfirm = useCallback(() => {
-    updateWallet({ id: walletID, startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}` }).then(res => {
+    updateWalletStartBlockNumber({
+      id: walletID,
+      startBlockNumber: `0x${BigInt(startBlockNumber).toString(16)}`,
+    }).then(res => {
       if (isSuccessResponse(res)) {
         setIsSetStartBlockShown(false)
       } else {
@@ -48,9 +94,9 @@ export const useSetBlockNumber = ({
   }, [startBlockNumber, walletID])
   const openDialog = useCallback(() => {
     setIsSetStartBlockShown(true)
-    setStartBlockNumber('')
+    setStartBlockNumber(initStartBlockNumber?.toString() ?? '')
     setBlockNumberErr('')
-  }, [])
+  }, [initStartBlockNumber])
   useEffect(() => {
     if (isHomePage) {
       const needShow = importedWalletDialogShown.getStatus(walletID)
@@ -70,6 +116,8 @@ export const useSetBlockNumber = ({
     onViewBlock,
     onConfirm,
     blockNumberErr,
+    countdown,
+    isSetLessThanBefore,
   }
 }
 
diff --git a/packages/neuron-ui/src/components/PageContainer/index.tsx b/packages/neuron-ui/src/components/PageContainer/index.tsx
index b90cbc6575..7ee23aad18 100755
--- a/packages/neuron-ui/src/components/PageContainer/index.tsx
+++ b/packages/neuron-ui/src/components/PageContainer/index.tsx
@@ -8,7 +8,7 @@ import {
   getNetworkLabelI18nkey,
 } from 'utils'
 import Alert from 'widgets/Alert'
-import { Close, NewTab } from 'widgets/Icons/icon'
+import { Attention, Close, NewTab } from 'widgets/Icons/icon'
 import { ReactComponent as Sun } from 'widgets/Icons/Sun.svg'
 import { ReactComponent as Moon } from 'widgets/Icons/Moon.svg'
 import SyncStatusComponent from 'components/SyncStatus'
@@ -45,7 +45,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
       connectionStatus,
       networkID,
     },
-    wallet: { addresses, id },
+    wallet: { addresses, id, startBlockNumber: walletStartBlockNumber },
     settings: { networks },
   } = useGlobalState()
   const { children, head, notice, className, isHomePage } = props
@@ -93,12 +93,18 @@ const PageContainer: React.FC<ComponentProps> = props => {
     onOpenAddressInExplorer,
     onViewBlock,
     onConfirm,
+    countdown,
+    isSetLessThanBefore,
+    blockNumberErr,
   } = useSetBlockNumber({
     firstAddress: addresses[0]?.address,
     isMainnet,
     isLightClient,
     walletID: id,
     isHomePage,
+    initStartBlockNumber: walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined,
+    headerTipNumber: bestKnownBlockNumber,
+    t,
   })
   return (
     <div className={`${styles.page} ${className || ''}`}>
@@ -134,6 +140,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
               isMigrate={isMigrate}
               isLightClient={isLightClient}
               onOpenSetStartBlock={openDialog}
+              startBlockNumber={walletStartBlockNumber}
             />
           </div>
         </div>
@@ -148,31 +155,45 @@ const PageContainer: React.FC<ComponentProps> = props => {
       <div className={styles.body}>{children}</div>
       <Dialog
         title={t('set-start-block-number.title')}
+        confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
         show={isSetStartBlockShown}
         onCancel={closeDialog}
         onConfirm={onConfirm}
-        disabled={!startBlockNumber}
+        disabled={!startBlockNumber || !!countdown}
+        contentClassName={styles.setBlockContent}
       >
-        <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
-        <TextField
-          field="startBlockNumber"
-          onChange={onChangeStartBlockNumber}
-          placeholder={t('set-start-block-number.input-place-holder')}
-          value={localNumberFormatter(startBlockNumber)}
-          suffix={
-            startBlockNumber ? (
-              <button type="button" className={styles.viewAction} onClick={onViewBlock}>
-                {t('set-start-block-number.view-block')}
-                <NewTab />
-              </button>
-            ) : (
-              <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
-                {t('set-start-block-number.locate-first-tx')}
-                <NewTab />
-              </button>
-            )
-          }
-        />
+        <div className={styles.setBlockWarn}>
+          <Attention />
+          {t('set-start-block-number.warn')}
+        </div>
+        <div className={styles.content}>
+          <p className={styles.startBlockTip}>{t('set-start-block-number.tip')}</p>
+          <TextField
+            field="startBlockNumber"
+            onChange={onChangeStartBlockNumber}
+            placeholder={t('set-start-block-number.input-place-holder')}
+            value={localNumberFormatter(startBlockNumber)}
+            error={blockNumberErr}
+            suffix={
+              startBlockNumber ? (
+                <button type="button" className={styles.viewAction} onClick={onViewBlock}>
+                  {t('set-start-block-number.view-block')}
+                  <NewTab />
+                </button>
+              ) : (
+                <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
+                  {t('set-start-block-number.locate-first-tx')}
+                  <NewTab />
+                </button>
+              )
+            }
+          />
+          {isSetLessThanBefore ? (
+            <Alert status="error" className={styles.errorMessage} withIcon={false}>
+              {t('set-start-block-number.set-less-than-before')}
+            </Alert>
+          ) : null}
+        </div>
       </Dialog>
     </div>
   )
diff --git a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
index 9113944a90..8c6fb0278a 100755
--- a/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
+++ b/packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss
@@ -144,9 +144,32 @@
   }
 }
 
-.startBlockTip {
-  font-weight: 400;
-  color: var(--secondary-text-color);
+.setBlockContent {
+  padding: 0 0 20px 0;
+  overflow-y: auto;
+
+  .content {
+    padding: 0 16px 0 16px;
+  }
+  .startBlockTip {
+    font-weight: 400;
+    color: var(--secondary-text-color);
+  }
+
+  .setBlockWarn {
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--warn-background-color);
+    color: var(--warn-text-color);
+    font-size: 12px;
+    font-weight: 500;
+
+    & > svg {
+      margin-right: 4px;
+    }
+  }
 }
 
 .viewAction {
diff --git a/packages/neuron-ui/src/components/SyncStatus/index.tsx b/packages/neuron-ui/src/components/SyncStatus/index.tsx
index 6ff0fb9f70..01a7d4ccac 100644
--- a/packages/neuron-ui/src/components/SyncStatus/index.tsx
+++ b/packages/neuron-ui/src/components/SyncStatus/index.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { SyncStatus as SyncStatusEnum, ConnectionStatus } from 'utils'
+import { SyncStatus as SyncStatusEnum, ConnectionStatus, clsx, localNumberFormatter } from 'utils'
 import { Confirming, NewTab } from 'widgets/Icons/icon'
 import { ReactComponent as UnexpandStatus } from 'widgets/Icons/UnexpandStatus.svg'
 import { ReactComponent as StartBlock } from 'widgets/Icons/StartBlock.svg'
@@ -13,12 +13,14 @@ const SyncDetail = ({
   onOpenValidTarget,
   isLightClient,
   onOpenSetStartBlock,
+  startBlockNumber,
 }: {
   syncBlockNumbers: string
   isLookingValidTarget: boolean
   onOpenValidTarget: (e: React.SyntheticEvent) => void
   isLightClient: boolean
   onOpenSetStartBlock: () => void
+  startBlockNumber?: string
 }) => {
   const [t] = useTranslation()
   return (
@@ -42,10 +44,16 @@ const SyncDetail = ({
           </div>
         </div>
       )}
+      {isLightClient && startBlockNumber ? (
+        <div className={styles.startBlockNumber}>
+          <div className={styles.title}>{t('network-status.tooltip.start-block-number')}:</div>
+          <div className={styles.number}>{localNumberFormatter(startBlockNumber)}</div>
+        </div>
+      ) : null}
       {isLightClient && (
         <div
           role="link"
-          className={styles.action}
+          className={clsx(styles.action, styles.setStartBlockNumber)}
           onClick={onOpenSetStartBlock}
           onKeyPress={onOpenSetStartBlock}
           tabIndex={-1}
@@ -70,6 +78,7 @@ const SyncStatus = ({
   isMigrate,
   isLightClient,
   onOpenSetStartBlock,
+  startBlockNumber,
 }: React.PropsWithoutRef<{
   syncStatus: SyncStatusEnum
   connectionStatus: State.ConnectionStatus
@@ -80,6 +89,7 @@ const SyncStatus = ({
   isMigrate: boolean
   isLightClient: boolean
   onOpenSetStartBlock: () => void
+  startBlockNumber?: string
 }>) => {
   const [t] = useTranslation()
   const [isOpen, setIsOpen] = useState(false)
@@ -116,6 +126,7 @@ const SyncStatus = ({
           onOpenValidTarget={onOpenValidTarget}
           isLightClient={isLightClient}
           onOpenSetStartBlock={onOpenSetStartBlock}
+          startBlockNumber={startBlockNumber}
         />
       }
       trigger="click"
diff --git a/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss b/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
index 94451a610e..9afd0e19e6 100755
--- a/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
+++ b/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
@@ -63,7 +63,7 @@
     font-size: 12px;
     font-weight: 400;
 
-    &:nth-child(2) {
+    &.setStartBlockNumber {
       &::before {
         content: '';
         display: block;
@@ -74,10 +74,6 @@
       }
     }
 
-    &:nth-child(3) {
-      margin-top: 12px;
-    }
-
     & > div {
       display: flex;
       align-items: center;
@@ -95,6 +91,19 @@
       }
     }
   }
+
+  .startBlockNumber {
+    margin-top: 8px;
+    .title {
+      font-size: 12px;
+      font-weight: 400;
+    }
+    .number {
+      color: var(--third-text-color);
+      font-family: D-DIN-PRO;
+      font-weight: 700;
+    }
+  }
 }
 
 .redDot {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 10f74f7f6c..52d9861916 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -31,6 +31,7 @@
       "tooltip": {
         "block-synced": "Block Synced",
         "looking-valid-target": "Looking for assumed valid target",
+        "start-block-number": "Start block number",
         "set-start-block-number": "Set start block number"
       },
       "migrating": "migrating..."
@@ -1125,10 +1126,13 @@
     },
     "set-start-block-number": {
       "title": "Set the start block number",
+      "warn": "Warning: Transactions before the start block of synchronization will not be synchronized",
       "tip": "The start sync block number is configuration when use light client ckb node, then you can set it and quick the sync",
       "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"
+      "view-block": "View the block",
+      "set-less-than-before": "The block number you set is smaller than the previous set, the synchronization will restart, please proceed with caution.",
+      "reset-to-header-tip-number": "Unable to set a block number greater than the header tip block number, reset to the header tip block number."
     },
     "main": {
       "external-node-detected-dialog": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 7a2189d3e2..9bf5bafb66 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -31,6 +31,7 @@
       "tooltip": {
         "block-synced": "Bloc synchronisé",
         "looking-valid-target": "Recherche de la cible valide présumée",
+        "start-block-number": "bloc de départ",
         "set-start-block-number": "Définir le numéro de bloc de départ"
       },
       "migrating": "migration en cours..."
@@ -1125,10 +1126,13 @@
     },
     "set-start-block-number": {
       "title": "Définir le numéro de bloc de départ",
+      "warn": "Veuillez noter que les transactions antérieures à la synchronisation du bloc initial ne seront pas synchronisées !",
       "tip": "Le numéro de bloc de départ est une configuration lorsque vous utilisez le noeud CKB en mode client léger. Vous pouvez le définir et accélérer la synchronisation.",
       "input-place-holder": "Veuillez entrer le numéro de bloc de départ pour la synchronisation, par exemple : 10, 100, 101",
       "locate-first-tx": "Localiser la première transaction",
-      "view-block": "Voir le bloc"
+      "view-block": "Voir le bloc",
+      "set-less-than-before": "Le numéro de bloc que vous avez défini est inférieur au bloc précédent. La synchronisation recommencera, veuillez procéder avec prudence.",
+      "reset-to-header-tip-number": "Impossible de définir un numéro de bloc supérieur au bloc le plus récent. Réinitialisation au numéro de bloc le plus récent."
     },
     "main": {
       "external-node-detected-dialog": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index c6ef72e6ab..fa8d5b9868 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -31,6 +31,7 @@
       "tooltip": {
         "block-synced": "已同步區塊",
         "looking-valid-target": "尋找預設可信區塊",
+        "start-block-number": "起始區塊",
         "set-start-block-number": "設置同步起始區塊"
       },
       "migrating": "正在數據遷移..."
@@ -1096,10 +1097,13 @@
     },
     "set-start-block-number": {
       "title": "設置同步起始區塊",
+      "warn": "請註意，同步起始區塊之前的交易不會被同步！",
       "tip": "輕客戶端模式下的訂閱起始點是可配置的，因此您可以設置同步起始區塊以加快同步速度。",
       "input-place-holder": "輸入同步起始區塊高度，例如：10,100,101",
       "locate-first-tx": "定位第一筆交易",
-      "view-block": "查看區塊"
+      "view-block": "查看區塊",
+      "set-less-than-before": "您設置的區塊號小於之前區塊，同步將重新開始，請謹慎操作。",
+      "reset-to-header-tip-number": "無法設置比最新區塊更大的區塊號，已重置為最新區塊號。"
     },
     "main": {
       "external-node-detected-dialog": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 7c68e910aa..6d31935a58 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -31,6 +31,7 @@
       "tooltip": {
         "block-synced": "已同步区块",
         "looking-valid-target": "寻找预设可信区块",
+        "start-block-number": "起始区块",
         "set-start-block-number": "设置同步起始区块"
       },
       "migrating": "正在数据迁移..."
@@ -1117,10 +1118,13 @@
     },
     "set-start-block-number": {
       "title": "设置同步起始区块",
+      "warn": "请注意，同步起始区块之前的交易不会被同步！",
       "tip": "轻客户端模式下的订阅起始点是可配置的，因此您可以设置同步起始区块以加快同步速度。",
       "input-place-holder": "输入同步起始区块高度，例如：10,100,101",
       "locate-first-tx": "定位第一笔交易",
-      "view-block": "查看区块"
+      "view-block": "查看区块",
+      "set-less-than-before": "您设置的区块号小于之前的设定，同步将重新开始，请谨慎操作。",
+      "reset-to-header-tip-number": "无法设置比最新区块更大的区块号，已重置为最新区块号。"
     },
     "main": {
       "external-node-detected-dialog": {
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 3ca2ffdff6..c9ab2831e6 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -60,6 +60,7 @@ type Action =
   | 'update-wallet'
   | 'delete-wallet'
   | 'backup-wallet'
+  | 'update-wallet-start-block-number'
   | 'get-all-addresses'
   | 'update-address-description'
   | 'request-password'
diff --git a/packages/neuron-ui/src/services/remote/wallets.ts b/packages/neuron-ui/src/services/remote/wallets.ts
index 89da4ef168..9c1e496c66 100644
--- a/packages/neuron-ui/src/services/remote/wallets.ts
+++ b/packages/neuron-ui/src/services/remote/wallets.ts
@@ -9,6 +9,9 @@ export const createWallet = remoteApi<Controller.CreateWalletParams>('create-wal
 export const updateWallet = remoteApi<Controller.UpdateWalletParams>('update-wallet')
 export const deleteWallet = remoteApi<Controller.DeleteWalletParams>('delete-wallet')
 export const backupWallet = remoteApi<Controller.DeleteWalletParams>('backup-wallet')
+export const updateWalletStartBlockNumber = remoteApi<Controller.UpdateWalletStartBlockNumberParams>(
+  'update-wallet-start-block-number'
+)
 export const getAddressesByWalletID = remoteApi<Controller.GetAddressesByWalletIDParams>('get-all-addresses')
 export const updateAddressDescription =
   remoteApi<Controller.UpdateAddressDescriptionParams>('update-address-description')
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 243fd982de..9c1ac509e2 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -202,6 +202,7 @@ declare namespace State {
     device?: DeviceInfo
     isHD?: boolean
     isWatchOnly?: boolean
+    startBlockNumber?: string
   }
 
   interface DeviceInfo {
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 35ecc4f87b..a0a743e90f 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -35,7 +35,11 @@ declare namespace Controller {
     newPassword?: string
     name?: string
     device?: any
-    startBlockNumber?: string
+  }
+
+  interface UpdateWalletStartBlockNumberParams {
+    id: string
+    startBlockNumber: string
   }
 
   interface RequestPasswordParams {
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index a9aa17f3a9..024eee26ff 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -64,6 +64,7 @@ import { resetSyncTaskQueue } from '../block-sync-renderer'
 import DataUpdateSubject from '../models/subjects/data-update'
 import CellManagement from './cell-management'
 import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
+import { CKBLightRunner } from '../services/light-runner'
 
 export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet' | 'migrate-acp'
 // Handle channel messages from renderer process and user actions.
@@ -332,19 +333,45 @@ export default class ApiController {
     })
 
     handle(
-      'update-wallet',
+      'update-wallet-start-block-number',
       async (
         _,
-        params: { id: string; password?: string; name?: string; newPassword?: string; startBlockNumber?: string }
+        params: {
+          id: string
+          startBlockNumber: string
+        }
       ) => {
         const res = this.#walletsController.update(params)
-        if (params.startBlockNumber) {
+        const network = NetworksService.getInstance().getCurrent()
+        if (network.type !== NetworkType.Light) {
+          throw new Error('Only Light client can set start block number')
+        }
+        const lastSetStartBlockNumber = WalletsService.getInstance().getCurrent()?.toJSON().startBlockNumber
+        if (lastSetStartBlockNumber && +params.startBlockNumber < +lastSetStartBlockNumber) {
+          await CKBLightRunner.getInstance().clearNodeCache()
+        } else {
           resetSyncTaskQueue.asyncPush(true)
         }
         return res
       }
     )
 
+    handle(
+      'update-wallet',
+      async (
+        _,
+        params: {
+          id: string
+          password?: string
+          name?: string
+          newPassword?: string
+        }
+      ) => {
+        const res = this.#walletsController.update(params)
+        return res
+      }
+    )
+
     handle('delete-wallet', async (_, { id = '', password = '' }) => {
       return this.#walletsController.delete({ id, password })
     })

From adf593dd86844faee76c4ec2032b5e615e6a1cff Mon Sep 17 00:00:00 2001
From: Natixe <49234582+Natixe@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:16:32 +0100
Subject: [PATCH 33/68] Adds Spanish 'es' translation for wallet and UI
 functions (#3024)

Co-authored-by: alejandroRbit <94946624+alejandroRbit@users.noreply.github.com>
Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 _typos.toml                                   |    2 +-
 packages/neuron-ui/.storybook/electron.js     |    2 +-
 packages/neuron-ui/src/locales/en.json        |    3 +-
 packages/neuron-ui/src/locales/es.json        | 1192 +++++++++++++++++
 packages/neuron-ui/src/locales/fr.json        |    3 +-
 packages/neuron-ui/src/locales/zh-tw.json     |    3 +-
 packages/neuron-ui/src/locales/zh.json        |    3 +-
 .../src/tests/calendar/index.test.ts          |   29 +-
 packages/neuron-ui/src/utils/const.ts         |    2 +-
 packages/neuron-ui/src/utils/i18n.ts          |    2 +
 packages/neuron-wallet/src/locales/es.ts      |  302 +++++
 packages/neuron-wallet/src/locales/i18n.ts    |    2 +
 .../neuron-wallet/src/services/settings.ts    |    2 +-
 .../tests/services/setting.test.ts            |    2 +
 14 files changed, 1540 insertions(+), 9 deletions(-)
 create mode 100644 packages/neuron-ui/src/locales/es.json
 create mode 100644 packages/neuron-wallet/src/locales/es.ts

diff --git a/_typos.toml b/_typos.toml
index 78683d1960..ae82742a0c 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -6,4 +6,4 @@ numer = "numer"
 lastest = "lastest"
 
 [files]
-extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts", "**/fr.{ts,json}"]
+extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts", "**/fr.{ts,json}", "**/es.{ts,json}"]
diff --git a/packages/neuron-ui/.storybook/electron.js b/packages/neuron-ui/.storybook/electron.js
index 9978d578ce..492a24c539 100644
--- a/packages/neuron-ui/.storybook/electron.js
+++ b/packages/neuron-ui/.storybook/electron.js
@@ -1,5 +1,5 @@
 const sendSyncValues = {
-  'get-locale': ('zh', 'fr'),
+  'get-locale': ('zh', 'fr', 'es'),
   'get-version': '0.103.1',
 }
 
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 52d9861916..ebb212ab95 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -413,7 +413,8 @@
         "en-US": "English(United States)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
-        "fr": "Français"
+        "fr": "Français",
+        "es": "Español"
       },
       "data": {
         "ckb-node-data": "CKB Node Config & Storage",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
new file mode 100644
index 0000000000..651e7d00e0
--- /dev/null
+++ b/packages/neuron-ui/src/locales/es.json
@@ -0,0 +1,1192 @@
+{
+  "translation": {
+    "launch-screen": {
+      "loading-wallets": "Cargando billeteras"
+    },
+    "contextmenu": {
+      "cut": "Cortar",
+      "copy": "Copiar",
+      "paste": "Pegar",
+      "selectall": "Seleccionar todo"
+    },
+    "navbar": {
+      "overview": "Resumen",
+      "wallet": "Billetera",
+      "send": "Enviar",
+      "receive": "Recibir",
+      "history": "Historial",
+      "addresses": "Direcciones",
+      "nervos-dao": "Nervos DAO",
+      "settings": "Configuración",
+      "special-assets": "Activos personalizados",
+      "sync-not-start": "Sincronización no iniciada aún",
+      "connecting": "Conectando",
+      "experimental-functions": "Experimental",
+      "s-udt": "Cuentas de activos",
+      "update-neuron-with-ckb": "La versión del nodo de CKB no coincide con Neuron (v{{ version }}), lo que puede causar problemas de compatibilidad. Por favor actualice a la última versión de Neuron.",
+      "ckb-node-compatible": "El nodo CKB no es compatible con Neuron (v{{ version }}), por favor compruébelo antes de continuar.",
+      "ckb-without-indexer": "Por favor agregue la opción '--indexer' para iniciar el nodo local"
+    },
+    "network-status": {
+      "tooltip": {
+        "block-synced": "Bloque sincronizado",
+        "looking-valid-target": "Buscando objetivo válido asumido",
+        "set-start-block-number": "Establecer el número de bloque inicial"
+      },
+      "migrating": "migrando..."
+    },
+    "import-hardware": {
+      "title": {
+        "select-model": "Por favor conecte su dispositivo y seleccione el modelo",
+        "detect-device": "Detectando dispositivo",
+        "name-wallet": "Nombre de la billetera",
+        "choose-address": "Elige una dirección del dispositivo"
+      },
+      "actions": {
+        "confirm": "Por favor confirme en su dispositivo...",
+        "success": "¡Importación exitosa!",
+        "next": "Siguiente",
+        "cancel": "Cancelar",
+        "back": "Regresar",
+        "rescan": "Volver a escanear",
+        "close": "Cerrar",
+        "finish": "Finalizar creación"
+      },
+      "errors": {
+        "multi-device": "Se han detectado varios dispositivos. Solo se puede conectar un dispositivo del mismo modelo.",
+        "device-not-found": "No se ha detectado ningún dispositivo. Por favor conecte su dispositivo.",
+        "ckb-app-not-found": "No se abre la aplicación CKB. Por favor abra la aplicación CKB en su dispositivo."
+      },
+      "waiting": "Esperando a la aplicación CKB...",
+      "abort": "Esperando a la aplicación CKB... Acción cancelada",
+      "app-version": "Aplicación CKB v{{version}} en ejecución.",
+      "firmware-version": "Firmware v{{version}} detectado.",
+      "wallet-name": "Nombre de la billetera",
+      "select-model": "Selecciona Modelo",
+      "other-device": "Otro"
+    },
+    "hardware-sign": {
+      "cancel": "Cancelar",
+      "title": "Firma a través de billetera de hardware",
+      "device": "Dispositivo:",
+      "status": {
+        "label": "Estado:",
+        "connect": "Conectado, listo para firmar.",
+        "user-input": "Conectado, esperando confirmación en el dispositivo...",
+        "disconnect": "Desconectado, por favor confirme que el dispositivo esté conectado y que la aplicación Nervos esté abierta."
+      },
+      "inputs": "Entradas (se está firmando la {{index}} de {{length}})",
+      "outputs": "Salidas ({{length}})",
+      "actions": {
+        "close": "Cerrar",
+        "success": "¡Transacción exitosa!",
+        "rescan": "Volver a escanear"
+      }
+    },
+    "hardware-verify-address": {
+      "title": "Verificar dirección a través de billetera de hardware",
+      "device": "Dispositivo:",
+      "address": "Dirección:",
+      "verified": "Verificado",
+      "invalid": "Inválido",
+      "status": {
+        "label": "Estado:",
+        "connect": "Conectado, listo para verificar.",
+        "user-input": "Conectado, esperando confirmación en el dispositivo...",
+        "disconnect": "Desconectado, por favor confirme que el dispositivo esté conectado y que la aplicación Nervos esté abierta."
+      },
+      "actions": {
+        "close": "Cerrar",
+        "reconnect": "Reconectar",
+        "copy-address": "Copiar Dirección",
+        "verify": "Verificar Dirección",
+        "finish": "Ok"
+      }
+    },
+    "offline-sign": {
+      "title": "Firma sin conexión",
+      "json-file": "Archivo JSON:",
+      "status": {
+        "label": "Estado:",
+        "unsigned": "Sin firmar",
+        "partially-signed": "Parcialmente firmado",
+        "signed": "Firmado"
+      },
+      "wallet": "Billetera:",
+      "content": "Contenido:",
+      "export": "Exportar Tx",
+      "sign-and-export": "Firmar y exportar",
+      "sign-and-broadcast": "Firmar y transmitir",
+      "actions": {
+        "broadcast": "Transmitir",
+        "sign": "Firmar y exportar",
+        "cancel": "Cancelar"
+      }
+    },
+    "overview": {
+      "date": "Fecha",
+      "type": "Tipo",
+      "balance": "Saldo",
+      "recent-activities": "Actividades Recientes",
+      "no-recent-activities": "No hay actividades recientes",
+      "activity": "Actividad",
+      "datetime": "Fecha y Hora",
+      "status": "Estado",
+      "amount": "Cantidad",
+      "address": "Dirección",
+      "sent": "Enviado",
+      "sending": "Enviando",
+      "received": "Recibido",
+      "receiving": "Recibiendo",
+      "more": "Más",
+      "copy-balance": "Copiar Saldo",
+      "create": "Crear cuenta de activo(s) {{name}}",
+      "destroy": "Destruir cuenta de activo(s) {{name}}",
+      "createSUDT": "Crear cuenta de activo <0></0>",
+      "destroySUDT": "Destruir cuenta de activo <0></0>",
+      "wallet-ready": "La billetera está lista, bienvenido",
+      "send": "Enviar",
+      "receive": "Recibir",
+      "locked": "Cantidad bloqueada",
+      "locked-balance": "Saldo bloqueado"
+    },
+    "wizard": {
+      "welcome-to-nervos-neuron": "Bienvenido a Neuron",
+      "create-or-import-your-first-wallet": "Crea o importa tu primera billetera",
+      "create-new-wallet": "Crear una Billetera",
+      "import-mnemonic": "Importar Semilla de Billetera",
+      "import-keystore": "Importar desde Keystore",
+      "import-wallet": "Importar una Billetera",
+      "import-hardware-wallet": "Importar una Billetera de Hardware",
+      "new-wallet": "Nueva Billetera",
+      "wallet-seed": "Semilla de Billetera",
+      "keystore": "Keystore",
+      "hardware-wallet": "Billetera de Hardware",
+      "next": "Siguiente",
+      "back": "Regresar",
+      "name": "Nombre",
+      "your-wallet-seed-is": "Se ha generado la nueva frase semilla de tu billetera",
+      "input-your-seed": "Por favor introduce la frase semilla de tu billetera",
+      "password": "Contraseña",
+      "confirm-password": "Confirmar Contraseña",
+      "set-wallet-name-and-password": "Nombra tu nueva billetera y elige una contraseña segura para protegerla",
+      "set-wallet-name": "Dale un nombre a tu nueva billetera",
+      "set-a-strong-password-to-protect-your-wallet": "Crea una contraseña segura para proteger tu billetera",
+      "wallet-suffix": "Billetera {{suffix}}",
+      "write-down-seed": "Escribe la frase semilla de tu billetera y guárdala en un lugar seguro",
+      "new-name": "Usa un nombre no usado previamente para la nueva billetera",
+      "complex-password": "La contraseña debe tener entre 8 y 50 caracteres y contener al menos tres categorías de caracteres entre las siguientes: letras en mayúscula, letras en minúscula, números y símbolos especiales.",
+      "same-password": "La contraseña y la confirmación de contraseña deben coincidir",
+      "input-seed-verify": "Ingresa la frase semilla creada para verificar",
+      "no-wallet": "¿No tienes una billetera?",
+      "create-wallet": "Crear Billetera",
+      "repeat-password": "Repetir Contraseña",
+      "finish-create": "Finalizar Creación",
+      "creating-wallet": "Se está preparando la billetera, por favor espera",
+      "add-one": "Añadir una más"
+    },
+    "import-keystore": {
+      "title": "Importar Keystore",
+      "select-file": "Seleccionar Archivo",
+      "label": {
+        "path": "Archivo de Claves",
+        "name": "Nombre de la Billetera",
+        "password": "Contraseña"
+      },
+      "placeholder": {
+        "path": "Haz clic para seleccionar el archivo de claves",
+        "name": "Nombre para la nueva billetera",
+        "password": "Contraseña para verificar el archivo de claves"
+      },
+      "button": {
+        "back": "Regresar",
+        "submit": "Enviar"
+      }
+    },
+    "detail": {
+      "more-transactions": "Más"
+    },
+    "send": {
+      "address": "Enviar a",
+      "input-address": "Por favor ingresa la dirección de destino",
+      "amount": "Cantidad (CKB)",
+      "input-amount": "Por favor ingresa la cantidad",
+      "send": "Enviar",
+      "reset": "Reiniciar",
+      "confirm-password": "Confirmar Contraseña",
+      "to": "Para",
+      "add-receiving-address": "Añadir Dirección de Recepción",
+      "input-password-to-confirm": "Ingresa la contraseña para confirmar",
+      "scan-to-get-address": "Escanea el código QR para leer la dirección a la que deseas enviar",
+      "total-amount": "Cantidad Total (CKB)",
+      "description": "Descripción",
+      "description-optional": "Por favor ingresa una descripción, opcional",
+      "balance": "Saldo",
+      "add-one": "Añadir uno más",
+      "remove-this": "Eliminar esta",
+      "fee": "Tarifa de Transacción (CKB)",
+      "advanced-fee-settings": "Configuración Avanzada de Tarifa",
+      "price": "Precio",
+      "pick-price": "Seleccionar Precio Rápido",
+      "custom-price": "Precio Personalizado",
+      "slow": "Lento",
+      "standard": "Estándar",
+      "fast": "Rápido",
+      "total-cycles": "Ciclos RISC-V Totales",
+      "scan-screen-qr-code": "Escanea el código QR en la pantalla",
+      "set-locktime": "Fijar hora de bloqueo",
+      "remove-receiving-address": "Eliminar Dirección de Recepción",
+      "remove-receiving-address-msg": "¿Estás seguro de que quieres eliminar la dirección de recepción seleccionada?",
+      "locktime-notice-content": "De acuerdo al número de bloque actual, puede haber algunas variaciones de tiempo en en el tiempo de bloqueo.",
+      "release-on": "Liberar en",
+      "locktime-warning": "Asegúrese de que la billetera del receptor pueda soportar el desbloqueo por vencimiento. (Nota: 1. Generalmente, las casas de cambio no admiten el desbloqueo por vencimiento {{extraNote}})",
+      "allow-use-sent-cell": "Se permite el uso de salidas no confirmadas en esta transacción.",
+      "submit-transaction": "Enviar la transacción"
+    },
+    "receive": {
+      "title": "Recibir",
+      "address-book": "Libro de Direcciones",
+      "click-to-copy": "Haz clic para copiar la dirección",
+      "copy-address": "Copiar Dirección",
+      "address-not-found": "Dirección no encontrada",
+      "prompt": "Neuron elige una nueva dirección de recepción para una mejor privacidad. Por favor, ve al Libro de Direcciones si deseas utilizar una dirección de recepción utilizada anteriormente.",
+      "address-qrcode": "Código QR de la Dirección",
+      "address": "Dirección {{network}}",
+      "verify-address": "Verificar Dirección",
+      "turn-into-full-version-format": "Convertir en formato de versión completa",
+      "turn-into-deprecated-format": "Convertir en formato obsoleto",
+      "save-qr-code": "Descargar",
+      "copy-qr-code": "Copiar"
+    },
+    "transaction-status": {
+      "pending": "Pendiente",
+      "success": "Éxito",
+      "failed": "Fallido",
+      "confirming": "Confirmación"
+    },
+    "confirmationsCount_one": "{{count}} Confirmación",
+    "confirmationsCount_other": "{{count}} Confirmaciones",
+    "history": {
+      "title": "Historial",
+      "title-detail": "Detalle del Historial",
+      "meta": "Meta",
+      "type": "Tipo",
+      "date": "Fecha",
+      "timestamp": "Hora",
+      "amount": "Cantidad",
+      "transaction-hash": "Hash de Transacción",
+      "send": "Enviar",
+      "receive": "Recibir",
+      "other": "Otro",
+      "more-actions": "Más Acciones",
+      "detail": "Detalle",
+      "explorer": "Explorador",
+      "first": "Primero",
+      "previous": "Anterior",
+      "next": "Siguiente",
+      "last": "Último",
+      "description": "Descripción",
+      "status": "Estado",
+      "blockNumber": "Número de Bloque",
+      "basic-information": "Información Básica",
+      "search": {
+        "button": "Buscar",
+        "placeholder": "Buscar hash de transacción, dirección o fecha (aaaa-mm-dd)"
+      },
+      "table": {
+        "name": "Nombre de la Billetera",
+        "type": "Tipo",
+        "amount": "Cantidad",
+        "timestamp": "Tiempo",
+        "status": "Estado",
+        "operation": "Operación"
+      },
+      "export-history": "Exportar Historial de Transacciones",
+      "confirmationTimes": "Confirmaciones",
+      "confirming-with-count": "{{confirmations}} Confirmaciones",
+      "view-on-explorer": "Ver en el Explorador",
+      "no-txs": "No Historial de Transacciones",
+      "view-in-explorer": "Ver en el explorador",
+      "view-in-explorer-button-title": "Ver en el explorador",
+      "view-detail": "Detalle",
+      "view-detail-button-title": "Ver Detalle",
+      "opening": "Abriendo",
+      "copy-tx-hash": "Copiar Hash de Transacción",
+      "copy-balance": "Copiar Saldo",
+      "copy-address": "Copiar Dirección",
+      "create": "Crear Cuenta de Activos {{name}}",
+      "destroy": "Destruir Cuenta de Activos {{name}}"
+    },
+    "transaction": {
+      "window-title": "Transacción: {{hash}}",
+      "date": "Fecha",
+      "transaction-hash": "Hash de Transacción",
+      "block-number": "Número de Bloque",
+      "goBack": "Volver",
+      "index": "Índice",
+      "address": "Dirección",
+      "income": "Ingreso",
+      "amount": "Cantidad",
+      "inputs": "Entradas",
+      "outputs": "Salidas",
+      "cell-from-cellbase": "Desde cellbase",
+      "lock-script": "Script de Bloqueo",
+      "lock-script-title": "Información de Dirección",
+      "deprecated-address-format": "Dirección en formato obsoleto"
+    },
+    "addresses": {
+      "title": "Libro de Direcciones",
+      "addresses": "Direcciones",
+      "type": "Tipo",
+      "address": "Dirección",
+      "identifier": "Identificador",
+      "description": "Descripción",
+      "balance": "Saldo",
+      "transactions": "TXs",
+      "receiving-address": "Recepción",
+      "change-address": "Cambiar",
+      "copy-address": "Copiar Dirección",
+      "request-payment": "Solicitar Pago",
+      "view-on-explorer": "Ver en el Explorador",
+      "default-description": "Ninguna",
+      "all-address": "Todas"
+    },
+    "settings": {
+      "title": {
+        "normal": "Ajustes",
+        "mac": "Preferencias"
+      },
+      "go-to-overview": "Ir a Resumen",
+      "setting-tabs": {
+        "general": "General",
+        "wallets": "Billeteras",
+        "network": "Red",
+        "data": "Datos"
+      },
+      "general": {
+        "show": "Mostrar",
+        "hide": "Ocultar",
+        "version": "Versión",
+        "language": "Idioma",
+        "select-language": "Seleccionar Idioma",
+        "apply": "Aplicar"
+      },
+      "wallet-manager": {
+        "edit-wallet": {
+          "wallet-name": "Nombre de la Billetera",
+          "password": "Contraseña",
+          "new-password": "Nueva Contraseña",
+          "confirm-password": "Confirmar Contraseña",
+          "edit-wallet": "Editar Billetera"
+        },
+        "edit-success": "Información de la billetera actualizada",
+        "delete-wallet-title": "Por Favor ingrese la {{name}} Contraseña",
+        "password": "Contraseña",
+        "wallet-detail": {
+          "balance": "Saldo"
+        }
+      },
+      "network": {
+        "online": "En Línea",
+        "offline": "Desconectado",
+        "add-network": "Agregar Red",
+        "remove-network": "Eliminar Red",
+        "remove-network-msg": "¿Está seguro de que desea eliminar la red seleccionada?",
+        "edit-network": {
+          "title": "Editar Red",
+          "rpc-url": "URL RPC",
+          "name": "Nombre de la Red",
+          "input-rpc": "Por favor ingrese el rpc",
+          "input-network": "Por favor ingrese el nombre"
+        },
+        "edit-success": "Edición de la red exitosa",
+        "mainnet": "Mainnet",
+        "testnet": "Testnet",
+        "lightTestnet": "Light Testnet",
+        "lightMainnet": "Light Mainnet",
+        "devnet": "Devnet",
+        "switch-network-type": "Cambiar a {{type}}"
+      },
+      "locale": {
+        "en": "Inglés",
+        "en-US": "Inglés(Estados Unidos)",
+        "zh": "中文(简体)",
+        "zh-TW": "中文(繁體)",
+        "fr": "Francés",
+        "es": "Español"
+      },
+      "data": {
+        "ckb-node-data": "Configuración de Datos del Nodo CKB",
+        "set": "Establecer",
+        "cache": "Caché",
+        "clear-cache-description": "Borre la memoria caché si encuentra problemas de sincronización de datos o visualización de saldo. Neuron volverá a escanear los datos de los bloques.",
+        "cache-cleared-on": "Caché actualizada en {{date}}",
+        "refresh": "Actualizar",
+        "clearing-cache": "Borrando Caché, por favor espere un momento",
+        "clear-success": "Caché Eliminada",
+        "set-path": "Establecer Ruta",
+        "remove-ckb-data-tip": "Por favor mueva los Datos del Nodo CKB de 【{{prevPath}}】 a 【{{currentPath}}】 y luego haga clic en \"Se han movido los datos\" para comenzar desde el bloque previamente sincronizado; O haga clic en \"Sincronizar desde el principio\" para empezar a sincronizar de nuevo.",
+        "resync-ckb-node-describe": "Atención: Sincronizar desde cero no eliminará los datos del Nodo CKB descargados previamente",
+        "cancel": "Cancelar",
+        "confirm-clear": "Confirmar",
+        "move-data-finish": "Se han movido los datos",
+        "re-sync": "Sincronizar desde cero",
+        "disabled-set-path": "Cuando el nodo CKB se inicia manualmente, la configuración de la ruta de configuración y el almacenamiento del nodo CKB no tienen efecto",
+        "ckb-node-storage": "Almacenamiento del Nodo CKB"
+      }
+    },
+    "password-request": {
+      "wallet-not-found": "No se encontró la billetera",
+      "password": "Ingresar Contraseña",
+      "placeholder": "Por favor ingrese la contraseña de la billetera",
+      "send": {
+        "title": "Enviar la transacción"
+      },
+      "send-nft": {
+        "title": "Enviar NFT"
+      },
+      "delete": {
+        "title": "Eliminar la billetera"
+      },
+      "backup": {
+        "title": "Respaldar la Billetera"
+      },
+      "unlock": {
+        "title": "Por favor ingrese la contraseña de la billetera para reclamar el activo"
+      },
+      "create-sudt-account": {
+        "title": "Crear Cuenta de Activos"
+      },
+      "send-sudt": {
+        "title": "Enviar sUDT"
+      },
+      "transfer-to-sudt": {
+        "title": "Enviar a cuenta sUDT"
+      },
+      "send-ckb-asset": {
+        "title": "Enviar CKB"
+      },
+      "send-acp": {
+        "title": "Enviar CKB"
+      },
+      "send-acp-sudt-to-new-cell": {
+        "title": "Enviar sUDT"
+      },
+      "send-acp-ckb-to-new-cell": {
+        "title": "Enviar CKB"
+      },
+      "migrate-acp": {
+        "title": "Actualizar Cuentas de Activos"
+      },
+      "send-cheque": {
+        "title": "Enviar Cheque"
+      },
+      "withdraw-cheque": {
+        "title": "Retirar Cheque"
+      },
+      "claim-cheque": {
+        "title": "Reclamar Cheque"
+      },
+      "create-account-to-claim-cheque": {
+        "title": "Reclamar Cheque con Nueva Cuenta"
+      },
+      "destroy-asset-account": {
+        "title": "Destruir Cuenta de Activos"
+      },
+      "send-from-multisig": {
+        "title": "Enviar CKB desde dirección multifirma"
+      },
+      "send-from-multisig-need-one": {
+        "title": "Enviar CKB desde dirección multifirma"
+      },
+      "xpub-notice": "Para billetera de solo lectura, sólo es posible exportar transacciones"
+      },
+      "qrcode": {
+        "copy": "Copiar imagen",
+        "save": "Guardar imagen"
+      },
+      "common": {
+        "or": "o",
+        "ok": "Ok",
+        "dismiss": "Descartar",
+        "confirm": "Confirmar",
+        "open": "Abrir",
+        "cancel": "Cancelar",
+        "save": "Guardar",
+        "toggle": {
+          "on": "Encendido",
+          "off": "Apagado"
+        },
+        "copy-tx-hash": "Copiar Hash de Transacción",
+        "copy-address": "Copiar Dirección",
+        "select": "Seleccionar",
+        "backup": "Respaldar",
+        "edit": "Editar",
+        "delete": "Borrar",
+        "click-to-edit": "Hacer clic para editar",
+        "notice": "Nota",
+        "experimental": "Experimental",
+        "close": "Cerrar",
+        "copy": "Copiar",
+        "copied": "Copiado",
+        "verification-failure": "Falló la Verificación",
+        "back": "Atrás",
+        "switch-to-light": "Cambiar a modo claro",
+        "switch-to-dark": "Cambiar a modo oscuro"
+      },
+      "notification-panel": {
+        "title": "Notificaciones"
+      },
+      "message-types": {
+        "warning": "advertencia",
+        "alert": "alerta",
+        "success": "éxito"
+      },
+      "messages": {
+        "error": "Error",
+        "unknown-error": "Error desconocido",
+        "update-wallet-successfully": "La billetera fue actualizada",
+        "delete-wallet-successfully": "La billetera fue eliminada",
+        "create-network-successfully": "La red fue creada",
+        "update-network-successfully": "La red fue actualizada",
+        "clear-cache-successfully": "El caché fue borrado",
+        "addr-copied": "La dirección ha sido copiada en el portapapeles",
+        "qrcode-copied": "El Código QR ha sido copiado en el portapapeles",
+        "view-the-run-node-doc": "Ver la guía en el navegador",
+        "remain-ckb-for-withdraw": "Es recomendable reservar algunos CKBytes para operaciones de retiro",
+        "no-valid-addresses-found": "No se encontraron direcciones válidas",
+        "decimal-range": "El decimal debe ser un número entero de {{range}}(incluido)",
+        "experimental-message-hardware": "Esta es una función experimental. Preste atención al riesgo y use con precaución.",
+        "experimental-message": "Esta es una función experimental, puede cambiar en cualquier momento. Por favor, use con precaución.",
+        "rebuild-sync": "Para una mejor experiencia de usuario, Neuron ha adoptado un nuevo almacenamiento, lo que requiere una migración de datos (estimado de 20 a 60 minutos).\nLo sentimos por la inconveniencia.",
+        "migrate-warning": "Advertencia: el proceso de migración puede fallar por razones desconocidas, lo que resulta en resincronización, ¡haga una copia de seguridad manualmente y comience la migración!",
+        "migrate-ckb-data": "Migrar",
+        "migrate": "Migrar",
+        "secp256k1/blake160-address-required": "Se requiere la dirección Secp256k1/Blake160",
+        "light-client-locktime-warning": "2. El modo de cliente ligero no admite mostrar CKBytes en tiempo de bloqueo.",
+        "light-client-cheque-warning": "Advertencia: el modo de cliente ligero no admite mostrar activos de Cheque.",
+        "fields": {
+          "wallet": "Billetera",
+          "name": "Nombre",
+          "password": "Contraseña",
+          "remote": "URL de RPC",
+          "network": "Red",
+          "address": "Dirección",
+          "amount": "Cantidad",
+          "transaction": "Transacción",
+          "default-address": "Dirección predeterminada",
+          "mnemonic": "Mnemónico",
+          "keystore-path": "Archivo Keystore",
+          "keystore-name": "Nombre de la billetera",
+          "keystore-password": "Contraseña",
+          "deposit": "Depósito",
+          "account-name": "Nombre de la cuenta",
+          "token-name": "Nombre del token",
+          "token-id": "ID del token",
+          "symbol": "Símbolo",
+          "decimal": "Decimal"
+        },
+        "codes": {
+        "-3": "",
+        "100": "La cantidad no es suficiente.",
+        "101": "La cantidad {{amount}} CKB es demasiado pequeña, por favor ingrese una cantidad no menor a {{required}} CKB.",
+        "102": "$t(messages.fields.{{fieldName}}) no es válido.",
+        "103": "$t(messages.fields.keystore-password) es incorrecta",
+        "104": "No se pudo conectar al nodo, por favor reinicie Neuron.",
+        "105": "Necesitas más CKBytes para el cambio (más de 61 CKBytes).",
+        "106": "Necesitas más CKBytes para el cambio (más de 61 CKBytes), o desliza hasta el final para enviar todo tu saldo.",
+        "107": "La cantidad {{amount}} CKB es demasiado pequeña, la transferencia con tiempo de bloqueo requiere una cantidad no menor a 69 CKB.",
+        "108": "La dirección proporcionada no pertenece a la billetera actual. Por favor revise su billetera o espere hasta que se complete la sincronización.",
+        "109": "Saldo insuficiente.",
+        "110": "Saldo disponible insuficiente, por favor intente de nuevo cuando la última transacción haya sido confirmada.",
+        "111": "La billetera actual no está configurada.",
+        "112": "Billetera {{id}} no encontrada.",
+        "113": "El archivo de almacenamiento es inválido, por favor revise la integridad del archivo.",
+        "114": "El balance mínimo de transferencia es {{bytes}} CKBytes.",
+        "115": "Necesitas más CKBytes para el cambio (más de 61 CKBytes), o haz clic en el botón 'Máx' para enviar todo tu saldo.",
+        "201": "$t(messages.fields.{{fieldName}}) es requerido.",
+        "202": "$t(messages.fields.{{fieldName}}) ya está en uso.",
+        "203": "$t(messages.fields.{{fieldName}}) debería ser más corto o igual a {{length}}.",
+        "204": "$t(messages.fields.{{fieldName}}) es demasiado corto, debe ser más largo o igual a {{length}}.",
+        "205": "$t(messages.fields.{{fieldName}}) {{fieldValue}} es inválido.",
+        "206": "$t(messages.fields.{{fieldName}}) no es válido, introduzca $t(messages.fields.{{fieldName}}) con no más de {{length}} decimales.",
+        "207": "$t(messages.fields.{{fieldName}}) {{fieldValue}} es inválido, no puede ser negativo.",
+        "208": "$t(messages.fields.{{fieldName}}) {{fieldValue}} no es válido, debería comenzar con http(s)://",
+        "209": "$t(messages.fields.{{fieldName}}) no debe tener espacios en blanco.",
+        "210": "\"{{value}}\" está reservado, por favor utilice otro.",
+        "211": "La cantidad no puede ser 0",
+        "212": "$t(messages.fields.{{fieldName}}) es demasiado simple",
+        "301": "$t(messages.fields.{{fieldName}}) {{fieldValue}} no se puede eliminar.",
+        "303": "$t(messages.fields.{{fieldName}}) no se encuentra.",
+        "304": "La cámara no está disponible o está deshabilitada.",
+        "305": "$t(messages.fields.address) no puede estar vacío.",
+        "306": "Por favor introduzca una dirección de red principal",
+        "307": "Por favor introduzca una dirección de testnet",
+        "308": "La cantidad no es suficiente",
+        "309": "El destinatario debe actualizar la dirección de su cuenta para aceptar más transferencias.",
+        "310": "Por favor introduzca una dirección {{tagName}}",
+        "402": "La aplicación CKB no se abre. Abra la aplicación CKB en su dispositivo.",
+        "403": "No se detectó ningún dispositivo. Por favor conecte su dispositivo",
+        "404": "Se detectaron varios dispositivos. Sólo se puede conectar un dispositivo del mismo modelo.",
+        "600": "Asegúrese de que la sincronización haya finalizado antes de realizar cualquier operación relacionada con transacciones."
+      }
+    },
+    "sync": {
+      "synced": "Sincronizado 100%",
+      "syncing": "Sincronizando {{ syncPercents }}",
+      "block-number": "número de bloque",
+      "syncing-balance": "El saldo se está actualizando",
+      "slow": "La sincronización es lenta",
+      "sync-failed": "Error de sincronización, por favor compruebe la red",
+      "sync-not-start": "La sincronización no se ha iniciado todavía, por favor intente reiniciar Neuron Wallet",
+      "connecting": "Conectando"
+    },
+    "pagination": {
+      "previous-page": "Página anterior",
+      "next-page": "Página siguiente",
+      "first-page": "Primera página",
+      "last-page": "Última página",
+      "page": "Página",
+      "selected": "Página actual",
+      "range": "{{start}} - {{end}} de {{count}}",
+      "page-no": "Página {{pageNo}}"
+    },
+    "nervos-dao": {
+      "free": "Disponible",
+      "locked": "Bloqueado",
+      "deposit": "Depósito",
+      "deposit-rules": "Reglas de Depósito",
+      "copy-balance": "Copiar Saldo",
+      "deposit-records": "Depósitos",
+      "completed-records": "Completados",
+      "apc": "APC Actual",
+      "apc-tooltip": "Porcentaje de Compensación Anual Actual",
+      "fee": "Tarifa de Transacción: ",
+      "deposit-to-nervos-dao": "Depositar en Nervos DAO",
+      "withdraw-from-nervos-dao": "Retirar de Nervos DAO",
+      "cancel": "Cancelar",
+      "proceed": "Continuar",
+      "compensation": "Compensación",
+      "notice-wait-time": "Aviso: Está a punto de iniciar un retiro, el cual tardará {{epochs}} epochs {{blocks}} bloques (aproximadamente {{days}} días) para completarse.",
+      "deposit-dialog-title": "Depósito",
+      "deposit-terms": "Nervos DAO requiere 102 CKBytes para el almacenamiento de Cells de depósito, las cuales no reciben compensación. Por favor visite Nervos DAO RFC para obtener más información sobre Nervos DAO",
+      "minimal-fee-required": "La capacidad mínima de depósito es de {{minimal}} CKBytes",
+      "compensation-accumulated": "Compensación acumulada en {{blockNumber}} bloques",
+      "withdraw-alert": "Advertencia: solo quedan {{epochs}} epochs ({{hours}} horas) hasta el final de su periodo de bloqueo actual. Si desea retirar en el periodo de bloqueo actual, envíe la solicitud de retiro a tiempo. Solo quedan {{nextLeftEpochs}} epochs ({{days}} días) hasta el final de su próximo periodo de bloqueo.",
+      "balance-not-reserved": "No reservar ningún CKBytes para futuras operaciones de DAO (no se recomienda)",
+      "deposit-amount": "Cantidad a Depositar (CKB)",
+      "deposit-record": {
+        "deposited-at": "Depositado",
+        "completed-at": "Completado",
+        "deposit-pending": "Depósito Pendiente",
+        "withdraw-action-label": "Retirar",
+        "unlock-action-label": "Desbloquear",
+        "record": "Registro",
+        "deposited": "Depositado",
+        "withdrawn": "Retirado",
+        "unlocked": "Desbloqueado",
+        "view-tx-detail": "Ver detalles de la transacción",
+        "locked-period": "Período de Bloqueo",
+        "compensated-period": "Período de Compensación",
+        "days-hours": "{{days}} días {{hours}} horas",
+        "no-deposit": "Sin Depósito",
+        "no-completed": "Sin Completar"
+    },
+    "compensation-period": {
+      "tooltip": {
+        "compensated-period": "Período de Compensación",
+        "days-hours": "{{days}} días {{hours}} horas",
+        "immature-for-withdraw": "Se tarda al menos 16 horas (4epochs) para realizar la siguiente acción",
+        "normal": "La cantidad de compensación es baja, no se recomienda la acción de retiro",
+        "suggested": "Período de retiro sugerido para una compensación maximizada",
+        "ending": "Es posible que el retiro solicitado se posponga y se bloquee durante un ciclo adicional de 30 días",
+        "withdrawn": "Retirado"
+      },
+      "stage-messages": {
+          "pending": "Pendiente...",
+          "immature-for-withdraw": "No se puede retirar CKB durante las próximas {{ horas }} horas",
+          "immature-for-unlock": "No se puede desbloquear CKB durante las próximas {{ horas }} horas",
+          "next-compensation-cycle": "El siguiente ciclo de compensación comenzará en aproximadamente {{días}} días",
+          "withdrawing": "Retirando...",
+          "compensation-cycle-will-end": "El ciclo de compensación termina en aproximadamente {{días}} días",
+          "compensation-cycle-has-ended": "El ciclo ha terminado, CKB está listo para ser desbloqueado",
+          "unlocking": "Desbloqueando..."
+        }
+      }
+    },
+    "nervos-dao-detail": {
+      "tx-detail": "Detalles de la transacción",
+      "deposited": "Depositado",
+      "withdrawn": "Retirado",
+      "unlocked": "Desbloqueado",
+      "basic-information": "Información básica",
+      "transaction-hash": "Hash de transacción",
+      "blockNumber": "Número de bloque",
+      "datetime": "Fecha y hora",
+      "income": "Ingreso",
+      "index": "Índice",
+      "address": "Dirección",
+      "amount": "Cantidad",
+      "cell-from-cellbase": "Desde cellbase",
+      "cancel": "Cancelar",
+      "next": "Siguiente"
+    },
+    "lock-info-dialog": {
+      "address-info": "Información de dirección",
+      "deprecated-address": "Dirección obsoleta"
+    },
+    "updates": {
+      "check-updates": "Buscar actualizaciones",
+      "checking-updates": "Buscando...",
+      "update-available": "Actualizaciones disponibles actualmente.",
+      "downloading-update": "Descargando actualización...",
+      "update-not-available": "Actualmente no hay actualizaciones disponibles.",
+      "updates-found-do-you-want-to-update": "Hay una actualización ({{versión}}) disponible",
+      "install-update": "Actualización inmediata",
+      "updates-downloaded-about-to-quit-and-install": "Actualización descargada. Listo para instalar y reiniciar.",
+      "quit-and-install": "Instalar y reiniciar"
+    },
+    "datetime": {
+      "mon": {
+        "full": "Lunes",
+        "short": "Lun.",
+        "tag": "L"
+      },
+      "tue": {
+        "full": "Martes",
+        "short": "Mar.",
+        "tag": "Ma"
+      },
+      "wed": {
+        "full": "Miércoles",
+        "short": "Mié.",
+        "tag": "X"
+      },
+      "thur": {
+        "full": "Jueves",
+        "short": "Jue.",
+        "tag": "J"
+      },
+      "fri": {
+        "full": "Viernes",
+        "short": "Vie.",
+        "tag": "V"
+      },
+      "sat": {
+        "full": "Sábado",
+        "short": "Sáb.",
+        "tag": "Sá"
+      },
+      "sun": {
+        "full": "Domingo",
+        "short": "Dom.",
+        "tag": "D"
+      },
+      "jan": {
+        "full": "Enero",
+        "short": "Ene.",
+        "tag": "E"
+      },
+      "feb": {
+        "full": "Febrero",
+        "short": "Feb.",
+        "tag": "F"
+      },
+      "mar": {
+        "full": "Marzo",
+        "short": "Mar.",
+        "tag": "M"
+      },
+      "apr": {
+        "full": "Abril",
+        "short": "Abr.",
+        "tag": "A"
+      },
+      "may": {
+        "full": "Mayo",
+        "short": "May.",
+        "tag": "M"
+      },
+      "june": {
+        "full": "Junio",
+        "short": "Jun.",
+        "tag": "J"
+      },
+      "july": {
+        "full": "Julio",
+        "short": "Jul.",
+        "tag": "J"
+      },
+      "aug": {
+        "full": "Agosto",
+        "short": "Ago.",
+        "tag": "Ago"
+      },
+      "sept": {
+        "full": "Septiembre",
+        "short": "Sept.",
+        "tag": "S"
+      },
+      "oct": {
+        "full": "Octubre",
+        "short": "Oct.",
+        "tag": "O"
+      },
+      "nov": {
+        "full": "Noviembre",
+        "short": "Nov.",
+        "tag": "N"
+      },
+      "dec": {
+        "full": "Diciembre",
+        "short": "Dic.",
+        "tag": "D"
+      },
+      "timezone": "Zona horaria",
+      "previous-month": "mes anterior",
+      "next-month": "próximo mes",
+      "start-tomorrow": "El tiempo seleccionado debe comenzar a partir de mañana."
+    },
+    "sign-and-verify": {
+      "window-title": "Firmar o verificar mensaje",
+      "sign-or-verify-message": "Firmar o verificar mensaje",
+      "message": "Mensaje",
+      "address": "Dirección",
+      "signature": "Firma",
+      "cancel": "Cancelar",
+      "sign": "Firmar",
+      "verify": "Verificar",
+      "password": "Contraseña",
+      "confirm": "Confirmar",
+      "verification-success": "Verificación exitosa",
+      "verification-failure": "Error de verificación",
+      "address-not-found": "La dirección proporcionada no pertenece a la billetera actual. Revise su billetera o espere hasta que se complete la sincronización.",
+      "sign-with-magic-byte": "El mensaje se firmará con bytes mágicos 'Mensaje de Nervos:'",
+      "verify-tip": "Se puede verificar con Neuron a partir de v0.33.1",
+      "verify-old-sign-success": "El mensaje fue firmado por Neuron antes de v0.33.1",
+      "input-message": "Por favor ingrese mensaje",
+      "input-choose-address": "Por favor ingrese o elija una dirección",
+      "input-password": "Por favor ingrese su contraseña"
+    },
+    "special-assets": {
+      "title": "Activos personalizados",
+      "date": "Fecha",
+      "assets": "Activos",
+      "type-script-tooltip": "Type Script",
+      "data-tooltip": "Datos",
+      "user-defined-asset": "Activo no catalogado",
+      "user-defined-asset-tooltip": "Este es un activo no catalogado. Neuron no puede procesarlo actualmente. Utilice un software de terceros para verificarlo.",
+      "locked-asset": "Bloqueado",
+      "locked-asset-tooltip": "El parámetro de bloqueo es de {{epochs}} épocas, la fecha de lanzamiento estimada es {{year}}-{{month}}-{{day}} (según la altura del bloque en ejecución real, pueden haber algunas variaciones de tiempo en el tiempo de bloqueo).",
+      "withdraw-asset-tooltip": "Hora estimada de lanzamiento es {{year}}-{{month}}-{{day}} {{hour}}:{{minute}} (según la altura del bloque en ejecución real).",
+      "user-defined-token-tooltip": "Migre el activo sUDT a una cuenta de activos sUDT",
+      "claim-asset": "Reclamar",
+      "withdraw-asset": "Retirar",
+      "view-details": "Ver detalles",
+      "release-success": "El activo fue liberado, vea los detalles en Historial.",
+      "no-special-assets": "No hay activos personalizados",
+      "experimental": "Experimental",
+      "unknown-asset": "Activo desconocido",
+      "transfer-nft": "Enviar",
+      "user-defined-token": "Migrar",
+      "transfer-nft-success": "Transferencia de activos exitosa",
+      "migrate-sudt-success": "Conversión a nueva cuenta de activo sUDT exitosa",
+      "send-sudt-success": "Transferencia exitosa a la cuenta de activo sUDT",
+      "unlock-success": "Activo reclamado. Vaya al historial de transacciones para obtener más detalles.",
+      "withdraw-cheque-success": "El activo fue retirado. Vaya al historial de transacciones para obtener más detalles.",
+      "claim-cheque-success": "Activo reclamado. Vaya al historial de transacciones para obtener más detalles."
+    },
+    "migrate-sudt": {
+      "title": "Migrar a una cuenta de activo sUDT",
+      "choose-title": "Modo de migración",
+      "next": "Siguiente",
+      "back": "Atrás",
+      "input-token": "Por favor ingrese el nombre del token",
+      "input-symbol": "Por favor ingrese el símbolo",
+      "input-decimal": "Por favor ingrese el decimal",
+      "turn-into-new-account": {
+        "title": "Conviértalo en una nueva cuenta de activo sUDT",
+        "sub-title": "Convierta el activo sUDT en una nueva cuenta sUDT, ocupa al menos 142 CKbytes.",
+        "cancel": "Cancelar",
+        "confirm": "Confirmar"
+      },
+      "transfer-to-exist-account": {
+        "title": "Transferir a una cuenta de activo sUDT",
+        "sub-title": "Transfiera todo el saldo sUDT a una cuenta sUDT existente. Asegúrese de que la cuenta objetivo esté activa."
+      },
+      "cancel": "Cancelar",
+      "confirm": "Confirmar",
+      "balance": "Balance",
+      "amount": "Monto",
+      "address": "Dirección"
+    },
+    "s-udt": {
+      "edit-account-success": "La información de la cuenta ha sido editada con éxito",
+      "create-account-success": "La cuenta de activos se ha creado correctamente",
+      "account-list": {
+        "title": "Cuentas de activos",
+        "no-asset-accounts": "No se ha detectado ningún activo sUDT",
+        "search": "Nombre de cuenta, nombre de token o símbolo",
+        "syncing": "Sincronizando, los datos actuales pueden ser inexactos",
+        "send": "Enviar",
+        "receive": "Recibir",
+        "set-account-info": "Establecer información de la cuenta"
+      },
+      "create-dialog": {
+        "create-asset-account": "Crear cuenta de activos",
+        "input-account-name": "Por favor ingrese el nombre de la cuenta",
+        "select-account-type": "Seleccione el tipo de cuenta",
+        "account-name": "Nombre de la cuenta",
+        "sudt-account": "Cuenta de activos sUDT",
+        "delete-failed": "No se pudo eliminar la configuración multifirma, el motivo del fallo: {{reason}}",
+        "ckb-account": "Cuenta CKB",
+        "set-token-info": "Establecer información del token",
+        "token-id": "ID del token",
+        "token-name": "Nombre del token",
+        "symbol": "Símbolo",
+        "decimal": "Decimal",
+        "confirm": "Confirmar",
+        "cancel": "Cancelar",
+        "next": "Siguiente",
+        "back": "Atrás",
+        "occupy-142-ckb": "Ocupa al menos 142 CKbytes.",
+        "occupy-61-ckb": "Ocupa al menos 61 CKbytes.",
+        "input": {
+          "account-name": "Por favor ingrese el nombre de la cuenta",
+          "token-id": "Ingrese el ID del token",
+          "token-name": "Ingrese el nombre del token",
+          "symbol": "Ingrese el símbolo",
+          "decimal": "Ingrese el decimal"
+        },
+        "placeholder": {
+          "token-id": "El ID del token es el Args del sUDT Type Script, que es el mismo que el hash de bloqueo del emisor del token."
+        }
+      },
+      "send": {
+        "title": "Enviar",
+        "address": "Enviar a",
+        "address-placeholder": "Ingrese la dirección",
+        "input-address": "Ingrese la dirección",
+        "input-description": "Ingrese la descripción, opcional",
+        "amount": "Monto",
+        "amount-placeholder": "Ingrese la cantidad",
+        "description": "Descripción",
+        "description-placeholder": "Ingrese la descripción, opcional",
+        "submit": "Enviar",
+        "click-to-edit": "Haga clic para editar",
+        "cheque-address-hint": {
+          "label": "Bloquee temporalmente 162 CKBytes",
+          "tooltip": "La capacidad de 162 CKBytes se bloqueará temporalmente para inicializar la transferencia del token, y se desbloqueará automáticamente una vez que el receptor reclame el token."
+        },
+        "destroy": "Destruir",
+        "destroy-ckb-desc": "Devolverá todo el CKB de esta cuenta de activo CKB a su dirección de cambio.",
+        "destroy-sudt-desc": "Devolverá el CKB ocupado de la cuenta de activos a su dirección de cambio.",
+        "extra-ckb-send-to-secp256": {
+          "label": "Enviar 142 CKBytes adicionales junto con {{assetName}}",
+          "tooltip": "Se enviarán 142 CKBytes adicionales junto con {{assetName}} para mantener el activo"
+        },
+        "extra-ckb-send-to-acp": {
+          "label": "Enviar {{extraCKB}} CKBytes adicionales para crear una cuenta de activo para el receptor"
+        },
+        "extra-ckb-send-to-unknow": {
+          "label": "La dirección de recepción tiene un script de bloqueo desconocido, asegúrese de que el receptor sepa cómo manejarlo, y se enviarán {{extraCKB}} CKBytes adicionales junto con {{assetName}} para mantener el activo"
+        },
+        "select-option": "Confirme la opción anterior antes de enviar"
+      },
+      "receive": {
+        "notation": "Solo acepta {{symbol}}"
+      },
+      "update-dialog": {
+        "update-asset-account": "Detalle de cuenta",
+        "account-name": "Nombre de la cuenta",
+        "token-id": "ID del token",
+        "token-name": "Nombre del token",
+        "symbol": "Símbolo",
+        "decimal": "Decimal",
+        "confirm": "Confirmar",
+        "cancel": "Cancelar"
+      }
+    },
+    "multisig-address": {
+      "window-title": "Direcciones de Multifirma",
+      "search": {
+        "placeholder": "buscar por dirección de multifirma, alias"
+      },
+      "add": {
+        "label": "Crear"
+      },
+      "import": {
+        "label": "Importar"
+      },
+      "export": {
+        "label": "Exportar"
+      },
+      "ok": "Aceptar",
+      "no-data": "No hay dirección multifirma",
+      "table": {
+        "address": "Dirección del firmante",
+        "alias": "Alias",
+        "type": "Tipo",
+        "balance": "Balance",
+        "copy-address": "Copiar dirección",
+        "action": "Acciones",
+        "more": "Más",
+        "sync-block": "Bloque sincronizado",
+        "actions": {
+          "info": "Información",
+          "send": "Enviar",
+          "approve": "Aprobar",
+          "delete": "Eliminar"
+        }
+      },
+      "import-dialog": {
+        "actions": {
+          "cancel": "Cancelar",
+          "confirm": "Confirmar"
+        },
+        "notice": "Solo se puede importar una configuración a la vez. Si el contenido del archivo es una matriz, se importa el primero de forma predeterminada."
+      },
+      "delete-failed": "Error al eliminar la configuración multifirma",
+      "remove-multisig-address": "Eliminar dirección multifirma",
+      "remove-multisig-address-msg": "¿Está seguro de que desea eliminar la dirección multifirma seleccionada?",
+      "send-ckb": {
+        "title": "Enviar CKB desde una dirección multifirma",
+        "detail": "Enviar desde la dirección multifirma {{m}}-de-{{n}}: <0></0>",
+        "balance": "Balance",
+        "address": "Dirección",
+        "amount": "Monto",
+        "send": "Enviar",
+        "cancel": "Cancelar",
+        "export": "Exportar Tx"
+      },
+      "multi-details": "Detalles de la dirección multifirma",
+      "create-dialog": {
+        "title": "Crear dirección multifirma",
+        "preview-title": "La dirección multifirma se ha generado",
+        "index": "Índice",
+        "required": "Requerido",
+        "signer-address": "Dirección del firmante",
+        "copy-address": "Copiar dirección",
+        "placeholder": "Ingrese {{type}} (1-255)",
+        "m-n": {
+          "title": "Ingrese la configuración de dirección multifirma en el tipo de m-de-n donde se requiere cualquier m llaves privadas de un posible n para mover el activo",
+          "m-less-equal-n": "Para la dirección multifirma m-de-n, m no debe ser mayor que n",
+          "m-n-required": "Ingrese m/n",
+          "m-n-between-0-256": "m/n debe estar entre 0 y 256"
+        },
+        "multi-address-info": {
+          "title": "Ingrese los firmantes para la dirección multifirma {{m}}-de-{{n}}",
+          "view-title": "La dirección multifirma {{m}}-de-{{n}}",
+          "ckb-address-placeholder": "Ingrese la dirección de ckb"
+        },
+        "multi-list": "Lista de firmantes",
+        "actions": {
+          "cancel": "Cancelar",
+          "back": "Atrás",
+          "next": "Siguiente",
+          "generate-address": "Generar dirección",
+          "confirm": "Confirmar"
+        },
+        "duplicate-address-forbid": "La dirección no puede ser duplicada"
+      },
+      "approve-dialog": {
+        "title": "Aprobar con dirección multifirma",
+        "detail": "Aprobar con la dirección multifirma {{m}}-de-{{n}} <0></0>",
+        "transaction": "Transacción",
+        "cancel": "Cancelar",
+        "signAndExport": "Firmar y exportar",
+        "export": "Exportar Tx",
+        "signAndBroadcast": "Firmar y enviar",
+        "broadcast": "Enviar",
+        "content": "Contenido:",
+        "status": "Estado",
+        "signerApprove": "Falta la aprobación de {{m}} firmante(s), incluidos {{r}} de firmante(s) especificado(s)",
+        "noRSignerApprove": "Falta la aprobación de {{m}} firmante(s)",
+        "signed": "Firmado",
+        "view-concise-data": "Datos concisos",
+        "view-raw-data": "Datos sin procesar"
+      }
+    },
+    "dropdown": {
+      "placeholder": "Por favor seleccione..."
+    },
+    "price-switch": {
+      "price": "Precio",
+      "customPrice": "Precio personalizado",
+      "errorTip": "El precio no puede ser menor que {{minPrice}} shannons/KB, vuelva a ingresar",
+      "hintTip": "El precio sugerido es {{suggestFeeRate}} shannons/KB",
+      "priceColumn": "Precio {{priceValue}} shannons/KB | Tarifa {{feeValue}} CKB",
+      "fast": "Rápido",
+      "standard": "Estándar",
+      "slow": "Lento",
+      "countDownTip": "El precio se actualizará después de {{countDown}} segundos",
+      "switchToCustomPrice": "Cambio a precio personalizado",
+      "switchToPrice": "Cambio a precio"
+    },
+    "set-start-block-number": {
+      "title": "Configurar el número de bloque inicial",
+      "tip": "El número de bloque de sincronización inicial se configura cuando se utiliza el nodo CKB de cliente ligero, por tanto puede configurarlo y acelerar la sincronización",
+      "input-place-holder": "Ingrese el número de bloque de sincronización inicial, por ejemplo: 10,100,101",
+      "locate-first-tx": "Ubicar la primera transacción",
+      "view-block": "Ver bloque"
+    },
+    "main": {
+      "external-node-detected-dialog": {
+        "title": "Nodo externo detectado",
+        "body-tips-without-network": "\"Internal Node\" está reservado para el nodo CKB incorporado, agregue una nueva opción de red para el nodo externo.",
+        "body-tips-with-network": "\"Internal Node\" está reservado para el nodo CKB incorporado, seleccione una de las siguientes opciones de red o agregue una nueva para el nodo externo.",
+        "add-network": "Agregar red",
+        "ignore-external-node": "Ignorar nodo externo"
+      }
+    },
+    "cell-manage": {
+      "title": "Gestionar Cell",
+      "wallet-balance": "Balance de la billetera",
+      "table": {
+        "head": {
+          "date": "Fecha",
+          "type": "Tipo",
+          "balance": "Balance",
+          "status": "Estado",
+          "description": "Descripción",
+          "action": "Acción"
+        },
+        "locked": "Bloqueado",
+        "unlocked": "Desbloqueado",
+        "default-description": "Ninguno"
+      },
+      "cell-detail-dialog": {
+        "title": "Detalles de la Cell",
+        "capacity-used": "Capacidad utilizada",
+        "data": "Datos",
+        "total": "Total",
+        "used": "Usado"
+      },
+      "locked-reason": {
+        "multi-locktime": "La Cell tiene un bloqueo de tiempo y no se puede usar hasta {{time}}.",
+        "multi-locktime-reached": "El bloqueo de tiempo para esta Cell ha expirado y debe reclamarla en Activos personalizados antes de usarla.",
+        "cheque-acp-multisig": "Esta es una Cell {{type}} y no admite desbloqueo.",
+        "NFT-SUDT-DAO": "Esta es un activo {{type}} y no admite desbloqueo.",
+        "Unknown": "Este es un activo no catalogado. Revise y confirme antes de continuar."
+      },
+      "cell-lock-dialog": {
+        "title": "Bloquear Cell",
+        "capacity": "Bloquear selección de Cells de {{capacity}} CKB",
+        "locked-cell-can-not-use": "Advertencia, las Cells bloqueadas no se pueden utilizar."
+      },
+      "cell-unlock-dialog": {
+        "title": "Desbloquear Cell",
+        "capacity": "Desbloquear Cell seleccionada {{capacity}} CKB"
+      },
+      "cell-consume-dialog": {
+        "title": "Consumir Cell",
+        "warn-consume": "Al consumir la Cell, no se retendrá ningún dato y se utilizará todo el ckb, asegúrese de que no haya datos importantes que necesiten ser retenidos"
+      },
+      "enter-password": "Ingresar Contraseña",
+      "password-placeholder": "Ingrese la contraseña de la billetera",
+      "lock": "Bloquear",
+      "unlock": "Desbloquear",
+      "consume": "Consumir"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 9bf5bafb66..98e95bd3e6 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -413,7 +413,8 @@
         "en-US": "Anglais (États-Unis)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
-        "fr": "Français"
+        "fr": "Français",
+        "es": "Español"
       },
       "data": {
         "ckb-node-data": "Configuration & stockage du noeud CKB",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index fa8d5b9868..ed8a420952 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -407,7 +407,8 @@
         "en-US": "English(United States)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
-        "fr": "Français"
+        "fr": "Français",
+        "es": "Español"
       },
       "data": {
         "ckb-node-data": "節點配置和數據",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 6d31935a58..4edaf921b0 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -406,7 +406,8 @@
         "en-US": "English(United States)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
-        "fr": "Français"
+        "fr": "Français",
+        "es": "Español"
       },
       "data": {
         "ckb-node-data": "节点配置和数据",
diff --git a/packages/neuron-ui/src/tests/calendar/index.test.ts b/packages/neuron-ui/src/tests/calendar/index.test.ts
index cf7e24dea2..bfac169ca6 100644
--- a/packages/neuron-ui/src/tests/calendar/index.test.ts
+++ b/packages/neuron-ui/src/tests/calendar/index.test.ts
@@ -110,8 +110,12 @@ describe('Get Local Month Short Names', () => {
     const names = ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.']
     expect(getLocalMonthShortNames('fr')).toEqual(names)
   })
-})
 
+  it('Spanish', () => {
+    const names = ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sept', 'oct', 'nov', 'dic']
+    expect(getLocalMonthShortNames('es')).toEqual(names)
+  })
+})
 describe('Get Local Month Names', () => {
   it('Chinese', () => {
     const names = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
@@ -152,6 +156,24 @@ describe('Get Local Month Names', () => {
     ]
     expect(getLocalMonthNames('fr')).toEqual(names)
   })
+
+  it('Spanish', () => {
+    const names = [
+      'enero',
+      'febrero',
+      'marzo',
+      'abril',
+      'mayo',
+      'junio',
+      'julio',
+      'agosto',
+      'septiembre',
+      'octubre',
+      'noviembre',
+      'diciembre',
+    ]
+    expect(getLocalMonthNames('es')).toEqual(names)
+  })
 })
 
 describe('Get Local Week Names', () => {
@@ -165,6 +187,11 @@ describe('Get Local Week Names', () => {
     expect(getLocalWeekNames('en')).toEqual(names)
   })
 
+  it('Spanish', () => {
+    const names = ['D', 'L', 'M', 'X', 'J', 'V', 'S']
+    expect(getLocalWeekNames('es')).toEqual(names)
+  })
+
   it('French', () => {
     const names = ['D', 'L', 'M', 'M', 'J', 'V', 'S']
     expect(getLocalWeekNames('fr')).toEqual(names)
diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts
index 624cf75931..7442b63012 100644
--- a/packages/neuron-ui/src/utils/const.ts
+++ b/packages/neuron-ui/src/utils/const.ts
@@ -49,7 +49,7 @@ export const DEFAULT_SUDT_FIELDS = {
   CKBSymbol: 'CKB',
   CKBDecimal: '8',
 }
-export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'fr'] as const
+export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'fr', 'es'] as const
 
 // address property
 export const SHORT_ADDR_LENGTH = 46
diff --git a/packages/neuron-ui/src/utils/i18n.ts b/packages/neuron-ui/src/utils/i18n.ts
index e422f4364d..7202152a5e 100644
--- a/packages/neuron-ui/src/utils/i18n.ts
+++ b/packages/neuron-ui/src/utils/i18n.ts
@@ -6,11 +6,13 @@ import zh from 'locales/zh.json'
 import en from 'locales/en.json'
 import zhTW from 'locales/zh-tw.json'
 import fr from 'locales/fr.json'
+import es from 'locales/es.json'
 
 i18n.use(initReactI18next).init({
   resources: {
     en,
     fr,
+    es,
     zh,
     'zh-TW': zhTW,
   },
diff --git a/packages/neuron-wallet/src/locales/es.ts b/packages/neuron-wallet/src/locales/es.ts
new file mode 100644
index 0000000000..259a23ee13
--- /dev/null
+++ b/packages/neuron-wallet/src/locales/es.ts
@@ -0,0 +1,302 @@
+export default {
+  translation: {
+    keywords: {
+      wallet: 'Billetera',
+      password: 'Contraseña',
+      'wallet-name': 'Nombre de la Billetera',
+    },
+    'application-menu': {
+      neuron: {
+        about: 'Acerca de {{app}}',
+        preferences: 'Preferencias...',
+        'check-updates': 'Buscar Actualizaciones...',
+        quit: 'Salir de {{app}}',
+      },
+      wallet: {
+        label: 'Billetera',
+        select: 'Seleccionar Billetera',
+        'create-new': 'Crear Nueva Billetera',
+        import: 'Importar Billetera',
+        backup: 'Respaldar Billetera Actual',
+        'export-xpubkey': 'Exportar Clave Pública Extendida',
+        delete: 'Eliminar Billetera Actual',
+        'change-password': 'Cambiar Contraseña',
+        'import-mnemonic': 'Importar Semilla de Billetera',
+        'import-keystore': 'Importar desde Keystore',
+        'import-xpubkey': 'Importar Clave Pública Extendida',
+        'import-hardware': 'Importar Billetera de Hardware',
+      },
+      edit: {
+        label: 'Editar',
+        cut: 'Cortar',
+        copy: 'Copiar',
+        paste: 'Pegar',
+        selectall: 'Seleccionar Todo',
+      },
+      tools: {
+        label: 'Herramientas',
+        'sign-and-verify': 'Firmar/Verificar Mensaje',
+        'multisig-address': 'Direcciones Multifirma',
+        'offline-sign': 'Firma sin Conexión',
+        'clear-sync-data': 'Limpiar todos los datos sincronizados',
+      },
+      window: {
+        label: 'Ventana',
+        minimize: 'Minimizar',
+        close: 'Cerrar Ventana',
+      },
+      help: {
+        label: 'Ayuda',
+        'nervos-website': 'Sitio web de Nervos',
+        'source-code': 'Código Fuente',
+        'report-issue': 'Informar Problema',
+        'contact-us': 'Contáctenos',
+        'contact-us-message':
+          '> Por favor, adjunte la información de depuración exportada a través de "Menú" -> "Ayuda" -> "Exportar Información de Depuración".',
+        documentation: 'Documentación',
+        settings: 'Configuración',
+        'export-debug-info': 'Exportar Información de Depuración',
+      },
+      develop: {
+        develop: 'Desarrollar',
+        'force-reload': 'Forzar Recarga',
+        reload: 'Recargar',
+        'toggle-dev-tools': 'Alternar Herramientas de Desarrollo',
+      },
+    },
+    services: {
+      transactions: 'Transacciones',
+      wallets: 'Billeteras',
+    },
+    messages: {
+      'failed-to-load-networks': 'Error al cargar las redes.',
+      'Networks-will-be-reset': 'Las redes se reiniciarán.',
+      'wallet-password-less-than-min-length': 'La contraseña debe tener al menos {{minPasswordLength}} caracteres.',
+      'wallet-password-more-than-max-length': 'La contraseña debe tener hasta {{maxPasswordLength}} caracteres.',
+      'wallet-password-letter-complexity':
+        'La contraseña debe contener una combinación de letras mayúsculas y minúsculas, números y símbolos especiales.',
+      'current-wallet-not-set': 'La billetera actual no está configurada.',
+      'incorrect-password': 'Contraseña incorrecta',
+      'invalid-address': 'La dirección {{address}} no es válida.',
+      'codehash-not-loaded': 'codehash no está cargado.',
+      'wallet-not-found': 'Billetera {{id}} no encontrada.',
+      'failed-to-create-mnemonic': 'Error al crear mnemónico.',
+      'network-not-found': 'No se encuentra la red con ID {{id}}.',
+      'invalid-name': 'El nombre de {{field}} no es válido.',
+      'default-network-unremovable': 'La red predeterminada no se puede quitar.',
+      'lack-of-default-network': 'Falta la red predeterminada.',
+      'current-network-not-set': 'La RPC del nodo CKB actual no ha sido configurada.',
+      'transaction-not-found': 'No se encuentra la transacción {{hash}}.',
+      'is-required': '{{field}} es obligatorio.',
+      'invalid-format': '{{field}} tiene un formato inválido.',
+      'used-name': 'El nombre de {{field}} ya está en uso, elija otro.',
+      'missing-required-argument': 'Falta el argumento obligatorio.',
+      'save-keystore': 'Guardar Keystore.',
+      'save-extended-public-key': 'Guardar Clave Pública Extendida.',
+      'import-extended-public-key': 'Importar Clave Pública Extendida.',
+      'invalid-mnemonic': 'La semilla de la billetera no es válida, por favor, revísela nuevamente.',
+      'unsupported-cipher': 'Cifrado no compatible.',
+      'capacity-not-enough': 'Saldo insuficiente.',
+      'capacity-not-enough-for-change': 'Necesitas más capacidades para el cambio (más de 61 CKBytes).',
+      'capacity-not-enough-for-change-by-transfer':
+        "Necesitas más capacidades para el cambio (más de 61 CKBytes), o haz clic en el botón 'Max' para enviar todo tu saldo.",
+      'live-capacity-not-enough':
+        'Saldo disponible insuficiente, por favor, inténtalo nuevamente cuando la última transacción haya sido confirmada.',
+      'capacity-too-small': 'El saldo mínimo de transferencia es de {{bytes}} CKBytes.',
+      'should-be-type-of': '{{field}} debe ser de tipo {{type}}.',
+      'invalid-keystore': 'Keystore no válido, por favor, verifica la integridad de tu archivo.',
+      'invalid-json': 'Archivo JSON no válido, por favor, verifica la integridad de tu archivo.',
+      'cell-is-not-yet-live': 'Por favor, espera hasta que la última transacción sea confirmada por la cadena.',
+      'transaction-is-not-committed-yet':
+        'No se pueden encontrar Cells requeridas en la cadena, por favor, asegúrate de que las transacciones relacionadas hayan sido confirmadas.',
+      'mainnet-address-required': '{{address}} no es una dirección de mainnet.',
+      'testnet-address-required': '{{address}} no es una dirección de testnet.',
+      'address-not-found':
+        'La dirección proporcionada no pertenece a la billetera actual. Por favor, verifica tu billetera o espera a que se complete la sincronización.',
+      'target-output-not-found': 'No hay una billetera de cuenta asociada con esta dirección.',
+      'acp-same-account': 'La cuenta de pago y la cuenta receptora no deben ser iguales.',
+      'device-sign-canceled':
+        "Has cancelado la solicitud de firma. De lo contrario, asegúrate de que la aplicación Nervos en tu dispositivo tenga la configuración 'permitir datos de contrato' habilitada.",
+      'connect-device-failed': 'No se puede conectar el dispositivo, por favor, verifica tu conexión.',
+      'unsupported-manufacturer': 'Los dispositivos de {{manufacturer}} aún no son compatibles.',
+      'wallet-not-supported-function': 'Esta billetera no admite la función {name}.',
+      'invalid-transaction-file': 'Archivo de transacción no válido.',
+      'offline-sign-failed': 'Firma fallida, por favor, verifica si estás firmando con la billetera correcta.',
+      'multisig-script-prefix-error': 'Error en la configuración multifirma',
+      'multisig-config-not-exist': 'La configuración multifirma no existe',
+      'multisig-config-exist': 'La configuración multifirma ya existe',
+      'multisig-config-address-error': 'La configuración de dirección de la configuración multifirma es incorrecta',
+      'multisig-config-need-error': 'La generación de transacciones multifirma requiere configuración multifirma',
+      'transaction-no-input-parameter': 'Falta un parámetro requerido en la Cell de entrada de la consulta',
+      'migrate-sudt-no-type': 'La Cell de migración no tiene un type script',
+      'multisig-not-signed': 'Faltan firmas parciales para transacciones multifirma',
+      'multisig-lock-hash-mismatch':
+        'La dirección multifirma actual no coincide con la transacción que se va a aprobar',
+      'sudt-acp-have-data': 'La cuenta ACP de sUDT destruida tiene saldo',
+      'no-match-address-for-sign': 'No se encontró una dirección coincidente',
+      'target-lock-error': 'La cuenta de activos CKB solo puede transferirse a una dirección sepe256k1 o acp',
+      'no-exist-ckb-node-data':
+        '{{path}} no tiene configuración y almacenamiento de nodo CKB, presiona confirmar para sincronizar desde cero',
+      'light-client-sudt-acp-error':
+        'El modo cliente ligero no admite el envío de activos a la cuenta de activos de otra persona',
+      'could-not-connect-service': 'No se pudo conectar al servicio, por favor, inténtalo nuevamente más tarde.',
+    },
+    messageBox: {
+      button: {
+        confirm: 'Aceptar',
+        discard: 'Cancelar',
+      },
+      'clear-sync-data': {
+        title: 'Borrar todos los datos sincronizados',
+        message:
+          'Borrar todos los datos sincronizados eliminará todos los datos sincronizados locales y volverá a sincronizar los datos en la cadena, la sincronización completa puede llevar mucho tiempo.',
+      },
+      'send-capacity': {
+        title: 'Enviar transacción',
+      },
+      'remove-network': {
+        title: 'Eliminar red',
+        message: 'La red {{name}} (dirección: {{address}}) será eliminada.',
+        alert: 'Esta es la red actual, al eliminarla, la conexión cambiará a la red predeterminada',
+      },
+      'remove-wallet': {
+        title: 'Eliminar la billetera',
+        password: 'Contraseña',
+      },
+      'backup-keystore': {
+        title: 'Respaldar el Keystore',
+        password: 'Contraseña',
+      },
+      transaction: {
+        title: 'Transacción: {{hash}}',
+      },
+      'sign-and-verify': {
+        title: 'Firmar/verificar mensaje',
+      },
+      'multisig-address': {
+        title: 'Direcciones Multifirma',
+      },
+      'ckb-dependency': {
+        title: 'Nodo CKB empaquetado',
+        message: 'Se requiere dependencia',
+        detail: `Los nodos de red en Neuron dependen de componentes C++, así que instale la última versión de Microsoft Visual C++ Redistributable for x64 para garantizar que el software funcione correctamente.`,
+        buttons: {
+          'install-and-exit': 'Instalar y salir',
+        },
+      },
+      'acp-migration': {
+        title: 'Actualizar cuenta de activos',
+        message: 'Actualizar cuenta de activos',
+        detail:
+          'Recientemente, nuestro equipo de seguridad identificó una posible vulnerabilidad en el script experimental de la cuenta de activos. Hemos implementado un nuevo script de cuenta de activos con una solución en la red principal y todas las cuentas de activos futuras usarán la nueva versión. Le sugerimos que las actualice para utilizar el nuevo script.',
+        buttons: {
+          migrate: 'Actualizar de forma segura ahora',
+          skip: 'Conozco el riesgo, actualizaré más tarde',
+        },
+      },
+      'acp-migration-completed': {
+        title: '¡Felicidades! Ha completado la actualización segura.',
+        message: '¡Felicidades! Ha completado la actualización segura.',
+        buttons: {
+          ok: 'Aceptar',
+        },
+      },
+      'hard-fork-migrate': {
+        message:
+          'Para adaptarse a la última versión de CKB, Neuron volverá a sincronizar los datos en la cadena, y la sincronización completa puede llevar mucho tiempo.',
+      },
+      'mail-us': {
+        message:
+          'Por favor, envíenos un correo con la información de depuración exportada a través de "Menú" -> "Ayuda" -> "Exportar información de depuración".',
+        'open-client': 'Abrir cliente de correo',
+        'fail-message':
+          'No se puede iniciar el cliente de correo, copie la dirección de correo, agregue la información de depuración exportada a través de "Menú" -> "Ayuda" -> "Exportar información de depuración" y envíenosla.',
+        'copy-mail-addr': 'Copiar dirección de correo',
+      },
+      'migrate-failed': {
+        title: 'Falló la migración',
+        message:
+          'La migración falló, presione Aceptar para eliminar los datos antiguos y sincronizar desde cero, o haga clic en Cancelar para migrar más tarde al reiniciar Neuron. Razón del fallo de la migración: {{ reason }}',
+        buttons: {
+          ok: 'Aceptar',
+          cancel: 'Cancelar',
+        },
+      },
+    },
+    prompt: {
+      password: {
+        label: 'Ingrese su contraseña',
+        submit: 'Enviar',
+        cancel: 'Cancelar',
+      },
+    },
+    updater: {
+      'update-not-available': 'Actualmente no hay actualizaciones disponibles.',
+    },
+    common: {
+      yes: 'Sí',
+      no: 'No',
+      ok: 'OK',
+      cancel: 'Cancelar',
+      error: 'Error',
+    },
+    'export-debug-info': {
+      'export-debug-info': 'Exportar Información de Depuración',
+      'debug-info-exported': 'La información de depuración se ha exportado a {{ file }}',
+    },
+    about: {
+      'app-version': '{{name}} Versión: {{version}}',
+      'ckb-client-version': 'Versión del Cliente CKB: {{version}}',
+      'ckb-light-client-version': 'Versión del Cliente Ligero CKB: {{version}}',
+    },
+    settings: {
+      title: {
+        normal: 'Configuraciones',
+        mac: 'Preferencias',
+      },
+    },
+    'export-transactions': {
+      'export-transactions': 'Exportar Historial de Transacciones',
+      'export-success': 'Las transacciones se han exportado',
+      'transactions-exported': '{{total}} registros de transacciones se han exportado a {{file}}',
+      column: {
+        time: 'Tiempo',
+        'block-number': 'Número de Bloque',
+        'tx-hash': 'Hash de Transacción',
+        'tx-type': 'Tipo de Transacción',
+        amount: 'Cantidad de CKB',
+        'udt-amount': 'Cantidad de UDT',
+        description: 'Descripción',
+      },
+      'tx-type': {
+        send: 'Enviar',
+        receive: 'Recibir',
+        'create-asset-account': 'Crear Cuenta de Activos {{name}}',
+        'destroy-asset-account': 'Destruir Cuenta de Activos {{name}}',
+      },
+    },
+    'offline-signature': {
+      'export-transaction': 'Exportar Transacción como JSON',
+      'transaction-exported': 'La transacción se ha exportado a {{filePath}}.',
+      'load-transaction': 'Cargar archivo de transacción',
+    },
+    'multisig-config': {
+      'import-config': 'Importar configuración multifirma',
+      'export-config': 'Exportar configuración multifirma',
+      'config-exported': 'Las configuraciones multifirma se han exportado a {{filePath}}.',
+      'import-duplicate': 'Por favor, verifique configuraciones duplicadas',
+      'import-result': 'Importación exitosa {{success}}, fallida {{fail}}.{{failCheck}}',
+      'confirm-delete': '¿Confirmar eliminar la configuración multifirma?',
+      'approve-tx': 'Confirmar transacción multifirma',
+      'delete-actions': {
+        ok: 'Confirmar',
+        cancel: 'Cancelar',
+      },
+    },
+    'open-in-explorer': {
+      title: 'Ver en CKB Explorer',
+      transaction: 'transacción',
+      message: 'Ver {{type}} {{key}} en CKB Explorer',
+    },
+  },
+}
diff --git a/packages/neuron-wallet/src/locales/i18n.ts b/packages/neuron-wallet/src/locales/i18n.ts
index 882ba31cfd..703b1f042c 100644
--- a/packages/neuron-wallet/src/locales/i18n.ts
+++ b/packages/neuron-wallet/src/locales/i18n.ts
@@ -3,11 +3,13 @@ import zh from './zh'
 import en from './en'
 import zhTW from './zh-tw'
 import fr from './fr'
+import es from './es'
 
 i18n.init({
   resources: {
     en,
     fr,
+    es,
     zh,
     'zh-TW': zhTW,
   },
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
index 89f82f35d6..719552dc60 100644
--- a/packages/neuron-wallet/src/services/settings.ts
+++ b/packages/neuron-wallet/src/services/settings.ts
@@ -9,7 +9,7 @@ import { LIGHT_CLIENT_MAINNET, LIGHT_CLIENT_TESTNET } from '../utils/const'
 
 const { app } = env
 
-export const locales = ['zh', 'zh-TW', 'en', 'en-US', 'fr'] as const
+export const locales = ['zh', 'zh-TW', 'en', 'en-US', 'fr', 'es'] as const
 export type Locale = (typeof locales)[number]
 const settingKeys = {
   ckbDataPath: 'ckbDataPath',
diff --git a/packages/neuron-wallet/tests/services/setting.test.ts b/packages/neuron-wallet/tests/services/setting.test.ts
index 96f760ddac..609c5dfe8e 100644
--- a/packages/neuron-wallet/tests/services/setting.test.ts
+++ b/packages/neuron-wallet/tests/services/setting.test.ts
@@ -73,8 +73,10 @@ describe('SettingsService', () => {
     it('set', () => {
       SettingsService.getInstance().locale = 'zh'
       SettingsService.getInstance().locale = 'fr'
+      SettingsService.getInstance().locale = 'es'
       expect(writeSyncMock).toBeCalledWith('locale', 'zh')
       expect(writeSyncMock).toBeCalledWith('locale', 'fr')
+      expect(writeSyncMock).toBeCalledWith('locale', 'es')
       expect(updateApplicationMenuMock).toHaveBeenCalled()
     })
     it('set exception', () => {

From f555d5bceedcbff72066e7e96102d0a08e3af5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 18 Jan 2024 07:56:32 +0000
Subject: [PATCH 34/68] fix: Add learn more link for compatible table (#3023)

---
 .../neuron-ui/src/containers/Navbar/index.tsx | 27 ++++++++++++++++---
 .../src/containers/Navbar/navbar.module.scss  |  8 ++++++
 packages/neuron-ui/src/locales/en.json        |  3 ++-
 packages/neuron-ui/src/locales/es.json        |  3 ++-
 packages/neuron-ui/src/locales/fr.json        |  3 ++-
 packages/neuron-ui/src/locales/zh-tw.json     |  3 ++-
 packages/neuron-ui/src/locales/zh.json        |  3 ++-
 packages/neuron-ui/src/types/App/index.d.ts   |  2 +-
 .../AlertDialog/alertDialog.module.scss       |  2 +-
 .../src/widgets/AlertDialog/index.tsx         |  2 +-
 10 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/packages/neuron-ui/src/containers/Navbar/index.tsx b/packages/neuron-ui/src/containers/Navbar/index.tsx
index 6c38bdbfe7..e7d2a9d14c 100644
--- a/packages/neuron-ui/src/containers/Navbar/index.tsx
+++ b/packages/neuron-ui/src/containers/Navbar/index.tsx
@@ -1,16 +1,21 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { useLocation, NavLink, useNavigate } from 'react-router-dom'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import { NeuronWalletActions, showGlobalAlertDialog, useDispatch, useState as useGlobalState } from 'states'
-import { VerifyExternalCkbNodeRes, checkForUpdates, getVersion, verifyExternalCkbNode } from 'services/remote'
+import {
+  VerifyExternalCkbNodeRes,
+  checkForUpdates,
+  getVersion,
+  openExternal,
+  verifyExternalCkbNode,
+} from 'services/remote'
 import { AppUpdater as AppUpdaterSubject } from 'services/subjects'
 import Badge from 'widgets/Badge'
 import Logo from 'widgets/Icons/Logo.png'
 import { Overview, History, NervosDAO, Settings, Experimental, MenuExpand, ArrowNext } from 'widgets/Icons/icon'
 import { RoutePath, clsx, isSuccessResponse, useOnLocaleChange } from 'utils'
 import Tooltip from 'widgets/Tooltip'
-
 import styles from './navbar.module.scss'
 
 export const FULL_SCREENS = [`/wizard/`, `/keystore/`, RoutePath.ImportHardware]
@@ -107,6 +112,10 @@ const Navbar = () => {
     }
   }, [network?.readonly])
 
+  const gotoCompatile = useCallback(() => {
+    openExternal(`https://neuron.magickbase.com${i18n.language.startsWith('zh') ? '/zh' : ''}/download`)
+  }, [i18n.language])
+
   useEffect(() => {
     // isUpdated is true or version is not empty means check update has return
     if (!verifyCkbResult || (isUpdated !== true && !version)) {
@@ -121,7 +130,17 @@ const Navbar = () => {
     } else if (!verifyCkbResult.ckbIsCompatible) {
       showGlobalAlertDialog({
         type: 'warning',
-        message: t('navbar.ckb-node-compatible', { version: getVersion() }),
+        message: (
+          <Trans
+            i18nKey="navbar.ckb-node-compatible"
+            values={{ version: getVersion(), btnText: t('navbar.learn-more') }}
+            components={[
+              <button type="button" className={styles.learnMore} onClick={gotoCompatile}>
+                {t('navbar.learn-more')}
+              </button>,
+            ]}
+          />
+        ),
         action: 'ok',
       })(dispatch)
     } else if (!verifyCkbResult.withIndexer) {
diff --git a/packages/neuron-ui/src/containers/Navbar/navbar.module.scss b/packages/neuron-ui/src/containers/Navbar/navbar.module.scss
index c2ee9f8021..269bd4c26a 100644
--- a/packages/neuron-ui/src/containers/Navbar/navbar.module.scss
+++ b/packages/neuron-ui/src/containers/Navbar/navbar.module.scss
@@ -198,3 +198,11 @@ $hover-bg-color: #3cc68a4d;
   top: 0;
   right: 0;
 }
+
+.learnMore {
+  border: none;
+  background-color: transparent;
+  color: var(--primary-color);
+  padding: 0;
+  cursor: pointer;
+}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index ebb212ab95..338f714db6 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -24,7 +24,8 @@
       "experimental-functions": "Experimental",
       "s-udt": "Asset Accounts",
       "update-neuron-with-ckb": "The version of the CKB node does not match Neuron (v{{ version }}), which may cause compatibility issues. Please update to the latest version of Neuron.",
-      "ckb-node-compatible": "CKB node is not compatible with Neuron (v{{ version }}), please check before further operation.",
+      "learn-more": "Learn More",
+      "ckb-node-compatible": "CKB node is not compatible with Neuron (v{{ version }}), please check before further operation. (<0>{{btnText}}</0>)",
       "ckb-without-indexer": "Please add '--indexer' option to start local node"
     },
     "network-status": {
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 651e7d00e0..9909598ea0 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -24,7 +24,8 @@
       "experimental-functions": "Experimental",
       "s-udt": "Cuentas de activos",
       "update-neuron-with-ckb": "La versión del nodo de CKB no coincide con Neuron (v{{ version }}), lo que puede causar problemas de compatibilidad. Por favor actualice a la última versión de Neuron.",
-      "ckb-node-compatible": "El nodo CKB no es compatible con Neuron (v{{ version }}), por favor compruébelo antes de continuar.",
+      "learn-more": "Saber más",
+      "ckb-node-compatible": "El nodo CKB no es compatible con Neuron (v{{ version }}), por favor compruébelo antes de continuar. (<0>{{btnText}}</0>)",
       "ckb-without-indexer": "Por favor agregue la opción '--indexer' para iniciar el nodo local"
     },
     "network-status": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 98e95bd3e6..a4fcb7e2c9 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -24,7 +24,8 @@
       "experimental-functions": "Expérimental",
       "s-udt": "Comptes d'actifs",
       "update-neuron-with-ckb": "La version du noeud CKB ne correspond pas à Neuron (v{{ version }}), ce qui peut entraîner des problèmes de compatibilité. Veuillez mettre à jour vers la dernière version de Neuron.",
-      "ckb-node-compatible": "Le noeud CKB n'est pas compatible avec Neuron (v{{ version }}), veuillez vérifier avant toute opération ultérieure.",
+      "learn-more": "En savoir plus",
+      "ckb-node-compatible": "Le noeud CKB n'est pas compatible avec Neuron (v{{ version }}), veuillez vérifier avant toute opération ultérieure. (<0>{{btnText}}</0>)",
       "ckb-without-indexer": "Veuillez ajouter l'option '--indexer' pour démarrer le noeud local"
     },
     "network-status": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index ed8a420952..151d07d7dd 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -24,7 +24,8 @@
       "experimental-functions": "實驗性功能",
       "s-udt": "資產賬戶",
       "update-neuron-with-ckb": "CKB 節點版本與 Neuron (v{{ version }}) 不匹配，可能導致兼容性問題。請更新到最新版 Neuron。",
-      "ckb-node-compatible": "CKB 節點版本與 Neuron (v{{ version }}) 不兼容，請謹慎使用。",
+      "learn-more": "了解更多",
+      "ckb-node-compatible": "CKB 節點版本與 Neuron (v{{ version }}) 不兼容，請謹慎使用。(<0>{{btnText}}</0>)",
       "ckb-without-indexer": "請添加 '--indexer' 參數來啟動本地節點"
     },
     "network-status": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 4edaf921b0..05fdaf61bd 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -24,7 +24,8 @@
       "experimental-functions": "实验性功能",
       "s-udt": "资产账户",
       "update-neuron-with-ckb": "CKB 节点版本与 Neuron (v{{ version }}) 不匹配，可能导致兼容性问题。请更新到最新版 Neuron。",
-      "ckb-node-compatible": "CKB 节点版本与 Neuron (v{{ version }}) 不兼容，请谨慎使用。",
+      "learn-more": "了解更多",
+      "ckb-node-compatible": "CKB 节点版本与 Neuron (v{{ version }}) 不兼容，请谨慎使用。(<0>{{btnText}}</0>)",
       "ckb-without-indexer": "请添加 '--indexer' 参数来启动本地节点"
     },
     "network-status": {
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 9c1ac509e2..dd3e99b739 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -138,7 +138,7 @@ declare namespace State {
   type GlobalAlertDialog = {
     show?: boolean
     title?: string
-    message?: string
+    message?: React.ReactNode
     type: 'success' | 'failed' | 'warning'
     action?: 'ok' | 'cancel' | 'all'
     onClose?: () => void
diff --git a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
index 28a879e2b2..b89b270757 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
+++ b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
@@ -4,7 +4,7 @@
   @include dialog-container;
   padding: 28px 24px 24px;
   text-align: center;
-  width: 456px;
+  width: 480px;
 
   &::backdrop {
     @include overlay;
diff --git a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
index eaab451223..4955d0fac2 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
+++ b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
@@ -21,7 +21,7 @@ const AlertDialog = ({
 }: {
   show?: boolean
   title?: string
-  message?: string
+  message?: React.ReactNode
   type: AlertType
   onOk?: () => void
   onCancel?: () => void

From e1894de3fa7be8ab16184f5d3358b57e94448509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 19 Jan 2024 02:23:40 +0000
Subject: [PATCH 35/68] Feat: view chain transaction detail (#2986)

* feat: Support view the chain tx detai

* chore: Add es and fr transaction

* chore: Change `send` to `receive`
---
 .../HardwareSign/HardwareSignOnPage.tsx       | 111 +++++
 .../HardwareSign/hardwareSign.module.scss     |  12 +
 .../src/components/HardwareSign/hooks.ts      | 425 +++++++++++++++++
 .../src/components/HardwareSign/index.tsx     | 427 ++----------------
 .../src/components/MultisigAddress/index.tsx  |   2 -
 .../components/OfflineSignDialog/index.tsx    |   8 +-
 .../PasswordRequest/PasswordRequestInPage.tsx | 124 +++++
 .../src/components/PasswordRequest/hooks.ts   | 366 +++++++++++++++
 .../src/components/PasswordRequest/index.tsx  | 378 ++--------------
 .../passwordRequest.module.scss               |   9 +
 .../neuron-ui/src/components/Send/hooks.ts    |  41 +-
 .../components/SendTxDetail/TxTopology.tsx    | 129 ++++++
 .../src/components/SendTxDetail/hooks.ts      |  13 +
 .../src/components/SendTxDetail/index.tsx     | 118 +++++
 .../SendTxDetail/sendTxDetail.module.scss     |  92 ++++
 .../SendTxDetail/txTopology.module.scss       | 274 +++++++++++
 packages/neuron-ui/src/locales/en.json        |  12 +
 packages/neuron-ui/src/locales/es.json        |  14 +-
 packages/neuron-ui/src/locales/fr.json        |  12 +
 packages/neuron-ui/src/locales/zh-tw.json     |  12 +
 packages/neuron-ui/src/locales/zh.json        |  12 +
 packages/neuron-ui/src/router.tsx             |  11 +
 packages/neuron-ui/src/states/init/chain.ts   |   1 -
 packages/neuron-ui/src/types/App/index.d.ts   |   6 +-
 packages/neuron-ui/src/utils/enums.ts         |   1 +
 .../src/widgets/Tooltip/tooltip.module.scss   |   7 +
 .../neuron-wallet/src/models/chain/input.ts   |  11 +-
 .../neuron-wallet/src/models/chain/output.ts  |   1 +
 packages/neuron-wallet/src/services/cells.ts  |   8 +-
 .../src/services/tx/transaction-generator.ts  |   2 +
 .../tests/services/cells.test.ts              |  40 +-
 31 files changed, 1908 insertions(+), 771 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/HardwareSign/HardwareSignOnPage.tsx
 create mode 100644 packages/neuron-ui/src/components/HardwareSign/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/PasswordRequest/PasswordRequestInPage.tsx
 create mode 100644 packages/neuron-ui/src/components/PasswordRequest/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/SendTxDetail/TxTopology.tsx
 create mode 100644 packages/neuron-ui/src/components/SendTxDetail/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/SendTxDetail/index.tsx
 create mode 100644 packages/neuron-ui/src/components/SendTxDetail/sendTxDetail.module.scss
 create mode 100644 packages/neuron-ui/src/components/SendTxDetail/txTopology.module.scss

diff --git a/packages/neuron-ui/src/components/HardwareSign/HardwareSignOnPage.tsx b/packages/neuron-ui/src/components/HardwareSign/HardwareSignOnPage.tsx
new file mode 100644
index 0000000000..50793cdb1d
--- /dev/null
+++ b/packages/neuron-ui/src/components/HardwareSign/HardwareSignOnPage.tsx
@@ -0,0 +1,111 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { useState as useGlobalState } from 'states'
+import { errorFormatter, useGoBack } from 'utils'
+import AlertDialog from 'widgets/AlertDialog'
+import Button from 'widgets/Button'
+import { Export, Sign } from 'widgets/Icons/icon'
+import HDWalletSign from '../HDWalletSign'
+import useHardwareSign, { HardwareSignProps } from './hooks'
+import styles from './hardwareSign.module.scss'
+
+const HardwareSignOnPage = ({
+  signType,
+  signMessage,
+  wallet,
+  onDismiss,
+  offlineSignJSON,
+  offlineSignType,
+  walletID,
+  actionType,
+  multisigConfig,
+  onSuccess,
+}: HardwareSignProps & State.PasswordRequest) => {
+  const {
+    app: {
+      send: { description, generatedTx },
+      loadings: { sending: isSending = false },
+    },
+    experimental,
+  } = useGlobalState()
+  const [t] = useTranslation()
+  const onGoBack = useGoBack()
+  const {
+    offlineSignActionType,
+    status,
+    error,
+    isLoading,
+    isNotAvailableToSign,
+    productName,
+    signAndExportFromGenerateTx,
+    sign,
+    reconnect,
+    exportTransaction,
+  } = useHardwareSign({
+    signType,
+    signMessage,
+    wallet,
+    offlineSignJSON,
+    offlineSignType,
+    description,
+    generatedTx,
+    isSending,
+    passwordRequest: { walletID, actionType, multisigConfig, onSuccess },
+    experimental,
+  })
+
+  if (error) {
+    return <AlertDialog show message={errorFormatter(error, t)} type="failed" onCancel={onDismiss || onGoBack} />
+  }
+
+  return (
+    <div title={t('hardware-sign.title')} className={styles.hardwareSignInPage}>
+      <div className={styles.container}>
+        <p>
+          {t('hardware-sign.device')}
+          <span>{productName}</span>
+        </p>
+        <p>
+          {t('hardware-sign.status.label')}
+          <span className={isNotAvailableToSign ? styles.warning : ''}>{status}</span>
+        </p>
+
+        <div>{wallet.isHD && generatedTx ? <HDWalletSign tx={generatedTx} /> : null}</div>
+
+        {offlineSignJSON === undefined && signType === 'transaction' ? (
+          <div className={styles.footer}>
+            <Button type="text" onClick={exportTransaction} disabled={isLoading}>
+              {t('offline-sign.export')} <Export />
+            </Button>
+            <div className={styles.divider} />
+            <Button
+              type="text"
+              className={styles.signAndExportFromGenerateTx}
+              onClick={signAndExportFromGenerateTx}
+              disabled={isNotAvailableToSign}
+              loading={!isNotAvailableToSign && isLoading}
+            >
+              {t('offline-sign.sign-and-export')} <Sign />
+            </Button>
+          </div>
+        ) : null}
+      </div>
+      <div className={styles.actions}>
+        <Button type="cancel" onClick={onDismiss || onGoBack} label={t('common.cancel')} />
+        {(actionType || offlineSignActionType) !== 'send-from-multisig' ? (
+          <Button
+            type="submit"
+            label={isNotAvailableToSign ? t('hardware-sign.actions.rescan') : t('sign-and-verify.sign')}
+            loading={isLoading}
+            disabled={isLoading}
+            onClick={isNotAvailableToSign ? reconnect : sign}
+          />
+        ) : null}
+      </div>
+    </div>
+  )
+}
+
+HardwareSignOnPage.displayName = 'HardwareSignOnPage'
+
+export default HardwareSignOnPage
diff --git a/packages/neuron-ui/src/components/HardwareSign/hardwareSign.module.scss b/packages/neuron-ui/src/components/HardwareSign/hardwareSign.module.scss
index 1fe600f938..09baaec176 100644
--- a/packages/neuron-ui/src/components/HardwareSign/hardwareSign.module.scss
+++ b/packages/neuron-ui/src/components/HardwareSign/hardwareSign.module.scss
@@ -49,3 +49,15 @@
 .warning {
   color: var(--error-color);
 }
+
+.hardwareSignInPage {
+  .container {
+    width: 100%;
+  }
+  .actions {
+    display: flex;
+    justify-content: center;
+    gap: 12px;
+    margin-top: 24px;
+  }
+}
diff --git a/packages/neuron-ui/src/components/HardwareSign/hooks.ts b/packages/neuron-ui/src/components/HardwareSign/hooks.ts
new file mode 100644
index 0000000000..e3cdf418c8
--- /dev/null
+++ b/packages/neuron-ui/src/components/HardwareSign/hooks.ts
@@ -0,0 +1,425 @@
+import { CkbAppNotFoundException, DeviceNotFoundException } from 'exceptions'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import {
+  DeviceInfo,
+  OfflineSignJSON,
+  OfflineSignStatus,
+  OfflineSignType,
+  connectDevice,
+  exportTransactionAsJSON,
+  getDeviceCkbAppVersion,
+  getDevices,
+  getPlatform,
+  signAndExportTransaction,
+  updateWallet,
+} from 'services/remote'
+import { ControllerResponse } from 'services/remote/remoteApiWrapper'
+import {
+  AppActions,
+  migrateAcp,
+  sendCreateSUDTAccountTransaction,
+  sendSUDTTransaction,
+  sendTransaction,
+  useDispatch,
+} from 'states'
+import { ErrorCode, RoutePath, errorFormatter, isSuccessResponse, useDidMount } from 'utils'
+
+export type SignType = 'message' | 'transaction'
+
+export interface HardwareSignProps {
+  signType: SignType
+  wallet: State.WalletIdentity
+  offlineSignJSON?: OfflineSignJSON
+  offlineSignType?: OfflineSignType
+  signMessage?: (password: string) => Promise<any>
+  onDismiss?: () => void
+}
+
+export default ({
+  signType,
+  signMessage,
+  wallet,
+  offlineSignJSON,
+  offlineSignType,
+  description,
+  generatedTx,
+  isSending,
+  passwordRequest,
+  experimental,
+  onCancel,
+}: {
+  description: string
+  generatedTx: State.GeneratedTx | null
+  isSending: boolean
+  passwordRequest: State.PasswordRequest
+  experimental: State.Experimental | null
+  onCancel?: (dismiss: boolean) => void
+} & Omit<HardwareSignProps, 'onDismiss'>) => {
+  const { actionType = null, multisigConfig } = passwordRequest
+  const [t] = useTranslation()
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const isWin32 = useMemo(() => {
+    return getPlatform() === 'win32'
+  }, [])
+  const [status, setStatus] = useState('')
+  const connectStatus = t('hardware-sign.status.connect')
+  const userInputStatus = t('hardware-sign.status.user-input')
+  const disconnectStatus = t('hardware-sign.status.disconnect')
+  const ckbAppNotFoundStatus = t(CkbAppNotFoundException.message)
+  const isNotAvailableToSign = useMemo(() => {
+    return status === disconnectStatus || status === ckbAppNotFoundStatus
+  }, [status, disconnectStatus, ckbAppNotFoundStatus])
+  const [error, setError] = useState('')
+  const [deviceInfo, setDeviceInfo] = useState(wallet.device!)
+  const [isReconnecting, setIsReconnecting] = useState(false)
+  const isLoading = useMemo(() => {
+    return status === userInputStatus || isReconnecting || isSending
+  }, [status, userInputStatus, isReconnecting])
+
+  const productName = `${wallet.device!.manufacturer} ${wallet.device!.product}`
+
+  const offlineSignActionType = useMemo(() => {
+    switch (offlineSignJSON?.type) {
+      case OfflineSignType.CreateSUDTAccount:
+        return 'create-sudt-account'
+      case OfflineSignType.SendSUDT:
+        return 'send-sudt'
+      case OfflineSignType.UnlockDAO:
+        return 'unlock'
+      case OfflineSignType.SendFromMultisigOnlySig:
+        return 'send-from-multisig'
+      default:
+        return 'send'
+    }
+  }, [offlineSignJSON])
+
+  const signAndExportFromJSON = useCallback(async () => {
+    const res = await signAndExportTransaction({
+      ...offlineSignJSON!,
+      walletID: wallet.id,
+      password: '',
+    })
+    if (!isSuccessResponse(res)) {
+      setError(errorFormatter(res.message, t))
+      return
+    }
+    if (res.result) {
+      dispatch({
+        type: AppActions.UpdateLoadedTransaction,
+        payload: res.result!,
+      })
+    }
+    onCancel?.(!!res.result)
+  }, [offlineSignJSON, dispatch, onCancel, t, wallet.id])
+
+  const signAndExportFromGenerateTx = useCallback(async () => {
+    setStatus(userInputStatus)
+    const json: OfflineSignJSON = {
+      transaction: generatedTx || experimental?.tx,
+      status: OfflineSignStatus.Signed,
+      type: offlineSignType!,
+      description,
+      asset_account: experimental?.assetAccount,
+    }
+    const res = await signAndExportTransaction({
+      ...json,
+      walletID: wallet.id,
+      password: '',
+      multisigConfig,
+    })
+    setStatus(connectStatus)
+    if (!isSuccessResponse(res)) {
+      setStatus(connectStatus)
+      setError(errorFormatter(res.message, t))
+      return
+    }
+    if (res.result) {
+      dispatch({
+        type: AppActions.UpdateLoadedTransaction,
+        payload: res.result!,
+      })
+    }
+    onCancel?.(!!res.result)
+  }, [
+    dispatch,
+    onCancel,
+    t,
+    wallet.id,
+    generatedTx,
+    userInputStatus,
+    description,
+    experimental,
+    offlineSignType,
+    connectStatus,
+    multisigConfig,
+  ])
+
+  const ensureDeviceAvailable = useCallback(
+    async (device: DeviceInfo) => {
+      try {
+        const connectionRes = await connectDevice(device)
+        let { descriptor } = device
+        if (!isSuccessResponse(connectionRes)) {
+          // for win32, opening or closing the ckb app changes the HID descriptor(deviceInfo),
+          // so if we can't connect to the device, we need to re-search device automatically.
+          // for unix, the descriptor never changes unless user plugs the device into another USB port,
+          // in that case, mannauly re-search device one time will do.
+          if (isWin32) {
+            setIsReconnecting(true)
+            const devicesRes = await getDevices(device)
+            setIsReconnecting(false)
+            if (isSuccessResponse(devicesRes) && Array.isArray(devicesRes.result) && devicesRes.result.length > 0) {
+              const [updatedDeviceInfo] = devicesRes.result
+              descriptor = updatedDeviceInfo.descriptor
+              setDeviceInfo(updatedDeviceInfo)
+            } else {
+              throw new DeviceNotFoundException()
+            }
+          } else {
+            throw new DeviceNotFoundException()
+          }
+        }
+
+        // getDeviceCkbAppVersion will halt forever while in win32 sleep mode.
+        const ckbVersionRes = await Promise.race([
+          getDeviceCkbAppVersion(descriptor),
+          new Promise<ControllerResponse>((_, reject) => {
+            setTimeout(() => reject(), 1000)
+          }),
+        ]).catch(() => {
+          return { status: ErrorCode.DeviceInSleep }
+        })
+
+        if (!isSuccessResponse(ckbVersionRes)) {
+          if (ckbVersionRes.status !== ErrorCode.DeviceInSleep) {
+            throw new CkbAppNotFoundException()
+          } else {
+            throw new DeviceNotFoundException()
+          }
+        }
+        setStatus(connectStatus)
+      } catch (err) {
+        if (err instanceof CkbAppNotFoundException) {
+          setStatus(ckbAppNotFoundStatus)
+        } else {
+          setStatus(disconnectStatus)
+        }
+      }
+    },
+    [connectStatus, disconnectStatus, ckbAppNotFoundStatus, isWin32]
+  )
+
+  const signTx = useCallback(async () => {
+    try {
+      await ensureDeviceAvailable(deviceInfo)
+      setStatus(userInputStatus)
+      const type = actionType || offlineSignActionType
+      const tx = offlineSignJSON?.transaction || generatedTx
+      // eslint-disable-next-line camelcase
+      const assetAccount = offlineSignJSON?.asset_account ?? experimental?.assetAccount
+      if (offlineSignJSON !== undefined) {
+        await signAndExportFromJSON()
+        return
+      }
+      switch (type) {
+        case 'send':
+        case 'send-nft':
+        case 'destroy-asset-account':
+        case 'send-cheque':
+        case 'claim-cheque': {
+          if (isSending) {
+            break
+          }
+          sendTransaction({
+            walletID: wallet.id,
+            tx: tx || experimental?.tx,
+            description,
+          })(dispatch).then(res => {
+            if (isSuccessResponse(res)) {
+              navigate?.(RoutePath.History)
+            } else {
+              setError(res.message)
+            }
+          })
+          break
+        }
+        case 'unlock': {
+          if (isSending) {
+            break
+          }
+          sendTransaction({ walletID: wallet.id, tx, description })(dispatch).then(res => {
+            if (isSuccessResponse(res)) {
+              navigate?.(RoutePath.History)
+            } else {
+              setError(res.message)
+            }
+          })
+          break
+        }
+        case 'create-sudt-account':
+        case 'create-account-to-claim-cheque': {
+          const params: Controller.SendCreateSUDTAccountTransaction.Params = {
+            walletID: wallet.id,
+            assetAccount,
+            tx: tx || experimental?.tx,
+          }
+          sendCreateSUDTAccountTransaction(params)(dispatch).then(res => {
+            if (isSuccessResponse(res)) {
+              navigate?.(RoutePath.History)
+            } else {
+              setError(res.message)
+            }
+          })
+          break
+        }
+        case 'send-ckb-asset':
+        case 'send-acp-sudt-to-new-cell':
+        case 'send-acp-ckb-to-new-cell':
+        case 'send-sudt': {
+          let skipLastInputs = true
+          if (actionType === 'send-acp-sudt-to-new-cell' || actionType === 'send-acp-ckb-to-new-cell') {
+            skipLastInputs = false
+          }
+          const params: Controller.SendSUDTTransaction.Params = {
+            walletID: wallet.id,
+            tx: tx || experimental?.tx,
+            skipLastInputs,
+          }
+          sendSUDTTransaction(params)(dispatch).then(res => {
+            if (isSuccessResponse(res)) {
+              navigate?.(RoutePath.History)
+            } else {
+              setError(res.message)
+            }
+          })
+          break
+        }
+        case 'migrate-acp': {
+          await migrateAcp({ id: wallet.id })(dispatch).then(res => {
+            if (isSuccessResponse(res)) {
+              navigate?.(RoutePath.History)
+            } else {
+              setError(typeof res.message === 'string' ? res.message : res.message.content ?? 'migrate-acp error')
+            }
+          })
+          break
+        }
+        case 'send-from-multisig-need-one': {
+          if (isSending) {
+            break
+          }
+          await sendTransaction({ walletID: wallet.id, tx: generatedTx, description, multisigConfig })(dispatch).then(
+            res => {
+              if (!isSuccessResponse(res)) {
+                setError(res.message.content)
+              }
+            }
+          )
+          break
+        }
+        default: {
+          break
+        }
+      }
+    } catch (err) {
+      setStatus(disconnectStatus)
+    }
+  }, [
+    actionType,
+    offlineSignActionType,
+    userInputStatus,
+    disconnectStatus,
+    experimental,
+    generatedTx,
+    offlineSignJSON,
+    isSending,
+    deviceInfo,
+    wallet.id,
+    description,
+    dispatch,
+    navigate,
+    signAndExportFromJSON,
+    ensureDeviceAvailable,
+    multisigConfig,
+  ])
+
+  const signMsg = useCallback(async () => {
+    await ensureDeviceAvailable(deviceInfo)
+    setStatus(userInputStatus)
+    await signMessage?.('')
+  }, [ensureDeviceAvailable, signMessage, deviceInfo, userInputStatus])
+
+  const sign = useCallback(
+    async (e?: React.FormEvent) => {
+      if (e) {
+        e.preventDefault()
+      }
+      if (signType === 'message') {
+        await signMsg()
+      } else {
+        await signTx()
+      }
+    },
+    [signType, signTx, signMsg]
+  )
+
+  const reconnect = useCallback(async () => {
+    setIsReconnecting(true)
+    try {
+      const res = await getDevices(deviceInfo)
+      if (isSuccessResponse(res) && Array.isArray(res.result) && res.result.length > 0) {
+        const [device] = res.result
+        setDeviceInfo(device)
+        if (device.descriptor !== deviceInfo.descriptor) {
+          await updateWallet({
+            id: wallet.id,
+            device,
+          })
+        }
+        await ensureDeviceAvailable(device)
+      }
+    } catch (err) {
+      setStatus(disconnectStatus)
+    } finally {
+      setIsReconnecting(false)
+    }
+  }, [deviceInfo, disconnectStatus, ensureDeviceAvailable, wallet.id])
+
+  const exportTransaction = useCallback(async () => {
+    const res = await exportTransactionAsJSON({
+      transaction: generatedTx || experimental?.tx,
+      status: OfflineSignStatus.Unsigned,
+      type: offlineSignType!,
+      description,
+      asset_account: experimental?.assetAccount,
+    })
+    if (!isSuccessResponse(res)) {
+      setError(errorFormatter(res.message, t))
+      return
+    }
+    onCancel?.(!!res.result)
+  }, [offlineSignType, generatedTx, onCancel, description, experimental])
+
+  useDidMount(() => {
+    ensureDeviceAvailable(deviceInfo)
+  })
+
+  return {
+    offlineSignActionType,
+    status,
+    error,
+    isLoading,
+    isNotAvailableToSign,
+    productName,
+    signAndExportFromJSON,
+    signAndExportFromGenerateTx,
+    signTx,
+    signMsg,
+    sign,
+    reconnect,
+    exportTransaction,
+  }
+}
diff --git a/packages/neuron-ui/src/components/HardwareSign/index.tsx b/packages/neuron-ui/src/components/HardwareSign/index.tsx
index 49c8e7264e..937d9b084f 100644
--- a/packages/neuron-ui/src/components/HardwareSign/index.tsx
+++ b/packages/neuron-ui/src/components/HardwareSign/index.tsx
@@ -1,59 +1,31 @@
-import React, { useCallback, useState, useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import {
-  useState as useGlobalState,
-  useDispatch,
-  sendTransaction,
-  sendCreateSUDTAccountTransaction,
-  sendSUDTTransaction,
-  AppActions,
-  migrateAcp,
-} from 'states'
-import { ControllerResponse } from 'services/remote/remoteApiWrapper'
-import { NavigateFunction } from 'react-router-dom'
-import {
-  connectDevice,
-  getDevices,
-  exportTransactionAsJSON,
-  OfflineSignStatus,
-  OfflineSignType,
-  OfflineSignJSON,
-  signAndExportTransaction,
-  getDeviceCkbAppVersion,
-  DeviceInfo,
-  updateWallet,
-  getPlatform,
-} from 'services/remote'
-import { ErrorCode, errorFormatter, isSuccessResponse, RoutePath, useDidMount } from 'utils'
+import React, { useCallback } from 'react'
+import { AppActions, useDispatch, useState as useGlobalState } from 'states'
+import { errorFormatter } from 'utils'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
 import Button from 'widgets/Button'
 import { Export, Sign } from 'widgets/Icons/icon'
-import { CkbAppNotFoundException, DeviceNotFoundException } from 'exceptions'
+import { useTranslation } from 'react-i18next'
 import HDWalletSign from '../HDWalletSign'
 import styles from './hardwareSign.module.scss'
-
-export type SignType = 'message' | 'transaction'
-
-export interface HardwareSignProps {
-  signType: SignType
-  wallet: State.WalletIdentity
-  offlineSignJSON?: OfflineSignJSON
-  offlineSignType?: OfflineSignType
-  onDismiss: () => void
-  signMessage?: (password: string) => Promise<any>
-  navigate?: NavigateFunction
-}
+import useHardwareSign, { HardwareSignProps } from './hooks'
 
 const HardwareSign = ({
   signType,
   signMessage,
-  navigate,
   wallet,
   onDismiss,
   offlineSignJSON,
   offlineSignType,
 }: HardwareSignProps) => {
+  const {
+    app: {
+      send: { description, generatedTx },
+      loadings: { sending: isSending = false },
+      passwordRequest,
+    },
+    experimental,
+  } = useGlobalState()
   const [t] = useTranslation()
   const dispatch = useDispatch()
   const onCancel = useCallback(
@@ -65,366 +37,35 @@ const HardwareSign = ({
         })
       }
       if (dismiss) {
-        onDismiss()
+        onDismiss?.()
       }
     },
     [dispatch, signType, onDismiss]
   )
-  const isWin32 = useMemo(() => {
-    return getPlatform() === 'win32'
-  }, [])
-  const [status, setStatus] = useState('')
-  const connectStatus = t('hardware-sign.status.connect')
-  const userInputStatus = t('hardware-sign.status.user-input')
-  const disconnectStatus = t('hardware-sign.status.disconnect')
-  const ckbAppNotFoundStatus = t(CkbAppNotFoundException.message)
-  const isNotAvailableToSign = useMemo(() => {
-    return status === disconnectStatus || status === ckbAppNotFoundStatus
-  }, [status, disconnectStatus, ckbAppNotFoundStatus])
-
   const {
-    app: {
-      send: { description, generatedTx },
-      loadings: { sending: isSending = false },
-      passwordRequest: { actionType = null, multisigConfig },
-    },
-    experimental,
-  } = useGlobalState()
-  const [error, setError] = useState('')
-  const [deviceInfo, setDeviceInfo] = useState(wallet.device!)
-  const [isReconnecting, setIsReconnecting] = useState(false)
-  const isLoading = useMemo(() => {
-    return status === userInputStatus || isReconnecting || isSending
-  }, [status, userInputStatus, isReconnecting])
-
-  const productName = `${wallet.device!.manufacturer} ${wallet.device!.product}`
-
-  const offlineSignActionType = useMemo(() => {
-    switch (offlineSignJSON?.type) {
-      case OfflineSignType.CreateSUDTAccount:
-        return 'create-sudt-account'
-      case OfflineSignType.SendSUDT:
-        return 'send-sudt'
-      case OfflineSignType.UnlockDAO:
-        return 'unlock'
-      case OfflineSignType.SendFromMultisigOnlySig:
-        return 'send-from-multisig'
-      default:
-        return 'send'
-    }
-  }, [offlineSignJSON])
-
-  const signAndExportFromJSON = useCallback(async () => {
-    const res = await signAndExportTransaction({
-      ...offlineSignJSON!,
-      walletID: wallet.id,
-      password: '',
-    })
-    if (!isSuccessResponse(res)) {
-      setError(errorFormatter(res.message, t))
-      return
-    }
-    if (res.result) {
-      dispatch({
-        type: AppActions.UpdateLoadedTransaction,
-        payload: res.result!,
-      })
-    }
-    onCancel(!!res.result)
-  }, [offlineSignJSON, dispatch, onCancel, t, wallet.id])
-
-  const signAndExportFromGenerateTx = useCallback(async () => {
-    setStatus(userInputStatus)
-    const json: OfflineSignJSON = {
-      transaction: generatedTx || experimental?.tx,
-      status: OfflineSignStatus.Signed,
-      type: offlineSignType!,
-      description,
-      asset_account: experimental?.assetAccount,
-    }
-    const res = await signAndExportTransaction({
-      ...json,
-      walletID: wallet.id,
-      password: '',
-      multisigConfig,
-    })
-    setStatus(connectStatus)
-    if (!isSuccessResponse(res)) {
-      setStatus(connectStatus)
-      setError(errorFormatter(res.message, t))
-      return
-    }
-    if (res.result) {
-      dispatch({
-        type: AppActions.UpdateLoadedTransaction,
-        payload: res.result!,
-      })
-    }
-    onCancel(!!res.result)
-  }, [
-    dispatch,
-    onCancel,
-    t,
-    wallet.id,
-    generatedTx,
-    userInputStatus,
-    description,
-    experimental,
-    offlineSignType,
-    connectStatus,
-    multisigConfig,
-  ])
-
-  const ensureDeviceAvailable = useCallback(
-    async (device: DeviceInfo) => {
-      try {
-        const connectionRes = await connectDevice(device)
-        let { descriptor } = device
-        if (!isSuccessResponse(connectionRes)) {
-          // for win32, opening or closing the ckb app changes the HID descriptor(deviceInfo),
-          // so if we can't connect to the device, we need to re-search device automatically.
-          // for unix, the descriptor never changes unless user plugs the device into another USB port,
-          // in that case, mannauly re-search device one time will do.
-          if (isWin32) {
-            setIsReconnecting(true)
-            const devicesRes = await getDevices(device)
-            setIsReconnecting(false)
-            if (isSuccessResponse(devicesRes) && Array.isArray(devicesRes.result) && devicesRes.result.length > 0) {
-              const [updatedDeviceInfo] = devicesRes.result
-              descriptor = updatedDeviceInfo.descriptor
-              setDeviceInfo(updatedDeviceInfo)
-            } else {
-              throw new DeviceNotFoundException()
-            }
-          } else {
-            throw new DeviceNotFoundException()
-          }
-        }
-
-        // getDeviceCkbAppVersion will halt forever while in win32 sleep mode.
-        const ckbVersionRes = await Promise.race([
-          getDeviceCkbAppVersion(descriptor),
-          new Promise<ControllerResponse>((_, reject) => {
-            setTimeout(() => reject(), 1000)
-          }),
-        ]).catch(() => {
-          return { status: ErrorCode.DeviceInSleep }
-        })
-
-        if (!isSuccessResponse(ckbVersionRes)) {
-          if (ckbVersionRes.status !== ErrorCode.DeviceInSleep) {
-            throw new CkbAppNotFoundException()
-          } else {
-            throw new DeviceNotFoundException()
-          }
-        }
-        setStatus(connectStatus)
-      } catch (err) {
-        if (err instanceof CkbAppNotFoundException) {
-          setStatus(ckbAppNotFoundStatus)
-        } else {
-          setStatus(disconnectStatus)
-        }
-      }
-    },
-    [connectStatus, disconnectStatus, ckbAppNotFoundStatus, isWin32]
-  )
-
-  const signTx = useCallback(async () => {
-    try {
-      await ensureDeviceAvailable(deviceInfo)
-      setStatus(userInputStatus)
-      const type = actionType || offlineSignActionType
-      const tx = offlineSignJSON?.transaction || generatedTx
-      // eslint-disable-next-line camelcase
-      const assetAccount = offlineSignJSON?.asset_account ?? experimental?.assetAccount
-      if (offlineSignJSON !== undefined) {
-        await signAndExportFromJSON()
-        return
-      }
-      switch (type) {
-        case 'send':
-        case 'send-nft':
-        case 'destroy-asset-account':
-        case 'send-cheque':
-        case 'claim-cheque': {
-          if (isSending) {
-            break
-          }
-          sendTransaction({
-            walletID: wallet.id,
-            tx: tx || experimental?.tx,
-            description,
-          })(dispatch).then(res => {
-            if (isSuccessResponse(res)) {
-              navigate?.(RoutePath.History)
-            } else {
-              setError(res.message)
-            }
-          })
-          break
-        }
-        case 'unlock': {
-          if (isSending) {
-            break
-          }
-          sendTransaction({ walletID: wallet.id, tx, description })(dispatch).then(res => {
-            if (isSuccessResponse(res)) {
-              navigate?.(RoutePath.History)
-            } else {
-              setError(res.message)
-            }
-          })
-          break
-        }
-        case 'create-sudt-account':
-        case 'create-account-to-claim-cheque': {
-          const params: Controller.SendCreateSUDTAccountTransaction.Params = {
-            walletID: wallet.id,
-            assetAccount,
-            tx: tx || experimental?.tx,
-          }
-          sendCreateSUDTAccountTransaction(params)(dispatch).then(res => {
-            if (isSuccessResponse(res)) {
-              navigate?.(RoutePath.History)
-            } else {
-              setError(res.message)
-            }
-          })
-          break
-        }
-        case 'send-ckb-asset':
-        case 'send-acp-sudt-to-new-cell':
-        case 'send-acp-ckb-to-new-cell':
-        case 'send-sudt': {
-          let skipLastInputs = true
-          if (actionType === 'send-acp-sudt-to-new-cell' || actionType === 'send-acp-ckb-to-new-cell') {
-            skipLastInputs = false
-          }
-          const params: Controller.SendSUDTTransaction.Params = {
-            walletID: wallet.id,
-            tx: tx || experimental?.tx,
-            skipLastInputs,
-          }
-          sendSUDTTransaction(params)(dispatch).then(res => {
-            if (isSuccessResponse(res)) {
-              navigate?.(RoutePath.History)
-            } else {
-              setError(res.message)
-            }
-          })
-          break
-        }
-        case 'migrate-acp': {
-          await migrateAcp({ id: wallet.id })(dispatch).then(res => {
-            if (isSuccessResponse(res)) {
-              navigate?.(RoutePath.History)
-            } else {
-              setError(typeof res.message === 'string' ? res.message : res.message.content ?? 'migrate-acp error')
-            }
-          })
-          break
-        }
-        case 'send-from-multisig-need-one': {
-          if (isSending) {
-            break
-          }
-          await sendTransaction({ walletID: wallet.id, tx: generatedTx, description, multisigConfig })(dispatch).then(
-            res => {
-              if (!isSuccessResponse(res)) {
-                setError(res.message.content)
-              }
-            }
-          )
-          break
-        }
-        default: {
-          break
-        }
-      }
-    } catch (err) {
-      setStatus(disconnectStatus)
-    }
-  }, [
-    actionType,
     offlineSignActionType,
-    userInputStatus,
-    disconnectStatus,
-    experimental,
-    generatedTx,
+    status,
+    error,
+    isLoading,
+    isNotAvailableToSign,
+    productName,
+    signAndExportFromGenerateTx,
+    sign,
+    reconnect,
+    exportTransaction,
+  } = useHardwareSign({
+    signType,
+    signMessage,
+    wallet,
     offlineSignJSON,
-    isSending,
-    deviceInfo,
-    wallet.id,
+    offlineSignType,
     description,
-    dispatch,
-    navigate,
-    signAndExportFromJSON,
-    ensureDeviceAvailable,
-    multisigConfig,
-  ])
-
-  const signMsg = useCallback(async () => {
-    await ensureDeviceAvailable(deviceInfo)
-    setStatus(userInputStatus)
-    await signMessage?.('')
-  }, [ensureDeviceAvailable, signMessage, deviceInfo, userInputStatus])
-
-  const sign = useCallback(
-    async (e?: React.FormEvent) => {
-      if (e) {
-        e.preventDefault()
-      }
-      if (signType === 'message') {
-        await signMsg()
-      } else {
-        await signTx()
-      }
-    },
-    [signType, signTx, signMsg]
-  )
-
-  const reconnect = useCallback(async () => {
-    setIsReconnecting(true)
-    try {
-      const res = await getDevices(deviceInfo)
-      if (isSuccessResponse(res) && Array.isArray(res.result) && res.result.length > 0) {
-        const [device] = res.result
-        setDeviceInfo(device)
-        if (device.descriptor !== deviceInfo.descriptor) {
-          await updateWallet({
-            id: wallet.id,
-            device,
-          })
-        }
-        await ensureDeviceAvailable(device)
-      }
-    } catch (err) {
-      setStatus(disconnectStatus)
-    } finally {
-      setIsReconnecting(false)
-    }
-  }, [deviceInfo, disconnectStatus, ensureDeviceAvailable, wallet.id])
-
-  const exportTransaction = useCallback(async () => {
-    const res = await exportTransactionAsJSON({
-      transaction: generatedTx || experimental?.tx,
-      status: OfflineSignStatus.Unsigned,
-      type: offlineSignType!,
-      description,
-      asset_account: experimental?.assetAccount,
-    })
-    if (!isSuccessResponse(res)) {
-      setError(errorFormatter(res.message, t))
-      return
-    }
-    onCancel(!!res.result)
-  }, [offlineSignType, generatedTx, onCancel, description, experimental])
-
-  useDidMount(() => {
-    ensureDeviceAvailable(deviceInfo)
+    generatedTx,
+    isSending,
+    passwordRequest,
+    experimental,
+    onCancel,
   })
-
   if (error) {
     return <AlertDialog show message={errorFormatter(error, t)} type="failed" onCancel={onCancel} />
   }
@@ -434,7 +75,7 @@ const HardwareSign = ({
       show
       title={t('hardware-sign.title')}
       onCancel={onCancel}
-      showConfirm={(actionType || offlineSignActionType) !== 'send-from-multisig'}
+      showConfirm={(passwordRequest.actionType || offlineSignActionType) !== 'send-from-multisig'}
       confirmText={isNotAvailableToSign ? t('hardware-sign.actions.rescan') : t('sign-and-verify.sign')}
       isLoading={isLoading}
       onConfirm={isNotAvailableToSign ? reconnect : sign}
diff --git a/packages/neuron-ui/src/components/MultisigAddress/index.tsx b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
index d6d38e702f..262fbe8596 100644
--- a/packages/neuron-ui/src/components/MultisigAddress/index.tsx
+++ b/packages/neuron-ui/src/components/MultisigAddress/index.tsx
@@ -12,7 +12,6 @@ import MultisigAddressCreateDialog from 'components/MultisigAddressCreateDialog'
 import MultisigAddressInfo from 'components/MultisigAddressInfo'
 import SendFromMultisigDialog from 'components/SendFromMultisigDialog'
 import { MultisigConfig } from 'services/remote'
-import PasswordRequest from 'components/PasswordRequest'
 import ApproveMultisigTxDialog from 'components/ApproveMultisigTxDialog'
 import Dialog from 'widgets/Dialog'
 import Table from 'widgets/Table'
@@ -383,7 +382,6 @@ const MultisigAddress = () => {
           isMainnet={isMainnet}
         />
       ) : null}
-      <PasswordRequest />
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
index ee497aeb65..a1f3179c6e 100644
--- a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
+++ b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
@@ -188,13 +188,7 @@ const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss }:
 
   if (wallet.device) {
     return (
-      <HardwareSign
-        signType="transaction"
-        navigate={navigate}
-        wallet={wallet}
-        onDismiss={onDismiss}
-        offlineSignJSON={offlineSignJSON}
-      />
+      <HardwareSign signType="transaction" wallet={wallet} onDismiss={onDismiss} offlineSignJSON={offlineSignJSON} />
     )
   }
 
diff --git a/packages/neuron-ui/src/components/PasswordRequest/PasswordRequestInPage.tsx b/packages/neuron-ui/src/components/PasswordRequest/PasswordRequestInPage.tsx
new file mode 100644
index 0000000000..4f12d12088
--- /dev/null
+++ b/packages/neuron-ui/src/components/PasswordRequest/PasswordRequestInPage.tsx
@@ -0,0 +1,124 @@
+import React from 'react'
+import Button from 'widgets/Button'
+import TextField from 'widgets/TextField'
+import { ReactComponent as Attention } from 'widgets/Icons/ExperimentalAttention.svg'
+import HardwareSignOnPage from 'components/HardwareSign/HardwareSignOnPage'
+import { Export, Sign } from 'widgets/Icons/icon'
+import { useState as useGlobalState } from 'states'
+import { OfflineSignType } from 'services/remote'
+import { useTranslation } from 'react-i18next'
+import { useGoBack } from 'utils'
+import usePasswordResuest from './hooks'
+import styles from './passwordRequest.module.scss'
+
+const PasswordRequestInPage = ({
+  walletID = '',
+  actionType = null,
+  multisigConfig,
+  onSuccess,
+  onCancel,
+}: State.PasswordRequest & { onCancel?: () => void }) => {
+  const {
+    app: {
+      send: { description, generatedTx },
+      loadings: { sending: isSending = false },
+    },
+    settings: { wallets = [] },
+    experimental,
+  } = useGlobalState()
+
+  const [t] = useTranslation()
+  const onGoBack = useGoBack()
+
+  const {
+    error,
+    wallet,
+    isLoading,
+    signType,
+    disabled,
+    password,
+    onSubmit,
+    onChange,
+    exportTransaction,
+    signAndExportFromGenerateTx,
+  } = usePasswordResuest({
+    description,
+    generatedTx,
+    isSending,
+    passwordRequest: { walletID, actionType, multisigConfig, onSuccess },
+    wallets,
+    experimental,
+  })
+
+  if (!wallet) {
+    return null
+  }
+
+  if (wallet.device) {
+    return (
+      <HardwareSignOnPage
+        signType="transaction"
+        wallet={wallet}
+        onDismiss={onCancel}
+        offlineSignType={signType}
+        walletID={walletID}
+        actionType={actionType}
+        multisigConfig={multisigConfig}
+        onSuccess={onSuccess}
+      />
+    )
+  }
+
+  return (
+    <div className={styles.passwordRequestInPage}>
+      {wallet.isWatchOnly ? (
+        <div className={styles.xpubNotice}>
+          <Attention />
+          {t('password-request.xpub-notice')}
+        </div>
+      ) : (
+        <TextField
+          className={styles.passwordInput}
+          placeholder={t('password-request.placeholder')}
+          width="100%"
+          label={t('password-request.password')}
+          value={password}
+          field="password"
+          type="password"
+          title={t('password-request.password')}
+          onChange={onChange}
+          autoFocus
+          error={error}
+        />
+      )}
+      {signType !== OfflineSignType.Invalid ? (
+        <div className={styles.footer}>
+          <Button type="text" onClick={exportTransaction} disabled={isLoading}>
+            {t('offline-sign.export')} <Export />
+          </Button>
+          {!wallet.isWatchOnly && (
+            <>
+              <div className={styles.divider} />
+              <Button
+                type="text"
+                className={styles.signAndExportFromGenerateTx}
+                onClick={signAndExportFromGenerateTx}
+                disabled={!password}
+                loading={isLoading}
+              >
+                {t('offline-sign.sign-and-export')} <Sign />
+              </Button>
+            </>
+          )}
+        </div>
+      ) : null}
+      <div className={styles.actions}>
+        <Button type="cancel" onClick={onCancel || onGoBack} label={t('common.cancel')} />
+        <Button type="submit" label={t('common.confirm')} loading={isLoading} disabled={disabled} onClick={onSubmit} />
+      </div>
+    </div>
+  )
+}
+
+PasswordRequestInPage.displayName = 'PasswordRequestInPage'
+export default PasswordRequestInPage
diff --git a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
new file mode 100644
index 0000000000..db51eb2835
--- /dev/null
+++ b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
@@ -0,0 +1,366 @@
+import { PasswordIncorrectException } from 'exceptions'
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import {
+  OfflineSignStatus,
+  OfflineSignType,
+  exportTransactionAsJSON,
+  invokeShowErrorMessage,
+  requestOpenInExplorer,
+  signAndExportTransaction,
+} from 'services/remote'
+import {
+  AppActions,
+  backupWallet,
+  deleteWallet,
+  migrateAcp,
+  sendCreateSUDTAccountTransaction,
+  sendSUDTTransaction,
+  sendTransaction,
+  useDispatch,
+} from 'states'
+import { ErrorCode, RoutePath, errorFormatter, isSuccessResponse } from 'utils'
+
+export default ({
+  description,
+  generatedTx,
+  isSending,
+  passwordRequest,
+  wallets,
+  experimental,
+  onDismiss,
+}: {
+  description: string
+  generatedTx: State.GeneratedTx | null
+  isSending: boolean
+  passwordRequest: State.PasswordRequest
+  wallets: State.WalletIdentity[]
+  experimental: State.Experimental | null
+  onDismiss?: () => void
+}) => {
+  const dispatch = useDispatch()
+  const [t] = useTranslation()
+  const navigate = useNavigate()
+
+  const [password, setPassword] = useState('')
+  const [error, setError] = useState('')
+  const { walletID = '', actionType = null, multisigConfig, onSuccess } = passwordRequest
+
+  useEffect(() => {
+    setPassword('')
+    setError('')
+  }, [actionType, setError, setPassword])
+
+  const signType = useMemo(() => {
+    switch (actionType) {
+      case 'create-sudt-account':
+        return OfflineSignType.CreateSUDTAccount
+      case 'send-ckb-asset':
+      case 'send-acp-ckb-to-new-cell':
+      case 'send-acp-sudt-to-new-cell':
+      case 'transfer-to-sudt':
+      case 'send-sudt':
+        return OfflineSignType.SendSUDT
+      case 'unlock':
+        return OfflineSignType.UnlockDAO
+      case 'send-nft':
+      case 'send-from-multisig-need-one':
+      case 'send':
+        return OfflineSignType.Regular
+      case 'send-from-multisig':
+        return OfflineSignType.SendFromMultisigOnlySig
+      default:
+        return OfflineSignType.Invalid
+    }
+  }, [actionType])
+
+  const exportTransaction = useCallback(async () => {
+    const res = await exportTransactionAsJSON({
+      transaction: generatedTx || experimental?.tx,
+      status: OfflineSignStatus.Unsigned,
+      type: signType,
+      description,
+      asset_account: experimental?.assetAccount,
+    })
+    if (!isSuccessResponse(res)) {
+      setError(errorFormatter(res.message, t))
+      return
+    }
+    if (res.result) {
+      onDismiss?.()
+    }
+  }, [signType, generatedTx, onDismiss, description, experimental])
+
+  const wallet = useMemo(() => wallets.find(w => w.id === walletID), [walletID, wallets])
+
+  const isLoading =
+    [
+      'send',
+      'unlock',
+      'create-sudt-account',
+      'send-sudt',
+      'transfer-to-sudt',
+      'send-ckb-asset',
+      'send-acp-ckb-to-new-cell',
+      'send-acp-sudt-to-new-cell',
+      'send-cheque',
+      'withdraw-cheque',
+      'claim-cheque',
+      'create-account-to-claim-cheque',
+      'send-from-multisig-need-one',
+      'send-from-multisig',
+      'destroy-asset-account',
+    ].includes(actionType || '') && isSending
+  const disabled = !password || isSending
+
+  const onSubmit = useCallback(
+    async (e?: React.FormEvent) => {
+      if (e) {
+        e.preventDefault()
+      }
+      if (disabled) {
+        return
+      }
+      const handleSendTxRes = ({ status }: { status: number }) => {
+        if (isSuccessResponse({ status })) {
+          if (onSuccess) {
+            onSuccess()
+            return
+          }
+          navigate(RoutePath.History)
+        } else if (status === ErrorCode.PasswordIncorrect) {
+          throw new PasswordIncorrectException()
+        }
+      }
+      try {
+        switch (actionType) {
+          case 'send': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'send-from-multisig-need-one': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({ walletID, tx: generatedTx, description, password, multisigConfig })(dispatch).then(
+              (res: { result?: string; status: number; message: string | { content: string } }) => {
+                if (isSuccessResponse(res)) {
+                  requestOpenInExplorer({ type: 'transaction', key: res.result })
+                } else if (res.status === ErrorCode.PasswordIncorrect) {
+                  throw new PasswordIncorrectException()
+                } else {
+                  invokeShowErrorMessage({
+                    title: t('messages.error'),
+                    content: typeof res.message === 'string' ? res.message : res.message.content!,
+                  })
+                }
+              }
+            )
+            break
+          }
+          case 'delete': {
+            await deleteWallet({ id: walletID, password })(dispatch).then(status => {
+              if (status === ErrorCode.PasswordIncorrect) {
+                throw new PasswordIncorrectException()
+              }
+            })
+            break
+          }
+          case 'backup': {
+            await backupWallet({ id: walletID, password })(dispatch).then(status => {
+              if (status === ErrorCode.PasswordIncorrect) {
+                throw new PasswordIncorrectException()
+              }
+            })
+            break
+          }
+          case 'migrate-acp': {
+            await migrateAcp({ id: walletID, password })(dispatch).then(({ status }) => {
+              if (isSuccessResponse({ status })) {
+                navigate(RoutePath.History)
+              } else if (status === ErrorCode.PasswordIncorrect) {
+                throw new PasswordIncorrectException()
+              }
+            })
+            break
+          }
+          case 'unlock': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(({ status }) => {
+              if (isSuccessResponse({ status })) {
+                dispatch({
+                  type: AppActions.SetGlobalDialog,
+                  payload: 'unlock-success',
+                })
+                onSuccess?.()
+              } else if (status === ErrorCode.PasswordIncorrect) {
+                throw new PasswordIncorrectException()
+              }
+            })
+            break
+          }
+          case 'create-sudt-account': {
+            const params: Controller.SendCreateSUDTAccountTransaction.Params = {
+              walletID,
+              assetAccount: experimental?.assetAccount,
+              tx: experimental?.tx,
+              password,
+            }
+            await sendCreateSUDTAccountTransaction(params)(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'send-ckb-asset':
+          case 'send-acp-ckb-to-new-cell':
+          case 'send-acp-sudt-to-new-cell':
+          case 'send-sudt':
+          case 'transfer-to-sudt': {
+            let skipLastInputs = true
+            if (actionType === 'send-acp-sudt-to-new-cell' || actionType === 'send-acp-ckb-to-new-cell') {
+              skipLastInputs = false
+            }
+            const params: Controller.SendSUDTTransaction.Params = {
+              walletID,
+              tx: experimental?.tx,
+              password,
+              skipLastInputs,
+            }
+            await sendSUDTTransaction(params)(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'destroy-asset-account':
+          case 'send-nft':
+          case 'send-cheque': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({
+              walletID,
+              tx: experimental?.tx,
+              description: experimental?.tx?.description,
+              password,
+            })(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'claim-cheque': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({ walletID, tx: experimental?.tx, password })(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'create-account-to-claim-cheque': {
+            if (isSending) {
+              break
+            }
+            await sendCreateSUDTAccountTransaction({
+              walletID,
+              password,
+              tx: experimental?.tx,
+              assetAccount: {
+                ...experimental?.assetAccount,
+                tokenID: experimental?.assetAccount.tokenId,
+                balance: '0',
+              },
+            })(dispatch).then(handleSendTxRes)
+            break
+          }
+          case 'withdraw-cheque': {
+            if (isSending) {
+              break
+            }
+            await sendTransaction({ walletID, tx: experimental?.tx, password })(dispatch).then(handleSendTxRes)
+            break
+          }
+          default: {
+            break
+          }
+        }
+      } catch (err) {
+        if (err instanceof PasswordIncorrectException) {
+          setError(t(err.message))
+        }
+      }
+    },
+    [
+      dispatch,
+      walletID,
+      password,
+      actionType,
+      description,
+      navigate,
+      isSending,
+      generatedTx,
+      disabled,
+      experimental,
+      setError,
+      t,
+      multisigConfig,
+    ]
+  )
+
+  const onChange = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.target as HTMLInputElement
+      setPassword(value)
+      setError('')
+    },
+    [setPassword, setError]
+  )
+
+  const signAndExportFromGenerateTx = useCallback(async () => {
+    dispatch({
+      type: AppActions.UpdateLoadings,
+      payload: {
+        sending: true,
+      },
+    })
+    const json = {
+      transaction: generatedTx || experimental?.tx,
+      status: OfflineSignStatus.Signed,
+      type: signType,
+      description,
+      asset_account: experimental?.assetAccount,
+    }
+    const res = await signAndExportTransaction({
+      ...json,
+      walletID,
+      password,
+      multisigConfig,
+    })
+    dispatch({
+      type: AppActions.UpdateLoadings,
+      payload: { sending: false },
+    })
+    if (!isSuccessResponse(res)) {
+      setError(errorFormatter(res.message, t))
+      return
+    }
+    if (res.result) {
+      dispatch({
+        type: AppActions.UpdateLoadedTransaction,
+        payload: res.result!,
+      })
+      onDismiss?.()
+    }
+  }, [description, dispatch, experimental, generatedTx, onDismiss, password, signType, t, walletID, multisigConfig])
+
+  return {
+    error,
+    wallet,
+    isLoading,
+    signType,
+    actionType,
+    disabled,
+    password,
+    onSubmit,
+    onChange,
+    exportTransaction,
+    signAndExportFromGenerateTx,
+  }
+}
diff --git a/packages/neuron-ui/src/components/PasswordRequest/index.tsx b/packages/neuron-ui/src/components/PasswordRequest/index.tsx
index e653f84423..1310ccc45f 100644
--- a/packages/neuron-ui/src/components/PasswordRequest/index.tsx
+++ b/packages/neuron-ui/src/components/PasswordRequest/index.tsx
@@ -1,34 +1,14 @@
-import React, { useState, useCallback, useMemo, useEffect } from 'react'
-import { useNavigate } from 'react-router-dom'
+import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import Button from 'widgets/Button'
 import TextField from 'widgets/TextField'
 import HardwareSign from 'components/HardwareSign'
 import { ReactComponent as Attention } from 'widgets/Icons/ExperimentalAttention.svg'
-import { ErrorCode, RoutePath, isSuccessResponse, errorFormatter } from 'utils'
 import Dialog from 'widgets/Dialog'
 import { Export, Sign } from 'widgets/Icons/icon'
-
-import {
-  useState as useGlobalState,
-  useDispatch,
-  AppActions,
-  sendTransaction,
-  deleteWallet,
-  backupWallet,
-  migrateAcp,
-  sendCreateSUDTAccountTransaction,
-  sendSUDTTransaction,
-} from 'states'
-import {
-  exportTransactionAsJSON,
-  OfflineSignStatus,
-  OfflineSignType,
-  signAndExportTransaction,
-  requestOpenInExplorer,
-  invokeShowErrorMessage,
-} from 'services/remote'
-import { PasswordIncorrectException } from 'exceptions'
+import { AppActions, useDispatch, useState as useGlobalState } from 'states'
+import { OfflineSignType } from 'services/remote'
+import usePasswordResuest from './hooks'
 import styles from './passwordRequest.module.scss'
 
 const PasswordRequest = () => {
@@ -36,343 +16,47 @@ const PasswordRequest = () => {
     app: {
       send: { description, generatedTx },
       loadings: { sending: isSending = false },
-      passwordRequest: { walletID = '', actionType = null, multisigConfig, onSuccess },
+      passwordRequest,
     },
     settings: { wallets = [] },
     experimental,
-    wallet: currentWallet,
   } = useGlobalState()
 
-  const dispatch = useDispatch()
   const [t] = useTranslation()
-  const navigate = useNavigate()
-
-  const [password, setPassword] = useState('')
-  const [error, setError] = useState('')
-
-  useEffect(() => {
-    setPassword('')
-    setError('')
-  }, [actionType, setError, setPassword])
-
+  const dispatch = useDispatch()
   const onDismiss = useCallback(() => {
     dispatch({
       type: AppActions.DismissPasswordRequest,
     })
   }, [dispatch])
 
-  const signType = useMemo(() => {
-    switch (actionType) {
-      case 'create-sudt-account':
-        return OfflineSignType.CreateSUDTAccount
-      case 'send-ckb-asset':
-      case 'send-acp-ckb-to-new-cell':
-      case 'send-acp-sudt-to-new-cell':
-      case 'transfer-to-sudt':
-      case 'send-sudt':
-        return OfflineSignType.SendSUDT
-      case 'unlock':
-        return OfflineSignType.UnlockDAO
-      case 'send-nft':
-      case 'send-from-multisig-need-one':
-      case 'send':
-        return OfflineSignType.Regular
-      case 'send-from-multisig':
-        return OfflineSignType.SendFromMultisigOnlySig
-      default:
-        return OfflineSignType.Invalid
-    }
-  }, [actionType])
-
-  const exportTransaction = useCallback(async () => {
-    const res = await exportTransactionAsJSON({
-      transaction: generatedTx || experimental?.tx,
-      status: OfflineSignStatus.Unsigned,
-      type: signType,
-      description,
-      asset_account: experimental?.assetAccount,
-    })
-    if (!isSuccessResponse(res)) {
-      setError(errorFormatter(res.message, t))
-      return
-    }
-    if (res.result) {
-      onDismiss()
-    }
-  }, [signType, generatedTx, onDismiss, description, experimental])
-
-  const wallet = useMemo(() => wallets.find(w => w.id === walletID), [walletID, wallets])
-
-  const isLoading =
-    [
-      'send',
-      'unlock',
-      'create-sudt-account',
-      'send-sudt',
-      'transfer-to-sudt',
-      'send-ckb-asset',
-      'send-acp-ckb-to-new-cell',
-      'send-acp-sudt-to-new-cell',
-      'send-cheque',
-      'withdraw-cheque',
-      'claim-cheque',
-      'create-account-to-claim-cheque',
-      'send-from-multisig-need-one',
-      'send-from-multisig',
-      'destroy-asset-account',
-    ].includes(actionType || '') && isSending
-  const disabled = !password || isSending
-
-  const onSubmit = useCallback(
-    async (e?: React.FormEvent) => {
-      if (e) {
-        e.preventDefault()
-      }
-      if (disabled) {
-        return
-      }
-      const handleSendTxRes = ({ status }: { status: number }) => {
-        if (isSuccessResponse({ status })) {
-          if (onSuccess) {
-            onSuccess()
-            return
-          }
-          navigate(RoutePath.History)
-        } else if (status === ErrorCode.PasswordIncorrect) {
-          throw new PasswordIncorrectException()
-        }
-      }
-      try {
-        switch (actionType) {
-          case 'send': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'send-from-multisig-need-one': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({ walletID, tx: generatedTx, description, password, multisigConfig })(dispatch).then(
-              (res: { result?: string; status: number; message: string | { content: string } }) => {
-                if (isSuccessResponse(res)) {
-                  requestOpenInExplorer({ type: 'transaction', key: res.result })
-                } else if (res.status === ErrorCode.PasswordIncorrect) {
-                  throw new PasswordIncorrectException()
-                } else {
-                  invokeShowErrorMessage({
-                    title: t('messages.error'),
-                    content: typeof res.message === 'string' ? res.message : res.message.content!,
-                  })
-                }
-              }
-            )
-            break
-          }
-          case 'delete': {
-            await deleteWallet({ id: walletID, password })(dispatch).then(status => {
-              if (status === ErrorCode.PasswordIncorrect) {
-                throw new PasswordIncorrectException()
-              }
-            })
-            break
-          }
-          case 'backup': {
-            await backupWallet({ id: walletID, password })(dispatch).then(status => {
-              if (status === ErrorCode.PasswordIncorrect) {
-                throw new PasswordIncorrectException()
-              }
-            })
-            break
-          }
-          case 'migrate-acp': {
-            await migrateAcp({ id: walletID, password })(dispatch).then(({ status }) => {
-              if (isSuccessResponse({ status })) {
-                navigate(RoutePath.History)
-              } else if (status === ErrorCode.PasswordIncorrect) {
-                throw new PasswordIncorrectException()
-              }
-            })
-            break
-          }
-          case 'unlock': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(({ status }) => {
-              if (isSuccessResponse({ status })) {
-                dispatch({
-                  type: AppActions.SetGlobalDialog,
-                  payload: 'unlock-success',
-                })
-                onSuccess?.()
-              } else if (status === ErrorCode.PasswordIncorrect) {
-                throw new PasswordIncorrectException()
-              }
-            })
-            break
-          }
-          case 'create-sudt-account': {
-            const params: Controller.SendCreateSUDTAccountTransaction.Params = {
-              walletID,
-              assetAccount: experimental?.assetAccount,
-              tx: experimental?.tx,
-              password,
-            }
-            await sendCreateSUDTAccountTransaction(params)(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'send-ckb-asset':
-          case 'send-acp-ckb-to-new-cell':
-          case 'send-acp-sudt-to-new-cell':
-          case 'send-sudt':
-          case 'transfer-to-sudt': {
-            let skipLastInputs = true
-            if (actionType === 'send-acp-sudt-to-new-cell' || actionType === 'send-acp-ckb-to-new-cell') {
-              skipLastInputs = false
-            }
-            const params: Controller.SendSUDTTransaction.Params = {
-              walletID,
-              tx: experimental?.tx,
-              password,
-              skipLastInputs,
-            }
-            await sendSUDTTransaction(params)(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'destroy-asset-account':
-          case 'send-nft':
-          case 'send-cheque': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({
-              walletID,
-              tx: experimental?.tx,
-              description: experimental?.tx?.description,
-              password,
-            })(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'claim-cheque': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({ walletID, tx: experimental?.tx, password })(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'create-account-to-claim-cheque': {
-            if (isSending) {
-              break
-            }
-            await sendCreateSUDTAccountTransaction({
-              walletID,
-              password,
-              tx: experimental?.tx,
-              assetAccount: {
-                ...experimental?.assetAccount,
-                tokenID: experimental?.assetAccount.tokenId,
-                balance: '0',
-              },
-            })(dispatch).then(handleSendTxRes)
-            break
-          }
-          case 'withdraw-cheque': {
-            if (isSending) {
-              break
-            }
-            await sendTransaction({ walletID, tx: experimental?.tx, password })(dispatch).then(handleSendTxRes)
-            break
-          }
-          default: {
-            break
-          }
-        }
-      } catch (err) {
-        if (err instanceof PasswordIncorrectException) {
-          setError(t(err.message))
-        }
-      }
-    },
-    [
-      dispatch,
-      walletID,
-      password,
-      actionType,
-      description,
-      navigate,
-      isSending,
-      generatedTx,
-      disabled,
-      experimental,
-      setError,
-      t,
-      multisigConfig,
-    ]
-  )
-
-  const onChange = useCallback(
-    (e: React.SyntheticEvent<HTMLInputElement>) => {
-      const { value } = e.target as HTMLInputElement
-      setPassword(value)
-      setError('')
-    },
-    [setPassword, setError]
-  )
-
-  const signAndExportFromGenerateTx = useCallback(async () => {
-    dispatch({
-      type: AppActions.UpdateLoadings,
-      payload: {
-        sending: true,
-      },
-    })
-    const json = {
-      transaction: generatedTx || experimental?.tx,
-      status: OfflineSignStatus.Signed,
-      type: signType,
-      description,
-      asset_account: experimental?.assetAccount,
-    }
-    const res = await signAndExportTransaction({
-      ...json,
-      walletID,
-      password,
-      multisigConfig,
-    })
-    dispatch({
-      type: AppActions.UpdateLoadings,
-      payload: { sending: false },
-    })
-    if (!isSuccessResponse(res)) {
-      setError(errorFormatter(res.message, t))
-      return
-    }
-    if (res.result) {
-      dispatch({
-        type: AppActions.UpdateLoadedTransaction,
-        payload: res.result!,
-      })
-      onDismiss()
-    }
-  }, [description, dispatch, experimental, generatedTx, onDismiss, password, signType, t, walletID, multisigConfig])
-
+  const {
+    error,
+    wallet,
+    isLoading,
+    signType,
+    actionType,
+    disabled,
+    password,
+    onSubmit,
+    onChange,
+    exportTransaction,
+    signAndExportFromGenerateTx,
+  } = usePasswordResuest({
+    description,
+    generatedTx,
+    isSending,
+    passwordRequest,
+    wallets,
+    experimental,
+    onDismiss,
+  })
   if (!wallet) {
     return null
   }
 
   if (wallet.device) {
-    return (
-      <HardwareSign
-        signType="transaction"
-        navigate={navigate}
-        wallet={wallet}
-        onDismiss={onDismiss}
-        offlineSignType={signType}
-      />
-    )
+    return <HardwareSign signType="transaction" wallet={wallet} onDismiss={onDismiss} offlineSignType={signType} />
   }
 
   return (
@@ -406,13 +90,13 @@ const PasswordRequest = () => {
         ].includes(actionType ?? '') ? null : (
           <div className={styles.walletName}>{wallet ? wallet.name : null}</div>
         )}
-        {currentWallet.isWatchOnly && (
+        {wallet.isWatchOnly && (
           <div className={styles.xpubNotice}>
             <Attention />
             {t('password-request.xpub-notice')}
           </div>
         )}
-        {currentWallet.isWatchOnly || (
+        {wallet.isWatchOnly || (
           <TextField
             className={styles.passwordInput}
             placeholder={t('password-request.placeholder')}
@@ -432,7 +116,7 @@ const PasswordRequest = () => {
             <Button type="text" onClick={exportTransaction} disabled={isLoading}>
               {t('offline-sign.export')} <Export />
             </Button>
-            {!currentWallet.isWatchOnly && (
+            {!wallet.isWatchOnly && (
               <>
                 <div className={styles.divider} />
                 <Button
diff --git a/packages/neuron-ui/src/components/PasswordRequest/passwordRequest.module.scss b/packages/neuron-ui/src/components/PasswordRequest/passwordRequest.module.scss
index 9026ba16e4..85f1f569ca 100644
--- a/packages/neuron-ui/src/components/PasswordRequest/passwordRequest.module.scss
+++ b/packages/neuron-ui/src/components/PasswordRequest/passwordRequest.module.scss
@@ -66,3 +66,12 @@
     transform: translateY(20%);
   }
 }
+
+.passwordRequestInPage {
+  .actions {
+    display: flex;
+    justify-content: center;
+    gap: 12px;
+    margin-top: 24px;
+  }
+}
diff --git a/packages/neuron-ui/src/components/Send/hooks.ts b/packages/neuron-ui/src/components/Send/hooks.ts
index 86fff5f3d4..b0dd76f996 100644
--- a/packages/neuron-ui/src/components/Send/hooks.ts
+++ b/packages/neuron-ui/src/components/Send/hooks.ts
@@ -11,9 +11,11 @@ import {
   calculateFee,
   validateOutputs,
   DefaultLockInfo,
+  RoutePath,
 } from 'utils'
 import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
 import { PlaceHolderArgs } from 'utils/const'
+import { useNavigate } from 'react-router-dom'
 
 let generateTxTimer: ReturnType<typeof setTimeout>
 
@@ -223,8 +225,19 @@ const useOnTransactionChange = ({
   ])
 }
 
-const useOnSubmit = (items: Readonly<State.Output[]>, isMainnet: boolean, dispatch: StateDispatch) =>
-  useCallback(
+const useOnSubmit = ({
+  items,
+  isMainnet,
+  dispatch,
+  enableUseSentCell,
+}: {
+  items: Readonly<State.Output[]>
+  isMainnet: boolean
+  dispatch: StateDispatch
+  enableUseSentCell: boolean
+}) => {
+  const navigate = useNavigate()
+  return useCallback(
     (e: React.FormEvent) => {
       const {
         dataset: { walletId, status },
@@ -235,20 +248,24 @@ const useOnSubmit = (items: Readonly<State.Output[]>, isMainnet: boolean, dispat
       }
       try {
         validateOutputs(items, isMainnet)
-        dispatch({
-          type: AppActions.RequestPassword,
-          payload: {
-            walletID: walletId as string,
-            actionType: 'send',
-          },
-        })
+        if (enableUseSentCell) {
+          navigate(RoutePath.SendTxDetail)
+        } else {
+          dispatch({
+            type: AppActions.RequestPassword,
+            payload: {
+              walletID: walletId as string,
+              actionType: 'send',
+            },
+          })
+        }
       } catch {
         // ignore
       }
     },
-    [dispatch, items, isMainnet]
+    [dispatch, items, isMainnet, enableUseSentCell, navigate]
   )
-
+}
 const useOnItemChange = (updateTransactionOutput: ReturnType<typeof useUpdateTransactionOutput>) =>
   useCallback(
     (e: any) => {
@@ -403,7 +420,7 @@ export const useInitialize = ({
   const removeTransactionOutput = useRemoveTransactionOutput(dispatch)
   const updateTransactionPrice = useUpdateTransactionPrice(dispatch)
   const onDescriptionChange = useSendDescriptionChange(dispatch)
-  const onSubmit = useOnSubmit(items, isMainnet, dispatch)
+  const onSubmit = useOnSubmit({ items, isMainnet, dispatch, enableUseSentCell })
   const onClear = useClear(dispatch)
 
   const updateSendingAllTransaction = useCallback(() => {
diff --git a/packages/neuron-ui/src/components/SendTxDetail/TxTopology.tsx b/packages/neuron-ui/src/components/SendTxDetail/TxTopology.tsx
new file mode 100644
index 0000000000..d8e483f54f
--- /dev/null
+++ b/packages/neuron-ui/src/components/SendTxDetail/TxTopology.tsx
@@ -0,0 +1,129 @@
+import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
+import React, { FC } from 'react'
+import { shannonToCKBFormatter } from 'utils'
+import Tooltip from 'widgets/Tooltip'
+import CopyZone from 'widgets/CopyZone'
+import { ArrowDownRound } from 'widgets/Icons/icon'
+import styles from './txTopology.module.scss'
+
+const TopologyCellItem = ({
+  inputStatus,
+  label,
+  address,
+  amount,
+}: {
+  inputStatus?: string
+  label: string
+  address?: string
+  amount: string
+}) => {
+  return (
+    <div className={styles.cellItemRoot}>
+      {inputStatus ? <div className={styles.inputStatus}>{inputStatus}</div> : null}
+      <div className={styles.itemTable}>
+        <div className={styles.label}>{label}</div>
+        <div className={styles.amount}>{`${shannonToCKBFormatter(amount)} CKB`}</div>
+        {address ? (
+          <Tooltip
+            tip={
+              <CopyZone content={address} className={styles.copyAddress}>
+                {address}
+              </CopyZone>
+            }
+            className={styles.address}
+            placement="top"
+            showTriangle
+            isTriggerNextToChild
+          >
+            <div>{`${address.slice(0, 8)}...${address.slice(-10)}`}</div>
+          </Tooltip>
+        ) : null}
+      </div>
+    </div>
+  )
+}
+
+const TxTopology: FC<{
+  tx: State.GeneratedTx
+  isMainnet: boolean
+}> = ({ tx, isMainnet }) => {
+  return (
+    <div className={styles.root}>
+      <div className={styles.inputs}>
+        {tx.inputs.map((v, idx) =>
+          v.lock && v.capacity ? (
+            <TopologyCellItem
+              // eslint-disable-next-line react/no-array-index-key
+              key={idx.toString()}
+              label={`Input${idx + 1}`}
+              address={scriptToAddress(v.lock, isMainnet)}
+              amount={v.capacity}
+              inputStatus={v.status === 'sent' ? 'Pending' : 'On-chain'}
+            />
+          ) : null
+        )}
+      </div>
+      <div className={styles.center}>
+        {tx.inputs.length > 1 ? (
+          <>
+            <div className={styles.inputConnection} style={{ height: `${(tx.inputs.length - 1) * 91}px` }}>
+              {Array.from({ length: (tx.inputs.length - 1) * 4 }).map((_, idx) => (
+                <div
+                  data-idx={idx}
+                  data-ignore-right={idx > 2 * tx.inputs.length - 4 && idx < 2 * tx.inputs.length - 1}
+                  className={
+                    tx.inputs.length % 2 !== 0 && idx === tx.inputs.length * 2 - 2 ? styles.centerLine : undefined
+                  }
+                />
+              ))}
+            </div>
+            <div className={styles.inputConnectTx}>
+              <div />
+              <ArrowDownRound />
+              <div />
+            </div>
+          </>
+        ) : (
+          <div className={styles.onlyOneInput}>
+            <ArrowDownRound />
+          </div>
+        )}
+        <div className={styles.txBox}>Transaction</div>
+        <div className={styles.outputConnectTx}>
+          <div />
+          <div />
+        </div>
+        <div className={styles.outputConnection} style={{ height: `${tx.outputs.length * 91}px` }}>
+          {Array.from({ length: tx.outputs.length * 4 }).map((_, idx) => (
+            <div
+              data-idx={idx}
+              data-ignore-left={idx > 2 * tx.outputs.length - 2 && idx <= 2 * tx.outputs.length}
+              className={tx.outputs.length % 2 === 0 && idx === tx.outputs.length * 2 ? styles.centerLine : undefined}
+            >
+              {idx % 4 === 0 || idx === tx.outputs.length * 4 - 1 ? <ArrowDownRound /> : null}
+            </div>
+          ))}
+        </div>
+      </div>
+      <div className={styles.outputs}>
+        {tx.outputs.map((v, idx) =>
+          v.lock && v.capacity ? (
+            <TopologyCellItem
+              // eslint-disable-next-line react/no-array-index-key
+              key={idx.toString()}
+              label={v.isChangeCell ? 'Change' : 'Receive'}
+              address={scriptToAddress(v.lock, isMainnet)}
+              amount={v.capacity}
+            />
+          ) : null
+        )}
+        <TopologyCellItem label="Fee" amount={tx.fee} />
+        <div className={styles.placeHolder} />
+      </div>
+    </div>
+  )
+}
+
+TxTopology.displayName = 'TxTopology'
+
+export default TxTopology
diff --git a/packages/neuron-ui/src/components/SendTxDetail/hooks.ts b/packages/neuron-ui/src/components/SendTxDetail/hooks.ts
new file mode 100644
index 0000000000..801f4380b1
--- /dev/null
+++ b/packages/neuron-ui/src/components/SendTxDetail/hooks.ts
@@ -0,0 +1,13 @@
+import { useCallback, useState } from 'react'
+
+export const useShowBalance = () => {
+  const [isBalanceShow, setIsBalanceShow] = useState(true)
+  return {
+    isBalanceShow,
+    onChange: useCallback(() => {
+      setIsBalanceShow((v: boolean) => !v)
+    }, []),
+  }
+}
+
+export default useShowBalance
diff --git a/packages/neuron-ui/src/components/SendTxDetail/index.tsx b/packages/neuron-ui/src/components/SendTxDetail/index.tsx
new file mode 100644
index 0000000000..7a064564f1
--- /dev/null
+++ b/packages/neuron-ui/src/components/SendTxDetail/index.tsx
@@ -0,0 +1,118 @@
+import React, { FC, useCallback, useState } from 'react'
+import { showPageNotice, useDispatch, useState as useGlobalState } from 'states'
+import { Copy, EyesOpen, GoBack } from 'widgets/Icons/icon'
+import PageContainer from 'components/PageContainer'
+import { useTranslation } from 'react-i18next'
+import { RoutePath, clsx, shannonToCKBFormatter, useGoBack, isMainnet as isMainnetUtils } from 'utils'
+import Tabs from 'widgets/Tabs'
+import { HIDE_BALANCE } from 'utils/const'
+import PasswordRequestInPage from 'components/PasswordRequest/PasswordRequestInPage'
+import { useNavigate } from 'react-router-dom'
+import useShowBalance from './hooks'
+import styles from './sendTxDetail.module.scss'
+import TxTopology from './TxTopology'
+
+enum TabId {
+  Basic,
+  Topology,
+}
+
+const TxBasic: FC<{
+  tx: State.GeneratedTx
+}> = ({ tx }) => {
+  const [t] = useTranslation()
+  const capacities = tx.inputs.reduce((total, addr) => total + BigInt(addr.capacity || 0), BigInt(0)).toString()
+  const dispatch = useDispatch()
+  const onCopy = useCallback(() => {
+    window.navigator.clipboard.writeText(tx.hash)
+    showPageNotice('common.copied')(dispatch)
+  }, [tx.hash, dispatch])
+  const { isBalanceShow: showCapacity, onChange: onChangeCapacityVisible } = useShowBalance()
+  const { isBalanceShow: showFee, onChange: onChangeFeeVisible } = useShowBalance()
+  return (
+    <div className={styles.txBasicRoot}>
+      <div className={styles.fieldName}>{t('send-tx-detail.tx-basic.tx-hash')}</div>
+      <div className={clsx(styles.fieldValue, styles.fullRow, styles.bold, styles.txHash)}>
+        {tx.hash}
+        <Copy onClick={onCopy} />
+      </div>
+      <div className={styles.fieldName}>{t('send-tx-detail.tx-basic.capacity')}</div>
+      <div className={styles.fieldValue}>
+        {`${showCapacity ? shannonToCKBFormatter(capacities) : HIDE_BALANCE} CKB`}
+        <EyesOpen onClick={onChangeCapacityVisible} />
+      </div>
+      <div className={styles.fieldName}>{t('send-tx-detail.tx-basic.tx-fee')}</div>
+      <div className={styles.fieldValue}>
+        {`${showFee ? shannonToCKBFormatter(tx.fee) : HIDE_BALANCE} CKB`}
+        <EyesOpen onClick={onChangeFeeVisible} />
+      </div>
+      <div className={styles.fieldName}>{t('send-tx-detail.tx-basic.size')}</div>
+      <div className={clsx(styles.fieldValue, styles.fullRow)}>{`${tx.size} Bytes`}</div>
+    </div>
+  )
+}
+
+const SendTxDetail = () => {
+  const {
+    app: {
+      pageNotice,
+      send: { generatedTx },
+    },
+    wallet,
+    chain: { networkID },
+    settings: { networks },
+  } = useGlobalState()
+  const isMainnet = isMainnetUtils(networks, networkID)
+  const [t] = useTranslation()
+  const onGoBack = useGoBack()
+  const tabs = [
+    { id: TabId.Basic, label: t('send-tx-detail.basic-info') },
+    { id: TabId.Topology, label: t('send-tx-detail.topology') },
+  ]
+  const [currentTab, setCurrentTab] = useState(tabs[0])
+  const navigate = useNavigate()
+  const onGotoView = useCallback(() => {
+    navigate(RoutePath.Overview)
+  }, [navigate])
+  if (!generatedTx) {
+    return null
+  }
+  return (
+    <PageContainer
+      onContextMenu={e => {
+        e.stopPropagation()
+        e.preventDefault()
+      }}
+      head={
+        <div>
+          <GoBack className={styles.goBack} onClick={onGoBack} />
+          <span className={styles.breadcrumbNav}>{`${t('send-tx-detail.page-title')}`}</span>
+        </div>
+      }
+      notice={pageNotice}
+    >
+      <div className={styles.tx}>
+        <Tabs
+          tabs={tabs}
+          onTabChange={setCurrentTab}
+          tabsClassName={styles.tabsClassName}
+          tabsWrapClassName={styles.tabsWrapClassName}
+          tabsColumnClassName={styles.tabsColumnClassName}
+          activeColumnClassName={styles.active}
+        />
+        {currentTab.id === TabId.Basic ? (
+          <TxBasic tx={generatedTx} />
+        ) : (
+          <TxTopology tx={generatedTx} isMainnet={isMainnet} />
+        )}
+      </div>
+      <div className={styles.password}>
+        <PasswordRequestInPage actionType="send" walletID={wallet.id} onCancel={onGotoView} />
+      </div>
+    </PageContainer>
+  )
+}
+
+SendTxDetail.displayName = 'SendTxDetail'
+
+export default SendTxDetail
diff --git a/packages/neuron-ui/src/components/SendTxDetail/sendTxDetail.module.scss b/packages/neuron-ui/src/components/SendTxDetail/sendTxDetail.module.scss
new file mode 100644
index 0000000000..abb96e135a
--- /dev/null
+++ b/packages/neuron-ui/src/components/SendTxDetail/sendTxDetail.module.scss
@@ -0,0 +1,92 @@
+@import '../../styles//mixin.scss';
+
+.goBack {
+  margin-right: 8px;
+  cursor: pointer;
+
+  & path {
+    stroke: var(--main-text-color);
+  }
+}
+
+.tx {
+  @include card;
+}
+
+.password {
+  @include card;
+  padding: 4px 16px 24px 16px;
+  margin-top: 16px;
+}
+
+.tabsClassName {
+  .tabsWrapClassName {
+    position: relative;
+    display: flex;
+
+    .tabsColumnClassName {
+      position: relative;
+      padding: 10px 20px;
+      font-size: 14px;
+      font-weight: 500;
+      color: var(--tabs-default-color);
+      background-color: transparent;
+      border: none;
+      margin-right: 10px;
+      cursor: pointer;
+
+      &:hover {
+        font-weight: bold;
+        color: var(--tabs-active);
+      }
+
+      &.active {
+        color: var(--tabs-active);
+        border-bottom: 2px solid var(--tabs-active);
+      }
+    }
+  }
+}
+
+.txBasicRoot {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(112px, auto) 1fr);
+  grid-auto-rows: minmax(56px, auto);
+  border-radius: 16px;
+  background: var(--secondary-background-color);
+
+  .fieldName {
+    display: flex;
+    align-items: center;
+    border-top: 1px solid var(--table-head-border-color);
+    padding: 0 16px;
+    color: #999999;
+  }
+
+  .fieldValue {
+    display: flex;
+    align-items: center;
+    border-top: 1px solid var(--table-head-border-color);
+    padding-right: 16px;
+    color: var(--main-text-color);
+
+    &.fullRow {
+      grid-column: 2 / -1;
+    }
+
+    &.bold {
+      font-weight: 500;
+    }
+
+    & > svg {
+      cursor: pointer;
+      margin-left: 8px;
+    }
+  }
+
+  .txHash {
+    display: flex;
+    align-items: center;
+    font-family: 'JetBrains Mono';
+  }
+}
diff --git a/packages/neuron-ui/src/components/SendTxDetail/txTopology.module.scss b/packages/neuron-ui/src/components/SendTxDetail/txTopology.module.scss
new file mode 100644
index 0000000000..da42cb3d66
--- /dev/null
+++ b/packages/neuron-ui/src/components/SendTxDetail/txTopology.module.scss
@@ -0,0 +1,274 @@
+@import '../../styles/mixin.scss';
+
+.cellItemRoot {
+  margin: 16px 0;
+  position: relative;
+  min-width: 160px;
+
+  .inputStatus {
+    color: var(--secondary-text-color);
+    font-size: 12px;
+    font-weight: 400;
+    margin-bottom: 4px;
+    position: absolute;
+    bottom: 100%;
+  }
+
+  .itemTable {
+    border: 1px solid var(--divide-line-color);
+    border-radius: 4px;
+    font-size: 12px;
+    background-color: var(--table-head-background-color);
+    color: --third-text-color;
+    display: grid;
+    grid-template-areas:
+      'label amount amount'
+      'address address address';
+
+    & > div {
+      padding: 6px;
+      line-height: 16px;
+    }
+    .label {
+      grid-area: label;
+      color: var(--main-text-color);
+      border-right: 1px solid var(--divide-line-color);
+      font-weight: 500;
+    }
+
+    .amount {
+      grid-area: amount;
+      color: var(--third-text-color);
+    }
+
+    .address {
+      border-top: 1px solid var(--divide-line-color);
+      grid-area: address;
+      width: calc(100% - 12px);
+      color: var(--third-text-color);
+      &:hover {
+        color: var(--primary-color);
+      }
+    }
+
+    .copyAddress {
+      width: 346px;
+      @include copyAddress;
+    }
+  }
+}
+
+.root {
+  padding: 28px 0;
+  border-top: 1px solid var(--divide-line-color);
+  display: flex;
+  justify-content: center;
+
+  & > div {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+
+  .center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: row;
+    .txBox {
+      border-radius: 4px;
+      border: 1px solid var(--divide-line-color);
+      background-color: var(--table-head-background-color);
+      width: 74px;
+      height: 24px;
+      line-height: 24px;
+      font-size: 12px;
+      font-weight: 400;
+      text-align: center;
+      color: var(--third-text-color);
+    }
+
+    .onlyOneInput {
+      width: 100px;
+      height: 1px;
+      background-color: var(--divide-line-color);
+      position: relative;
+      svg {
+        position: absolute;
+        left: 50%;
+        top: 100%;
+        transform: rotate(-90deg) translateX(50%);
+        > path {
+          fill: var(--divide-line-color);
+          stroke: var(--divide-line-color);
+        }
+      }
+    }
+    .inputConnection {
+      width: 40px;
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      & > div {
+        flex: 1 1 auto;
+        border-color: var(--divide-line-color) !important;
+        border-right: 1px solid;
+
+        &:nth-child(4n + 1) {
+          border-top: 1px solid;
+        }
+        &:first-child {
+          border-radius: 0 8px 0 0;
+        }
+        &:last-child {
+          border-radius: 0 0 8px 0;
+          border-bottom: 1px solid;
+        }
+        &[data-ignore-right='true'] {
+          border-right: none;
+        }
+        &.centerLine {
+          position: absolute;
+          top: calc(50% - 1px);
+          width: calc(200% + 16px);
+          left: -28px;
+          transform: scale(0.5);
+          border-top: 2px solid;
+        }
+      }
+    }
+    .inputConnectTx {
+      width: 60px;
+      height: 46px;
+      position: relative;
+
+      & > div {
+        height: 50%;
+        border-left: 1px solid;
+        border-color: var(--divide-line-color) !important;
+        margin-left: -1px;
+        &:first-child {
+          border-bottom: 1px solid;
+          border-radius: 0 0 0 8px;
+        }
+        &:last-child {
+          border-top: 1px solid;
+          width: 8px;
+          border-radius: 8px 0 0 0;
+          margin-top: -1px;
+        }
+      }
+
+      svg {
+        position: absolute;
+        transform: translateY(-50%) rotate(-90deg);
+        left: 50%;
+        top: 50%;
+        > path {
+          fill: var(--divide-line-color);
+          stroke: var(--divide-line-color);
+        }
+      }
+    }
+    .outputConnectTx {
+      width: 60px;
+      height: 52px;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+      & > div {
+        height: 50%;
+        border-right: 1px solid;
+        border-color: var(--divide-line-color) !important;
+        margin-right: -1px;
+        &:first-child {
+          width: 100%;
+          border-bottom: 1px solid;
+          border-radius: 0 0 8px 0;
+        }
+        &:last-child {
+          border-top: 1px solid;
+          width: 8px;
+          border-radius: 0 8px 0 0;
+          margin-top: -1px;
+        }
+      }
+    }
+    .outputConnection {
+      width: 40px;
+      height: calc(100% - 59px - 32px);
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      & > div {
+        flex: 1;
+        border-color: var(--divide-line-color) !important;
+        border-left: 1px solid;
+        position: relative;
+        &:nth-child(4n + 1) {
+          border-top: 1px solid;
+          svg {
+            bottom: 100%;
+            transform: rotate(-90deg) translateY(-50%) translateX(-50%);
+          }
+        }
+        &:first-child {
+          border-radius: 8px 0 0 0;
+
+          svg {
+            bottom: 100%;
+            transform: rotate(-90deg) translateY(-50%) translateX(-50%);
+          }
+        }
+        &:last-child {
+          border-radius: 0 0 0 8px;
+          border-bottom: 1px solid;
+          position: relative;
+          top: -14px;
+          svg {
+            top: 100%;
+            transform: rotate(-90deg) translateY(-50%) translateX(50%);
+          }
+        }
+        &[data-ignore-left='true'] {
+          border-left: none;
+        }
+        &.centerLine {
+          position: absolute;
+          top: calc(50% - 1px);
+          width: calc(200% + 16px);
+          left: -28px;
+          transform: scale(0.5);
+          border-top: 2px solid;
+
+          & > svg {
+            transform: rotate(-90deg) translateY(-50%) translateX(-50%) scale(2);
+          }
+        }
+      }
+
+      svg {
+        position: absolute;
+        left: 50%;
+        > path {
+          fill: var(--divide-line-color);
+          stroke: var(--divide-line-color);
+        }
+      }
+    }
+  }
+
+  .inputs {
+    position: relative;
+  }
+
+  .outputs {
+    position: relative;
+
+    .placeHolder {
+      height: 29px;
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 338f714db6..509ce2726a 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -1193,6 +1193,18 @@
       "lock": "Lock",
       "unlock": "Unlock",
       "consume": "Consume"
+    },
+    "send-tx-detail": {
+      "page-title": "Transaction Detail",
+      "basic-info": "Basic Information",
+      "topology": "Topology",
+      "tx-basic": {
+        "tx-hash": "Transaction Hash",
+        "capacity": "Capacity",
+        "tx-fee": "Transaction Fee",
+        "size": "Size",
+        "lock-time": "Lock Time"
+      }
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 9909598ea0..1440ab833e 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -1188,6 +1188,18 @@
       "lock": "Bloquear",
       "unlock": "Desbloquear",
       "consume": "Consumir"
+    },
+    "send-tx-detail": {
+      "page-title": "Detalles de la transacción",
+      "basic-info": "Información Básica",
+      "topology": "Diagrama de topología",
+      "tx-basic": {
+        "tx-hash": "Hash de Transacción",
+        "capacity": "Cantidad",
+        "tx-fee": "Tarifa de transacción",
+        "size": "tamaño",
+        "lock-time": "Período de Bloqueo"
+      }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index a4fcb7e2c9..abf5f0883c 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -1193,6 +1193,18 @@
       "lock": "Verrouiller",
       "unlock": "Déverrouiller",
       "consume": "Consommer"
+    },
+    "send-tx-detail": {
+      "page-title": "Détail de l'historique",
+      "basic-info": "Informations de base",
+      "topology": "Schéma topologique",
+      "tx-basic": {
+        "tx-hash": "Hash de transaction",
+        "capacity": "Montant",
+        "tx-fee": "Frais de transaction",
+        "size": "taille",
+        "lock-time": "Période de verrouillage"
+      }
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 151d07d7dd..cea843f0cc 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -1164,6 +1164,18 @@
       "lock": "鎖定",
       "unlock": "解鎖",
       "consume": "消耗"
+    },
+    "send-tx-detail": {
+      "page-title": "交易詳情",
+      "basic-info": "基本信息",
+      "topology": "拓撲圖",
+      "tx-basic": {
+        "tx-hash": "交易哈希",
+        "capacity": "金額",
+        "tx-fee": "交易費",
+        "size": "大小",
+        "lock-time": "鎖定時間"
+      }
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 05fdaf61bd..0146f9920d 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -1185,6 +1185,18 @@
       "lock": "锁定",
       "unlock": "解锁",
       "consume": "消耗"
+    },
+    "send-tx-detail": {
+      "page-title": "交易详情",
+      "basic-info": "基本信息",
+      "topology": "拓扑图",
+      "tx-basic": {
+        "tx-hash": "交易哈希",
+        "capacity": "金额",
+        "tx-fee": "交易费",
+        "size": "大小",
+        "lock-time": "锁定时间"
+      }
     }
   }
 }
diff --git a/packages/neuron-ui/src/router.tsx b/packages/neuron-ui/src/router.tsx
index 76114bd4f2..79bee75bd7 100644
--- a/packages/neuron-ui/src/router.tsx
+++ b/packages/neuron-ui/src/router.tsx
@@ -22,6 +22,7 @@ import Settings from 'components/Settings'
 import SignAndVerify from 'components/SignAndVerify'
 import MultisigAddress from 'components/MultisigAddress'
 import CellManagement from 'components/CellManagement'
+import SendTxDetail from 'components/SendTxDetail'
 
 const toolsRouters = [
   {
@@ -113,6 +114,16 @@ const mainRouterConfig: RouteObject[] = [
           },
         ],
       },
+      {
+        path: RoutePath.SendTxDetail,
+        element: (
+          <>
+            <SendTxDetail />
+            <Outlet />
+          </>
+        ),
+        children: [...toolsRouters],
+      },
       {
         path: RoutePath.History,
         children: [
diff --git a/packages/neuron-ui/src/states/init/chain.ts b/packages/neuron-ui/src/states/init/chain.ts
index 2fc84a4314..e0da056662 100644
--- a/packages/neuron-ui/src/states/init/chain.ts
+++ b/packages/neuron-ui/src/states/init/chain.ts
@@ -19,7 +19,6 @@ export const transactionState: State.DetailedTransaction = {
   blockHash: '',
   witnesses: [],
   nervosDao: false,
-  size: 0,
 }
 
 export const chainState: Readonly<State.Chain> = {
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index dd3e99b739..2c01956c4b 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -31,6 +31,7 @@ declare namespace State {
     lock: CKBComponents.Script | null
     type?: CKBComponents.Script
     data?: string
+    status?: string
   }
 
   interface DetailedOutput {
@@ -40,6 +41,7 @@ declare namespace State {
     outPoint: CKBComponents.OutPoint
     type?: CKBComponents.Script
     data?: string
+    isChangeCell?: boolean
   }
   interface DetailedTransaction extends Transaction {
     blockHash: string
@@ -50,7 +52,8 @@ declare namespace State {
     outputs: DetailedOutput[]
     outputsCount: string
     witnesses: string[]
-    size: number
+    size?: number
+    isLastChange?: boolean
   }
   interface Output {
     address: string | undefined
@@ -122,6 +125,7 @@ declare namespace State {
       blake160s: string[]
     }
     onSuccess?: () => void
+    showType?: 'Global' | ''
   }
 
   interface SUDTAccount {
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index ce71adb71e..901eafe4ab 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -25,6 +25,7 @@ export enum RoutePath {
   SUDTAccountList = '/s-udt/accounts',
   SUDTSend = '/s-udt/send',
   ImportHardware = '/import-hardware',
+  SendTxDetail = '/send-tx-detail',
   OfflineSign = 'offline-sign',
   SignVerify = 'sign-verify',
   MultisigAddress = 'multisig-address',
diff --git a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
index 4e77a25c16..6c4d88ffd1 100644
--- a/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
+++ b/packages/neuron-ui/src/widgets/Tooltip/tooltip.module.scss
@@ -291,5 +291,12 @@ $placements: left, right, top, bottom, left-top, right-top, left-bottom, right-b
         }
       }
     }
+    &[data-placement='top'] {
+      &[data-trigger-next-to-child='true'] {
+        & .tip {
+          margin-bottom: 2px;
+        }
+      }
+    }
   }
 }
diff --git a/packages/neuron-wallet/src/models/chain/input.ts b/packages/neuron-wallet/src/models/chain/input.ts
index 9c00015ede..352989fab8 100644
--- a/packages/neuron-wallet/src/models/chain/input.ts
+++ b/packages/neuron-wallet/src/models/chain/input.ts
@@ -2,6 +2,7 @@ import OutPoint from './out-point'
 import Script from './script'
 import { BI } from '@ckb-lumos/bi'
 import TypeChecker from '../../utils/type-checker'
+import { OutputStatus } from './output'
 
 export default class Input {
   public previousOutput: OutPoint | null
@@ -14,6 +15,7 @@ export default class Input {
   public type?: Script | null
   public typeHash?: string | null
   public data?: string | null
+  public status?: OutputStatus
 
   // don't using = directly, using setXxx instead
   // check hex string
@@ -27,7 +29,8 @@ export default class Input {
     multiSignBlake160?: string | null,
     type?: Script | null,
     typeHash?: string | null,
-    data?: string | null
+    data?: string | null,
+    status?: OutputStatus
   ) {
     this.previousOutput = previousOutput
     this.since = since ? BigInt(since).toString() : since
@@ -42,6 +45,7 @@ export default class Input {
     this.typeHash = typeHash || this.type?.computeHash()
 
     this.data = data
+    this.status = status
 
     TypeChecker.hashChecker(this.lockHash, this.typeHash)
     TypeChecker.numberChecker(this.since, this.capacity, this.inputIndex)
@@ -58,6 +62,7 @@ export default class Input {
     type,
     typeHash,
     data,
+    status,
   }: {
     previousOutput: OutPoint | null
     since?: string
@@ -69,6 +74,7 @@ export default class Input {
     type?: Script | null
     typeHash?: string | null
     data?: string | null
+    status?: OutputStatus
   }): Input {
     return new Input(
       previousOutput ? OutPoint.fromObject(previousOutput) : previousOutput,
@@ -80,7 +86,8 @@ export default class Input {
       multiSignBlake160,
       type ? Script.fromObject(type) : type,
       typeHash,
-      data
+      data,
+      status
     )
   }
 
diff --git a/packages/neuron-wallet/src/models/chain/output.ts b/packages/neuron-wallet/src/models/chain/output.ts
index 5a8e2f568f..9a15c8d774 100644
--- a/packages/neuron-wallet/src/models/chain/output.ts
+++ b/packages/neuron-wallet/src/models/chain/output.ts
@@ -42,6 +42,7 @@ export default class Output {
   public depositOutPoint?: OutPoint
   public depositTimestamp?: string
   public multiSignBlake160?: string | null
+  public isChangeCell?: boolean
 
   public customizedAssetInfo?: CustomizedAssetInfo
 
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index 6e41ac3d11..8cdbf836a2 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -744,7 +744,13 @@ export default class CellsService {
       {}
     )
     useCells.every(cell => {
-      const input: Input = new Input(cell.outPoint(), '0', cell.capacity, cell.lockScript(), cell.lockHash)
+      const input: Input = Input.fromObject({
+        previousOutput: cell.outPoint(),
+        since: '0',
+        capacity: cell.capacity,
+        lock: cell.lockScript(),
+        status: cell.status as OutputStatus,
+      })
       if (inputs.find(el => el.lockHash === cell.lockHash!)) {
         totalSize += TransactionSize.emptyWitness()
       } else {
diff --git a/packages/neuron-wallet/src/services/tx/transaction-generator.ts b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
index d0a833f13b..53dccc2047 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-generator.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-generator.ts
@@ -260,12 +260,14 @@ export class TransactionGenerator {
       const changeCapacity = BigInt(capacities) - needCapacities - finalFeeInt
 
       const output = new Output(changeCapacity.toString(), Script.fromSDK(addressToScript(changeAddress)))
+      output.isChangeCell = true
 
       tx.addOutput(output)
     }
 
     tx.outputs = ArrayUtils.shuffle(tx.outputs)
     tx.outputsData = tx.outputs.map(output => output.data || '0x')
+    tx.hash = tx.computeHash()
 
     return tx
   }
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index e8afb1bf48..0b4129bdeb 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -704,7 +704,15 @@ describe('CellsService', () => {
         )
         const input = await getConnection().getRepository(MultisigOutput).createQueryBuilder('multisig_output').getOne()
         expect(res).toEqual({
-          inputs: [new Input(input!.outPoint(), '0', input!.capacity, input!.lockScript(), input!.lockHash)],
+          inputs: [
+            Input.fromObject({
+              previousOutput: input!.outPoint(),
+              capacity: input!.capacity,
+              lock: input!.lockScript(),
+              since: '0',
+              status: OutputStatus.Live,
+            }),
+          ],
           capacities: toShannon('1000'),
           finalFee: TransactionFee.fee(
             TransactionSize.input() +
@@ -1492,7 +1500,15 @@ describe('CellsService', () => {
             data: liveCell.data,
           }),
         ],
-        changeInputs: [new Input(output.outPoint(), '0', output.capacity, output.lockScript(), output.lockHash)],
+        changeInputs: [
+          Input.fromObject({
+            previousOutput: output.outPoint(),
+            since: '0',
+            capacity: output.capacity,
+            lock: output.lockScript(),
+            status: OutputStatus.Live,
+          }),
+        ],
         anyoneCanPayOutputs: [
           Output.fromObject({
             capacity: liveCell.capacity,
@@ -1559,7 +1575,15 @@ describe('CellsService', () => {
             data: liveCell.data,
           }),
         ],
-        changeInputs: [new Input(output.outPoint(), '0', output.capacity, output.lockScript(), output.lockHash)],
+        changeInputs: [
+          Input.fromObject({
+            previousOutput: output.outPoint(),
+            since: '0',
+            capacity: output.capacity,
+            lock: output.lockScript(),
+            status: OutputStatus.Live,
+          }),
+        ],
         anyoneCanPayOutputs: [
           Output.fromObject({
             capacity: liveCell.capacity,
@@ -1623,7 +1647,15 @@ describe('CellsService', () => {
             data: liveCell.data,
           }),
         ],
-        changeInputs: [new Input(output.outPoint(), '0', output.capacity, output.lockScript(), output.lockHash)],
+        changeInputs: [
+          Input.fromObject({
+            previousOutput: output.outPoint(),
+            since: '0',
+            capacity: output.capacity,
+            lock: output.lockScript(),
+            status: OutputStatus.Live,
+          }),
+        ],
         anyoneCanPayOutputs: [
           Output.fromObject({
             capacity: liveCell.capacity,

From d3c98b5b8095256c0a87fb5451ad905d1529fd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Tue, 23 Jan 2024 09:59:27 +0000
Subject: [PATCH 36/68] feat: Split full node and light client db file. (#2915)

---
 .../sync/indexer-cache-service.ts             |  3 +-
 .../sync/light-synchronizer.ts                |  4 +-
 .../sync/tx-address-finder.ts                 |  2 +-
 .../block-sync-renderer/tx-status-listener.ts |  2 +-
 .../src/controllers/app/index.ts              |  4 ++
 .../src/database/chain/connection.ts          | 17 ++++++
 .../chain/entities/multisig-config.ts         | 14 +++++
 .../neuron-wallet/src/database/chain/index.ts |  2 +-
 .../src/database/chain/ormconfig.ts           | 56 +++++++++++++++---
 .../chain/subscriber/address-subscriber.ts    | 10 ++++
 .../subscriber/asset-account-subscriber.ts    | 26 +++++++++
 .../subscriber/multisig-config-subscriber.ts  | 19 ++++++
 .../subscriber/sudt-token-info-subscriber.ts  | 32 ++++++++++
 .../subscriber/tx-description-subscriber.ts   | 10 ++++
 .../subscriber/user-setting-subscriber.ts     | 58 +++++++++++++++++++
 .../src/models/synced-block-number.ts         |  2 +-
 .../neuron-wallet/src/services/addresses.ts   |  2 +-
 .../src/services/anyone-can-pay.ts            |  2 +-
 .../src/services/asset-account-service.ts     |  3 +-
 .../src/services/cell-local-info.ts           |  2 +-
 packages/neuron-wallet/src/services/cells.ts  |  3 +-
 .../neuron-wallet/src/services/multisig.ts    |  3 +-
 .../src/services/sudt-token-info.ts           |  3 +-
 .../src/services/sync-progress.ts             |  3 +-
 .../src/services/tx/failed-transaction.ts     |  3 +-
 .../services/tx/transaction-description.ts    |  2 +-
 .../src/services/tx/transaction-persistor.ts  |  3 +-
 .../src/services/tx/transaction-service.ts    |  2 +-
 .../neuron-wallet/src/services/wallets.ts     |  3 +-
 .../index/createBlockSyncTask.test.ts         |  5 +-
 .../index/killBlockSyncTask.test.ts           |  4 +-
 .../index/queryIndexer.test.ts                |  8 ++-
 .../indexer-cache-service.intg.test.ts        |  7 +--
 .../tx-status-listener.intg.test.ts           |  7 +--
 .../tests/controllers/export-debug.test.ts    |  2 +
 .../tests/controllers/multisig.test.ts        |  4 ++
 .../models/keys/hd-public-key-info.test.ts    |  4 ++
 .../models/synced-block-number.intg.test.ts   | 12 ++--
 .../tests/services/address.test.ts            |  9 ++-
 .../tests/services/anyone-can-pay.test.ts     |  3 +-
 .../services/asset-account-service.test.ts    |  6 +-
 .../tests/services/cell-local-info.test.ts    |  3 +-
 .../tests/services/cells.test.ts              |  5 +-
 .../tests/services/multisig.test.ts           | 14 ++++-
 .../tests/services/sudt-token-info.test.ts    |  3 +-
 .../tests/services/transactions.test.ts       |  5 +-
 .../services/tx/transaction-generator.test.ts |  5 +-
 .../services/tx/transaction-persistor.test.ts |  5 +-
 .../services/tx/transaction-service.test.ts   |  3 +-
 .../tx/transaction.description.intg.test.ts   |  7 +--
 .../tests/services/wallets.test.ts            | 16 ++---
 .../tests/setupAndTeardown/index.ts           | 12 ++--
 .../tests/utils/export-history/index.test.ts  |  3 +-
 53 files changed, 350 insertions(+), 97 deletions(-)
 create mode 100644 packages/neuron-wallet/src/database/chain/connection.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/address-subscriber.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/multisig-config-subscriber.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/tx-description-subscriber.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/subscriber/user-setting-subscriber.ts

diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
index b58c3d1555..45f74efba8 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/indexer-cache-service.ts
@@ -1,10 +1,11 @@
-import { In, getConnection } from 'typeorm'
+import { In } from 'typeorm'
 import { queue } from 'async'
 import AddressMeta from '../../database/address/meta'
 import IndexerTxHashCache from '../../database/chain/entities/indexer-tx-hash-cache'
 import RpcService from '../../services/rpc-service'
 import TransactionWithStatus from '../../models/chain/transaction-with-status'
 import SyncInfoEntity from '../../database/chain/entities/sync-info'
+import { getConnection } from '../../database/chain/connection'
 import { TransactionCollector, CellCollector, Indexer as CkbIndexer } from '@ckb-lumos/ckb-indexer'
 
 export default class IndexerCacheService {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index 00ad630bea..d8af5d0d61 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -15,12 +15,12 @@ import { DepType } from '../../models/chain/cell-dep'
 import { molecule } from '@ckb-lumos/codec'
 import { blockchain } from '@ckb-lumos/base'
 import type { Base } from '@ckb-lumos/rpc/lib/Base'
-import { getConnection } from 'typeorm'
 import { BI } from '@ckb-lumos/bi'
 import IndexerCacheService from './indexer-cache-service'
 import { ScriptType } from '@ckb-lumos/ckb-indexer/lib/type'
 import { scriptToAddress } from '../../utils/scriptAndAddress'
 import NetworksService from '../../services/networks'
+import { getConnection } from '../../database/chain/connection'
 
 const unpackGroup = molecule.vector(blockchain.OutPoint)
 
@@ -168,7 +168,7 @@ export default class LightSynchronizer extends Synchronizer {
         updatedSyncProgress.push(currentSyncProgress)
       }
     })
-    await getConnection().manager.save(updatedSyncProgress, { chunk: 100 })
+    await getConnection('light').manager.save(updatedSyncProgress, { chunk: 100 })
   }
 
   private async initSyncProgress(appendScripts: AppendScript[] = []) {
diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
index d857dbee1e..f8d1a9d295 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/tx-address-finder.ts
@@ -1,4 +1,3 @@
-import { getConnection } from 'typeorm'
 import { scriptToAddress } from '../../utils/scriptAndAddress'
 import OutputEntity from '../../database/chain/entities/output'
 import NetworksService from '../../services/networks'
@@ -6,6 +5,7 @@ import Output from '../../models/chain/output'
 import OutPoint from '../../models/chain/out-point'
 import Transaction from '../../models/chain/transaction'
 import SystemScriptInfo from '../../models/system-script-info'
+import { getConnection } from '../../database/chain/connection'
 
 export interface AnyoneCanPayInfo {
   tokenID: string
diff --git a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
index 039c2d1d68..1fbba05c50 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
@@ -1,4 +1,3 @@
-import { getConnection } from 'typeorm'
 import { CONNECTION_NOT_FOUND_NAME } from '../database/chain/ormconfig'
 import { FailedTransaction, TransactionPersistor } from '../services/tx'
 import RpcService from '../services/rpc-service'
@@ -6,6 +5,7 @@ import NetworksService from '../services/networks'
 import Transaction, { TransactionStatus } from '../models/chain/transaction'
 import TransactionWithStatus from '../models/chain/transaction-with-status'
 import logger from '../utils/logger'
+import { getConnection } from '../database/chain/connection'
 import { interval } from 'rxjs'
 
 type TransactionDetail = {
diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
index 30a0873f1a..748ea92f49 100644
--- a/packages/neuron-wallet/src/controllers/app/index.ts
+++ b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -15,6 +15,8 @@ import SyncApiController from '../../controllers/sync-api'
 import { SETTINGS_WINDOW_TITLE } from '../../utils/const'
 import { stopCkbNode } from '../../services/ckb-runner'
 import { CKBLightRunner } from '../../services/light-runner'
+import { migrateDBFile } from '../../database/chain/ormconfig'
+import { MAINNET_GENESIS_HASH, TESTNET_GENESIS_HASH } from '../../models/network'
 
 const app = electronApp
 
@@ -37,6 +39,8 @@ export default class AppController {
   }
 
   public start = async () => {
+    migrateDBFile(TESTNET_GENESIS_HASH)
+    migrateDBFile(MAINNET_GENESIS_HASH)
     registerListeners()
 
     if (!env.isTestMode) {
diff --git a/packages/neuron-wallet/src/database/chain/connection.ts b/packages/neuron-wallet/src/database/chain/connection.ts
new file mode 100644
index 0000000000..a65452b356
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/connection.ts
@@ -0,0 +1,17 @@
+import { getConnection as originGetConnection } from 'typeorm'
+import { NetworkType } from '../../models/network'
+import NetworksService from '../../services/networks'
+
+export type ConnectionName = 'light' | 'full'
+
+export function getCurrentConnectionName(): ConnectionName {
+  return NetworksService.getInstance().getCurrent()?.type === NetworkType.Light ? 'light' : 'full'
+}
+
+export function getConnection(connectionName: ConnectionName = getCurrentConnectionName()) {
+  const connection = originGetConnection(connectionName)
+  if (!connection) {
+    throw new Error(`The connection ${connectionName} should be initialized before use`)
+  }
+  return connection
+}
diff --git a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
index 30128092ae..2c0b2d8f6a 100644
--- a/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
+++ b/packages/neuron-wallet/src/database/chain/entities/multisig-config.ts
@@ -43,6 +43,20 @@ export default class MultisigConfig {
     return multisigConfig
   }
 
+  public cloneIgnoreBlockNumber(): MultisigConfig {
+    const multisigConfig = new MultisigConfig()
+
+    multisigConfig.walletId = this.walletId
+    multisigConfig.r = this.r
+    multisigConfig.m = this.m
+    multisigConfig.n = this.n
+    multisigConfig.blake160s = this.blake160s
+    if (this.alias) {
+      multisigConfig.alias = this.alias
+    }
+    return multisigConfig
+  }
+
   @AfterInsert()
   emitInsert() {
     this.changed('AfterInsert')
diff --git a/packages/neuron-wallet/src/database/chain/index.ts b/packages/neuron-wallet/src/database/chain/index.ts
index bfa5492391..fcb13996e9 100644
--- a/packages/neuron-wallet/src/database/chain/index.ts
+++ b/packages/neuron-wallet/src/database/chain/index.ts
@@ -1,4 +1,3 @@
-import { getConnection } from 'typeorm'
 import MultisigOutputChangedSubject from '../../models/subjects/multisig-output-db-changed-subject'
 import SyncProgressService from '../../services/sync-progress'
 import InputEntity from './entities/input'
@@ -9,6 +8,7 @@ import IndexerTxHashCache from './entities/indexer-tx-hash-cache'
 import MultisigOutput from './entities/multisig-output'
 import SyncProgress from './entities/sync-progress'
 import TxLock from './entities/tx-lock'
+import { getConnection } from '../../database/chain/connection'
 
 /*
  * Clean local sqlite storage
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 9a90ea6be6..a4c6c134d7 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -1,6 +1,7 @@
 import { createConnection, getConnectionOptions, getConnection } from 'typeorm'
 import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'
 import path from 'path'
+import fs from 'fs'
 
 import logger from '../../utils/logger'
 import env from '../../env'
@@ -60,23 +61,33 @@ import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234
 import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
 import { RenameSyncProgress1702781527414 } from './migrations/1702781527414-RenameSyncProgress'
 import { RemoveAddressInIndexerCache1704357651876 } from './migrations/1704357651876-RemoveAddressInIndexerCache'
+import { ConnectionName } from './connection'
+import AddressSubscribe from './subscriber/address-subscriber'
+import MultisigConfigSubscribe from './subscriber/multisig-config-subscriber'
+import TxDescriptionSubscribe from './subscriber/tx-description-subscriber'
+import SudtTokenInfoSubscribe from './subscriber/sudt-token-info-subscriber'
+import AssetAccountSubscribe from './subscriber/asset-account-subscriber'
 
 export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError'
 
-const dbPath = (name: string): string => {
-  const filename = `cell-${name}.sqlite`
+const dbPath = (name: string, connectionName: string): string => {
+  const filename = `${connectionName}-${name}.sqlite`
   return path.join(env.fileBasePath, 'cells', filename)
 }
 
-const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectionOptions> => {
+const connectOptions = async (
+  genesisBlockHash: string,
+  connectionName: ConnectionName
+): Promise<SqliteConnectionOptions> => {
   const connectionOptions = await getConnectionOptions()
-  const database = env.isTestMode ? ':memory:' : dbPath(genesisBlockHash)
+  const database = env.isTestMode ? ':memory:' : dbPath(genesisBlockHash, connectionName)
 
   const logging: boolean | ('query' | 'schema' | 'error' | 'warn' | 'info' | 'log' | 'migration')[] = ['warn', 'error']
   // (env.isDevMode) ? ['warn', 'error', 'log', 'info', 'schema', 'migration'] : ['warn', 'error']
 
   return {
     ...connectionOptions,
+    name: connectionName,
     type: 'sqlite',
     database,
     entities: [
@@ -137,28 +148,55 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
       RenameSyncProgress1702781527414,
       RemoveAddressInIndexerCache1704357651876,
     ],
+    subscribers: [
+      AddressSubscribe,
+      AssetAccountSubscribe,
+      MultisigConfigSubscribe,
+      SudtTokenInfoSubscribe,
+      TxDescriptionSubscribe,
+    ],
     logger: 'simple-console',
     logging,
     maxQueryExecutionTime: 30,
   }
 }
 
-export const initConnection = async (genesisBlockHash: string) => {
+const initConnectionWithType = async (genesisBlockHash: string, connectionName: ConnectionName) => {
   // try to close connection, if not exist, will throw ConnectionNotFoundError when call getConnection()
   try {
-    await getConnection().close()
+    await getConnection(connectionName).close()
   } catch (err) {
     // do nothing
   }
-  const connectionOptions = await connectOptions(genesisBlockHash)
+  const connectionOptions = await connectOptions(genesisBlockHash, connectionName)
 
   try {
     await createConnection(connectionOptions)
-    await getConnection().manager.query(`PRAGMA busy_timeout = 3000;`)
-    await getConnection().manager.query(`PRAGMA temp_store = MEMORY;`)
+    await getConnection(connectionName).manager.query(`PRAGMA busy_timeout = 3000;`)
+    await getConnection(connectionName).manager.query(`PRAGMA temp_store = MEMORY;`)
   } catch (err) {
     logger.error(err.message)
   }
 }
 
+export async function initConnection(genesisBlockHash: string) {
+  await initConnectionWithType(genesisBlockHash, 'full')
+  await initConnectionWithType(genesisBlockHash, 'light')
+}
+
+export function migrateDBFile(genesisBlockHash: string) {
+  const originDBFile = dbPath(genesisBlockHash, 'cell')
+  const currentFullDBFile = dbPath(genesisBlockHash, 'full')
+  const currentLightDBFile = dbPath(genesisBlockHash, 'light')
+  if (fs.existsSync(originDBFile) && (!fs.existsSync(currentLightDBFile) || !fs.existsSync(currentFullDBFile))) {
+    if (!fs.existsSync(currentFullDBFile)) {
+      fs.copyFileSync(originDBFile, currentFullDBFile)
+    }
+    if (!fs.existsSync(currentLightDBFile)) {
+      fs.copyFileSync(originDBFile, currentLightDBFile)
+    }
+    fs.rmSync(originDBFile)
+  }
+}
+
 export default initConnection
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/address-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/address-subscriber.ts
new file mode 100644
index 0000000000..3ab39095ed
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/address-subscriber.ts
@@ -0,0 +1,10 @@
+import { EventSubscriber } from 'typeorm'
+import UserSettingSubscriber from './user-setting-subscriber'
+import AddressDescription from '../entities/address-description'
+
+@EventSubscriber()
+export default class AddressSubscribe extends UserSettingSubscriber<AddressDescription> {
+  listenTo() {
+    return AddressDescription
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
new file mode 100644
index 0000000000..7e06e8db0d
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/asset-account-subscriber.ts
@@ -0,0 +1,26 @@
+import { EventSubscriber, InsertEvent } from 'typeorm'
+import UserSettingSubscriber from './user-setting-subscriber'
+import AssetAccount from '../entities/asset-account'
+
+@EventSubscriber()
+export default class AssetAccountSubscribe extends UserSettingSubscriber<AssetAccount> {
+  unionKeys: string[] = ['tokenID', 'blake160']
+
+  ignoreUpdateKeys: string[] = ['sudtTokenInfo']
+
+  listenTo() {
+    return AssetAccount
+  }
+
+  async afterInsert(event: InsertEvent<AssetAccount>): Promise<AssetAccount | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository(AssetAccount)
+    if (repo && event.entity) {
+      const exist = await repo.findOne({ tokenID: event.entity.tokenID, blake160: event.entity.blake160 })
+      if (exist) {
+        await repo.upsert(AssetAccount.fromModel(event.entity.toModel()), this.unionKeys)
+      } else {
+        await repo.save(event.entity)
+      }
+    }
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/multisig-config-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/multisig-config-subscriber.ts
new file mode 100644
index 0000000000..ba7d54c2e6
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/multisig-config-subscriber.ts
@@ -0,0 +1,19 @@
+import { EventSubscriber, InsertEvent } from 'typeorm'
+import UserSettingSubscriber from './user-setting-subscriber'
+import MultisigConfig from '../entities/multisig-config'
+
+@EventSubscriber()
+export default class MultisigConfigSubscribe extends UserSettingSubscriber<MultisigConfig> {
+  ignoreUpdateKeys = ['lastestBlockNumber']
+
+  listenTo() {
+    return MultisigConfig
+  }
+
+  async afterInsert(event: InsertEvent<MultisigConfig>): Promise<MultisigConfig | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository(MultisigConfig)
+    if (repo && event.entity) {
+      await repo.upsert(event.entity.cloneIgnoreBlockNumber(), this.unionKeys)
+    }
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
new file mode 100644
index 0000000000..5682bb5fa6
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/sudt-token-info-subscriber.ts
@@ -0,0 +1,32 @@
+import { EventSubscriber, InsertEvent } from 'typeorm'
+import UserSettingSubscriber from './user-setting-subscriber'
+import SudtTokenInfo from '../entities/sudt-token-info'
+
+@EventSubscriber()
+export default class SudtTokenInfoSubscribe extends UserSettingSubscriber<SudtTokenInfo> {
+  unionKeys: string[] = ['tokenID']
+
+  entityKeyName: string = 'tokenID'
+
+  ignoreUpdateKeys: string[] = ['assetAccounts']
+
+  listenTo() {
+    return SudtTokenInfo
+  }
+
+  async afterInsert(event: InsertEvent<SudtTokenInfo>): Promise<SudtTokenInfo | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository(SudtTokenInfo)
+    if (repo && event.entity) {
+      let mergeEntity: SudtTokenInfo | undefined = undefined
+      const existEntity = await event.connection.getRepository(SudtTokenInfo).findOne(event.entity.tokenID)
+      if (existEntity) {
+        mergeEntity = new SudtTokenInfo()
+        mergeEntity.tokenID = event.entity.tokenID || existEntity.tokenID
+        mergeEntity.symbol = event.entity.symbol || existEntity.symbol
+        mergeEntity.tokenName = event.entity.tokenName || existEntity.tokenName
+        mergeEntity.decimal = event.entity.decimal || existEntity.decimal
+      }
+      await repo.upsert(mergeEntity ?? event.entity, this.unionKeys)
+    }
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/tx-description-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/tx-description-subscriber.ts
new file mode 100644
index 0000000000..61f392b7be
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/tx-description-subscriber.ts
@@ -0,0 +1,10 @@
+import { EventSubscriber } from 'typeorm'
+import UserSettingSubscriber from './user-setting-subscriber'
+import TxDescription from '../entities/tx-description'
+
+@EventSubscriber()
+export default class TxDescriptionSubscribe extends UserSettingSubscriber<TxDescription> {
+  listenTo() {
+    return TxDescription
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/subscriber/user-setting-subscriber.ts b/packages/neuron-wallet/src/database/chain/subscriber/user-setting-subscriber.ts
new file mode 100644
index 0000000000..10d3d8e1eb
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/subscriber/user-setting-subscriber.ts
@@ -0,0 +1,58 @@
+import { EntitySubscriberInterface, InsertEvent, RemoveEvent, UpdateEvent } from 'typeorm'
+import { ConnectionName, getConnection, getCurrentConnectionName } from '../connection'
+
+type Constructor<T> = new (...args: unknown[]) => T
+
+// Trigger relative updating through subscribing the changes from corresponding entities
+export default abstract class UserSettingSubscriber<Entity extends object>
+  implements EntitySubscriberInterface<Entity>
+{
+  abstract listenTo(): string | Constructor<Entity>
+
+  unionKeys: string[] = ['id']
+
+  entityKeyName: string = 'id'
+
+  ignoreUpdateKeys: string[] = []
+
+  getNeedSyncConnection(connectionName: string) {
+    const currentConnectionName = getCurrentConnectionName()
+    if (connectionName === currentConnectionName) {
+      const otherConnectionName: ConnectionName = currentConnectionName === 'full' ? 'light' : 'full'
+      return getConnection(otherConnectionName)
+    }
+    return
+  }
+
+  async afterInsert(event: InsertEvent<Entity>): Promise<Entity | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository<Entity>(this.listenTo())
+    if (repo && event.entity) {
+      await repo.upsert(event.entity, this.unionKeys)
+    }
+  }
+
+  async afterUpdate(event: UpdateEvent<Entity>): Promise<Entity | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository<Entity>(this.listenTo())
+    const updatedColumns = event.updatedColumns.filter(v => !this.ignoreUpdateKeys.includes(v.propertyName))
+    if (repo && event.entity && event.databaseEntity && updatedColumns.length) {
+      const updateEntity = updatedColumns.reduce(
+        (pre, cur) => ({
+          ...pre,
+          [cur.propertyName]: event.entity![cur.propertyName],
+        }),
+        {}
+      )
+      const key = (event.databaseEntity as any)[this.entityKeyName]
+      if (key !== undefined && key !== null) {
+        await repo.update(key, updateEntity)
+      }
+    }
+  }
+
+  async afterRemove(event: RemoveEvent<Entity>): Promise<Entity | void> {
+    const repo = this.getNeedSyncConnection(event.connection.name)?.getRepository<Entity>(this.listenTo())
+    if (repo && event.databaseEntity) {
+      await repo.remove(event.databaseEntity)
+    }
+  }
+}
diff --git a/packages/neuron-wallet/src/models/synced-block-number.ts b/packages/neuron-wallet/src/models/synced-block-number.ts
index 50d9145611..35f98e9e0a 100644
--- a/packages/neuron-wallet/src/models/synced-block-number.ts
+++ b/packages/neuron-wallet/src/models/synced-block-number.ts
@@ -1,4 +1,4 @@
-import { getConnection } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import SyncInfoEntity from '../database/chain/entities/sync-info'
 import logger from '../utils/logger'
 
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index 866df7c80c..91647a04e7 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -4,7 +4,7 @@ import { Address as AddressInterface } from '../models/address'
 import AddressCreatedSubject from '../models/subjects/address-created-subject'
 import NetworksService from '../services/networks'
 import AddressParser from '../models/address-parser'
-import { getConnection } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import { TransactionsService } from '../services/tx'
 import CellsService from './cells'
 import SystemScriptInfo from '../models/system-script-info'
diff --git a/packages/neuron-wallet/src/services/anyone-can-pay.ts b/packages/neuron-wallet/src/services/anyone-can-pay.ts
index 639e406aa7..bfe9b8af33 100644
--- a/packages/neuron-wallet/src/services/anyone-can-pay.ts
+++ b/packages/neuron-wallet/src/services/anyone-can-pay.ts
@@ -1,7 +1,7 @@
 import AssetAccountInfo from '../models/asset-account-info'
 import AddressParser from '../models/address-parser'
 import { TransactionGenerator } from './tx'
-import { getConnection } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import Output from '../models/chain/output'
 import LiveCell from '../models/chain/live-cell'
 import Transaction from '../models/chain/transaction'
diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
index 7e076a4310..be00ae7bf7 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -1,4 +1,5 @@
-import { getConnection, In } from 'typeorm'
+import { In } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import BufferUtils from '../utils/buffer'
 import OutputEntity from '../database/chain/entities/output'
 import Transaction, { TransactionStatus } from '../models/chain/transaction'
diff --git a/packages/neuron-wallet/src/services/cell-local-info.ts b/packages/neuron-wallet/src/services/cell-local-info.ts
index 8ce44ad5fe..545f82ebfb 100644
--- a/packages/neuron-wallet/src/services/cell-local-info.ts
+++ b/packages/neuron-wallet/src/services/cell-local-info.ts
@@ -1,4 +1,4 @@
-import { getConnection } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import CellLocalInfo, { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
 import CellsService from './cells'
 
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index 8cdbf836a2..ad3b73c57c 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -1,5 +1,6 @@
-import { Brackets, getConnection, In, IsNull, type ObjectLiteral } from 'typeorm'
+import { Brackets, In, IsNull, type ObjectLiteral } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { getConnection } from '../database/chain/connection'
 import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
 import {
   CapacityNotEnough,
diff --git a/packages/neuron-wallet/src/services/multisig.ts b/packages/neuron-wallet/src/services/multisig.ts
index 9c28e92bba..5f97cd3b3a 100644
--- a/packages/neuron-wallet/src/services/multisig.ts
+++ b/packages/neuron-wallet/src/services/multisig.ts
@@ -1,4 +1,5 @@
-import { getConnection, In, Not } from 'typeorm'
+import { In, Not } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import MultisigConfig from '../database/chain/entities/multisig-config'
 import MultisigOutput from '../database/chain/entities/multisig-output'
 import { MultisigConfigNotExistError, MultisigConfigExistError } from '../exceptions/multisig'
diff --git a/packages/neuron-wallet/src/services/sudt-token-info.ts b/packages/neuron-wallet/src/services/sudt-token-info.ts
index 1f9e31ef3f..c24f06ad79 100644
--- a/packages/neuron-wallet/src/services/sudt-token-info.ts
+++ b/packages/neuron-wallet/src/services/sudt-token-info.ts
@@ -1,5 +1,6 @@
-import { In, Not, getConnection } from 'typeorm'
+import { In, Not } from 'typeorm'
 import SudtTokenInfoEntity from '../database/chain/entities/sudt-token-info'
+import { getConnection } from '../database/chain/connection'
 
 export default class SudtTokenInfoService {
   static async findSudtTokenInfoByArgs(typeArgsList: string[]) {
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 7bef4e3fb3..92d8f02a21 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -1,7 +1,8 @@
-import { getConnection, In, LessThan, Not } from 'typeorm'
+import { In, LessThan, Not } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import SyncProgress, { SyncAddressType } from '../database/chain/entities/sync-progress'
 import WalletService from './wallets'
+import { getConnection } from '../database/chain/connection'
 
 export default class SyncProgressService {
   static async resetSyncProgress(
diff --git a/packages/neuron-wallet/src/services/tx/failed-transaction.ts b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
index dc3c89cfb4..6841cedca1 100644
--- a/packages/neuron-wallet/src/services/tx/failed-transaction.ts
+++ b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
@@ -1,4 +1,5 @@
-import { getConnection, In } from 'typeorm'
+import { In } from 'typeorm'
+import { getConnection } from '../../database/chain/connection'
 import OutputEntity from '../../database/chain/entities/output'
 import TransactionEntity from '../../database/chain/entities/transaction'
 import { OutputStatus } from '../../models/chain/output'
diff --git a/packages/neuron-wallet/src/services/tx/transaction-description.ts b/packages/neuron-wallet/src/services/tx/transaction-description.ts
index 3d6d06a6a4..a7466a9580 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-description.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-description.ts
@@ -1,5 +1,5 @@
-import { getConnection } from 'typeorm'
 import TxDescription from '../../database/chain/entities/tx-description'
+import { getConnection } from '../../database/chain/connection'
 
 const getEntity = async (walletId: string, txHash: string) => {
   return await getConnection().getRepository(TxDescription).createQueryBuilder().where({ walletId, txHash }).getOne()
diff --git a/packages/neuron-wallet/src/services/tx/transaction-persistor.ts b/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
index 05a2d8203c..7298ded15f 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-persistor.ts
@@ -1,4 +1,5 @@
-import { getConnection, In, QueryRunner } from 'typeorm'
+import { In, QueryRunner } from 'typeorm'
+import { getConnection } from '../../database/chain/connection'
 import InputEntity from '../../database/chain/entities/input'
 import OutputEntity from '../../database/chain/entities/output'
 import TransactionEntity from '../../database/chain/entities/transaction'
diff --git a/packages/neuron-wallet/src/services/tx/transaction-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index ce2701eb57..e58a36e84f 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-service.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-service.ts
@@ -1,7 +1,7 @@
-import { getConnection } from 'typeorm'
 import { CKBRPC } from '@ckb-lumos/rpc'
 import TransactionEntity from '../../database/chain/entities/transaction'
 import OutputEntity from '../../database/chain/entities/output'
+import { getConnection } from '../../database/chain/connection'
 import Transaction, {
   TransactionStatus,
   SudtInfo,
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index ac993ce4d0..021bc3202c 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -11,7 +11,8 @@ import FileService from './file'
 import AddressService from './addresses'
 import { DeviceInfo } from './hardware/common'
 import HdPublicKeyInfo from '../database/chain/entities/hd-public-key-info'
-import { getConnection, In, Not } from 'typeorm'
+import { In, Not } from 'typeorm'
+import { getConnection } from '../database/chain/connection'
 import NetworksService from './networks'
 import { NetworkType } from '../models/network'
 import { resetSyncTaskQueue } from '../block-sync-renderer'
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
index 9fda25fbc2..61da50c476 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/createBlockSyncTask.test.ts
@@ -1,6 +1,8 @@
+import { NetworkType } from '../../../src/models/network'
+
 describe(`Create block sync task`, () => {
   const STUB_ADDRESS_METAS = 'address metas'
-  const STUB_NETWORK = { id: 'id', genesisHash: '0x1', remote: 'stub_network_url' }
+  const STUB_NETWORK = { id: 'id', genesisHash: '0x1', remote: 'stub_network_url', type: NetworkType.Normal }
   const stubbedLoggerInfo = jest.fn()
   const stubbedChildProcessOn = jest.fn()
   const stubbedChildProcessSend = jest.fn()
@@ -74,6 +76,7 @@ describe(`Create block sync task`, () => {
         addressMetas: STUB_ADDRESS_METAS,
         genesisHash: STUB_NETWORK.genesisHash,
         indexerUrl: STUB_NETWORK.remote,
+        nodeType: NetworkType.Normal,
         url: STUB_NETWORK.remote,
       },
     })
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/killBlockSyncTask.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/killBlockSyncTask.test.ts
index 9e103f5d62..e529dbf91f 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/killBlockSyncTask.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/killBlockSyncTask.test.ts
@@ -1,3 +1,5 @@
+import { NetworkType } from '../../../src/models/network'
+
 describe(`Kill block sync task`, () => {
   const stubbedQueryIndexer = jest.fn()
   const stubbedLoggerInfo = jest.fn()
@@ -8,7 +10,7 @@ describe(`Kill block sync task`, () => {
     throw new Error()
   })
   const stubbedChildProcessOnce = jest.fn()
-  const stubbedGetCurrentNetwork = jest.fn().mockReturnValue({ id: 'id', genesisHash: '0x' })
+  const stubbedGetCurrentNetwork = jest.fn().mockReturnValue({ id: 'id', genesisHash: '0x', type: NetworkType.Normal })
   const stubbedSyncTaskCtor = jest.fn().mockImplementation(() => ({ queryIndexer: stubbedQueryIndexer }))
 
   // jest.doMock('electron', () => ({ BrowserWindow: jest.fn() }))
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/index/queryIndexer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/index/queryIndexer.test.ts
index f12bb96a55..4830687e43 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/index/queryIndexer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/index/queryIndexer.test.ts
@@ -1,3 +1,5 @@
+import { NetworkType } from '../../../src/models/network'
+
 const STUB_QUERY = 'stub query'
 const stubbedIndexerServiceStart = jest.fn()
 const stubbedLoggerInfo = jest.fn()
@@ -33,9 +35,9 @@ jest.doMock('services/indexer', () => ({
 }))
 jest.doMock('services/addresses', () => ({ getAddressesByAllWallets: stubbedGetAddressesByAllWallets }))
 jest.doMock('services/networks', () => ({
-  getInstance: jest
-    .fn()
-    .mockReturnValue({ getCurrent: () => ({ id: 'id', genesisHash: '0x1', remote: 'stub_network_url' }) }),
+  getInstance: jest.fn().mockReturnValue({
+    getCurrent: () => ({ id: 'id', genesisHash: '0x1', remote: 'stub_network_url', type: NetworkType.Normal }),
+  }),
 }))
 
 const blockSyncRenderer = require('block-sync-renderer')
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
index 21e922ff1f..507934f31e 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/indexer-cache-service.intg.test.ts
@@ -1,11 +1,10 @@
 import { when } from 'jest-when'
-import { getConnection } from 'typeorm'
-import { initConnection } from '../../src/database/chain/ormconfig'
 import AddressMeta from '../../src/database/address/meta'
 import { AddressType } from '../../src/models/keys/address'
 import { AddressVersion } from '../../src/models/address'
 import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
 import RpcService from '../../src/services/rpc-service'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const stubbedGetTransactionFn = jest.fn()
 const stubbedGetHeaderFn = jest.fn()
@@ -129,11 +128,11 @@ const fakeTx3 = {
 
 describe('indexer cache service', () => {
   beforeAll(async () => {
-    await initConnection('')
+    await initConnection()
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts
index 9178b1a4ea..430ced19fa 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts
@@ -1,11 +1,10 @@
-import { getConnection } from 'typeorm'
-import { initConnection } from '../../src/database/chain/ormconfig'
 import mockedTransactions from '../setupAndTeardown/transactions.fixture'
 import { TransactionStatus } from '../../src/models/chain/transaction'
 import TransactionPersistor from '../../src/services/tx/transaction-persistor'
 import { OutputStatus } from '../../src/models/chain/output'
 import TxStatus, { TxStatusType } from '../../src/models/chain/tx-status'
 import TransactionEntity from '../../src/database/chain/entities/transaction'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const stubbedRPCServiceConstructor = jest.fn()
 const stubbedGetTransactionFn = jest.fn()
@@ -48,11 +47,11 @@ const { register } = require('../../src/block-sync-renderer/tx-status-listener')
 
 describe('', () => {
   beforeAll(async () => {
-    await initConnection('')
+    await initConnection()
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/controllers/export-debug.test.ts b/packages/neuron-wallet/tests/controllers/export-debug.test.ts
index 1bbfbac015..5fbe40e45a 100644
--- a/packages/neuron-wallet/tests/controllers/export-debug.test.ts
+++ b/packages/neuron-wallet/tests/controllers/export-debug.test.ts
@@ -56,6 +56,7 @@ jest.mock('../../src/services/networks', () => {
         getCurrent() {
           return {
             remote: 'http://127.0.0.1:8114',
+            type: NetworkType.Normal,
           }
         },
       }
@@ -90,6 +91,7 @@ jest.mock('../../src/services/light-runner', () => {
 import { dialog } from 'electron'
 import logger from '../../src/utils/logger'
 import ExportDebugController from '../../src/controllers/export-debug'
+import { NetworkType } from '../../src/models/network'
 
 describe('Test ExportDebugController', () => {
   const exportDebugController: any = new ExportDebugController()
diff --git a/packages/neuron-wallet/tests/controllers/multisig.test.ts b/packages/neuron-wallet/tests/controllers/multisig.test.ts
index f502c461d5..564f1e8fd7 100644
--- a/packages/neuron-wallet/tests/controllers/multisig.test.ts
+++ b/packages/neuron-wallet/tests/controllers/multisig.test.ts
@@ -4,6 +4,7 @@ import MultisigController from '../../src/controllers/multisig'
 import CellsService from '../../src/services/cells'
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 import { systemScripts } from '../../src/utils/systemScripts'
+import { NetworkType } from '../../src/models/network'
 
 let response = 0
 let dialogRes = { canceled: false, filePaths: ['./'], filePath: './' }
@@ -64,6 +65,9 @@ const isMainnetMock = jest.fn().mockReturnValue(false)
 jest.mock('../../src/services/networks', () => ({
   getInstance: () => ({
     isMainnet: () => isMainnetMock(),
+    getCurrent: () => ({
+      type: NetworkType.Normal,
+    }),
   }),
 }))
 
diff --git a/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts b/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
index d02d054440..68c397e1bd 100644
--- a/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
+++ b/packages/neuron-wallet/tests/models/keys/hd-public-key-info.test.ts
@@ -2,6 +2,7 @@ import { scriptToAddress } from '../../../src/utils/scriptAndAddress'
 import { AddressType } from '../../../src/models/keys/address'
 import KeyInfos from '../../setupAndTeardown/public-key-info.fixture'
 import { systemScripts } from '../../../src/utils/systemScripts'
+import { NetworkType } from '../../../src/models/network'
 
 const stubbedIsMainnet = jest.fn()
 
@@ -9,6 +10,9 @@ jest.mock('services/networks', () => {
   return {
     getInstance: () => ({
       isMainnet: stubbedIsMainnet,
+      getCurrent: () => ({
+        type: NetworkType.Normal,
+      }),
     }),
   }
 })
diff --git a/packages/neuron-wallet/tests/models/synced-block-number.intg.test.ts b/packages/neuron-wallet/tests/models/synced-block-number.intg.test.ts
index 1e66938a94..c4a7855960 100644
--- a/packages/neuron-wallet/tests/models/synced-block-number.intg.test.ts
+++ b/packages/neuron-wallet/tests/models/synced-block-number.intg.test.ts
@@ -1,4 +1,4 @@
-import { getConnection } from 'typeorm'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const stubbedSyncedBlockNumberSubjectNext = jest.fn()
 const stubbedLoggerInfo = jest.fn()
@@ -8,22 +8,20 @@ const resetMocks = () => {
   stubbedLoggerInfo.mockReset()
 }
 
-jest.doMock('utils/logger', () => {
+jest.mock('utils/logger', () => {
   return {
-    info: stubbedLoggerInfo,
+    info: () => stubbedLoggerInfo(),
   }
 })
 
-import { initConnection } from '../../src/database/chain/ormconfig'
-
 describe('SyncedBlockNumber model', () => {
   let SyncedBlockNumber: any
   beforeAll(async () => {
-    await initConnection('')
+    await initConnection()
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index 5467f85fa3..98bbf90d12 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -1,6 +1,4 @@
 import { AccountExtendedPublicKey } from '../../src/models/keys/key'
-import initConnection from '../../src/database/chain/ormconfig'
-import { getConnection } from 'typeorm'
 import SystemScriptInfo from '../../src/models/system-script-info'
 import { OutputStatus } from '../../src/models/chain/output'
 import OutputEntity from '../../src/database/chain/entities/output'
@@ -11,6 +9,8 @@ import { TransactionStatus } from '../../src/models/chain/transaction'
 import AddressParser from '../../src/models/address-parser'
 import { when } from 'jest-when'
 import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
+import { NetworkType } from '../../src/models/network'
 
 const walletId = '1'
 const extendedKey = new AccountExtendedPublicKey(
@@ -71,6 +71,9 @@ jest.mock('services/networks', () => ({
   getInstance() {
     return {
       isMainnet: () => true,
+      getCurrent: () => ({
+        type: NetworkType.Normal,
+      }),
     }
   },
 }))
@@ -124,7 +127,7 @@ describe('integration tests for AddressService', () => {
     })
 
     afterAll(async () => {
-      await getConnection().close()
+      await closeConnection()
     })
 
     beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts b/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
index 07d6fb0f7e..4f259b2a8e 100644
--- a/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
+++ b/packages/neuron-wallet/tests/services/anyone-can-pay.test.ts
@@ -1,8 +1,7 @@
-import { getConnection } from 'typeorm'
 import AnyoneCanPayService from '../../src/services/anyone-can-pay'
 import AssetAccountEntity from '../../src/database/chain/entities/asset-account'
 import AssetAccount from '../../src/models/asset-account'
-import { initConnection, closeConnection } from '../setupAndTeardown'
+import { initConnection, closeConnection, getConnection } from '../setupAndTeardown'
 import { AcpSendSameAccountError, TargetLockError, TargetOutputNotFoundError } from '../../src/exceptions'
 import AssetAccountInfo from '../../src/models/asset-account-info'
 import SystemScriptInfo from '../../src/models/system-script-info'
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 14da05c9ba..39842abbbe 100644
--- a/packages/neuron-wallet/tests/services/asset-account-service.test.ts
+++ b/packages/neuron-wallet/tests/services/asset-account-service.test.ts
@@ -1,5 +1,3 @@
-import { getConnection } from 'typeorm'
-import { initConnection } from '../../src/database/chain/ormconfig'
 import AssetAccount from '../../src/models/asset-account'
 import AssetAccountEntity from '../../src/database/chain/entities/asset-account'
 import SudtTokenInfo from '../../src/database/chain/entities/sudt-token-info'
@@ -10,7 +8,7 @@ import { OutputStatus } from '../../src/models/chain/output'
 import SudtTokenInfoEntity from '../../src/database/chain/entities/sudt-token-info'
 import TransactionEntity from '../../src/database/chain/entities/transaction'
 import { TransactionStatus } from '../../src/models/chain/transaction'
-import { createAccounts } from '../setupAndTeardown'
+import { closeConnection, createAccounts, getConnection, initConnection } from '../setupAndTeardown'
 import accounts from '../setupAndTeardown/accounts.fixture'
 import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
 import { AddressType } from '../../src/models/keys/address'
@@ -138,7 +136,7 @@ describe('AssetAccountService', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/cell-local-info.test.ts b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
index 0fc67685ca..188d4f6ac7 100644
--- a/packages/neuron-wallet/tests/services/cell-local-info.test.ts
+++ b/packages/neuron-wallet/tests/services/cell-local-info.test.ts
@@ -1,7 +1,6 @@
 import type { OutPoint } from '@ckb-lumos/base'
-import { getConnection } from 'typeorm'
 import CellLocalInfoService from '../../src/services/cell-local-info'
-import { closeConnection, initConnection } from '../setupAndTeardown'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
 
 const outPoints = [
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index 0b4129bdeb..085ca35b3c 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -1,8 +1,6 @@
-import { getConnection } from 'typeorm'
 import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 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, {
@@ -31,6 +29,7 @@ import { MultisigConfigNeedError, TransactionInputParameterMiss } from '../../sr
 import LiveCell from '../../src/models/chain/live-cell'
 import BufferUtils from '../../src/utils/buffer'
 import CellLocalInfo from '../../src/database/chain/entities/cell-local-info'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const randomHex = (length: number = 64): string => {
   const str: string = Array.from({ length })
@@ -101,7 +100,7 @@ describe('CellsService', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/multisig.test.ts b/packages/neuron-wallet/tests/services/multisig.test.ts
index a661e72b56..18933d0d7d 100644
--- a/packages/neuron-wallet/tests/services/multisig.test.ts
+++ b/packages/neuron-wallet/tests/services/multisig.test.ts
@@ -1,5 +1,3 @@
-import { getConnection } from 'typeorm'
-import { initConnection } from '../../src/database/chain/ormconfig'
 import MultisigConfig from '../../src/database/chain/entities/multisig-config'
 import MultisigConfigModel from '../../src/models/multisig-config'
 import MultisigService from '../../src/services/multisig'
@@ -9,6 +7,8 @@ import { keyInfos } from '../setupAndTeardown/public-key-info.fixture'
 import Multisig from '../../src/models/multisig'
 import SystemScriptInfo from '../../src/models/system-script-info'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
+import { NetworkType } from '../../src/models/network'
 
 const [alice, bob, charlie] = keyInfos
 
@@ -25,6 +25,14 @@ jest.mock('../../src/models/subjects/multisig-output-db-changed-subject', () =>
   },
 }))
 
+jest.mock('../../src/services/networks', () => ({
+  getInstance: () => ({
+    getCurrent: () => ({
+      type: NetworkType.Normal,
+    }),
+  }),
+}))
+
 describe('multisig service', () => {
   const multisigService = new MultisigService()
   const multisigConfigModel = new MultisigConfigModel(
@@ -66,7 +74,7 @@ describe('multisig service', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/sudt-token-info.test.ts b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
index f2021694c6..88e6d96d66 100644
--- a/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
+++ b/packages/neuron-wallet/tests/services/sudt-token-info.test.ts
@@ -1,7 +1,6 @@
-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 { closeConnection, getConnection, 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'
diff --git a/packages/neuron-wallet/tests/services/transactions.test.ts b/packages/neuron-wallet/tests/services/transactions.test.ts
index 37df1c55b7..8abca504b8 100644
--- a/packages/neuron-wallet/tests/services/transactions.test.ts
+++ b/packages/neuron-wallet/tests/services/transactions.test.ts
@@ -1,8 +1,7 @@
-import { getConnection } from 'typeorm'
-import { initConnection } from '../../src/database/chain/ormconfig'
 import TransactionsService, { SearchType } from '../../src/services/tx/transaction-service'
 import TransactionEntity from '../../src/database/chain/entities/transaction'
 import { TransactionStatus } from '../../src/models/chain/transaction'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const generateTx = (hash: string, timestamp: string) => {
   const tx = new TransactionEntity()
@@ -69,7 +68,7 @@ describe('transactions service', () => {
     })
 
     afterAll(async () => {
-      await getConnection().close()
+      await closeConnection()
     })
 
     beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
index 8a87127ffa..12db6c9f6f 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts
@@ -1,7 +1,5 @@
 import { when } from 'jest-when'
-import { getConnection } from 'typeorm'
 import { bytes } from '@ckb-lumos/codec'
-import { initConnection } from '../../../src/database/chain/ormconfig'
 import OutputEntity from '../../../src/database/chain/entities/output'
 import InputEntity from '../../../src/database/chain/entities/input'
 import TransactionEntity from '../../../src/database/chain/entities/transaction'
@@ -88,6 +86,7 @@ import AssetAccount from '../../../src/models/asset-account'
 import MultisigConfigModel from '../../../src/models/multisig-config'
 import MultisigOutput from '../../../src/database/chain/entities/multisig-output'
 import { LumosCell } from '../../../src/block-sync-renderer/sync/synchronizer'
+import { closeConnection, getConnection, initConnection } from '../../setupAndTeardown'
 
 describe('TransactionGenerator', () => {
   beforeAll(async () => {
@@ -124,7 +123,7 @@ describe('TransactionGenerator', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   const generateCell = (
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-persistor.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-persistor.test.ts
index 0dab3e8f9b..78c3ac4f91 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-persistor.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-persistor.test.ts
@@ -1,8 +1,6 @@
 import Transaction, { TransactionStatus } from '../../../src/models/chain/transaction'
 import { TransactionPersistor, TxSaveType } from '../../../src/services/tx'
-import initConnection from '../../../src/database/chain/ormconfig'
 import TransactionEntity from '../../../src/database/chain/entities/transaction'
-import { getConnection } from 'typeorm'
 import transactions from '../../setupAndTeardown/transactions.fixture'
 import AssetAccountInfo from '../../../src/models/asset-account-info'
 import SystemScriptInfo from '../../../src/models/system-script-info'
@@ -12,6 +10,7 @@ import { OutputStatus } from '../../../src/models/chain/output'
 import OutputEntity from '../../../src/database/chain/entities/output'
 import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info'
 import InputEntity from '../../../src/database/chain/entities/input'
+import { closeConnection, getConnection, initConnection } from '../../setupAndTeardown'
 
 const [tx, tx2] = transactions
 
@@ -21,7 +20,7 @@ describe('TransactionPersistor', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
index 3d34af281d..6b5f9165a8 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts
@@ -3,11 +3,10 @@ import fs from 'fs'
 import path from 'path'
 import TransactionService, { SearchType } from '../../../src/services/tx/transaction-service'
 import Transaction, { TransactionStatus } from '../../../src/models/chain/transaction'
-import { initConnection, saveTransactions, closeConnection, saveAccounts } from '../../setupAndTeardown'
+import { initConnection, saveTransactions, closeConnection, saveAccounts, getConnection } from '../../setupAndTeardown'
 import { keyInfos } from '../../setupAndTeardown/public-key-info.fixture'
 import accounts from '../../setupAndTeardown/accounts.fixture'
 import transactions from '../../setupAndTeardown/transactions.fixture'
-import { getConnection } from 'typeorm'
 import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info'
 import TransactionPersistor, { TxSaveType } from '../../../src/services/tx/transaction-persistor'
 import SystemScriptInfo from '../../../src/models/system-script-info'
diff --git a/packages/neuron-wallet/tests/services/tx/transaction.description.intg.test.ts b/packages/neuron-wallet/tests/services/tx/transaction.description.intg.test.ts
index 6e3e3bc849..fa70123a14 100644
--- a/packages/neuron-wallet/tests/services/tx/transaction.description.intg.test.ts
+++ b/packages/neuron-wallet/tests/services/tx/transaction.description.intg.test.ts
@@ -1,7 +1,6 @@
-import initConnection from '../../../src/database/chain/ormconfig'
-import { getConnection } from 'typeorm'
 import TxDescription from '../../../src/database/chain/entities/tx-description'
 import { get, set } from '../../../src/services/tx/transaction-description'
+import { closeConnection, getConnection, initConnection } from '../../setupAndTeardown'
 
 describe('transaction description service', () => {
   const txs = [
@@ -10,11 +9,11 @@ describe('transaction description service', () => {
     { walletId: 'w3', txHash: 'hash3', description: 'desc3' },
   ]
   beforeAll(async () => {
-    await initConnection('')
+    await initConnection()
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/services/wallets.test.ts b/packages/neuron-wallet/tests/services/wallets.test.ts
index 73600bbcf5..e43a8f7c56 100644
--- a/packages/neuron-wallet/tests/services/wallets.test.ts
+++ b/packages/neuron-wallet/tests/services/wallets.test.ts
@@ -1,3 +1,9 @@
+import Keystore from '../../src/models/keys/keystore'
+import { when } from 'jest-when'
+import { WalletFunctionNotSupported } from '../../src/exceptions/wallet'
+import { AddressType } from '../../src/models/keys/address'
+import { Manufacturer } from '../../src/services/hardware/common'
+
 const stubbedDeletedByWalletIdFn = jest.fn()
 const stubbedGenerateAndSaveForExtendedKeyQueue = jest.fn()
 const stubbedGenerateAndSaveForPublicKeyQueueAsyncPush = jest.fn()
@@ -25,16 +31,10 @@ jest.doMock('../../src/services/addresses', () => {
     getAddressesByWalletId: stubbedGetAddressesByWalletId,
   }
 })
-import Keystore from '../../src/models/keys/keystore'
-import initConnection from '../../src/database/chain/ormconfig'
-import { getConnection } from 'typeorm'
-import { when } from 'jest-when'
-import { WalletFunctionNotSupported } from '../../src/exceptions/wallet'
-import { AddressType } from '../../src/models/keys/address'
-import { Manufacturer } from '../../src/services/hardware/common'
 import WalletService, { WalletProperties, Wallet } from '../../src/services/wallets'
 import { AccountExtendedPublicKey } from '../../src/models/keys/key'
 import HdPublicKeyInfo from '../../src/database/chain/entities/hd-public-key-info'
+import { closeConnection, getConnection, initConnection } from '../setupAndTeardown'
 
 const resetMocks = () => {
   stubbedDeletedByWalletIdFn.mockReset()
@@ -61,7 +61,7 @@ describe('wallet service', () => {
   })
 
   afterAll(async () => {
-    await getConnection().close()
+    await closeConnection()
   })
 
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/setupAndTeardown/index.ts b/packages/neuron-wallet/tests/setupAndTeardown/index.ts
index 24d2cec210..b2fd2ff5d6 100644
--- a/packages/neuron-wallet/tests/setupAndTeardown/index.ts
+++ b/packages/neuron-wallet/tests/setupAndTeardown/index.ts
@@ -1,16 +1,20 @@
 import initDB from '../../src/database/chain/ormconfig'
-import { getConnection } from 'typeorm'
+import { getConnection as originGetConnection } from 'typeorm'
 import { TransactionPersistor } from '../../src/services/tx'
 import AssetAccount from '../../src/models/asset-account'
 import OutputEntity from '../../src/database/chain/entities/output'
 import AssetAccountEntity from '../../src/database/chain/entities/asset-account'
 
-export const initConnection = () => {
-  return initDB(':memory:')
+export const initConnection = (genesisBlockHash?: string) => {
+  return initDB(genesisBlockHash ?? ':memory:')
 }
 
 export const closeConnection = () => {
-  return getConnection().close()
+  return originGetConnection('full').close()
+}
+
+export const getConnection = () => {
+  return originGetConnection('full')
 }
 
 export const saveTransactions = async (txs: any) => {
diff --git a/packages/neuron-wallet/tests/utils/export-history/index.test.ts b/packages/neuron-wallet/tests/utils/export-history/index.test.ts
index e6e2e2734b..3d6b252c33 100644
--- a/packages/neuron-wallet/tests/utils/export-history/index.test.ts
+++ b/packages/neuron-wallet/tests/utils/export-history/index.test.ts
@@ -1,12 +1,11 @@
 import os from 'os'
 import fs from 'fs'
 import path from 'path'
-import { initConnection, closeConnection, saveTransactions } from '../../setupAndTeardown/index'
+import { initConnection, closeConnection, saveTransactions, getConnection } from '../../setupAndTeardown/index'
 import transactions from '../../setupAndTeardown/transactions.fixture'
 import { keyInfos } from '../../setupAndTeardown/public-key-info.fixture'
 import i18n from '../../../src/locales/i18n'
 import exportHistory from '../../../src/utils/export-history'
-import { getConnection } from 'typeorm'
 import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info'
 
 describe('Test exporting history', () => {

From 28094280758c747edc288413d5993f927b342c34 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Mon, 29 Jan 2024 17:44:17 +0800
Subject: [PATCH 37/68] fix: Hot/cold combination of a wallet doesn't work
 smooth (#3000)

* fix: issue 288

* fix: broadcastTransaction

* fix: BroadcastTransaction

* fix: French

* fix: broadcastTransactionOnly

* fix: comments

* fix: broadcastSignedTransaction

* fix

* feat: remove Wallet field

---------

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../broadcastTransaction.module.scss          |  42 +++++
 .../components/BroadcastTransaction/index.tsx | 136 +++++++++++++++
 .../src/components/OfflineSign/index.tsx      |  60 ++++---
 .../OfflineSign/offlineSign.module.scss       |  10 ++
 .../components/OfflineSignDialog/index.tsx    |   7 +-
 packages/neuron-ui/src/locales/en.json        |  10 +-
 packages/neuron-ui/src/locales/fr.json        | 156 +++++++++---------
 packages/neuron-ui/src/locales/zh-tw.json     |  10 +-
 packages/neuron-ui/src/locales/zh.json        |  10 +-
 packages/neuron-ui/src/router.tsx             |   5 +
 .../neuron-ui/src/services/remote/offline.ts  |   3 +
 .../src/services/remote/remoteApiWrapper.ts   |   1 +
 packages/neuron-ui/src/utils/enums.ts         |   1 +
 packages/neuron-wallet/src/controllers/api.ts |   4 +
 .../neuron-wallet/src/controllers/app/menu.ts |  12 ++
 packages/neuron-wallet/src/locales/en.ts      |   1 +
 packages/neuron-wallet/src/locales/zh-tw.ts   |   1 +
 packages/neuron-wallet/src/locales/zh.ts      |   1 +
 .../src/services/asset-account-service.ts     |   2 +-
 .../src/services/transaction-sender.ts        |   6 +-
 20 files changed, 359 insertions(+), 119 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
 create mode 100644 packages/neuron-ui/src/components/BroadcastTransaction/index.tsx

diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss b/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
new file mode 100644
index 0000000000..56ed207431
--- /dev/null
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/broadcastTransaction.module.scss
@@ -0,0 +1,42 @@
+.main {
+  tr {
+    td {
+      font-size: 14px;
+      line-height: 26px;
+      color: var(--main-text-color);
+      svg {
+        width: 14px;
+        height: 14px;
+        margin-right: 4px;
+        position: relative;
+        top: 2px;
+      }
+    }
+    .first {
+      padding-right: 24px;
+      color: var(--input-second-color);
+    }
+  }
+}
+
+.warningDialog {
+  width: 680px;
+  .content {
+    display: flex;
+    justify-content: center;
+    margin-top: 24px;
+    color: var(--main-text-color);
+  }
+}
+
+.textarea {
+  color: var(--main-text-color);
+  margin-top: 17px;
+  width: 648px;
+  height: 206px;
+  resize: none;
+  background: var(--secondary-background-color);
+  border: 1px solid var(--divide-line-color);
+  border-radius: 8px;
+  padding: 16px;
+}
diff --git a/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
new file mode 100644
index 0000000000..ccc1da482c
--- /dev/null
+++ b/packages/neuron-ui/src/components/BroadcastTransaction/index.tsx
@@ -0,0 +1,136 @@
+import React, { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import { isSuccessResponse, RoutePath, isMainnet as isMainnetUtil, useGoBack, getExplorerUrl } from 'utils'
+import Dialog from 'widgets/Dialog'
+import AlertDialog from 'widgets/AlertDialog'
+import { useDispatch, useState as useGlobalState } from 'states'
+import { broadcastSignedTransaction, OfflineSignStatus, openExternal, getTransactionList } from 'services/remote'
+
+import styles from './broadcastTransaction.module.scss'
+
+const BroadcastTransaction = () => {
+  const {
+    app: { loadedTransaction = {} },
+    chain: { networkID },
+    settings: { networks },
+    wallet,
+  } = useGlobalState()
+
+  const [isBroadcasting, setIsBroadcasting] = useState(false)
+  const [broadcastedTxHash, setBroadcastedTxHash] = useState<string | null>('')
+  const [t] = useTranslation()
+  const dispatch = useDispatch()
+  const [errMsg, setErrMsg] = useState('')
+  const isMainnet = isMainnetUtil(networks, networkID)
+
+  const { filePath, json } = loadedTransaction
+
+  const jsonContent = useMemo(() => {
+    return JSON.stringify(json, null, 2)
+  }, [json])
+
+  const signStatus: OfflineSignStatus = json.status
+
+  const isSigned = useMemo(() => signStatus === OfflineSignStatus.Signed, [signStatus])
+
+  const onBack = useGoBack()
+
+  const navigate = useNavigate()
+  const onBroadcast = useCallback(async () => {
+    if (broadcastedTxHash) {
+      openExternal(`${getExplorerUrl(isMainnet)}/transaction/${broadcastedTxHash}`)
+      return
+    }
+
+    setIsBroadcasting(true)
+
+    const res = await broadcastSignedTransaction({
+      ...json,
+    })
+
+    setIsBroadcasting(false)
+
+    if (isSuccessResponse(res)) {
+      if (!wallet?.id) {
+        setBroadcastedTxHash(res.result)
+        return
+      }
+
+      if (res.result) {
+        getTransactionList({
+          walletID: wallet.id,
+          pageNo: 1,
+          pageSize: 10,
+          keywords: res.result,
+        }).then(txRes => {
+          if (isSuccessResponse(txRes) && txRes.result.items.length) {
+            navigate(RoutePath.History)
+          } else {
+            setBroadcastedTxHash(res.result)
+          }
+        })
+      }
+    } else {
+      setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
+    }
+  }, [wallet, json, navigate, dispatch, broadcastedTxHash, setBroadcastedTxHash])
+
+  return (
+    <>
+      <Dialog
+        show={isSigned}
+        title={t('offline-sign.broadcast-transaction')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        confirmText={
+          broadcastedTxHash ? t('offline-sign.actions.view-in-explorer') : t('offline-sign.actions.broadcast')
+        }
+        isLoading={isBroadcasting}
+        onConfirm={onBroadcast}
+      >
+        <div className={styles.main}>
+          <table>
+            <tbody>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.json-file')}</td>
+                <td>{filePath}</td>
+              </tr>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.status.label')}</td>
+                <td>{t('offline-sign.status.signed')}</td>
+              </tr>
+              <tr>
+                <td className={styles.first}>{t('offline-sign.content')}</td>
+              </tr>
+            </tbody>
+          </table>
+          <textarea disabled value={jsonContent} className={styles.textarea} />
+        </div>
+      </Dialog>
+
+      <Dialog
+        show={!isSigned}
+        className={styles.warningDialog}
+        title={t('offline-sign.import-transaction-to-sign')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        onConfirm={onBack}
+      >
+        <div className={styles.content}>{t('offline-sign.import-unsigned-transaction-detail')}</div>
+      </Dialog>
+
+      <AlertDialog
+        show={!!errMsg}
+        title={t('message-types.alert')}
+        message={errMsg}
+        type="failed"
+        onCancel={() => setErrMsg('')}
+      />
+    </>
+  )
+}
+
+BroadcastTransaction.displayName = 'BroadcastTransaction'
+
+export default BroadcastTransaction
diff --git a/packages/neuron-ui/src/components/OfflineSign/index.tsx b/packages/neuron-ui/src/components/OfflineSign/index.tsx
index 7caac8ee15..0f4014e3ae 100644
--- a/packages/neuron-ui/src/components/OfflineSign/index.tsx
+++ b/packages/neuron-ui/src/components/OfflineSign/index.tsx
@@ -1,11 +1,10 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useNavigate } from 'react-router-dom'
-import { isSuccessResponse, RoutePath, useDidMount, useGoBack } from 'utils'
+import { isSuccessResponse, useDidMount, useGoBack } from 'utils'
 import Dialog from 'widgets/Dialog'
 import AlertDialog from 'widgets/AlertDialog'
-import { useDispatch, useState as useGlobalState } from 'states'
-import { broadcastTransaction, getCurrentWallet, OfflineSignStatus } from 'services/remote'
+import { useState as useGlobalState } from 'states'
+import { getCurrentWallet, OfflineSignStatus } from 'services/remote'
 import { ReactComponent as HardWalletIcon } from 'widgets/Icons/HardWallet.svg'
 import OfflineSignDialog from '../OfflineSignDialog'
 
@@ -18,9 +17,7 @@ const OfflineSign = () => {
 
   const [wallet, setWallet] = useState<State.Wallet | null>(null)
   const [isSigning, setIsSigning] = useState(false)
-  const [isBroadCasting, setIsBroadcasting] = useState(false)
   const [t] = useTranslation()
-  const dispatch = useDispatch()
   const [errMsg, setErrMsg] = useState('')
 
   const { filePath, json } = loadedTransaction
@@ -31,6 +28,8 @@ const OfflineSign = () => {
 
   const signStatus: OfflineSignStatus = json.status
 
+  const isSigned = useMemo(() => signStatus === OfflineSignStatus.Signed, [signStatus])
+
   const status = useMemo(() => {
     switch (signStatus) {
       case OfflineSignStatus.Unsigned:
@@ -48,24 +47,6 @@ const OfflineSign = () => {
     setIsSigning(true)
   }, [setIsSigning])
 
-  const navigate = useNavigate()
-  const onBroadcast = useCallback(async () => {
-    setIsBroadcasting(true)
-    try {
-      const res = await broadcastTransaction({
-        ...json,
-        walletID: wallet!.id,
-      })
-      if (isSuccessResponse(res)) {
-        navigate(RoutePath.History)
-      } else {
-        setErrMsg(typeof res.message === 'string' ? res.message : res.message.content || '')
-      }
-    } finally {
-      setIsBroadcasting(false)
-    }
-  }, [wallet, json, navigate, dispatch])
-
   useDidMount(() => {
     getCurrentWallet().then(res => {
       if (isSuccessResponse(res)) {
@@ -76,26 +57,29 @@ const OfflineSign = () => {
 
   const signDialogOnDismiss = useCallback(() => {
     setIsSigning(false)
-  }, [])
+  }, [setIsSigning])
 
   if (isSigning && wallet) {
     return (
-      <OfflineSignDialog isBroadcast={false} wallet={wallet} offlineSignJSON={json} onDismiss={signDialogOnDismiss} />
+      <OfflineSignDialog
+        isBroadcast={false}
+        wallet={wallet}
+        offlineSignJSON={json}
+        onDismiss={signDialogOnDismiss}
+        onCompleted={onBack}
+      />
     )
   }
 
   return (
     <>
       <Dialog
-        show={!isSigning}
+        show={!isSigned}
         title={t('offline-sign.title')}
         cancelText={t('offline-sign.actions.cancel')}
         onCancel={onBack}
-        confirmText={
-          signStatus === OfflineSignStatus.Signed ? t('offline-sign.actions.broadcast') : t('offline-sign.actions.sign')
-        }
-        isLoading={signStatus === OfflineSignStatus.Signed && isBroadCasting}
-        onConfirm={signStatus === OfflineSignStatus.Signed ? onBroadcast : onSign}
+        confirmText={t('offline-sign.actions.sign')}
+        onConfirm={onSign}
       >
         <div className={styles.main}>
           <table>
@@ -123,6 +107,18 @@ const OfflineSign = () => {
           <textarea disabled value={jsonContent} className={styles.textarea} />
         </div>
       </Dialog>
+
+      <Dialog
+        show={isSigned}
+        className={styles.warningDialog}
+        title={t('offline-sign.import-signed-transaction')}
+        cancelText={t('offline-sign.actions.cancel')}
+        onCancel={onBack}
+        onConfirm={onBack}
+      >
+        <div className={styles.content}>{t('offline-sign.import-signed-transaction-detail')}</div>
+      </Dialog>
+
       <AlertDialog
         show={!!errMsg}
         title={t('message-types.alert')}
diff --git a/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss b/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
index 003c3b161b..56ed207431 100644
--- a/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
+++ b/packages/neuron-ui/src/components/OfflineSign/offlineSign.module.scss
@@ -19,6 +19,16 @@
   }
 }
 
+.warningDialog {
+  width: 680px;
+  .content {
+    display: flex;
+    justify-content: center;
+    margin-top: 24px;
+    color: var(--main-text-color);
+  }
+}
+
 .textarea {
   color: var(--main-text-color);
   margin-top: 17px;
diff --git a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
index a1f3179c6e..4dd0a4ce0a 100644
--- a/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
+++ b/packages/neuron-ui/src/components/OfflineSignDialog/index.tsx
@@ -23,9 +23,10 @@ interface SignDialogProps {
   wallet: State.Wallet
   offlineSignJSON: OfflineSignJSON
   onDismiss: () => void
+  onCompleted: () => void
 }
 
-const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss }: SignDialogProps) => {
+const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss, onCompleted }: SignDialogProps) => {
   const {
     app: {
       send: { description },
@@ -65,8 +66,8 @@ const OfflineSignDialog = ({ isBroadcast, wallet, offlineSignJSON, onDismiss }:
       type: AppActions.UpdateLoadedTransaction,
       payload: res.result!,
     })
-    onDismiss()
-  }, [offlineSignJSON, dispatch, onDismiss, t, password, walletID])
+    onCompleted()
+  }, [offlineSignJSON, dispatch, onCompleted, t, password, walletID])
 
   const onSubmit = useCallback(
     async (e?: React.FormEvent) => {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 509ce2726a..cb3558039d 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -114,6 +114,8 @@
         "partially-signed": "Partially Signed",
         "signed": "Signed"
       },
+      "import-signed-transaction": "Import a signed transaction",
+      "import-signed-transaction-detail": "You have imported a signed transaction, please confirm and try again.",
       "wallet": "Wallet:",
       "content": "Content:",
       "export": "Export Tx",
@@ -122,8 +124,12 @@
       "actions": {
         "broadcast": "Broadcast",
         "sign": "Sign and export",
-        "cancel": "Cancel"
-      }
+        "cancel": "Cancel",
+        "view-in-explorer": "View in Explorer"
+      },
+      "broadcast-transaction": "Broadcast Transaction",
+      "import-transaction-to-sign": "Import a transaction to sign",
+      "import-unsigned-transaction-detail": "You have imported an unsigned transaction, please confirm and try again."
     },
     "overview": {
       "date": "Date",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index abf5f0883c..4178995b94 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -55,27 +55,27 @@
         "finish": "fin de la création"
       },
       "errors": {
-        "multi-device" : "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté",
-        "device-not-found" : "Aucun appareil n'a été détecté. Veuillez connecter votre appareil.",
-        "ckb-app-not-found" : "L'application CKB ne s'ouvre pas. Veuillez ouvrir l'application CKB sur votre appareil."
-      },
-      "waiting" : "Waiting for CKB app...",
-      "abort" : "En attente de l'application CKB... Action annulée",
-      "app-version" : "CKB App v{{version}} en cours d'exécution",
-      "firmware-version" : "Firmware v{{version}} détecté",
-      "wallet-name" : "Nom du portefeuille",
-      "select-model" : "Select Model",
-      "other-device" : "Autres"
+        "multi-device": "Plusieurs appareils détectés. Un seul appareil du même modèle peut être connecté",
+        "device-not-found": "Aucun appareil n'a été détecté. Veuillez connecter votre appareil.",
+        "ckb-app-not-found": "L'application CKB ne s'ouvre pas. Veuillez ouvrir l'application CKB sur votre appareil."
+      },
+      "waiting": "Waiting for CKB app...",
+      "abort": "En attente de l'application CKB... Action annulée",
+      "app-version": "CKB App v{{version}} en cours d'exécution",
+      "firmware-version": "Firmware v{{version}} détecté",
+      "wallet-name": "Nom du portefeuille",
+      "select-model": "Select Model",
+      "other-device": "Autres"
     },
     "hardware-sign": {
-      "annuler" : "Annuler",
-      "title" : "Signer via le portefeuille matériel",
-      "device" : "Appareil :",
-      "status" : {
-        "label" : "Status :",
-        "connect" : "Connecté, prêt à signer",
-        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
-        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+      "annuler": "Annuler",
+      "title": "Signer via le portefeuille matériel",
+      "device": "Appareil :",
+      "status": {
+        "label": "Status :",
+        "connect": "Connecté, prêt à signer",
+        "user-input": "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect": "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
       },
       "inputs": "Inputs(signing {{index}} of {{length}})",
       "outputs": "Outputs({{length}})",
@@ -92,10 +92,10 @@
       "verified": "Vérifié",
       "invalid": "Invalid",
       "status": {
-        "label" : "Status :",
-        "connect" : "Connecté, prêt pour la vérification",
-        "user-input" : "Connecté, en attente de confirmation sur l'appareil...",
-        "disconnect" : "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
+        "label": "Status :",
+        "connect": "Connecté, prêt pour la vérification",
+        "user-input": "Connecté, en attente de confirmation sur l'appareil...",
+        "disconnect": "Déconnecté, veuillez confirmer que l'appareil est connecté et ouvrir l'application Nervos"
       },
       "actions": {
         "close": "Fermer",
@@ -104,7 +104,7 @@
         "verify": "Vérifier l'adresse",
         "finish": "Ok"
       }
-    },  
+    },
     "offline-sign": {
       "title": "Signature hors ligne",
       "json-file": "Fichier JSON :",
@@ -114,6 +114,8 @@
         "partially-signed": "Partiellement signé",
         "signed": "Signé"
       },
+      "import-signed-transaction": "Importer une transaction signée",
+      "import-signed-transaction-detail": "Vous avez importé une transaction signée, veuillez confirmer et essayer à nouveau.",
       "wallet": "Wallet :",
       "content": "Contenu :",
       "export": "Exporter Tx",
@@ -122,8 +124,12 @@
       "actions": {
         "broadcast": "Diffuser",
         "sign": "Signer et exporter",
-        "cancel": "Annuler"
-      }
+        "cancel": "Annuler",
+        "view-in-explorer": "Voir dans l'Explorateur"
+      },
+      "broadcast-transaction": "Diffuser la Transaction",
+      "import-transaction-to-sign": "Importer une transaction à signer",
+      "import-unsigned-transaction-detail": "Vous avez importé une transaction non signée, veuillez confirmer et essayer à nouveau."
     },
     "overview": {
       "date": "Date",
@@ -294,7 +300,7 @@
       "search": {
         "button": "Rechercher",
         "placeholder": "Rechercher le hash de transaction, l'adresse ou la date (aaaa-mm-jj)"
-     },
+      },
       "table": {
         "name": "Nom du Wallet",
         "type": "Type",
@@ -318,42 +324,42 @@
       "copy-address": "Copier l'adresse",
       "create": "Créer le compte d'actif {{name}}",
       "destroy": "Détruire le compte d'actif {{name}}"
-    },  
+    },
     "transaction": {
-        "window-title": "Transaction : {{hash}}",
-        "date": "Date",
-        "transaction-hash": "Hash de transaction",
-        "block-number": "Numéro de bloc",
-        "goBack": "Retour",
-        "index": "Index",
-        "address": "Adresse",
-        "income": "Revenu",
-        "amount": "Montant",
-        "inputs": "Entrées",
-        "outputs": "Sorties",
-        "cell-from-cellbase": "De cellbase",
-        "lock-script": "Script de verrouillage",
-        "lock-script-title": "Informations sur l'adresse",
-        "deprecated-address-format": "Adresse au format obsolète"
-      },
-      "addresses": {
-        "title": "Carnet d'adresses",
-        "addresses": "Adresses",
-        "type": "Type",
-        "address": "Adresse",
-        "identifier": "Identifiant",
-        "description": "Description",
-        "balance": "Solde",
-        "transactions": "TXs",
-        "receiving-address": "Réception",
-        "change-address": "Changement",
-        "copy-address": "Copier l'adresse",
-        "request-payment": "Demander un paiement",
-        "view-on-explorer": "Voir sur l'explorateur",
-        "default-description": "Aucun",
-        "all-address": "Toutes"
+      "window-title": "Transaction : {{hash}}",
+      "date": "Date",
+      "transaction-hash": "Hash de transaction",
+      "block-number": "Numéro de bloc",
+      "goBack": "Retour",
+      "index": "Index",
+      "address": "Adresse",
+      "income": "Revenu",
+      "amount": "Montant",
+      "inputs": "Entrées",
+      "outputs": "Sorties",
+      "cell-from-cellbase": "De cellbase",
+      "lock-script": "Script de verrouillage",
+      "lock-script-title": "Informations sur l'adresse",
+      "deprecated-address-format": "Adresse au format obsolète"
     },
-    "settings":{
+    "addresses": {
+      "title": "Carnet d'adresses",
+      "addresses": "Adresses",
+      "type": "Type",
+      "address": "Adresse",
+      "identifier": "Identifiant",
+      "description": "Description",
+      "balance": "Solde",
+      "transactions": "TXs",
+      "receiving-address": "Réception",
+      "change-address": "Changement",
+      "copy-address": "Copier l'adresse",
+      "request-payment": "Demander un paiement",
+      "view-on-explorer": "Voir sur l'explorateur",
+      "default-description": "Aucun",
+      "all-address": "Toutes"
+    },
+    "settings": {
       "title": {
         "normal": "Paramètres",
         "mac": "Préférences"
@@ -389,17 +395,17 @@
         }
       },
       "network": {
-       "online": "En ligne",
-       "offline": "Hors ligne",
-       "add-network": "Ajouter un réseau",
-       "remove-network": "Supprimer le réseau",
-       "remove-network-msg": "Êtes-vous sûr de vouloir supprimer le réseau sélectionné ?",
+        "online": "En ligne",
+        "offline": "Hors ligne",
+        "add-network": "Ajouter un réseau",
+        "remove-network": "Supprimer le réseau",
+        "remove-network-msg": "Êtes-vous sûr de vouloir supprimer le réseau sélectionné ?",
         "edit-network": {
-         "title": "Modifier le réseau",
-         "rpc-url": "URL RPC",
-         "name": "Nom du réseau",
-         "input-rpc": "Veuillez entrer rpc",
-         "input-network": "Veuillez entrer le nom" 
+          "title": "Modifier le réseau",
+          "rpc-url": "URL RPC",
+          "name": "Nom du réseau",
+          "input-rpc": "Veuillez entrer rpc",
+          "input-network": "Veuillez entrer le nom"
         },
         "edit-success": "Modification réussie du réseau",
         "mainnet": "Mainnet",
@@ -408,8 +414,8 @@
         "lightMainnet": "Mainnet léger",
         "devnet": "Devnet",
         "switch-network-type": "Basculer vers {{type}}"
-      },  
-        "locale": {
+      },
+      "locale": {
         "en": "Anglais",
         "en-US": "Anglais (États-Unis)",
         "zh": "中文(简体)",
@@ -436,7 +442,7 @@
         "disabled-set-path": "Lorsque le noeud CKB est démarré manuellement, la configuration du chemin du noeud CKB ne prend pas effet.",
         "ckb-node-storage": "Stockage du noeud CKB"
       }
-    },    
+    },
     "password-request": {
       "wallet-not-found": "Le Wallet n'a pas été trouvé",
       "password": "Entrez le mot de passe",
@@ -506,7 +512,7 @@
     "qrcode": {
       "copy": "Copier l'image",
       "save": "Enregistrer l'image"
-    },  
+    },
     "common": {
       "or": "ou",
       "ok": "Ok",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index cea843f0cc..fbd4630cba 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -108,6 +108,8 @@
         "partially-signed": "部分簽名",
         "signed": "已簽名"
       },
+      "import-signed-transaction": "導入已簽名交易",
+      "import-signed-transaction-detail": "您導入了一個已簽名交易，請確認並重試。",
       "wallet": "錢包：",
       "content": "內容：",
       "export": "導出交易",
@@ -116,8 +118,12 @@
       "actions": {
         "broadcast": "廣播交易",
         "sign": "簽名並導出",
-        "cancel": "取消"
-      }
+        "cancel": "取消",
+        "view-in-explorer": "在瀏覽器中查看"
+      },
+      "broadcast-transaction": "廣播交易",
+      "import-transaction-to-sign": "導入一筆交易以簽名",
+      "import-unsigned-transaction-detail": "您導入了一個未簽名交易，請確認並重試。"
     },
     "overview": {
       "date": "時間",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 0146f9920d..3144a97ca0 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -107,6 +107,8 @@
         "partially-signed": "部分签名",
         "signed": "已签名"
       },
+      "import-signed-transaction": "导入已签名交易",
+      "import-signed-transaction-detail": "您导入了一个已签名交易，请确认并重试。",
       "wallet": "钱包：",
       "content": "内容：",
       "export": "导出交易",
@@ -115,8 +117,12 @@
       "actions": {
         "broadcast": "广播交易",
         "sign": "签名并导出",
-        "cancel": "取消"
-      }
+        "cancel": "取消",
+        "view-in-explorer": "在浏览器中查看"
+      },
+      "broadcast-transaction": "广播交易",
+      "import-transaction-to-sign": "导入一笔交易以签名",
+      "import-unsigned-transaction-detail": "您导入了一个未签名交易，请确认并重试。"
     },
     "overview": {
       "date": "时间",
diff --git a/packages/neuron-ui/src/router.tsx b/packages/neuron-ui/src/router.tsx
index 79bee75bd7..8e197d8bfa 100644
--- a/packages/neuron-ui/src/router.tsx
+++ b/packages/neuron-ui/src/router.tsx
@@ -22,6 +22,7 @@ import Settings from 'components/Settings'
 import SignAndVerify from 'components/SignAndVerify'
 import MultisigAddress from 'components/MultisigAddress'
 import CellManagement from 'components/CellManagement'
+import BroadcastTransaction from 'components/BroadcastTransaction'
 import SendTxDetail from 'components/SendTxDetail'
 
 const toolsRouters = [
@@ -37,6 +38,10 @@ const toolsRouters = [
     path: RoutePath.MultisigAddress,
     element: <MultisigAddress />,
   },
+  {
+    path: RoutePath.BroadcastTransaction,
+    element: <BroadcastTransaction />,
+  },
 ]
 
 const mainRouterConfig: RouteObject[] = [
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index 2860ab770d..1743cd2a46 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -38,9 +38,12 @@ export type SignProps = OfflineSignJSON & { walletID: string; password: string;
 
 export type BroadcastProps = OfflineSignJSON & { walletID: string }
 
+export type SignedTransaction = OfflineSignJSON & { status: OfflineSignStatus.Signed }
+
 export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-transaction-as-json')
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
 export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction-only')
+export const broadcastSignedTransaction = remoteApi<SignedTransaction, string>('broadcast-signed-transaction')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
 )
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index c9ab2831e6..be0709d0db 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -134,6 +134,7 @@ type Action =
   | 'export-transaction-as-json'
   | 'sign-transaction-only'
   | 'broadcast-transaction-only'
+  | 'broadcast-signed-transaction'
   | 'sign-and-export-transaction'
   | 'sign-and-broadcast-transaction'
   // nft
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index 901eafe4ab..d7b457a6da 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -29,6 +29,7 @@ export enum RoutePath {
   OfflineSign = 'offline-sign',
   SignVerify = 'sign-verify',
   MultisigAddress = 'multisig-address',
+  BroadcastTransaction = 'broadcast-transaction',
 }
 
 export enum CapacityUnit {
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 024eee26ff..a766ecbbc3 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -795,6 +795,10 @@ export default class ApiController {
       return this.#offlineSignController.broadcastTransaction(params)
     })
 
+    handle('broadcast-signed-transaction', async (_, params) => {
+      return this.#offlineSignController.broadcastTransaction({ ...params, walletID: '' })
+    })
+
     handle('sign-and-export-transaction', async (_, params) => {
       return this.#offlineSignController.signAndExportTransaction({
         ...params,
diff --git a/packages/neuron-wallet/src/controllers/app/menu.ts b/packages/neuron-wallet/src/controllers/app/menu.ts
index 7c014bf087..24ae895113 100644
--- a/packages/neuron-wallet/src/controllers/app/menu.ts
+++ b/packages/neuron-wallet/src/controllers/app/menu.ts
@@ -23,6 +23,7 @@ enum URL {
   ImportKeystore = '/keystore/import',
   ImportHardware = '/import-hardware',
   OfflineSign = 'offline-sign',
+  BroadcastTransaction = 'broadcast-transaction',
 }
 
 enum ExternalURL {
@@ -361,6 +362,17 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
           loadTransaction(URL.OfflineSign, json, filePath)
         },
       },
+      {
+        label: t('application-menu.tools.broadcast-transaction'),
+        click: async () => {
+          const result = await OfflineSignService.loadTransactionJSON()
+          if (!result) {
+            return
+          }
+          const { json, filePath } = result
+          loadTransaction(URL.BroadcastTransaction, json, filePath)
+        },
+      },
     ],
   }
 
diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts
index 5afd76c2f0..c7a01ed7c7 100644
--- a/packages/neuron-wallet/src/locales/en.ts
+++ b/packages/neuron-wallet/src/locales/en.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': 'Multisig Addresses',
         'offline-sign': 'Offline sign',
         'clear-sync-data': 'Clear all synchronized data',
+        'broadcast-transaction': 'Broadcast Transaction',
       },
       window: {
         label: 'Window',
diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts
index 2a33914e52..10f73600a9 100644
--- a/packages/neuron-wallet/src/locales/zh-tw.ts
+++ b/packages/neuron-wallet/src/locales/zh-tw.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': '多簽地址',
         'offline-sign': '離線簽名',
         'clear-sync-data': '清除所有同步數據',
+        'broadcast-transaction': '廣播交易',
       },
       window: {
         label: '視窗',
diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts
index 803ac9a975..218c52483d 100644
--- a/packages/neuron-wallet/src/locales/zh.ts
+++ b/packages/neuron-wallet/src/locales/zh.ts
@@ -39,6 +39,7 @@ export default {
         'multisig-address': '多签地址',
         'offline-sign': '离线签名',
         'clear-sync-data': '清除所有同步数据',
+        'broadcast-transaction': '广播交易',
       },
       window: {
         label: '窗口',
diff --git a/packages/neuron-wallet/src/services/asset-account-service.ts b/packages/neuron-wallet/src/services/asset-account-service.ts
index be00ae7bf7..7dc8f4689c 100644
--- a/packages/neuron-wallet/src/services/asset-account-service.ts
+++ b/packages/neuron-wallet/src/services/asset-account-service.ts
@@ -342,7 +342,7 @@ export default class AssetAccountService {
       [assetAccount.tokenID, assetAccount.blake160]
     )
 
-    if (exists[0].exist === 1) {
+    if (exists[0].exist === 1 && walletID) {
       // For hardware wallet in ckb asset account:
       // 1. If a ckb account has been created, another one cannot be created;
       // 2. If a ckb account has been destroyed, ckb account can be created.
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index 7c0195b5fe..b8bc3f5962 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -100,8 +100,10 @@ export default class TransactionSender {
     await TransactionPersistor.saveSentTx(tx, txHash)
     await MultisigService.saveSentMultisigOutput(tx)
 
-    const wallet = WalletService.getInstance().get(walletID)
-    await wallet.checkAndGenerateAddresses()
+    if (walletID) {
+      const wallet = WalletService.getInstance().get(walletID)
+      await wallet.checkAndGenerateAddresses()
+    }
     return txHash
   }
 

From 21a2f35bcdf64afdbebf5366d908c24067a8a030 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Mon, 29 Jan 2024 20:17:45 +0800
Subject: [PATCH 38/68] feat: Same wallet import optimization (#3001)

* fix: issue 291

* fix

* fix

* fix: remove unused files

* fix: test

* fix: Same wallet import optimization

* fix

* fix: comments

* fix: comments

* fix: comments

* fix: comments

* fix: Merge

* fix

---------

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../detectDuplicateWalletDialog.module.scss   |  32 +++++
 .../DetectDuplicateWalletDialog/index.tsx     | 114 ++++++++++++++++
 .../components/ImportHardware/name-wallet.tsx |  67 +++++----
 .../src/components/ImportKeystore/index.tsx   | 101 ++++++++------
 .../src/components/PasswordRequest/hooks.ts   |   4 +-
 .../ReplaceDuplicateWalletDialog/index.tsx    | 129 ++++++++++++++++++
 .../replaceDuplicateWalletDialog.module.scss  |  24 ++++
 .../src/components/WalletSetting/index.tsx    |  47 +++++--
 .../WalletSetting/walletSetting.module.scss   |  11 +-
 .../src/components/WalletWizard/index.tsx     | 106 ++++++++------
 packages/neuron-ui/src/locales/en.json        |  12 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  12 +-
 packages/neuron-ui/src/locales/zh.json        |  12 +-
 .../src/services/remote/remoteApiWrapper.ts   |   1 +
 .../neuron-ui/src/services/remote/wallets.ts  |   1 +
 packages/neuron-ui/src/states/init/wallet.ts  |   2 +
 .../neuron-ui/src/stories/Navbar.stories.tsx  |   2 +-
 .../src/stories/PasswordRequest.stories.tsx   |  12 +-
 .../src/stories/WalletSetting.stories.tsx     |   2 +
 packages/neuron-ui/src/styles/mixin.scss      |   1 +
 packages/neuron-ui/src/types/App/index.d.ts   |   1 +
 .../neuron-ui/src/types/Controller/index.d.ts |   5 +
 packages/neuron-ui/src/utils/enums.ts         |   1 +
 .../neuron-ui/src/widgets/Icons/Detect.svg    |  10 ++
 packages/neuron-ui/src/widgets/Icons/icon.tsx |   8 ++
 .../src/widgets/RadioGroup/index.tsx          |   4 +-
 packages/neuron-wallet/src/controllers/api.ts |   4 +
 .../neuron-wallet/src/controllers/wallets.ts  |  11 +-
 .../neuron-wallet/src/exceptions/wallet.ts    |   8 ++
 .../neuron-wallet/src/services/wallets.ts     |  42 +++++-
 .../tests/services/wallets.test.ts            |  57 +++++++-
 31 files changed, 693 insertions(+), 150 deletions(-)
 create mode 100755 packages/neuron-ui/src/components/DetectDuplicateWalletDialog/detectDuplicateWalletDialog.module.scss
 create mode 100644 packages/neuron-ui/src/components/DetectDuplicateWalletDialog/index.tsx
 create mode 100644 packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/index.tsx
 create mode 100755 packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/replaceDuplicateWalletDialog.module.scss
 create mode 100644 packages/neuron-ui/src/widgets/Icons/Detect.svg

diff --git a/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/detectDuplicateWalletDialog.module.scss b/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/detectDuplicateWalletDialog.module.scss
new file mode 100755
index 0000000000..68343457f0
--- /dev/null
+++ b/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/detectDuplicateWalletDialog.module.scss
@@ -0,0 +1,32 @@
+.content {
+  width: 648px;
+  .detail {
+    margin: 0;
+    color: var(--secondary-text-color);
+  }
+  .groupWrap {
+    margin-top: 16px;
+    height: 177px;
+    overflow-y: scroll;
+    border: 1px solid var(--divide-line-color);
+    border-radius: 8px;
+    padding-left: 16px;
+    > div {
+      border-bottom: 1px solid var(--divide-line-color);
+      padding-top: 16px;
+      &:last-child {
+        border: none;
+      }
+    }
+    .radioItem {
+      padding: 0 0 16px;
+      &:hover,
+      &:focus {
+        background: transparent;
+        button {
+          visibility: visible;
+        }
+      }
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/index.tsx b/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/index.tsx
new file mode 100644
index 0000000000..cc98e15f20
--- /dev/null
+++ b/packages/neuron-ui/src/components/DetectDuplicateWalletDialog/index.tsx
@@ -0,0 +1,114 @@
+import React, { useMemo, useState, useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import Dialog from 'widgets/Dialog'
+import RadioGroup from 'widgets/RadioGroup'
+import { useState as useGlobalState, useDispatch, AppActions } from 'states'
+import { requestPassword } from 'services/remote'
+import styles from './detectDuplicateWalletDialog.module.scss'
+
+const DetectDuplicateWalletDialog = ({ onClose }: { onClose: () => void }) => {
+  const {
+    wallet: { id: currentID = '' },
+    settings: { wallets = [] },
+  } = useGlobalState()
+  const dispatch = useDispatch()
+  const [duplicatedWallets, setDuplicatedWallets] = useState<string[]>([])
+  const [t] = useTranslation()
+
+  const groups = useMemo(() => {
+    const obj: {
+      [key: string]: State.WalletIdentity[]
+    } = {}
+    wallets.forEach(item => {
+      if (item.extendedKey in obj) {
+        obj[item.extendedKey].push(item)
+      } else {
+        obj[item.extendedKey] = [item]
+      }
+    })
+
+    return Object.values(obj).filter(list => list.length > 1)
+  }, [wallets])
+
+  const handleGroupChange = useCallback(
+    (checked: string) => {
+      const [extendedKey, id] = checked.split('_')
+
+      const list = wallets
+        .filter(item => {
+          if (item.extendedKey === extendedKey) {
+            return item.id !== id
+          }
+          return duplicatedWallets.includes(item.id)
+        })
+        .map(item => item.id)
+
+      setDuplicatedWallets(list)
+    },
+    [wallets, duplicatedWallets, setDuplicatedWallets]
+  )
+
+  const onConfirm = useCallback(async () => {
+    const getRequest = (id: string) => {
+      if (wallets.find(item => (item.id === id && item.device) || item.isWatchOnly)) {
+        return requestPassword({ walletID: id, action: 'delete-wallet' })
+      }
+      return new Promise(resolve => {
+        dispatch({
+          type: AppActions.RequestPassword,
+          payload: {
+            walletID: id,
+            actionType: 'delete',
+            onSuccess: async () => {
+              await resolve(id)
+            },
+          },
+        })
+      })
+    }
+
+    const requestToDeleteIds = duplicatedWallets
+      .filter(item => item !== currentID)
+      .concat(duplicatedWallets.includes(currentID) ? [currentID] : [])
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (const id of requestToDeleteIds) {
+      // eslint-disable-next-line no-await-in-loop
+      await getRequest(id)
+    }
+    onClose()
+  }, [wallets, duplicatedWallets, requestPassword, onClose, dispatch])
+
+  return (
+    <Dialog
+      show
+      title={t('settings.wallet-manager.detected-duplicate.title')}
+      onCancel={onClose}
+      onConfirm={onConfirm}
+      disabled={duplicatedWallets.length === 0}
+    >
+      <div className={styles.content}>
+        <p className={styles.detail}>{t('settings.wallet-manager.detected-duplicate.detail')}</p>
+        <div className={styles.groupWrap}>
+          {groups.map(group => (
+            <RadioGroup
+              inputIdPrefix="detect-duplicate-wallet"
+              key={group[0].extendedKey}
+              defaultValue=""
+              onChange={handleGroupChange}
+              itemClassName={styles.radioItem}
+              options={group.map(wallet => ({
+                value: `${wallet.extendedKey}_${wallet.id}`,
+                label: <span className={styles.walletName}>{wallet.name}</span>,
+              }))}
+            />
+          ))}
+        </div>
+      </div>
+    </Dialog>
+  )
+}
+
+DetectDuplicateWalletDialog.displayName = 'DetectDuplicateWalletDialog'
+
+export default DetectDuplicateWalletDialog
diff --git a/packages/neuron-ui/src/components/ImportHardware/name-wallet.tsx b/packages/neuron-ui/src/components/ImportHardware/name-wallet.tsx
index 5960236158..4c555b2cce 100644
--- a/packages/neuron-ui/src/components/ImportHardware/name-wallet.tsx
+++ b/packages/neuron-ui/src/components/ImportHardware/name-wallet.tsx
@@ -3,10 +3,11 @@ import { useTranslation } from 'react-i18next'
 import Button from 'widgets/Button'
 import TextField from 'widgets/TextField'
 import { createHardwareWallet } from 'services/remote'
-import { CONSTANTS, isSuccessResponse, useDialogWrapper } from 'utils'
+import { CONSTANTS, isSuccessResponse, useDialogWrapper, ErrorCode } from 'utils'
 import Alert from 'widgets/Alert'
 import { FinishCreateLoading, getAlertStatus } from 'components/WalletWizard'
 import { importedWalletDialogShown } from 'services/localCache'
+import ReplaceDuplicateWalletDialog, { useReplaceDuplicateWallet } from 'components/ReplaceDuplicateWalletDialog'
 import { ImportStep, ActionType, ImportHardwareState } from './common'
 
 import styles from './findDevice.module.scss'
@@ -26,6 +27,7 @@ const NameWallet = ({
   const [walletName, setWalletName] = useState(`${model?.manufacturer} ${model?.product}`)
   const [errorMsg, setErrorMsg] = useState('')
   const { dialogRef, openDialog, closeDialog } = useDialogWrapper()
+  const { onImportingExitingWalletError, dialogProps } = useReplaceDuplicateWallet()
 
   const onBack = useCallback(() => {
     dispatch({ step: ImportStep.ImportHardware })
@@ -46,6 +48,11 @@ const NameWallet = ({
               importedWalletDialogShown.setStatus(res.result.id, true)
             }
           } else {
+            if (res.status === ErrorCode.DuplicateImportWallet) {
+              onImportingExitingWalletError(res.message)
+              return
+            }
+
             setErrorMsg(typeof res.message === 'string' ? res.message : res.message!.content!)
           }
         })
@@ -62,33 +69,37 @@ const NameWallet = ({
   }, [])
 
   return (
-    <form className={styles.container}>
-      <header className={styles.title}>{t('import-hardware.title.name-wallet')}</header>
-      <section className={styles.name}>
-        <TextField
-          required
-          autoFocus
-          placeholder={t('wizard.set-wallet-name')}
-          onChange={onInput}
-          field="wallet-name"
-          value={walletName}
-          maxLength={MAX_WALLET_NAME_LENGTH}
-        />
-      </section>
-      <Alert status={getAlertStatus(!!walletName, !errorMsg)} className={styles.alert}>
-        <span>{errorMsg || t('wizard.new-name')}</span>
-      </Alert>
-      <footer className={styles.footer}>
-        <Button
-          type="submit"
-          label={t('import-hardware.actions.finish')}
-          onClick={onNext}
-          disabled={!walletName || !!errorMsg}
-        />
-        <Button type="text" label={t('import-hardware.actions.back')} onClick={onBack} />
-      </footer>
-      <FinishCreateLoading dialogRef={dialogRef} />
-    </form>
+    <>
+      <form className={styles.container}>
+        <header className={styles.title}>{t('import-hardware.title.name-wallet')}</header>
+        <section className={styles.name}>
+          <TextField
+            required
+            autoFocus
+            placeholder={t('wizard.set-wallet-name')}
+            onChange={onInput}
+            field="wallet-name"
+            value={walletName}
+            maxLength={MAX_WALLET_NAME_LENGTH}
+          />
+        </section>
+        <Alert status={getAlertStatus(!!walletName, !errorMsg)} className={styles.alert}>
+          <span>{errorMsg || t('wizard.new-name')}</span>
+        </Alert>
+        <footer className={styles.footer}>
+          <Button
+            type="submit"
+            label={t('import-hardware.actions.finish')}
+            onClick={onNext}
+            disabled={!walletName || !!errorMsg}
+          />
+          <Button type="text" label={t('import-hardware.actions.back')} onClick={onBack} />
+        </footer>
+        <FinishCreateLoading dialogRef={dialogRef} />
+      </form>
+
+      <ReplaceDuplicateWalletDialog {...dialogProps} />
+    </>
   )
 }
 
diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
index 07be66530d..e3b71e74ac 100644
--- a/packages/neuron-ui/src/components/ImportKeystore/index.tsx
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -15,6 +15,7 @@ import {
   useDialogWrapper,
 } from 'utils'
 
+import ReplaceDuplicateWalletDialog, { useReplaceDuplicateWallet } from 'components/ReplaceDuplicateWalletDialog'
 import { FinishCreateLoading, CreateFirstWalletNav } from 'components/WalletWizard'
 import TextField from 'widgets/TextField'
 import { importedWalletDialogShown } from 'services/localCache'
@@ -48,6 +49,7 @@ const ImportKeystore = () => {
   const navigate = useNavigate()
   const [fields, setFields] = useState(defaultFields)
   const [openingFile, setOpeningFile] = useState(false)
+  const { onImportingExitingWalletError, dialogProps } = useReplaceDuplicateWallet()
   const goBack = useGoBack()
 
   const disabled = !!(
@@ -115,6 +117,11 @@ const ImportKeystore = () => {
             throw new PasswordIncorrectException()
           }
 
+          if (res.status === ErrorCode.DuplicateImportWallet) {
+            onImportingExitingWalletError(res.message)
+            return
+          }
+
           if (res.message) {
             const msg = typeof res.message === 'string' ? res.message : res.message.content || ''
             if (msg) {
@@ -193,51 +200,55 @@ const ImportKeystore = () => {
   )
 
   return (
-    <form className={styles.container} onSubmit={handleSubmit}>
-      <div className={styles.title}>{t('import-keystore.title')}</div>
-      <CreateFirstWalletNav />
-      {Object.entries(fields)
-        .filter(([key]) => !key.endsWith('Error'))
-        .map(([key, value]) => {
-          return (
-            <TextField
-              className={styles.field}
-              key={key}
-              field={key}
-              onClick={key === 'path' ? handleFileClick : undefined}
-              placeholder={t(`import-keystore.placeholder.${key}`)}
-              type={key === 'password' ? 'password' : 'text'}
-              readOnly={key === 'path'}
-              disabled={key === 'path' && openingFile}
-              value={value}
-              error={fields[`${key}Error` as keyof KeystoreFields]}
-              errorWithIcon
-              onChange={handleChange}
-              suffix={
-                key === 'path' ? (
-                  <span
-                    onClick={handleFileClick}
-                    className={styles.chooseFileSuffix}
-                    onKeyDown={() => {}}
-                    role="button"
-                    tabIndex={-1}
-                  >
-                    {t('import-keystore.select-file')}
-                  </span>
-                ) : null
-              }
-              required
-            />
-          )
-        })}
-      <div className={styles.actions}>
-        <Button type="submit" label={t('import-keystore.button.submit')} disabled={disabled}>
-          {t('import-keystore.button.submit') as string}
-        </Button>
-        <Button type="text" onClick={goBack} label={t('import-keystore.button.back')} />
-      </div>
-      <FinishCreateLoading dialogRef={dialogRef} />
-    </form>
+    <>
+      <form className={styles.container} onSubmit={handleSubmit}>
+        <div className={styles.title}>{t('import-keystore.title')}</div>
+        <CreateFirstWalletNav />
+        {Object.entries(fields)
+          .filter(([key]) => !key.endsWith('Error'))
+          .map(([key, value]) => {
+            return (
+              <TextField
+                className={styles.field}
+                key={key}
+                field={key}
+                onClick={key === 'path' ? handleFileClick : undefined}
+                placeholder={t(`import-keystore.placeholder.${key}`)}
+                type={key === 'password' ? 'password' : 'text'}
+                readOnly={key === 'path'}
+                disabled={key === 'path' && openingFile}
+                value={value}
+                error={fields[`${key}Error` as keyof KeystoreFields]}
+                errorWithIcon
+                onChange={handleChange}
+                suffix={
+                  key === 'path' ? (
+                    <span
+                      onClick={handleFileClick}
+                      className={styles.chooseFileSuffix}
+                      onKeyDown={() => {}}
+                      role="button"
+                      tabIndex={-1}
+                    >
+                      {t('import-keystore.select-file')}
+                    </span>
+                  ) : null
+                }
+                required
+              />
+            )
+          })}
+        <div className={styles.actions}>
+          <Button type="submit" label={t('import-keystore.button.submit')} disabled={disabled}>
+            {t('import-keystore.button.submit') as string}
+          </Button>
+          <Button type="text" onClick={goBack} label={t('import-keystore.button.back')} />
+        </div>
+        <FinishCreateLoading dialogRef={dialogRef} />
+      </form>
+
+      <ReplaceDuplicateWalletDialog {...dialogProps} />
+    </>
   )
 }
 
diff --git a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
index db51eb2835..6f8991b5d6 100644
--- a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
+++ b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
@@ -164,7 +164,9 @@ export default ({
           }
           case 'delete': {
             await deleteWallet({ id: walletID, password })(dispatch).then(status => {
-              if (status === ErrorCode.PasswordIncorrect) {
+              if (isSuccessResponse({ status })) {
+                onSuccess?.()
+              } else if (status === ErrorCode.PasswordIncorrect) {
                 throw new PasswordIncorrectException()
               }
             })
diff --git a/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/index.tsx b/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/index.tsx
new file mode 100644
index 0000000000..c644a496e9
--- /dev/null
+++ b/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/index.tsx
@@ -0,0 +1,129 @@
+import React, { useMemo, useState, useCallback } from 'react'
+import { useNavigate } from 'react-router-dom'
+import { useTranslation } from 'react-i18next'
+import Dialog from 'widgets/Dialog'
+import RadioGroup from 'widgets/RadioGroup'
+import { useState as useGlobalState, useDispatch, updateWalletProperty, setCurrentWallet } from 'states'
+import { RoutePath, isSuccessResponse } from 'utils'
+import { replaceWallet } from 'services/remote'
+import styles from './replaceDuplicateWalletDialog.module.scss'
+
+const useReplaceDuplicateWallet = () => {
+  const [extendedKey, setExtendedKey] = useState('')
+  const [importedWalletId, setImportedWalletId] = useState('')
+
+  const onClose = useCallback(() => {
+    setImportedWalletId('')
+  }, [setImportedWalletId])
+
+  const onImportingExitingWalletError = (
+    message:
+      | string
+      | {
+          content?: string
+          meta?: { [key: string]: string }
+        }
+  ) => {
+    try {
+      const msg = typeof message === 'string' ? '' : message.content
+      if (msg) {
+        const obj = JSON.parse(msg)
+        setExtendedKey(obj.extendedKey)
+        setImportedWalletId(obj.id)
+      }
+    } catch (error) {
+      onClose()
+    }
+  }
+
+  const show = useMemo(() => !!extendedKey && !!importedWalletId, [importedWalletId, extendedKey])
+
+  return {
+    onImportingExitingWalletError,
+    dialogProps: {
+      show,
+      onClose,
+      extendedKey,
+      importedWalletId,
+    },
+  }
+}
+
+const ReplaceDuplicateWalletDialog = ({
+  show,
+  onClose,
+  extendedKey,
+  importedWalletId,
+}: {
+  show: boolean
+  onClose: () => void
+  extendedKey: string
+  importedWalletId: string
+}) => {
+  const {
+    settings: { wallets = [] },
+  } = useGlobalState()
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const [selectedId, setSelectedId] = useState('')
+  const [t] = useTranslation()
+
+  const group = useMemo(() => wallets.filter(item => item.extendedKey === extendedKey), [wallets, extendedKey])
+
+  const handleGroupChange = useCallback(
+    (checked: string) => {
+      setSelectedId(checked as string)
+    },
+    [setSelectedId]
+  )
+
+  const onConfirm = useCallback(() => {
+    replaceWallet({
+      existingWalletId: selectedId,
+      importedWalletId,
+    })
+      .then(res => {
+        if (isSuccessResponse(res)) {
+          navigate(RoutePath.Overview)
+          return
+        }
+        onClose()
+      })
+      .finally(() => {
+        setSelectedId('')
+      })
+  }, [selectedId, updateWalletProperty, onClose, dispatch, setCurrentWallet])
+
+  return (
+    <Dialog
+      show={show}
+      title={t('settings.wallet-manager.importing-existing.title')}
+      onCancel={onClose}
+      onConfirm={onConfirm}
+      confirmText={t('settings.wallet-manager.importing-existing.replace')}
+      disabled={!selectedId}
+    >
+      <div className={styles.content}>
+        <p className={styles.detail}>{t('settings.wallet-manager.importing-existing.detail')}</p>
+        <div className={styles.groupWrap}>
+          <RadioGroup
+            inputIdPrefix="replace-duplicate-wallet"
+            defaultValue=""
+            onChange={handleGroupChange}
+            itemClassName={styles.radioItem}
+            options={group.map(wallet => ({
+              value: wallet.id,
+              label: <span className={styles.walletName}>{wallet.name}</span>,
+            }))}
+          />
+        </div>
+      </div>
+    </Dialog>
+  )
+}
+
+ReplaceDuplicateWalletDialog.displayName = 'ReplaceDuplicateWalletDialog'
+
+export default ReplaceDuplicateWalletDialog
+
+export { useReplaceDuplicateWallet }
diff --git a/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/replaceDuplicateWalletDialog.module.scss b/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/replaceDuplicateWalletDialog.module.scss
new file mode 100755
index 0000000000..a4b447ec48
--- /dev/null
+++ b/packages/neuron-ui/src/components/ReplaceDuplicateWalletDialog/replaceDuplicateWalletDialog.module.scss
@@ -0,0 +1,24 @@
+.content {
+  width: 648px;
+  .detail {
+    margin: 0;
+    color: var(--secondary-text-color);
+  }
+  .groupWrap {
+    margin-top: 16px;
+    overflow-y: scroll;
+    border: 1px solid var(--divide-line-color);
+    border-radius: 8px;
+    padding: 16px 0 0 16px;
+    .radioItem {
+      padding: 0 0 16px;
+      &:hover,
+      &:focus {
+        background: transparent;
+        button {
+          visibility: visible;
+        }
+      }
+    }
+  }
+}
diff --git a/packages/neuron-ui/src/components/WalletSetting/index.tsx b/packages/neuron-ui/src/components/WalletSetting/index.tsx
index 821ae19c7b..7dc3885e1e 100644
--- a/packages/neuron-ui/src/components/WalletSetting/index.tsx
+++ b/packages/neuron-ui/src/components/WalletSetting/index.tsx
@@ -1,18 +1,22 @@
-import React, { useEffect, useCallback, useState } from 'react'
+import React, { useEffect, useCallback, useState, useMemo } from 'react'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { WalletWizardPath } from 'components/WalletWizard'
-import { ReactComponent as EditWallet } from 'widgets/Icons/Edit.svg'
-import { ReactComponent as DeleteWallet } from 'widgets/Icons/Delete.svg'
-import { ReactComponent as CreateWallet } from 'widgets/Icons/Add.svg'
-import { ReactComponent as ImportKeystore } from 'widgets/Icons/SoftWalletImportKeystore.svg'
-import { ReactComponent as Export } from 'widgets/Icons/Export.svg'
-import { ReactComponent as ImportHardware } from 'widgets/Icons/HardWalletImport.svg'
-import { ReactComponent as AddSimple } from 'widgets/Icons/AddSimple.svg'
+import {
+  Edit as EditWallet,
+  Add as CreateWallet,
+  Detect,
+  Delete as DeleteWallet,
+  Export,
+  AddSimple,
+  ImportKeystore,
+  ImportHardware,
+} from 'widgets/Icons/icon'
 import Tooltip from 'widgets/Tooltip'
 import Toast from 'widgets/Toast'
 import { StateDispatch } from 'states'
 import WalletEditorDialog from 'components/WalletEditorDialog'
+import DetectDuplicateWalletDialog from 'components/DetectDuplicateWalletDialog'
 import {
   backToTop,
   RoutePath,
@@ -63,6 +67,13 @@ const WalletSetting = ({
   const [showEditDialog, setShowEditDialog] = useState(false)
   const [editWallet, setEditWallet] = useState('')
   const [notice, setNotice] = useState('')
+  const [showDetectDialog, setShowDetectDialog] = useState(false)
+
+  const hasDuplicateWallets = useMemo(() => {
+    const extendedKeys = wallets.map(item => item.extendedKey)
+    const extendedKeySet = new Set(extendedKeys)
+    return extendedKeys.length > extendedKeySet.size
+  }, [wallets])
 
   useEffect(() => {
     backToTop()
@@ -124,6 +135,14 @@ const WalletSetting = ({
     setNotice(t('settings.wallet-manager.edit-success'))
   }, [setShowEditDialog, setNotice])
 
+  const handleDetect = useCallback(() => {
+    setShowDetectDialog(true)
+  }, [setShowDetectDialog])
+
+  const onDetectDialogClose = useCallback(() => {
+    setShowDetectDialog(false)
+  }, [setShowDetectDialog])
+
   return (
     <div>
       <RadioGroup
@@ -153,7 +172,7 @@ const WalletSetting = ({
         }))}
       />
 
-      <div className={styles.addWrap}>
+      <div className={styles.actionWrap}>
         <Tooltip
           tip={
             <div className={styles.actions}>
@@ -168,10 +187,16 @@ const WalletSetting = ({
           trigger="click"
           showTriangle
         >
-          <button type="button" className={styles.addBtn}>
+          <button type="button" className={styles.actionBtn}>
             <AddSimple /> {t('wizard.add-one')}
           </button>
         </Tooltip>
+
+        {hasDuplicateWallets ? (
+          <button type="button" className={styles.actionBtn} onClick={handleDetect}>
+            <Detect /> {t('wizard.detect-duplicate-wallets')}
+          </button>
+        ) : null}
       </div>
 
       <WalletEditorDialog
@@ -183,6 +208,8 @@ const WalletSetting = ({
         onSuccess={onEditSuccess}
       />
 
+      {showDetectDialog ? <DetectDuplicateWalletDialog onClose={onDetectDialogClose} /> : null}
+
       <Toast content={notice} onDismiss={() => setNotice('')} />
     </div>
   )
diff --git a/packages/neuron-ui/src/components/WalletSetting/walletSetting.module.scss b/packages/neuron-ui/src/components/WalletSetting/walletSetting.module.scss
index 9ad7f189cc..9905525747 100644
--- a/packages/neuron-ui/src/components/WalletSetting/walletSetting.module.scss
+++ b/packages/neuron-ui/src/components/WalletSetting/walletSetting.module.scss
@@ -7,14 +7,19 @@
   padding: 0 0 5px 8px;
 }
 
-.addWrap {
+.actionWrap {
   position: relative;
-  display: inline-block;
+  display: flex;
+  gap: 24px;
   margin: 16px 0 0 14px;
 }
 
-.addBtn {
+.actionBtn {
   @include icon-hover-button();
+  svg {
+    width: 16px;
+    height: 16px;
+  }
 }
 
 .actions {
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
index 15f1c79c71..384492854a 100644
--- a/packages/neuron-ui/src/components/WalletWizard/index.tsx
+++ b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -18,6 +18,7 @@ import {
 } from 'utils'
 import i18n from 'utils/i18n'
 import MnemonicInput from 'widgets/MnemonicInput'
+import ReplaceDuplicateWalletDialog, { useReplaceDuplicateWallet } from 'components/ReplaceDuplicateWalletDialog'
 import Alert from 'widgets/Alert'
 import { Loading } from 'widgets/Icons/icon'
 import TextField from 'widgets/TextField'
@@ -49,6 +50,10 @@ const importWalletWithMnemonic = (params: Controller.ImportMnemonicParams) => (n
       importedWalletDialogShown.setStatus(res.result.id, true)
       navigate(RoutePath.Overview)
     } else if (res.status > 0) {
+      if (res.status === ErrorCode.DuplicateImportWallet) {
+        throw res
+      }
+
       showErrorMessage(i18n.t(`messages.error`), i18n.t(`messages.codes.${res.status}`))
     } else if (res.message) {
       const msg = typeof res.message === 'string' ? res.message : res.message.content || ''
@@ -315,6 +320,8 @@ const Submission = ({ state = initState, wallets = [], dispatch }: WizardElement
   const [t] = useTranslation()
   const message = 'wizard.set-wallet-name-and-password'
 
+  const { onImportingExitingWalletError, dialogProps } = useReplaceDuplicateWallet()
+
   const isNameUnused = useMemo(() => name && !wallets.find(w => w.name === name), [name, wallets])
   const isPwdComplex = useMemo(() => {
     try {
@@ -372,7 +379,13 @@ const Submission = ({ state = initState, wallets = [], dispatch }: WizardElement
         if (type === MnemonicAction.Create) {
           createWalletWithMnemonic(p)(navigate).finally(() => closeDialog())
         } else {
-          importWalletWithMnemonic(p)(navigate).finally(() => closeDialog())
+          importWalletWithMnemonic(p)(navigate)
+            .catch(error => {
+              onImportingExitingWalletError(error.message)
+            })
+            .finally(() => {
+              closeDialog()
+            })
         }
       }, 0)
     },
@@ -380,52 +393,55 @@ const Submission = ({ state = initState, wallets = [], dispatch }: WizardElement
   )
 
   return (
-    <form onSubmit={onNext} className={styles.submission}>
-      {type === MnemonicAction.Create && (
-        <div className={styles.steps}>
-          {[0, 1, 2].map(v => (
-            <div key={v.toString()} className={`${styles.step} ${styles.activity}`} />
-          ))}
+    <>
+      <form onSubmit={onNext} className={styles.submission}>
+        {type === MnemonicAction.Create && (
+          <div className={styles.steps}>
+            {[0, 1, 2].map(v => (
+              <div key={v.toString()} className={`${styles.step} ${styles.activity}`} />
+            ))}
+          </div>
+        )}
+        <div className={styles.title}>{t(message)}</div>
+        {submissionInputs.map((input, idx) => (
+          <div
+            key={input.key}
+            className={styles.input}
+            data-chars={input.type === 'password' ? `${state[input.key].length}/${MAX_PASSWORD_LENGTH}` : ''}
+          >
+            <TextField
+              data-field={input.key}
+              type={input.type as 'password' | 'text'}
+              value={state[input.key]}
+              onChange={onChange}
+              maxLength={input.maxLength}
+              placeholder={input.hint ? t(input.hint) : undefined}
+              tabIndex={idx}
+              required
+            />
+          </div>
+        ))}
+        <div className={styles.inputNotice}>
+          <Alert status={getAlertStatus(!!state.name, !!isNameUnused)}>
+            <span>{t('wizard.new-name')}</span>
+          </Alert>
+          <Alert status={getAlertStatus(!!state.password, !!isPwdComplex)}>
+            <span>{t('wizard.complex-password')}</span>
+          </Alert>
+          <Alert status={getAlertStatus(!!state.confirmPassword, !!isPwdSame)}>
+            <span>{t('wizard.same-password')}</span>
+          </Alert>
         </div>
-      )}
-      <div className={styles.title}>{t(message)}</div>
-      {submissionInputs.map((input, idx) => (
-        <div
-          key={input.key}
-          className={styles.input}
-          data-chars={input.type === 'password' ? `${state[input.key].length}/${MAX_PASSWORD_LENGTH}` : ''}
-        >
-          <TextField
-            data-field={input.key}
-            type={input.type as 'password' | 'text'}
-            value={state[input.key]}
-            onChange={onChange}
-            maxLength={input.maxLength}
-            placeholder={input.hint ? t(input.hint) : undefined}
-            tabIndex={idx}
-            required
-          />
+        <div className={`${styles.actions} ${styles.createWallet}`}>
+          <Button type="submit" label={t('wizard.finish-create')} disabled={disableNext}>
+            {t('wizard.finish-create') as string}
+          </Button>
+          <Button type="text" onClick={() => navigate(-1)} label={t('wizard.back')} />
         </div>
-      ))}
-      <div className={styles.inputNotice}>
-        <Alert status={getAlertStatus(!!state.name, !!isNameUnused)}>
-          <span>{t('wizard.new-name')}</span>
-        </Alert>
-        <Alert status={getAlertStatus(!!state.password, !!isPwdComplex)}>
-          <span>{t('wizard.complex-password')}</span>
-        </Alert>
-        <Alert status={getAlertStatus(!!state.confirmPassword, !!isPwdSame)}>
-          <span>{t('wizard.same-password')}</span>
-        </Alert>
-      </div>
-      <div className={`${styles.actions} ${styles.createWallet}`}>
-        <Button type="submit" label={t('wizard.finish-create')} disabled={disableNext}>
-          {t('wizard.finish-create') as string}
-        </Button>
-        <Button type="text" onClick={() => navigate(-1)} label={t('wizard.back')} />
-      </div>
-      <FinishCreateLoading dialogRef={dialogRef} />
-    </form>
+        <FinishCreateLoading dialogRef={dialogRef} />
+      </form>
+      <ReplaceDuplicateWalletDialog {...dialogProps} />
+    </>
   )
 }
 
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index cb3558039d..2ce6ffc762 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -191,7 +191,8 @@
       "repeat-password": "Repeat Password",
       "finish-create": "Finish Creating",
       "creating-wallet": "Wallet is being preparing, please wait",
-      "add-one": "Add One More"
+      "add-one": "Add One More",
+      "detect-duplicate-wallets": "Detect Duplicate Wallets"
     },
     "import-keystore": {
       "title": "Import Keystore File",
@@ -392,6 +393,15 @@
         "password": "Password",
         "wallet-detail": {
           "balance": "Balance"
+        },
+        "importing-existing": {
+          "title": "Importing an existing wallet",
+          "detail": "You imported a wallet that already exists, choose to replace the existing wallet or cancel the import.",
+          "replace": "Replace"
+        },
+        "detected-duplicate": {
+          "title": "Detected duplicate wallets",
+          "detail": "You have duplicate wallets in your account and it is recommended that you choose to keep the wallet that needs to be unique to make it less difficult to manage."
         }
       },
       "network": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index fbd4630cba..58e78a4864 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -185,7 +185,8 @@
       "repeat-password": "重復密碼",
       "finish-create": "完成創建",
       "creating-wallet": "錢包準備中，請稍後",
-      "add-one": "添加錢包"
+      "add-one": "添加錢包",
+      "detect-duplicate-wallets": "檢測重複錢包"
     },
     "import-keystore": {
       "title": "導入 Keystore 文件",
@@ -387,6 +388,15 @@
         "password": "密碼",
         "wallet-detail": {
           "balance": "餘額"
+        },
+        "importing-existing": {
+          "title": "導入已存在錢包",
+          "detail": "您導入了一個已經存在的錢包，請選擇替換現有錢包或取消導入。",
+          "replace": "替換"
+        },
+        "detected-duplicate": {
+          "title": "檢測到重複的錢包",
+          "detail": "您的帳戶中有重複的錢包，建議您選擇保留需要獨一無二的錢包，以便於更輕鬆地管理。"
         }
       },
       "network": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 3144a97ca0..794abc32b8 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -184,7 +184,8 @@
       "repeat-password": "重复密码",
       "finish-create": "完成创建",
       "creating-wallet": "钱包准备中，请稍后",
-      "add-one": "添加钱包"
+      "add-one": "添加钱包",
+      "detect-duplicate-wallets": "检测重复钱包"
     },
     "import-keystore": {
       "title": "导入 Keystore 文件",
@@ -385,6 +386,15 @@
         "password": "密码",
         "wallet-detail": {
           "balance": "余额"
+        },
+        "importing-existing": {
+          "title": "导入已存在钱包",
+          "detail": "您导入了一个已经存在的钱包，请选择替换现有钱包或取消导入。",
+          "replace": "替换"
+        },
+        "detected-duplicate": {
+          "title": "检测到重复的钱包",
+          "detail": "您的账户中有重复的钱包，建议您选择保留需要独一无二的钱包，以便于更轻松地管理。"
         }
       },
       "network": {
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index be0709d0db..9b12b9dccb 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -59,6 +59,7 @@ type Action =
   | 'create-wallet'
   | 'update-wallet'
   | 'delete-wallet'
+  | 'replace-wallet'
   | 'backup-wallet'
   | 'update-wallet-start-block-number'
   | 'get-all-addresses'
diff --git a/packages/neuron-ui/src/services/remote/wallets.ts b/packages/neuron-ui/src/services/remote/wallets.ts
index 9c1e496c66..33c26d1f82 100644
--- a/packages/neuron-ui/src/services/remote/wallets.ts
+++ b/packages/neuron-ui/src/services/remote/wallets.ts
@@ -8,6 +8,7 @@ export const importKeystore = remoteApi<Controller.ImportKeystoreParams>('import
 export const createWallet = remoteApi<Controller.CreateWalletParams>('create-wallet')
 export const updateWallet = remoteApi<Controller.UpdateWalletParams>('update-wallet')
 export const deleteWallet = remoteApi<Controller.DeleteWalletParams>('delete-wallet')
+export const replaceWallet = remoteApi<Controller.ReplaceWalletParams>('replace-wallet')
 export const backupWallet = remoteApi<Controller.DeleteWalletParams>('backup-wallet')
 export const updateWalletStartBlockNumber = remoteApi<Controller.UpdateWalletStartBlockNumberParams>(
   'update-wallet-start-block-number'
diff --git a/packages/neuron-ui/src/states/init/wallet.ts b/packages/neuron-ui/src/states/init/wallet.ts
index 0de42e6d8e..617f6276c7 100644
--- a/packages/neuron-ui/src/states/init/wallet.ts
+++ b/packages/neuron-ui/src/states/init/wallet.ts
@@ -5,6 +5,7 @@ export const emptyWallet: State.Wallet = {
   id: '',
   balance: '0',
   addresses: [],
+  extendedKey: '',
 }
 
 const wallet = currentWallet.load()
@@ -17,6 +18,7 @@ export const walletState: State.Wallet = {
   device: wallet?.device,
   isHD: wallet?.isHD,
   isWatchOnly: wallet?.isWatchOnly,
+  extendedKey: '',
 }
 
 export default walletState
diff --git a/packages/neuron-ui/src/stories/Navbar.stories.tsx b/packages/neuron-ui/src/stories/Navbar.stories.tsx
index f4d5b24c27..0e75b2d797 100644
--- a/packages/neuron-ui/src/stories/Navbar.stories.tsx
+++ b/packages/neuron-ui/src/stories/Navbar.stories.tsx
@@ -3,7 +3,7 @@ import Navbar from 'containers/Navbar'
 import { withRouter } from 'storybook-addon-react-router-v6'
 import { initStates } from 'states'
 
-const wallets: State.WalletIdentity[] = [{ id: 'wallet id', name: 'wallet name' }]
+const wallets: State.WalletIdentity[] = [{ id: 'wallet id', name: 'wallet name', extendedKey: '' }]
 
 const meta: Meta<typeof Navbar> = {
   component: Navbar,
diff --git a/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx b/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
index 0b28b821f6..1bf2f6f8ed 100644
--- a/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
+++ b/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
@@ -22,7 +22,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
@@ -36,7 +36,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
@@ -50,7 +50,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
@@ -64,7 +64,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
@@ -78,7 +78,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
@@ -92,7 +92,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
     ...initStates,
     settings: {
       ...initStates.settings,
-      wallets: [{ id: '1', name: 'test wallet' }],
+      wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
     },
     app: {
       ...initStates.app,
diff --git a/packages/neuron-ui/src/stories/WalletSetting.stories.tsx b/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
index 219204eb88..208a16bc7c 100644
--- a/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
+++ b/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
@@ -9,10 +9,12 @@ const states: { [title: string]: State.WalletIdentity[] } = {
     {
       id: '1',
       name: 'Wallet 1',
+      extendedKey: '',
     },
     {
       id: '2',
       name: 'Wallet 2',
+      extendedKey: '',
     },
   ],
 }
diff --git a/packages/neuron-ui/src/styles/mixin.scss b/packages/neuron-ui/src/styles/mixin.scss
index 1d8ea27ba7..9dfa2f6de3 100644
--- a/packages/neuron-ui/src/styles/mixin.scss
+++ b/packages/neuron-ui/src/styles/mixin.scss
@@ -161,6 +161,7 @@
   color: $normalColor !important;
   font-weight: 500;
   font-size: 14px;
+  line-height: 20px;
   cursor: pointer;
   display: flex;
   align-items: center;
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 2c01956c4b..a7187731a4 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -207,6 +207,7 @@ declare namespace State {
     isHD?: boolean
     isWatchOnly?: boolean
     startBlockNumber?: string
+    extendedKey: string
   }
 
   interface DeviceInfo {
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index a0a743e90f..5be3667b02 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -52,6 +52,11 @@ declare namespace Controller {
     password: string
   }
 
+  interface ReplaceWalletParams {
+    existingWalletId: string
+    importedWalletId: string
+  }
+
   interface BackupWalletParams {
     id: string
     password: string
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index d7b457a6da..647f421446 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -109,6 +109,7 @@ export enum ErrorCode {
   DeviceInSleep = 501,
   // active warning
   WaitForFullySynced = 600,
+  DuplicateImportWallet = 118,
 }
 
 export enum SyncStatus {
diff --git a/packages/neuron-ui/src/widgets/Icons/Detect.svg b/packages/neuron-ui/src/widgets/Icons/Detect.svg
new file mode 100644
index 0000000000..30a972e89e
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Detect.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_28437_26292)">
+<path d="M15.3343 7.66714C15.3343 3.43353 11.9007 0 7.66714 0C3.43353 0 0 3.43355 0 7.66714C0 11.9007 3.43355 15.3343 7.66714 15.3343C9.30058 15.3343 10.8007 14.8342 12.0341 13.9675L13.6009 15.5343C13.8586 15.792 14.2765 15.792 14.5342 15.5343C14.792 15.2765 14.792 14.8587 14.5342 14.6009L13.0675 13.1341C14.4676 11.7007 15.3343 9.80061 15.3343 7.66714ZM1.3334 7.66714C1.3334 4.16692 4.16692 1.3334 7.66714 1.3334C11.1674 1.3334 14.0009 4.16692 14.0009 7.66714C14.0009 11.1674 11.1674 14.0009 7.66714 14.0009C4.16692 14.0009 1.3334 11.134 1.3334 7.66714ZM10.2006 3.80032C10.1006 3.53364 9.86727 3.36696 9.60059 3.36696C9.3339 3.36696 9.06722 3.5003 8.96721 3.76699L7.53379 8.33385L6.6004 4.96705C6.50039 4.7337 6.23371 4.56703 5.96702 4.56703C5.70034 4.56703 5.46699 4.7337 5.36698 5.00039L4.50026 8.50052H3.33352V9.83394H4.93362C5.20031 9.83394 5.46699 9.66726 5.567 9.40058L6.03369 7.4701L6.93375 10.8668C7.03375 11.1001 7.2671 11.2668 7.53379 11.2668C7.80047 11.2668 8.03382 11.1001 8.13382 10.8668L9.53391 6.30336L9.9006 8.06716C10.0006 8.33384 10.234 8.50052 10.534 8.50052H12.0007V7.1671H11.0007L10.2006 3.80032Z" fill="#8DA394"/>
+</g>
+<defs>
+<clipPath id="clip0_28437_26292">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index e58d9aa183..ecdd2b8c2e 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -52,6 +52,10 @@ 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 { ReactComponent as DetectSvg } from './Detect.svg'
+import { ReactComponent as DeleteSvg } from './Delete.svg'
+import { ReactComponent as ImportKeystoreSvg } from './SoftWalletImportKeystore.svg'
+import { ReactComponent as ImportHardwareSvg } from './HardWalletImport.svg'
 
 import styles from './icon.module.scss'
 
@@ -120,3 +124,7 @@ export const Lock = WrapSvg(LockSvg, styles.withTheme)
 export const LockCell = WrapSvg(LockCellSvg)
 export const UnLock = WrapSvg(UnLockSvg)
 export const Consume = WrapSvg(ConsumeSvg)
+export const Detect = WrapSvg(DetectSvg)
+export const Delete = WrapSvg(DeleteSvg)
+export const ImportKeystore = WrapSvg(ImportKeystoreSvg)
+export const ImportHardware = WrapSvg(ImportHardwareSvg)
diff --git a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
index 0355b90693..0268abc203 100644
--- a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
+++ b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
@@ -12,8 +12,8 @@ export interface RadioGroupOptions {
 export interface RadioGroupProps {
   options: RadioGroupOptions[]
   onChange?: (arg: string) => void
-  defaultValue?: string | number
-  value?: string | number
+  defaultValue?: string
+  value?: string
   itemClassName?: string
   className?: string
   inputIdPrefix?: string
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index a766ecbbc3..5545842aab 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -376,6 +376,10 @@ export default class ApiController {
       return this.#walletsController.delete({ id, password })
     })
 
+    handle('replace-wallet', async (_, { existingWalletId = '', importedWalletId = '' }) => {
+      return this.#walletsController.replaceWallet(existingWalletId, importedWalletId)
+    })
+
     handle('backup-wallet', async (_, { id = '', password = '' }) => {
       return this.#walletsController.backup({ id, password })
     })
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index 2865217439..61b972a0b4 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -42,7 +42,7 @@ export default class WalletsController {
     }
     return {
       status: ResponseCode.Success,
-      result: wallets.map(({ name, id, device }) => ({ name, id, device })),
+      result: wallets.map(({ name, id, device, extendedKey }) => ({ name, id, device, extendedKey })),
     }
   }
 
@@ -632,6 +632,15 @@ export default class WalletsController {
     }
   }
 
+  public async replaceWallet(existingWalletId: string, importedWalletId: string): Promise<Controller.Response<any>> {
+    const walletsService = WalletsService.getInstance()
+    await walletsService.replace(existingWalletId, importedWalletId)
+
+    return {
+      status: ResponseCode.Success,
+    }
+  }
+
   // Important: Check password before calling this, unless it's backing up a watch only wallet.
   private async backupWallet(id: string): Promise<Controller.Response<boolean>> {
     const walletsService = WalletsService.getInstance()
diff --git a/packages/neuron-wallet/src/exceptions/wallet.ts b/packages/neuron-wallet/src/exceptions/wallet.ts
index fc69196c86..25962d77a3 100644
--- a/packages/neuron-wallet/src/exceptions/wallet.ts
+++ b/packages/neuron-wallet/src/exceptions/wallet.ts
@@ -78,6 +78,13 @@ export class WalletFunctionNotSupported extends Error {
   }
 }
 
+export class DuplicateImportWallet extends Error {
+  public code = 118
+  constructor(errorStr: string) {
+    super(errorStr)
+  }
+}
+
 export default {
   WalletNotFound,
   CurrentWalletNotSet,
@@ -88,4 +95,5 @@ export default {
   LiveCapacityNotEnough,
   CapacityNotEnoughForChange,
   InvalidKeystore,
+  DuplicateImportWallet,
 }
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index 021bc3202c..6d7306c8d4 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid'
-import { WalletNotFound, IsRequired, UsedName, WalletFunctionNotSupported } from '../exceptions'
+import { WalletNotFound, IsRequired, UsedName, WalletFunctionNotSupported, DuplicateImportWallet } from '../exceptions'
 import Store from '../models/store'
 import Keystore from '../models/keys/keystore'
 import WalletDeletedSubject from '../models/subjects/wallet-deleted-subject'
@@ -278,6 +278,7 @@ export default class WalletService {
   private listStore: Store // Save wallets (meta info except keystore, which is persisted separately)
   private walletsKey = 'wallets'
   private currentWalletKey = 'current'
+  private importedWallet: Wallet | undefined
 
   public static getInstance = () => {
     if (!WalletService.instance) {
@@ -375,18 +376,55 @@ export default class WalletService {
       throw new UsedName('Wallet')
     }
 
-    const wallet = this.fromJSON({ ...props, id: uuid() })
+    const id = uuid()
+
+    const wallet = this.fromJSON({ ...props, id })
 
     if (!wallet.isHardware()) {
       wallet.saveKeystore(props.keystore!)
     }
 
+    if (this.getAll().find(item => item.extendedKey === props.extendedKey)) {
+      this.importedWallet = wallet
+      throw new DuplicateImportWallet(JSON.stringify({ extendedKey: props.extendedKey, id }))
+    }
+
     this.listStore.writeSync(this.walletsKey, [...this.getAll(), wallet.toJSON()])
 
     this.setCurrent(wallet.id)
     return wallet
   }
 
+  public replace = async (existingWalletId: string, importedWalletId: string) => {
+    const wallet = this.get(existingWalletId)
+    if (!wallet || !this.importedWallet) {
+      throw new WalletNotFound(existingWalletId)
+    }
+
+    const newWallet = this.importedWallet?.toJSON()
+    if (importedWalletId !== newWallet.id) {
+      throw new WalletNotFound(importedWalletId)
+    }
+    if (wallet.toJSON().extendedKey !== newWallet.extendedKey) {
+      throw new Error('The wallets are not the same and cannot be replaced.')
+    }
+
+    const wallets = this.getAll()
+
+    this.listStore.writeSync(this.walletsKey, [...wallets, newWallet])
+
+    this.setCurrent(newWallet.id)
+
+    await AddressService.deleteByWalletId(existingWalletId)
+
+    const newWallets = wallets.filter(w => w.id !== existingWalletId)
+    this.listStore.writeSync(this.walletsKey, [...newWallets, newWallet])
+
+    if (!wallet.isHardware()) {
+      wallet.deleteKeystore()
+    }
+  }
+
   public update = (id: string, props: Omit<WalletProperties, 'id' | 'extendedKey'>) => {
     const wallets = this.getAll()
     const index = wallets.findIndex((w: WalletProperties) => w.id === id)
diff --git a/packages/neuron-wallet/tests/services/wallets.test.ts b/packages/neuron-wallet/tests/services/wallets.test.ts
index e43a8f7c56..f696f2c270 100644
--- a/packages/neuron-wallet/tests/services/wallets.test.ts
+++ b/packages/neuron-wallet/tests/services/wallets.test.ts
@@ -1,6 +1,6 @@
 import Keystore from '../../src/models/keys/keystore'
 import { when } from 'jest-when'
-import { WalletFunctionNotSupported } from '../../src/exceptions/wallet'
+import { WalletFunctionNotSupported, DuplicateImportWallet } from '../../src/exceptions/wallet'
 import { AddressType } from '../../src/models/keys/address'
 import { Manufacturer } from '../../src/services/hardware/common'
 
@@ -53,6 +53,7 @@ describe('wallet service', () => {
   let wallet2: WalletProperties
   let wallet3: WalletProperties
   let wallet4: WalletProperties
+  let wallet5: WalletProperties
   const fakePublicKey = 'keykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykeykey'
   const fakeChainCode = 'codecodecodecodecodecodecodecodecodecodecodecodecodecodecodecode'
 
@@ -121,7 +122,7 @@ describe('wallet service', () => {
     wallet3 = {
       name: 'wallet-test3',
       id: '',
-      extendedKey: 'a',
+      extendedKey: 'b',
       keystore: new Keystore(
         {
           cipher: 'wallet3',
@@ -155,6 +156,29 @@ describe('wallet service', () => {
         addressType: AddressType.Receiving,
       },
     }
+
+    wallet5 = {
+      name: 'wallet-test5',
+      id: '',
+      extendedKey: 'a',
+      keystore: new Keystore(
+        {
+          cipher: 'wallet5',
+          cipherparams: { iv: 'wallet1' },
+          ciphertext: 'wallet5',
+          kdf: '5',
+          kdfparams: {
+            dklen: 1,
+            n: 1,
+            r: 1,
+            p: 1,
+            salt: '1',
+          },
+          mac: '5',
+        },
+        '5'
+      ),
+    }
   })
 
   afterEach(() => {
@@ -424,7 +448,7 @@ describe('wallet service', () => {
       })
       expect(stubbedGenerateAndSaveForExtendedKeyQueue).toHaveBeenCalledWith({
         walletId: createdWallet3.id,
-        extendedKey: expect.objectContaining({ publicKey: 'a' }),
+        extendedKey: expect.objectContaining({ publicKey: 'b' }),
         isImporting: false,
         receivingAddressCount: 20,
         changeAddressCount: 10,
@@ -483,4 +507,31 @@ describe('wallet service', () => {
       expect(checkAndGenerateAddressesMock).toHaveBeenCalledTimes(1)
     })
   })
+
+  describe('DuplicateImportWallet', () => {
+    beforeEach(() => {
+      walletService.create(wallet2)
+    })
+    it('create an exiting wallet', () => {
+      expect(() => walletService.create(wallet5)).toThrowError(DuplicateImportWallet)
+    })
+  })
+
+  describe('ReplaceWallet', () => {
+    let createdWallet2: any
+    beforeEach(() => {
+      createdWallet2 = walletService.create(wallet2)
+    })
+    it('replace an exiting wallet', async () => {
+      try {
+        walletService.create(wallet5)
+      } catch (error) {
+        const { extendedKey, id } = JSON.parse(error.message)
+        await walletService.replace(createdWallet2.id, id)
+        expect(extendedKey).toBe('a')
+        expect(() => walletService.get(createdWallet2.id)).toThrowError()
+        expect(walletService.get(id).name).toBe(wallet5.name)
+      }
+    })
+  })
 })

From 1472c2f454dd37dc2dd88f4d8a3a1a9b463c3752 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:38:40 +0800
Subject: [PATCH 39/68] Update ckb client versions (#3032)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ckb-version b/.ckb-version
index 64a30f7e97..cff1fcdc66 100644
--- a/.ckb-version
+++ b/.ckb-version
@@ -1 +1 @@
-v0.113.0
+v0.113.1

From 2a63bc037f292f489b9fb2d71b589a8aee6a9472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 1 Feb 2024 10:41:02 +0000
Subject: [PATCH 40/68] fix: Set the bottom height max because bottom add an
 element (#3030)

fix: Set the bottom height max because bottom add an element/

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../src/components/Send/send.module.scss      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/neuron-ui/src/components/Send/send.module.scss b/packages/neuron-ui/src/components/Send/send.module.scss
index 32f5f430b5..cd0952d1e1 100644
--- a/packages/neuron-ui/src/components/Send/send.module.scss
+++ b/packages/neuron-ui/src/components/Send/send.module.scss
@@ -1,18 +1,7 @@
 @import '../../styles/mixin.scss';
-$bottomHeight: 84px;
-$headerHeight: 104px;
-
-.content {
-  overflow-y: scroll;
-  margin-bottom: 60px;
-  height: calc(100vh - $headerHeight - $bottomHeight);
-}
-
-.withFullySynced {
-  .content {
-    height: calc(100vh - $headerHeight - $bottomHeight - 60px);
-  }
-}
+$bottomHeight: 24px;
+$headerHeight: 72px;
+$noticeHeight: 60px;
 
 .layout {
   display: flex;
@@ -51,15 +40,23 @@ $headerHeight: 104px;
     }
   }
 
+  &.withFullySynced {
+    .right {
+      height: calc(100vh - $headerHeight - $bottomHeight - $noticeHeight);
+    }
+  }
+
   .right {
     margin-left: 16px;
     flex: 1;
     position: relative;
     border-radius: 16px;
     background: var(--secondary-background-color);
-    min-height: 436px;
+    height: calc(100vh - $headerHeight - $bottomHeight);
+    $actionHeight: 108px;
 
     .content {
+      $contentPadding: 16px;
       padding: 16px;
       /**
         These styles are for showing the full tips, because of content needs to scroll on the y-axis.
@@ -70,6 +67,8 @@ $headerHeight: 104px;
       left: -48px;
       padding-left: 64px;
       width: calc(100% - 32px);
+      overflow-y: scroll;
+      height: calc(100% - $actionHeight - 2 * $contentPadding);
     }
 
     .rightFooter {

From ace289b1a9ea521a3c4347b697f1c309c3420da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Sun, 4 Feb 2024 04:20:36 +0000
Subject: [PATCH 41/68] feat: Show tip for first sync and show dialog when disk
 is not enough (#3005)

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 ...valid_target.yml => update_wallet_env.yml} |  10 +-
 package.json                                  |   2 +-
 .../DataSetting/dataSetting.module.scss       |  68 -----------
 .../src/components/DataSetting/hooks.ts       |  47 ++------
 .../src/components/DataSetting/index.tsx      |  70 ++----------
 .../src/components/Overview/index.tsx         |  48 +++++++-
 .../components/Overview/overview.module.scss  |   5 +
 .../neuron-ui/src/containers/Main/hooks.ts    |  62 +++++++++-
 .../neuron-ui/src/containers/Main/index.tsx   |  39 ++++++-
 .../src/containers/Main/main.module.scss      |   5 +
 packages/neuron-ui/src/locales/en.json        |  12 +-
 packages/neuron-ui/src/locales/es.json        |  12 +-
 packages/neuron-ui/src/locales/fr.json        |  12 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  12 +-
 packages/neuron-ui/src/locales/zh.json        |  12 +-
 packages/neuron-ui/src/services/remote/app.ts |   6 +-
 .../src/services/remote/remoteApiWrapper.ts   |   2 +
 packages/neuron-ui/src/services/subjects.ts   |   4 +-
 .../DataPathDialog/dataPathDialog.module.scss |  62 ++++++++++
 .../src/widgets/DataPathDialog/index.tsx      |  73 ++++++++++++
 .../neuron-ui/src/widgets/Icons/FirstSync.png | Bin 0 -> 18917 bytes
 .../src/widgets/Icons/NoDiskSpaceWarn.png     | Bin 0 -> 17075 bytes
 .../widgets/MigrateCkbDataDialog/index.tsx    | 106 ++++++++++++++++++
 .../migrateCkbDataDialog.module.scss          |  69 ++++++++++++
 packages/neuron-wallet/.env                   |   3 +-
 packages/neuron-wallet/src/controllers/api.ts |  55 +++++++--
 .../src/controllers/app/subscribe.ts          |   6 +
 .../src/models/subjects/no-disk-space.ts      |   5 +
 .../neuron-wallet/src/services/ckb-runner.ts  |  13 ++-
 packages/neuron-wallet/src/services/node.ts   |   5 +
 .../neuron-wallet/src/services/settings.ts    |  13 +++
 .../tests/services/ckb-runner.test.ts         |   4 +-
 .../neuron-wallet/tests/services/node.test.ts |  33 ++++++
 .../tests/services/setting.test.ts            |   3 +
 scripts/update-valid-target.js                |  40 -------
 scripts/update-wallet-env.js                  |  56 +++++++++
 36 files changed, 726 insertions(+), 248 deletions(-)
 rename .github/workflows/{update_valid_target.yml => update_wallet_env.yml} (89%)
 create mode 100644 packages/neuron-ui/src/widgets/DataPathDialog/dataPathDialog.module.scss
 create mode 100644 packages/neuron-ui/src/widgets/DataPathDialog/index.tsx
 create mode 100644 packages/neuron-ui/src/widgets/Icons/FirstSync.png
 create mode 100644 packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png
 create mode 100644 packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
 create mode 100644 packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss
 create mode 100644 packages/neuron-wallet/src/models/subjects/no-disk-space.ts
 delete mode 100644 scripts/update-valid-target.js
 create mode 100644 scripts/update-wallet-env.js

diff --git a/.github/workflows/update_valid_target.yml b/.github/workflows/update_wallet_env.yml
similarity index 89%
rename from .github/workflows/update_valid_target.yml
rename to .github/workflows/update_wallet_env.yml
index c5c40702b8..bda340a1ba 100644
--- a/.github/workflows/update_valid_target.yml
+++ b/.github/workflows/update_wallet_env.yml
@@ -14,13 +14,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: 'chore-update-valid-target/${{github.ref_name}}'
+          branch: 'chore-update-wallet-env/${{github.ref_name}}'
           sha: '${{ github.event.create.head.sha }}'
 
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: 'chore-update-valid-target/${{github.ref_name}}'
+          ref: 'chore-update-wallet-env/${{github.ref_name}}'
       
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -29,7 +29,7 @@ jobs:
 
       - name: Write env file
         run: |
-          npm run update:valid-target
+          npm run update:wallet-env
 
       - name: Commit env file
         uses: actions/github-script@v7
@@ -41,7 +41,7 @@ jobs:
             const fs = require('node:fs')
             const { BASE, HEAD } = process.env
             const envFilePath = 'packages/neuron-wallet/.env'
-            const destinationBranch = `chore-update-valid-target/${BASE}`
+            const destinationBranch = `chore-update-wallet-env/${BASE}`
             const { data } = await github.rest.repos.getContent({
               owner: context.repo.owner,
               repo: context.repo.repo,
@@ -63,7 +63,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BASE: ${{github.ref}}
-          HEAD: chore-update-valid-target/${{github.ref_name}}
+          HEAD: chore-update-wallet-env/${{github.ref_name}}
           REPO: ${{github.repository}}
         with:
           script: |
diff --git a/package.json b/package.json
index d52255be37..1318cbb1a7 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "lint": "lerna run --stream lint",
     "postinstall": "husky install",
     "db:chain": "node ./node_modules/.bin/typeorm",
-    "update:valid-target": "node ./scripts/update-valid-target.js",
+    "update:wallet-env": "node ./scripts/update-wallet-env.js",
     "update:neuron-compatible": "node ./scripts/add-neuron-version-in-compatibility-table.js",
     "update:client-versions": "node ./scripts/update-ckb-client-versions.js"
   },
diff --git a/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss b/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss
index 6bdb9c8095..e260687f30 100644
--- a/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss
+++ b/packages/neuron-ui/src/components/DataSetting/dataSetting.module.scss
@@ -160,71 +160,3 @@
   word-break: normal;
   white-space: normal;
 }
-
-.dialogContainer {
-  max-width: 700px;
-  color: var(--main-text-color);
-  font-size: 14px;
-  line-height: 24px;
-
-  .attention {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 8px;
-    width: 80%;
-    margin: 32px auto 0;
-    background: var(--warn-background-color);
-    border: 1px solid rgba(252, 136, 0, 0.2);
-    border-radius: 4px;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 24px;
-    color: var(--warn-text-color);
-
-    @media (prefers-color-scheme: dark) {
-      border: none;
-    }
-
-    svg {
-      margin-right: 4px;
-      width: 14px;
-    }
-  }
-}
-
-.footer {
-  padding: 24px 0;
-  @include dialog-footer;
-  --footer-background-color: #ecf9f0;
-  @media (prefers-color-scheme: dark) {
-    --footer-background-color: #2d3534;
-  }
-
-  .footerBtn {
-    padding: 0 20px;
-    background: var(--footer-background-color);
-    color: var(--primary-color);
-    &:not([disabled]) {
-      &:hover,
-      &:focus {
-        background-color: var(--footer-background-color);
-        color: color-mix(in srgb, #000000 20%, var(--primary-color));
-      }
-
-      &:active {
-        background-color: var(--footer-background-color);
-        color: color-mix(in srgb, #000000 20%, var(--primary-color));
-      }
-    }
-    &:last-of-type {
-      margin-left: 24px;
-    }
-    svg {
-      g,
-      path {
-        fill: var(--primary-color);
-      }
-    }
-  }
-}
diff --git a/packages/neuron-ui/src/components/DataSetting/hooks.ts b/packages/neuron-ui/src/components/DataSetting/hooks.ts
index 586ea9858f..e945e4823d 100644
--- a/packages/neuron-ui/src/components/DataSetting/hooks.ts
+++ b/packages/neuron-ui/src/components/DataSetting/hooks.ts
@@ -1,24 +1,15 @@
-import React, { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  getCkbNodeDataPath,
-  invokeShowOpenDialog,
-  startProcessMonitor,
-  stopProcessMonitor,
-  setCkbNodeDataPath,
-} from 'services/remote'
+import { getCkbNodeDataPath, invokeShowOpenDialog, startProcessMonitor, stopProcessMonitor } from 'services/remote'
 import { isSuccessResponse } from 'utils'
 
 const type = 'ckb'
 
 export const useDataPath = (network?: State.Network) => {
   const [t] = useTranslation()
-  const [isSaving, setIsSaving] = useState(false)
-  const [savingType, setSavingType] = useState<string | null>()
-  const [prevPath, setPrevPath] = useState<string>()
-  const [currentPath, setCurrentPath] = useState<string | undefined>()
+  const [prevPath, setPrevPath] = useState('')
+  const [currentPath, setCurrentPath] = useState('')
   const [isDialogOpen, setIsDialogOpen] = useState(false)
-  const [faidMessage, setFaidMessage] = useState('')
 
   useEffect(() => {
     getCkbNodeDataPath().then(res => {
@@ -50,29 +41,11 @@ export const useDataPath = (network?: State.Network) => {
     })
   }, [setIsDialogOpen, type])
   const onConfirm = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
-      setFaidMessage('')
-      const { dataset } = e.currentTarget
-      setIsSaving(true)
-      setSavingType(dataset.syncType)
-      setCkbNodeDataPath({
-        dataPath: currentPath!,
-        clearCache: type === 'ckb' && dataset?.resync === 'true',
-      })
-        .then(res => {
-          if (isSuccessResponse(res)) {
-            setPrevPath(currentPath)
-            setIsDialogOpen(false)
-          } else {
-            setFaidMessage(typeof res.message === 'string' ? res.message : res.message.content!)
-          }
-        })
-        .finally(() => {
-          setIsSaving(false)
-          setSavingType(null)
-        })
+    (dataPath: string) => {
+      setPrevPath(dataPath)
+      setIsDialogOpen(false)
     },
-    [currentPath, setIsDialogOpen, setPrevPath]
+    [setIsDialogOpen, setPrevPath]
   )
   return {
     prevPath,
@@ -80,11 +53,7 @@ export const useDataPath = (network?: State.Network) => {
     onSetting,
     onCancel,
     onConfirm,
-    isSaving,
-    savingType,
     isDialogOpen,
-    faidMessage,
-    setFaidMessage,
   }
 }
 
diff --git a/packages/neuron-ui/src/components/DataSetting/index.tsx b/packages/neuron-ui/src/components/DataSetting/index.tsx
index 19448cccd6..6c284eff8c 100644
--- a/packages/neuron-ui/src/components/DataSetting/index.tsx
+++ b/packages/neuron-ui/src/components/DataSetting/index.tsx
@@ -1,14 +1,12 @@
-import React, { useCallback, useRef, useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Button from 'widgets/Button'
 import ClearCache from 'components/ClearCache'
 import { useDispatch, useState as useGlobalState } from 'states'
 import { shell } from 'electron'
 import Tooltip from 'widgets/Tooltip'
-import Dialog from 'widgets/Dialog'
-import AlertDialog from 'widgets/AlertDialog'
 import { NetworkType } from 'utils/const'
 import { Attention } from 'widgets/Icons/icon'
+import MigrateCkbDataDialog from 'widgets/MigrateCkbDataDialog'
 import { useDataPath } from './hooks'
 
 import styles from './dataSetting.module.scss'
@@ -40,24 +38,12 @@ const PathItem = ({
 const DataSetting = () => {
   const dispatch = useDispatch()
   const [t] = useTranslation()
-  const resyncRef = useRef<HTMLButtonElement | null>(null)
   const {
     chain: { networkID },
     settings: { networks = [] },
   } = useGlobalState()
   const network = useMemo(() => networks.find(n => n.id === networkID), [networkID, networks])
-  const {
-    onSetting,
-    prevPath,
-    currentPath,
-    isDialogOpen,
-    onCancel,
-    onConfirm,
-    isSaving,
-    savingType,
-    faidMessage,
-    setFaidMessage,
-  } = useDataPath(network)
+  const { onSetting, prevPath, currentPath, isDialogOpen, onCancel, onConfirm } = useDataPath(network)
 
   const openPath = useCallback(() => {
     if (prevPath) {
@@ -100,50 +86,12 @@ const DataSetting = () => {
           <ClearCache className={styles.item} btnClassName={styles.itemBtn} dispatch={dispatch} />
         </div>
       </div>
-
-      <Dialog show={isDialogOpen} title={t('settings.data.ckb-node-storage')} onCancel={onCancel} showFooter={false}>
-        <div className={styles.dialogContainer}>
-          <div>{t('settings.data.remove-ckb-data-tip', { prevPath, currentPath })}</div>
-          <div className={styles.attention}>
-            <Attention />
-            {t('settings.data.resync-ckb-node-describe')}
-          </div>
-
-          <div className={styles.footer}>
-            <Button
-              ref={resyncRef}
-              disabled={isSaving}
-              className={styles.footerBtn}
-              data-sync-type="resync"
-              data-resync="true"
-              label={t('settings.data.re-sync')}
-              type="primary"
-              onClick={onConfirm}
-              loading={isSaving && savingType === 'resync'}
-            />
-
-            <Button
-              disabled={isSaving}
-              className={styles.footerBtn}
-              data-sync-type="move"
-              label={t('settings.data.move-data-finish')}
-              type="primary"
-              onClick={onConfirm}
-              loading={isSaving && savingType === 'move'}
-            />
-          </div>
-        </div>
-      </Dialog>
-
-      <AlertDialog
-        show={!!faidMessage}
-        title={t('settings.data.ckb-node-data')}
-        message={faidMessage}
-        type="warning"
-        onCancel={() => setFaidMessage('')}
-        onOk={() => {
-          resyncRef?.current?.click()
-        }}
+      <MigrateCkbDataDialog
+        show={isDialogOpen}
+        prevPath={prevPath}
+        currentPath={currentPath}
+        onCancel={onCancel}
+        onConfirm={onConfirm}
       />
     </>
   )
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
index c637c9aae3..c9984eb15b 100644
--- a/packages/neuron-ui/src/components/Overview/index.tsx
+++ b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useEffect, useState } from 'react'
 import { Link, useNavigate } from 'react-router-dom'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import { useState as useGlobalState, useDispatch, updateTransactionList } from 'states'
 import {
   shannonToCKBFormatter,
@@ -34,6 +34,9 @@ import CopyZone from 'widgets/CopyZone'
 import { HIDE_BALANCE } from 'utils/const'
 import TransactionType from 'components/TransactionType'
 import { getLockedBalance } from 'services/remote/cellManage'
+import { getFirstSyncInfo, setCkbNodeDataPath, startSync } from 'services/remote'
+import FirstSync from 'widgets/Icons/FirstSync.png'
+import DataPathDialog from 'widgets/DataPathDialog'
 import styles from './overview.module.scss'
 
 const { PAGE_SIZE, CONFIRMATION_THRESHOLD } = CONSTANTS
@@ -128,6 +131,39 @@ const Overview = () => {
       }
     })
   }, [])
+  const [isFirstSyncDialogShow, setIsFirstSyncDialogShow] = useState(false)
+  const [ckbNodeDataInfo, setCkbNodeDataInfo] = useState<{ size?: number; dataPath?: string } | undefined>()
+  useEffect(() => {
+    getFirstSyncInfo().then(res => {
+      if (isSuccessResponse(res) && res.result) {
+        setIsFirstSyncDialogShow(res.result.isFirstSync)
+        setCkbNodeDataInfo({ size: res.result.needSize, dataPath: res.result.ckbNodeDataPath })
+      }
+    })
+  }, [])
+  const onChangeDataPath = useCallback((newDataPath: string) => {
+    setCkbNodeDataPath({
+      dataPath: newDataPath,
+      onlySetPath: true,
+    }).then(res => {
+      if (isSuccessResponse(res)) {
+        setCkbNodeDataInfo(v => ({
+          size: v?.size,
+          dataPath: newDataPath,
+        }))
+      }
+    })
+  }, [])
+  const onCancel = useCallback(() => {
+    setIsFirstSyncDialogShow(false)
+  }, [])
+  const onStartSync = useCallback(() => {
+    startSync().then(res => {
+      if (isSuccessResponse(res)) {
+        setIsFirstSyncDialogShow(false)
+      }
+    })
+  }, [])
   return (
     <PageContainer head={t('navbar.overview')} notice={pageNotice} isHomePage>
       <div className={styles.topContainer}>
@@ -264,6 +300,16 @@ const Overview = () => {
 
       {showReceive ? <Receive onClose={() => setShowReceive(false)} /> : null}
       {showAddressBook ? <AddressBook onClose={() => setShowAddressBook(false)} /> : null}
+      <DataPathDialog
+        show={isFirstSyncDialogShow}
+        confirmText={t('overview.start-sync')}
+        icon={<img className={styles.firstSyncIcon} src={FirstSync} alt="First Sync" />}
+        text={<Trans i18nKey="overview.first-sync-notice" values={{ size: ckbNodeDataInfo?.size }} />}
+        dataPath={ckbNodeDataInfo?.dataPath ?? ''}
+        onChangeDataPath={onChangeDataPath}
+        onCancel={onCancel}
+        onConfirm={onStartSync}
+      />
     </PageContainer>
   )
 }
diff --git a/packages/neuron-ui/src/components/Overview/overview.module.scss b/packages/neuron-ui/src/components/Overview/overview.module.scss
index 5633c78e32..4241522aa1 100644
--- a/packages/neuron-ui/src/components/Overview/overview.module.scss
+++ b/packages/neuron-ui/src/components/Overview/overview.module.scss
@@ -210,3 +210,8 @@
     }
   }
 }
+
+.firstSyncIcon {
+  width: 64px;
+  height: 64px;
+}
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
index e8c04e5a65..9938e20ff3 100644
--- a/packages/neuron-ui/src/containers/Main/hooks.ts
+++ b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -10,7 +10,14 @@ import {
   showGlobalAlertDialog,
 } from 'states/stateProvider/actionCreators'
 
-import { getCurrentWallet, getWinID, setCurrentNetwork, startNodeIgnoreExternal } from 'services/remote'
+import {
+  getCkbNodeDataPath,
+  getCurrentWallet,
+  getWinID,
+  setCurrentNetwork,
+  startNodeIgnoreExternal,
+  startSync,
+} from 'services/remote'
 import {
   DataUpdate as DataUpdateSubject,
   NetworkList as NetworkListSubject,
@@ -19,6 +26,7 @@ import {
   SyncState as SyncStateSubject,
   Command as CommandSubject,
   ShowGlobalDialog as ShowGlobalDialogSubject,
+  NoDiskSpace,
 } from 'services/subjects'
 import { ckbCore, getTipHeader } from 'services/chain'
 import {
@@ -327,6 +335,58 @@ export const useSubscription = ({
   ])
 }
 
+export const useNoDiskSpace = (navigate: NavigateFunction) => {
+  const [isNoDiskSpaceDialogShow, setIsNoDiskSpaceDialogShow] = useState(false)
+  const [isMigrateDataDialogShow, setIsMigrateDataDialogShow] = useState(false)
+  const [oldCkbDataPath, setOldCkbDataPath] = useState('')
+  const [newCkbDataPath, setNewCkbDataPath] = useState('')
+  useEffect(() => {
+    const noDiskSpaceSubject = NoDiskSpace.subscribe(params => {
+      navigate(RoutePath.Overview)
+      setIsNoDiskSpaceDialogShow(params)
+      getCkbNodeDataPath().then(res => {
+        if (isSuccessResponse(res)) {
+          setOldCkbDataPath(res.result!)
+        }
+      })
+    })
+    return () => {
+      noDiskSpaceSubject.unsubscribe()
+    }
+  }, [navigate])
+  const onConfirm = useCallback(() => {
+    startSync().then(res => {
+      if (isSuccessResponse(res)) {
+        setIsNoDiskSpaceDialogShow(false)
+      }
+    })
+  }, [])
+  const onMigrate = useCallback(() => {
+    setIsMigrateDataDialogShow(true)
+  }, [])
+  const onConfirmMigrate = useCallback((dataPath: string) => {
+    setIsMigrateDataDialogShow(false)
+    setIsNoDiskSpaceDialogShow(false)
+    setOldCkbDataPath(dataPath)
+  }, [])
+  return {
+    isNoDiskSpaceDialogShow,
+    setNewCkbDataPath,
+    oldCkbDataPath,
+    newCkbDataPath,
+    onCancel: useCallback(() => {
+      setIsNoDiskSpaceDialogShow(false)
+    }, []),
+    onConfirm,
+    isMigrateDataDialogShow,
+    onMigrate,
+    onCloseMigrateDialog: useCallback(() => {
+      setIsMigrateDataDialogShow(false)
+    }, []),
+    onConfirmMigrate,
+  }
+}
+
 export const useCheckNode = (networks: State.Network[], networkID: string) => {
   const [isSwitchNetworkShow, setIsSwitchNetworkShow] = useState<boolean>(false)
   const [selectNetwork, setSelectNetwork] = useState(networks[0]?.id)
diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
index 9d60f521aa..8078c1d5a0 100644
--- a/packages/neuron-ui/src/containers/Main/index.tsx
+++ b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from 'react'
 import { useNavigate, useLocation, Outlet } from 'react-router-dom'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import { useState as useGlobalState, useDispatch, dismissGlobalAlertDialog } from 'states'
 import { useMigrate, useOnDefaultContextMenu, useOnLocaleChange } from 'utils'
 import AlertDialog from 'widgets/AlertDialog'
@@ -9,8 +9,11 @@ import Button from 'widgets/Button'
 import RadioGroup from 'widgets/RadioGroup'
 import NetworkEditorDialog from 'components/NetworkEditorDialog'
 import { AddSimple } from 'widgets/Icons/icon'
+import DataPathDialog from 'widgets/DataPathDialog'
+import NoDiskSpaceWarn from 'widgets/Icons/NoDiskSpaceWarn.png'
+import MigrateCkbDataDialog from 'widgets/MigrateCkbDataDialog'
 import styles from './main.module.scss'
-import { useSubscription, useSyncChainData, useOnCurrentWalletChange, useCheckNode } from './hooks'
+import { useSubscription, useSyncChainData, useOnCurrentWalletChange, useCheckNode, useNoDiskSpace } from './hooks'
 
 const MainContent = () => {
   const navigate = useNavigate()
@@ -70,6 +73,19 @@ const MainContent = () => {
     dismissGlobalAlertDialog()(dispatch)
   }, [dispatch])
   const { isMigrateDialogShow, onCancel, onBackUp, onConfirm } = useMigrate()
+  const {
+    isNoDiskSpaceDialogShow,
+    oldCkbDataPath,
+    newCkbDataPath,
+    setNewCkbDataPath,
+    onCancel: onCloseNoDiskDialog,
+    onConfirm: onContinueSync,
+    isMigrateDataDialogShow,
+    onMigrate,
+    onCloseMigrateDialog,
+    onConfirmMigrate,
+  } = useNoDiskSpace(navigate)
+  const needConfirm = newCkbDataPath && newCkbDataPath !== oldCkbDataPath
 
   return (
     <div onContextMenu={onContextMenu}>
@@ -139,6 +155,25 @@ const MainContent = () => {
           id="new"
         />
       ) : null}
+      <DataPathDialog
+        show={isNoDiskSpaceDialogShow}
+        icon={<img className={styles.noDiskSpace} src={NoDiskSpaceWarn} alt="No disk space" />}
+        confirmText={
+          needConfirm ? t('main.no-disk-space-dialog.migrate-data') : t('main.no-disk-space-dialog.continue-sync')
+        }
+        dataPath={newCkbDataPath || oldCkbDataPath}
+        text={<Trans i18nKey="main.no-disk-space-dialog.tip" />}
+        onCancel={onCloseNoDiskDialog}
+        onConfirm={needConfirm ? onMigrate : onContinueSync}
+        onChangeDataPath={setNewCkbDataPath}
+      />
+      <MigrateCkbDataDialog
+        show={isMigrateDataDialogShow}
+        prevPath={oldCkbDataPath}
+        currentPath={newCkbDataPath}
+        onCancel={onCloseMigrateDialog}
+        onConfirm={onConfirmMigrate}
+      />
     </div>
   )
 }
diff --git a/packages/neuron-ui/src/containers/Main/main.module.scss b/packages/neuron-ui/src/containers/Main/main.module.scss
index 0e01fceaa4..7ff69e97c3 100644
--- a/packages/neuron-ui/src/containers/Main/main.module.scss
+++ b/packages/neuron-ui/src/containers/Main/main.module.scss
@@ -25,3 +25,8 @@
     }
   }
 }
+
+.noDiskSpace {
+  width: 64px;
+  height: 64px;
+}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 2ce6ffc762..db3b2d4754 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -156,7 +156,9 @@
       "send": "Send",
       "receive": "Receive",
       "locked": "Locked Amount",
-      "locked-balance": "Locked Balance"
+      "locked-balance": "Locked Balance",
+      "first-sync-notice": "The initial synchronization requires at least {{size}} GB of disk space. <br />And the data size will increase over time. It is recommended to choose a larger disk space to store the data.",
+      "start-sync": "Start Sync"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "Welcome to Neuron",
@@ -550,7 +552,8 @@
       "verification-failure": "Verification Failed",
       "back": "Back",
       "switch-to-light": "Switch to Light Mode",
-      "switch-to-dark": "Switch to Dark Mode"
+      "switch-to-dark": "Switch to Dark Mode",
+      "ckb-node-data-path": "CKB Node Data Path"
     },
     "notification-panel": {
       "title": "Notifications"
@@ -1159,6 +1162,11 @@
         "body-tips-with-network": "\"Internal Node\" is reserved for the built-in CKB node, please select from the following network options or add a new one for the external node.",
         "add-network": "Add Network",
         "ignore-external-node": "Ignore external node"
+      },
+      "no-disk-space-dialog": {
+        "tip": "Due to insufficient disk space, synchronization has been stopped. <br /> Please allocate more disk space or migrate the data to another disk.",
+        "continue-sync": "Continue Sync",
+        "migrate-data": "Migrate Data"
       }
     },
     "cell-manage": {
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 1440ab833e..9308fdfa2f 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -149,7 +149,9 @@
       "send": "Enviar",
       "receive": "Recibir",
       "locked": "Cantidad bloqueada",
-      "locked-balance": "Saldo bloqueado"
+      "locked-balance": "Saldo bloqueado",
+      "first-sync-notice": "La sincronización inicial requiere al menos {{size}} GB de espacio en disco, <br />Además, el tamaño de los datos aumentará con el tiempo, se recomienda seleccionar un espacio en disco más grande para almacenar los datos.",
+      "start-sync": "Iniciar sincronización"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "Bienvenido a Neuron",
@@ -533,7 +535,8 @@
         "verification-failure": "Falló la Verificación",
         "back": "Atrás",
         "switch-to-light": "Cambiar a modo claro",
-        "switch-to-dark": "Cambiar a modo oscuro"
+        "switch-to-dark": "Cambiar a modo oscuro",
+        "ckb-node-data-path": "CKB Ruta de los datos del nodo"
       },
       "notification-panel": {
         "title": "Notificaciones"
@@ -1138,6 +1141,11 @@
         "body-tips-with-network": "\"Internal Node\" está reservado para el nodo CKB incorporado, seleccione una de las siguientes opciones de red o agregue una nueva para el nodo externo.",
         "add-network": "Agregar red",
         "ignore-external-node": "Ignorar nodo externo"
+      },
+      "no-disk-space-dialog": {
+        "tip": "La sincronización se ha detenido debido a falta de espacio en disco. <br /> Asigne más espacio en disco o migre los datos a otro disco.",
+        "continue-sync": "Continuar sincronización",
+        "migrate-data": "Migrar datos"
       }
     },
     "cell-manage": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 4178995b94..873641eea1 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -156,7 +156,9 @@
       "send": "Envoyer",
       "receive": "Recevoir",
       "locked": "Montant verrouillé",
-      "locked-balance": "Solde verrouillé"
+      "locked-balance": "Solde verrouillé",
+      "first-sync-notice": "La synchronisation initiale nécessite au moins {{size}} Go d'espace disque, la taille des données augmentera avec le temps. Il est recommandé de choisir un espace disque plus important pour stocker les données.",
+      "start-sync": "Démarrer la synchronisation"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "Bienvenue sur Neuron",
@@ -540,7 +542,8 @@
       "verification-failure": "Échec de la vérification",
       "back": "Retour",
       "switch-to-light": "Passer en mode clair",
-      "switch-to-dark": "Passer en mode sombre"
+      "switch-to-dark": "Passer en mode sombre",
+      "ckb-node-data-path": "CKB Chemin des données du nœud"
     },
     "notification-panel": {
       "title": "Notifications"
@@ -1149,6 +1152,11 @@
         "body-tips-with-network": "\"Noeud interne\" est réservé au noeud CKB intégré, veuillez sélectionner parmi les options réseau suivantes ou en ajouter une nouvelle pour le noeud externe.",
         "add-network": "Ajouter un réseau",
         "ignore-external-node": "Ignorer le noeud externe"
+      },
+      "no-disk-space-dialog": {
+        "tip": "En raison d'un espace disque insuffisant, la synchronisation a été interrompue. <br /> Veuillez allouer plus d'espace disque ou migrer les données vers un autre disque.",
+        "continue-sync": "Continuer la synchronisation",
+        "migrate-data": "Migration des données"
       }
     },
     "cell-manage": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 58e78a4864..cd7e92d5f4 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -150,7 +150,9 @@
       "send": "轉賬",
       "receive": "收款",
       "locked": "已鎖定餘額",
-      "locked-balance": "已鎖定余額"
+      "locked-balance": "已鎖定余額",
+      "first-sync-notice": "首次同步數據至少需要 {{size}} GB的磁盤空間，<br />並且數據大小會隨著時間增長，建議選擇較大磁盤空間來存儲數據。",
+      "start-sync": "開始同步"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "歡迎使用 Neuron",
@@ -544,7 +546,8 @@
       "verification-failure": "驗證失敗",
       "back": "上一步",
       "switch-to-light": "開啟日間模式",
-      "switch-to-dark": "開啟夜間模式"
+      "switch-to-dark": "開啟夜間模式",
+      "ckb-node-data-path": "CKB 節點數據路徑"
     },
     "notification-panel": {
       "title": "通知中心"
@@ -1130,6 +1133,11 @@
         "body-tips-with-network": "\"Internal Node\" 僅用於連接內置節點，請選擇以下網絡選項或添加新的網絡選項以連接外部節點。",
         "add-network": "添加網絡",
         "ignore-external-node": "忽略外部節點"
+      },
+      "no-disk-space-dialog": {
+        "tip": "由於磁盤空間不足，同步已停止。 <br /> 請分配更多磁盤空間或將數據遷移到其他磁盤。",
+        "continue-sync": "繼續同步",
+        "migrate-data": "遷移數據"
       }
     },
     "cell-manage": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 794abc32b8..37c2f45e91 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -149,7 +149,9 @@
       "send": "转账",
       "receive": "收款",
       "locked": "已锁定余额",
-      "locked-balance": "已锁定余额"
+      "locked-balance": "已锁定余额",
+      "first-sync-notice": "首次同步数据至少需要 {{size}} GB的磁盘空间，<br />并且数据大小会随着时间增长，建议选择较大磁盘空间来存储数据。",
+      "start-sync": "开始同步"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "欢迎使用 Neuron",
@@ -543,7 +545,8 @@
       "verification-failure": "验证失败",
       "back": "上一步",
       "switch-to-light": "开启日间模式",
-      "switch-to-dark": "开启夜间模式"
+      "switch-to-dark": "开启夜间模式",
+      "ckb-node-data-path": "CKB 节点数据路径"
     },
     "notification-panel": {
       "title": "通知中心"
@@ -1151,6 +1154,11 @@
         "body-tips-with-network": "\"Internal Node\" 仅用于连接内置节点，请选择以下网络选项或添加新的网络选项以连接外部节点。",
         "add-network": "添加网络",
         "ignore-external-node": "忽略外部节点"
+      },
+      "no-disk-space-dialog": {
+        "tip": "由于磁盘空间不足，同步已停止。 <br /> 请分配更多磁盘空间或将数据迁移到其他磁盘。",
+        "continue-sync": "继续同步",
+        "migrate-data": "迁移数据"
       }
     },
     "cell-manage": {
diff --git a/packages/neuron-ui/src/services/remote/app.ts b/packages/neuron-ui/src/services/remote/app.ts
index 1924b6331e..ce391b86dc 100644
--- a/packages/neuron-ui/src/services/remote/app.ts
+++ b/packages/neuron-ui/src/services/remote/app.ts
@@ -17,12 +17,16 @@ export const requestOpenInExplorer = remoteApi<Controller.RequestOpenInExplorerP
 export const handleViewError = remoteApi<string>('handle-view-error')
 export const setLocale = remoteApi<(typeof LOCALES)[number]>('set-locale')
 export const getCkbNodeDataPath = remoteApi<void, string>('get-ckb-node-data-path')
-export const setCkbNodeDataPath = remoteApi<{ dataPath: string; clearCache?: boolean }, string>(
+export const setCkbNodeDataPath = remoteApi<{ dataPath: string; clearCache?: boolean; onlySetPath?: boolean }, string>(
   'set-ckb-node-data-path'
 )
 export const stopProcessMonitor = remoteApi<'ckb'>('stop-process-monitor')
 export const startProcessMonitor = remoteApi<'ckb'>('start-process-monitor')
 export const startNodeIgnoreExternal = remoteApi<void, boolean>('start-node-ignore-external')
+export const getFirstSyncInfo = remoteApi<void, { isFirstSync: boolean; needSize: number; ckbNodeDataPath: string }>(
+  'get-first-sync-info'
+)
+export const startSync = remoteApi<void, void>('start-sync')
 
 export type VerifyExternalCkbNodeRes =
   | {
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 9b12b9dccb..5e176dd251 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -50,6 +50,8 @@ type Action =
   | 'set-theme'
   | 'verify-external-ckb-node'
   | 'start-node-ignore-external'
+  | 'get-first-sync-info'
+  | 'start-sync'
   // Wallets
   | 'get-all-wallets'
   | 'get-current-wallet'
diff --git a/packages/neuron-ui/src/services/subjects.ts b/packages/neuron-ui/src/services/subjects.ts
index a9e36665c9..2fb4037ccb 100644
--- a/packages/neuron-ui/src/services/subjects.ts
+++ b/packages/neuron-ui/src/services/subjects.ts
@@ -31,7 +31,8 @@ const SubjectConstructor = <T>(
     | 'device-sign-index'
     | 'multisig-output-update'
     | 'migrate'
-    | 'show-global-dialog',
+    | 'show-global-dialog'
+    | 'no-disk-space',
   isMulti?: boolean
 ) => {
   return ipcRenderer
@@ -69,6 +70,7 @@ export const SetLocale = SubjectConstructor<(typeof LOCALES)[number]>('set-local
 export const DeviceSignIndex = SubjectConstructor<Subject.SignIndex>('device-sign-index')
 export const MultisigOutputUpdate = SubjectConstructor<string>('multisig-output-update')
 export const Migrate = SubjectConstructor<'need-migrate' | 'migrating' | 'failed' | 'finish'>('migrate', true)
+export const NoDiskSpace = SubjectConstructor<boolean>('no-disk-space')
 
 export default {
   DataUpdate,
diff --git a/packages/neuron-ui/src/widgets/DataPathDialog/dataPathDialog.module.scss b/packages/neuron-ui/src/widgets/DataPathDialog/dataPathDialog.module.scss
new file mode 100644
index 0000000000..d6208d61e5
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/DataPathDialog/dataPathDialog.module.scss
@@ -0,0 +1,62 @@
+.dialog {
+  min-width: 600px;
+}
+
+.icon {
+  text-align: center;
+}
+
+.text {
+  margin: 8px 0 28px 0;
+  color: var(--main-text-color);
+  text-align: center;
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 24px;
+}
+
+.pathContainer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+  background: var(--secondary-background-color);
+  border: 1px solid var(--divide-line-color);
+  border-radius: 8px;
+  button {
+    border: none;
+    background: transparent;
+    cursor: pointer;
+    padding: 0 16px;
+    height: 100%;
+  }
+
+  .btn {
+    color: var(--secondary-text-color);
+    flex-shrink: 0;
+    background: var(--input-disabled-color);
+    border-radius: 0 8px 8px 0;
+    border-left: 1px solid var(--divide-line-color);
+  }
+  .path {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    color: var(--input-hint-color);
+    &:hover {
+      color: var(--primary-color);
+    }
+  }
+}
+
+.desc {
+  color: var(--third-text-color);
+  font-size: 12px;
+  font-weight: 400;
+  margin-bottom: 8px;
+}
+
+.content {
+  padding: 20px 40px 0 40px;
+}
diff --git a/packages/neuron-ui/src/widgets/DataPathDialog/index.tsx b/packages/neuron-ui/src/widgets/DataPathDialog/index.tsx
new file mode 100644
index 0000000000..576b37e139
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/DataPathDialog/index.tsx
@@ -0,0 +1,73 @@
+import React, { useCallback } from 'react'
+import Dialog from 'widgets/Dialog'
+import { useTranslation } from 'react-i18next'
+import { shell } from 'electron'
+import { invokeShowOpenDialog } from 'services/remote'
+import { isSuccessResponse } from 'utils'
+import styles from './dataPathDialog.module.scss'
+
+const DataPathDialog = ({
+  show,
+  confirmText,
+  icon,
+  text,
+  dataPath,
+  onChangeDataPath,
+  onCancel,
+  onConfirm,
+}: {
+  show: boolean
+  confirmText: string
+  icon: React.ReactNode
+  text: React.ReactNode
+  dataPath: string
+  onChangeDataPath: (dataPath: string) => void
+  onCancel: () => void
+  onConfirm: (e: React.FormEvent<Element>) => void
+}) => {
+  const [t] = useTranslation()
+  const openPath = useCallback((e: React.SyntheticEvent<HTMLButtonElement>) => {
+    const {
+      dataset: { path },
+    } = e.currentTarget
+    if (path) {
+      shell.openPath(path)
+    }
+  }, [])
+  const onSetDataPath = useCallback(() => {
+    invokeShowOpenDialog({
+      buttonLabel: t('settings.data.set', { lng: navigator.language }),
+      properties: ['openDirectory', 'createDirectory', 'promptToCreate', 'treatPackageAsDirectory'],
+    }).then(res => {
+      if (isSuccessResponse(res) && res.result && !res.result?.canceled && res.result?.filePaths?.length) {
+        onChangeDataPath(res.result.filePaths[0])
+      }
+    })
+  }, [])
+  return (
+    <Dialog
+      show={show}
+      confirmText={confirmText}
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      showHeader={false}
+      contentClassName={styles.content}
+      className={styles.dialog}
+    >
+      <div className={styles.icon}>{icon}</div>
+      <div className={styles.text}>{text}</div>
+      <div className={styles.desc}>{t('common.ckb-node-data-path')}</div>
+      <div className={styles.pathContainer}>
+        <button className={styles.path} type="button" onClick={openPath} data-path={dataPath}>
+          {dataPath}
+        </button>
+        <button className={styles.btn} type="button" onClick={onSetDataPath}>
+          {t('settings.data.set-path')}
+        </button>
+      </div>
+    </Dialog>
+  )
+}
+
+DataPathDialog.displayName = 'DataPathDialog'
+export default DataPathDialog
diff --git a/packages/neuron-ui/src/widgets/Icons/FirstSync.png b/packages/neuron-ui/src/widgets/Icons/FirstSync.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecdfa7a26db1924512b0d549a37fe9adb8fdec3d
GIT binary patch
literal 18917
zcmV)dK&QWnP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsHNqR{{K~#7F?Y#-O
zWmSDAx`sWS>CU$%iUJV@C1NxVLCs+7prC<}7s#Nohp%5u%*%V-c}e^dlZgGr^!xg?
zu{%R2b_S#A0AW<nDkjB&jw8{Iq6o-PKuvcz_l$d7YxVE9_BmDM*j-pa-I4{T&bepU
zXP^C_fB#_#@$~whUQ&DyuHCzL$1Sb57*TF<E^tB=xDb&kL@BgU*5Wy>jFrxfUiI47
zJ}ge+^*zG?x7_l+mUCM!c24{*{yfuy@*uD<AU_@pft$wFP>L5t3Wxu!<K<CbvqJs3
zGw%HtU;LW;#YwhKdIq@q>Z{wWR_kZ+Lw^%gewMM$KTqP87Wbam!r#acP3?q|!ZQH>
zFPs9CNIqw!lpl9e{!w6y+b_QO;(<5`)=A3%&N+4c`**)y2I6;>GtY9AYiopth=Y*+
zMk0?YMd3fZLghrPYK_3B$slQk3ngpK!2iJvd&5A!PnzJbFS_W}4~k8^PC5nv;pGQD
zc=Jy}(0|7``$7vTKm02li3=u}FaZ83(#owv#dq;nA8##4-$1y9%DQbZ4|8HdcPb8t
zgE`L_)Dlv}TDwN5t`3BK-)mm?x;;3i6Ps+EGz@V0<(I4Pf6)*A7%1?2m9;-)J+VYB
z>9sb8eV3KA<s-2YU%>PCN+%yGjU5DWkeR}mQYkBqq^b|Bt(qdx%f{HV@%eK>_~+nY
z^TPWL&NG6l6@q9+fk?vOOQCeX{Noo~aHrTr>ttX6dE=fvFSnKZt;&hlz=c;{bvv*0
z#f1I`A-<oJLVrSw>T6K*{U8W(SC$o|8t!0FjY~2JA^>Yupe>J~m5gL*s}|Uz1!^xB
z);=GS|6FI?xzGp;&e;irInf9;m_Qdw%RhMS1sA+sY?8I98Q}KYZ(mHa@-Ip&Uk7y`
zlIV6K?zNp4kAbMy!STBbQhz`yJ2bh?g1}W;Yka^~HVoZpRLT(dd0tRUNE?DDj1FyJ
zoyL7;%2;`=U_+^O8^=Ed%yuch>&Ng|N>!T&FaQ`K5P_6Gf5B@nxKeC_wP_h(_jS8>
zrrLg3=-}B@_n!FHO;!B>KkQcN%m<VV4=FABa1C;;q2;0JlO!=!Rar7Yj`y2!9U5pI
z*epx6ZfUCnP=9Ro*o+h$$3ST<t5U>C9Lqe*W}H-8;4@r?@4XZ%K-QYTia5}s9f#|1
z2VQdFg%^HJoZxFyGQgc5_&{e(MW2Bbo;|h4Q^^PMzY1yn3%FzV;&C?+B6qIHL7*a$
z5^r}Ej{(9Pm;syOab%1u3Zek1C_rdkXe%0c!_cS(?h70!G@;5xrUMPlU~x01C8XY3
zSaTVU`7;P1^${jeq8WytZ?_vSd*v%%nTZp4X|V~{Prc!dZ!4X+#CztR0X!!={Fobq
zK>e|D?x8S}UF*y!P*Iw>vg$OOWoe_TbfqnAY%6$dht^Y}i?IbGKzkGxn!&=ehZZnW
znGDvU<#KIYSXCknr4dyia+ABzf<Xf90xb)0-XqXFO=yF&d|Uy0P}Le~yD)a{th1hV
z%SS)@(Gxa0*mMkV<Bd1I0)XvbAVgDcqVn-i29NxGK_LGgmVebrGf+lnT9^W~D@#|E
zxiLZ-kS|xZC`ya?-*lkz%Mi|fbKV3EEmGK$w5ntR7`WMNLdcbiRqUcjy7AblDy(1w
z62y^0nMyjPbY;O(p!!~%&M7#NQ|Wj}oD2acW2+aRw)2#Gue|cgFNza%DY1zboW8AA
zg;#m7ej@hx0go!>{zIVTwMqvELa8>44MwT4+1Lc7NTg{ro2CI1FfgW~26xSt5n?2=
zAh&VDR_DF!TzAo{Ugh8yxGWFhCC=N8jZ%Tu&X~UEu~ti&Hnc-g6mm>%2ux{dPNW=$
zS{~BUTn&G4<*-JQL>i?WWYznwz4qF3#R<ALjSs*${|8=j-c3biFRVPeBMfBiGf)G6
z6UE{ErL+TAh<psnH(OCo;zY5iV8<OLzS$IFJcf)mg&B>Y`hw85c@+G!yk(2)uC1w!
zUe6Od&jQ)P^Yjsts)GLq@+OIML#JCUA=XBtD0Z>VVRe8IH=qw%vT_U1OfNxT_<utI
z5J2+iA=HQfb3U*%(>(9huYUC*ae}Q)qXAy@((`_)H10xUee6Ag$Ms%F{vX3DySFH-
zzBDQw!^4kam6p{AQGIT75!f*}B8n>4qx8=Nwt~YKL$cc-FeQFC9E$z>_K9pQw<Z2A
ztHdpCX;wkTh#-&^{?7AUW?3f3&>G+!k%0M1%}hdWA|VS`$+VKXi*x!P!dCwc=UDQb
zsR_V6@Cn=*2iAx05+~r=6h6RBx8C|J(Cv!SK$8pcFeK_vqELKPieSG~dSeL60iG*L
zSpw<Pl~l1+`N)n&g;y0yHL9Q)KphyHjv2L=u;0oJ3P`98M1lKO5Lpp9(GiKOMuh@c
zAm<h$TMTkhL_*9!{m(*;*gWu`iIkB#jzwBn$%ruyl>mcQTB=neT~kSQ*7W=d8v~bo
z-cMb6*})sGz4~+F1X?G&27pb~u5{N`#?9i-JCaEMUJ?W!Q!aQU*5TTq8W*s=MJiPh
z%Vwd9s?3UBDcbEKjvKW3<xmX$u_(n`+cSoL4scsenl4EyHxJ^c!B{Rvk?o5<RDT5X
zpv=mlu`Ka=0xbY@AZa=bv<H0y3BRI1ToJ(2gTz<hz5?E0Dz#jLX}STNchBM9086U@
zM&SNGU3cAeKPXP1b;2{io;|m`4L1KwJp5oQ3jYF0{Jky^y&wp))uJ#30(uMLLxRh3
zni)juwyI)BVv~?0oK6F~_VB7CA-h%A5%3Y<0-69gh;9{#Z~)>z)<=M!2B2-rkrBuk
zK#Wuu@7vg@9PPixadU`#HLxxM_q5wHWe6KXQ=qKN;rfq|Ogi8ydxa1+=Xpm<dSE(6
z_<9vm)U)CQStm3DeBcASUye-OFNI3}SrV!nfV8e5N*g;^-POU+@I851mhkJVG#v}t
z`Z&f74jYNRUadPye>e}KZfzS%vp;YLzTeD@Nx>Yn`;cFM9kw)#2Z`2-6*VJf1db`&
zVg~+S(`7*>dp$#cz$T{F0>ge^6(P_Ce5po6$P5w?#5~e^fUNU_&|Y2(__`8C23m={
z5~sy+e8S`kPFMzb_q*R622t?GVW6(mf&51RJdXjP?-^y%LRLlCiK-aLUMq||(V&MN
z;oAyCO0(Ri=?bJbQG9LyM=yj!$M;d<Np#VJCjbUX4~%8fXu5P9$hESeg2f2VApV9)
zXyEy7wT^4l_Y6agktEB|E?P1|m|Iw=f*d|S;6%WE2DkvU58_Yw8ll!heDI+<4>|o8
zOaRUp<>puS+<4=Q#R;%ZSOz%tv@?DM&eJ+<=a+HOR*lsIc-2`^!OA1P&w9D&4~B@c
ztfTW4#t7I9B!4M!9ctbV+_|Lk#0J9W*1h!4h(ia*lK1tR5m}ge#t2F9X632^4j?3d
zZ5^M5DQLSH!()&^Y7H`gkC0pX1B?!;*t!%P5ZMUYCpJxF7GoVi6UYMa@IA2m8+Eyn
z@T!0y5zK%>ocd?1T@X+4Iw7Ng>vr$n8A<({fmSyoih9_TWmkzH9ao0wx`JSfQ~@R5
zBn^SY4dSkHq}15JvmZKDCQihN<6+mUvLTVg69H~nUbtm=?h1rHxG@H5tKFOePKdyP
zW}_fx2pbcGZLz!@!`laG?O4(rRHLD6%s1Ui&qzQ;$Q}xnu)rV%1Mv@_$0byN&{bFp
zqn!&8tpY`|ZZA&u`@sM)f19r|BokD2$0H9vTwQU+-+f#>h3kaW08Jge8Oiv&WS|Zd
zg&hEsA641_&nfYLWsMb8p$od-uHUcGJ15%A3z@+H>Nw0~18RH-r*3-8#pT$}&d!QM
z=|LI7_EQH$;aK*>tk7X-Df!Vjtjz?R!hWAxA&_(esW8GYklpol)oIhS^AM7tGw9zh
zfG&mJKY(M&q7n^*V~5BXu0Vr*4yoclf%FqX@DTxThNWg@^=o_f>^WULh3kZ409=qC
z1)wsI{QSL;^p!Z)KyVpx!QYBv(!6Ryv=lglaC>KVp$y=lmDPq@E7#rJd;pEGU=Kl!
z>maivv>v5)|Gtq-$0ON+2UxB_mCumSO-Cjm;e!;RARdz$ie~9Te4gflw!aT<a5Ks~
zoeUoXWPx%p9sj0zv7j})d=n=U(38lMhA!a_WI`b#h=Nt&>?f@?e*v0T)89#7AS=sx
zfJA@uRGNYliUIDp<BmB{;HRCEUxaNx2;Gf5KFqI4A^4RA;%9Tfx(E6L*J`&75xv21
zzu4H=@IF?wupnn<YWto*iuo9V43+B+YXS@TOd-uAK2(bT90^X3pC$n2M)6iQ;5*<}
zYY~`$wL&c?TRd(6XTyJvsN(dvW>`C+xy)e<nuX0=E)7zOWjPLGIR|_2CWyX2k7*Gq
zTmdo8${)G;=9~Yyc#75u!vK^5M09V$h1xG|^(dhH4WM;ng!$EY%!><{7Zd@aFXk7Q
zE8_MeM%hsLvwDuHTsVJ1c#2~c@ZeY1)*PRpXD{gXbIsKbABoN?KuWyogF(PI+nYNa
z8G~2=)juN!4J?4~XXrQ>^nElzZNsl7*1*WX7;puwKu|_yI|%SI29`;vP8=6t3fQdh
zr{Qoke3hD*-~!$;l!95xtTgYu?Y7%?iKk$lFbr_>hi?8E#Qa;}a^DXoSdXG;R7!}`
z*Z^oDgdaOG8jFT&nzhx3eEc4R5S>o_d4_Iu`pPE3oyx2BS=e_H)W4xu+jg-*;0Ut0
z2I4P<miMC|wGBxB243vpziB8~6^Xw-Sytl(o(cTH+JfeV`2r@1DrOB~{E;irOgKd_
zPN4}DQp+tUty85l!@3B$u3tD(rCghWVOlJtMe(1-Q?O152Ds&xTb_Z`-X&1`UyLHn
zjM)fj*NjOO%Zwf_XlxA}v%bIBakAtnp<_sX2?CUm_Gt*$g{lq_vK14;6V;<?XH4(E
z3>tuc^I;U$P9GVC|EBN-=qPgWc(pp|i>T45rlBJVPcvXPDn(|<01VM3+yaw?5BS6r
zau0zEEe_w*BJk1QJ`j7=m!gCEOlC41tQSH<ggT>f@sl^*bkiHfle|s{21rNge}RNO
zgoMfgV<1RAQKzlTM3r?}wWE=PLG}$$?2egJ%#N8kLwmcUQxl~DBKtTUQcF;W#lG92
z;-@w~9gk%f>Yhe`4&Rn=S#H|~RS(;8m@#Jk|Driz4l+`G?Cmas^GK(#7XKN+NW<p{
zh!DaIG#ZT>dIl~~0B6ozrkP;MOvTF76shOWfcWoW?@`SJb)SKMJSkb{w-%*%7yN-U
z#gn+6at8R&O&|I#An<1gVf0V<bA+TD3v<dW>s9?eY$+}yi#SZbQUF@q`udvM*MC&g
zKGP<9I}GTS$C{bfW}~~VsK)n$=yP-RcQjzzw}RkHVeCEqwY3#>`st_3v(G-;zn6^B
zeP~Vbwechrq_SryN!w9?!3G`xifYflLEm5j>0*LPZPA4@NK?>4vY>?^zbv(llSUCD
z3!xDXYUz5Q_CxsS-buBx_XH1X0bk1qhp;LZN^9Tu5C8BF4e=zcrxXafZO@)p472>b
z$eG`OxcM$zoE}s^L#2F#*sl@7dPWg26=4UNwMru^2bwUIt411Xy&-dvyEc?Ct9z9y
zW!z8}A*A5Vf|#Rl3=Oa@JK(BOXk?NnVvOfx(KauC`3u#dy&$k2x^~bOVJ8&5yeIgc
zhHAQz9<p3q6e~Ryv===XBmgAQDI`b~NBqvpIe<f>64w$DDAI<=NhoRHXoP`9z^_@k
z!iv#KNSovAUjP;e>i(jmyh86AC;?yMRCqkulLZhxWg6gyE3Z6#b#3*1$mIQZ*!_=z
zs69%)*18-b<ZH;L=|S})6IfNfIupk-E?>5_nn_ycG|Ie0j>427qR01X$EotE>M7g)
zaY{xACBwVsj+R&Pj|}%BxziI13-kW{d~WI+P!sURXn?PU3xV85=Mq{Z1CT^h;{hV9
z@epo7Q0Ey&sq&S^tVY6bad`o}0$IyQDrBo=SE=yR;Dx)TtZM|EJ<^0aX+A_$;BX$r
z<-2$9ep1rLPYDAs(c_f3qO8pQ%|`T|I0z8-0np2Hc>652(UwS`%309S5_J3m058=>
zjqU5Xz=vj2!ZD1a{bp#_;H{`*{P9pSJEImCm+c(9KRSj4glIn6WmA3VLwAaG({*$L
zy&*t^uzkl4$Iy_+wKLL#KLm-!<Jgixin8H|D$c_Mkobg<2@Do_=FerEvdlb26ky>a
z)So9uAY}}v!VEy<TU}kwHi-(3zA{ok0K_l{?rH56yZ_tn8Sw<Kr-T7^E-n53C`+4B
z5?xme2K&b2@sO&YwfpOc`3qleg$ox)ip1w*rgi7$7JQi&V{sp&gHXH&+~(0czRyd1
z6v}8hl*9&*-m{=9e1d(FKEUkcJ+%AJe92kndAp|J_pIRO)>c+LB)k|d+g78Yrp(Y6
zT|Eb<Vk_+bV|%;0LJC<y+8F^*BQ;uWLoF2n+5_t6WK$V%wD4(SYJ{S2NN8n&(q94H
z9}sfVy)<c07l*+i;fE9eAbN(Imw(DyNbv-&C!GO4_<`$xYE+~@HO}(C6_wqKbY34^
zpTPu_sSTZndrjo1PK(M`K}N}<{%?zwl|z7L6)=Bgh}Dyj&9dbfxf!H#NjNfumuCFm
zf&}~5;Pg=|kchR*2V%pkKYMvu@7lG?z3gQ#N7R6DaS}3it2H$a>G{KH9M_-`8DTsE
zoD39^*u&HzBx8DL80VSg#06rvfoLFIPlYj|gG=k!Vg^qZxgy6(GpnR}#!>BShnrWA
z${C9cVFDQF4KIH25B{Qf0@stu05@HG?XyA^yeTcptDAA-J`jBnx7!&EXE`Ve!!r9Q
zVooPDaa9*~koW=e`$+b>`O_9GV|?0Y#_5dNNvMO!=@+X&{buVhkHqHpc|QPlo}pe8
z)lly=_9s&K`OiP--*@`ybMn-4cL4^j8Re9jU50$ZV=pZ(df%Z)(}1BSO%E}Mx=x_Z
z1+ct)HVAE?Gcdxs?=S)YVSMFLOd!cR1vCTZ%ajF_h6Fk=EfVos;G3C%C1j(*h`h-E
z6#0=Staji@V*r3XTN<s#yGrZs#IO8(v(wnnaXg08l&!4}49lwUHn;!=A=a!NO+J_9
z>+I%~jP0j3UwG*cJaKtrST+T4rno*IhhF8+irPHP`v3GOw3K#Y2M=vLB=+v@`Ro4!
zXPlwVI{R!#GcZQn&ts6;4jnw`GlEPC8K`}lpm7%21Sw~hjPY;2&Ty190v-t@YDs4x
zgBE}T&}v5&q?rvSFb*!U_8S_7zA+Uv^$QVEz#mX~Ui|%a*Il<$JOS%TV*r5WzX#R#
z)!}e>Pcv$Cp*F`LT2`>Cr_=G>x<!d(N)cKXTF|qmTFocedj{1z00P5G9VU6`_0M`$
zPPJd#fAE5!v@R_z`no=*aCuMok6ME&o_3rBrnDoW<UakCPe~+`_;Gjc^PVSn?V9!P
zB}`0Mnc2fF+qYL_KAImQfd<mgWKkCk!E>9Po3o<b5=>4-NEB63>~HX9J!#8f3BM#V
zCPygi>_hPU?_@ipnBc=TIOHb7C%)mjX+=%&3}7IC$l+GvIIkxK2l((UyMG-j?HPl-
zxV_5r9)8R~hj9U$UzFNGFN#W+&MK(?G_6E?W)@-8K(yO2LMZ`ndd_ub*ovh*CXd)(
zv=OtjK!0q;hysKPmqO98V_P9^@8^91i|a9f4F7f49#eB_-s!Sr!l};1;FyQ@Kd5OI
z4j|9Jb9q_JLY;#tWe#IKMzlb1K`9MmjIVBL4>hwB8BFBBLn=fXT91_kMgc~1oGl=u
z)||&F1l*T4K3Zj2*l2WYPH0mZCBq28fO!a1&p_U1f#Si@*J_Fs9?ly~23Em(oD({?
zdgb3=^=WY&*AvbFx9{0=o|EeBI*Q+0rs+ON!XQwp&`~EFfL=NSU<!y-L1KhL;y<?%
zSs&k~)oiz|mZb+>ApR;AGj6`Q;D&2MSpoE^K+Lx72&e)!ct~)H*cxxQ8(CM8Nm^x7
z79v+W+B@x`bj0Zm4m{&SzHnqj)CuMM(vltR8;g4mY=|><EGU|i)3<Gt_w0L6!h!SJ
zK!Hos4S+u(eg0TjGlqt06L@k!rewP<To1VcXEWJsh4A{aAOu-MqyT{vyR;ZX(+0$U
zeQh}SnB_>1g1q~1z-Mtbm6*&QI+7unOe>oVx?ry%4*a7(_p?9q;j6E{`cZM5))UGA
zH{N(-6RP}Lq*Si~7k?p);}k^A0CxiHaXFlSp#DI}fcBLoD{36<IUy8W5!)1n1JpJw
z1PPJHGw`OzvecEM)VJY^lL3$~aHFEHaaA2ryO9aN7z6JJvZV_YciBcJ+F?Y6;g@F)
z-IQY+imH&R6D2^P`toa!4#e!%S!x1x&Y5SrL+OSZAYVWx@=znfy0B#=vyRp<95rCX
zu>?LLgJu&ygGr1S>b?mdrBE^u3YZ2U!NfN&6Yga}0-iORCFII>kxTv>nBg=WeZD67
zByA|BcN4}?Y&@|+r1h(Q;TPU;?Uh$vd0eKHJ)u585{AD3BlabH%V+Q>L%lI<erAw4
zXE7&;SjKZPoW2t1XWti8wB?KkPpX8q`neCaSmH(RyR2&O9tf?b6Ub1|v`Upg%IK}r
zPPfWBI!L2Bd?UES#~u|->wD$~!f*_XaZS;eD9hZ3km-28{Kq>!k1$gB?|s!vUgDOQ
zmVEJuPZ}Ks%lPw|G>z01Vng3cXnH->U0;{BrF`Q^$qwYw4<f19L1Z|9QW>0>O`#dr
zwbWmR!T7Jx6<?Zo0*8^oY36u3)y!8E7u7Rxygxi%RYXsi24H~$c>muZp1B?w(}RFP
z$Ij^@8)e>gYP4dy&T?ZkqSJ?9uWbUxzF8&;5#bsXjuPI3^tW2InWQOTk!L}}8K$Dy
zUbdat*s6i@>N>%HwgZq26oip+k)P<InJ@4}_v%00kh4(Zdg)Z?*4(uqp=1hvHnhwk
zMB>Z;csJ6*TgB{bBA>l$m)bX66Z=*l1*#j0I8R)qYF~iKqCCpI&2QN@HHD7aizbds
zKw1cRf%xaZcHw&n7bKP?1%V2!#znF42n2k_AW&d`8z3(<2JxSZQ;esLB!@M@<eDlq
zH3j0Fhraf}-m9*<;`8FWTu+<^u=b5s2A{yiInZbXfcH%?D2GKaFAOeZ8M2*YGOdFh
zm#nZMsFG}{+qIZ_C8)Cy*2Ne;?TWuy@wH_uG5Hjpe6IRk<C&Nqz7PL;lTZ*+?`r|@
zn9%|=gM7TTvCTiXdg!aFRkja1-Mz_;5dmMn^UgaNV)_}9uRiZQclsG;SjPWD+4q@9
z62FcD>e_&z==<}aG8iEqWVskaLKZP1^<>hlOY@H)Wdt@8c~i6zYUn;(;6W&nlmrwm
zJ&C_wu;r8yCgy-paaI}89gTngJ@2_;PJEZ^3DE!_`N&7k!VmgU09v1hq^ttx&3mJw
zj9gF^oS~v(19%knGKCM-1W*>*sO?jtuIj>5M<%WlL$V<4fL{cqErx+b^x%)ri%zu+
zB`(^wcGM7D2m{nMnN1jbld}~#&ateU8o;a>B<4y*pMa)fDcoZFcxG(7p3$fY9F7CE
zA>q$^-{S5^?o&&hj*kqQYEIs}_dYSF<`CY2v0P74OYwZzc*=7JgCM0lRtR1Fc>*|)
zj9d^mswisFv4xpPoQ@njhNXtj0E56(A!pjbF_cXZ`z)U-{s!rvK0+wXA-2dGnvM!=
z_JQlK{h0VJ))S%ul&xNmEAm-@I_oRr$}lU&vaS^7pZ1=mUC8#+X|vf{okSTPs2ey}
zGgkPnI|3|&Nr4|t?_#v<VcBVu2BohtDfr-`-6tWZXdfTbKOmv`H|zh1?-M8BYlqT(
z0TCrWW-^J|gIa|^(e$%qvfFO^wA>3#uyf~(AW%d=ssgmk^Pom(!ePv^`Zstm2tQ+S
zi3sNC@bw_NY0MBn5c34k2pmcU{3CE-g%BqTT`<xrSOsA}i4dqi9X<EWM!tR~3_@Q;
z1V8FG{`%^xm&JFnj=Ki9>Z+^G2Lw7(X4%(phW#q9%H~YW>`n!yFlm}P6)QJK;uBG$
zx}QlL<lfmHBp8x3*O&u=yE18Rw+y+Oi;MP=18cs@hCcj8cceJi$G{Ju#M3W;wRLpl
zhUHKyt$hSQA0mhENrEzL4B;<8H46@dKt$rGDfk`<tE=14LTT)QqW($`sB~z36amBB
z%{Ii2g$4O6_yh0_+(T;*O8Nq-0yY4!r%@$xTq)UtCdh#a`1Wy}t4a(U{KO$Xa8@@2
zeE_fk{5`3d@Nz{Ov^y;*iV6Uhfj_7L6q+p{^cno6Q!Q}xn)(MEc?+;4vZdR0(+$_&
zARgyBt_(oW^!|JA`9*lQ58=Qo8>2E?8w}0<18Y@(kVE>NTZk8&PP7Xg6FhY!gUG-;
zd?u}Mft4G;N$bqSZZur;9Xow^)?f`6$Be~h#5_>C#c;-UmOG+c1s;H~0GPb*;)(En
zYKnBERNU0Iw_zduW5MUM(MYq{qm6i;jN|ZH<Uq)lb_Ps=m*5IUir^24@6Rnk2ngrk
z!3X!rQ%~I@wrrV|&p722ao>Fp=@d?(9+fhV3l}zPUqy{8$$<lE2FhA>{2YRu08zvV
zb+T>@VsleTd?Vx~ll;fe7y~Q<SD!!fWq3NMtA@T_Ngs&}!I^A~Fy`D#F8#T`z47|1
zyW(-I<H`Upe*W{HBLn@CAdK#f!?1Vn-p7i4`}R9HeMOq(rtGC|etzC1VDus4dp6b(
z@R@5gKt%0iL)%fF>lS>1)UfKt`k;u!oSWA^&acY4N=L*_F?s+c1v9pUfwutN>z4yJ
z)9FB!b8;gy0Er-qN2VZAYfm4RpK0US#1RZi@)$&c^NIJe3aA26mzI{qhV9ll1$@SK
ztho1!dyzXhB-DIEo^|fo;?Vt%;QYaW4JGF}at;(`1f!EmmOu^DQK{-;5t@S*->dn1
zfg#F962K>r3?1RyNCy?k$U>7Da5B#TiFf!3BU3FfEhY1hCwF+gvIbs(J#^y@*L^}f
zjunXGxs*C34x`5q)};A(T&5<KY@G&xVb0ufid)Op-J=_ixzm@HT$Rvf!ZCnhfKa<8
zF3cLFFad+iH<nB~*z3<N3YTPS>&SK2S#F8EKkPEXDo28|^g9d+56mzZv{7yd7J9Jb
zx3R71Pl*m9pk}s(F+%VeLlMu5#-p&wqOKZ>SoS42)djhQ$xrcF#M!!QI8FOfgxpr5
z^i@Zn`s61?n5H6FTy#LOMK*x+H^%e_fbY_mnG-q?HWDSflPTUB`3D{rhJr!|rDP5L
zROF0O0ANt(Fb<(s1*qCr(tQT7=nFa6d^&KdUb3dTe@Hw@c~gL=FUB)}ARfm$u1;W-
zgl8g7={FjUG~?V|=1qdYG#d>hV8-5i=S-e2J+vwX?itd}Oj@oANKB)#)s<a9gn6n+
zRN8I^XKc};^HrySang>RK0WWi&B%E}XKY#q=AAiq{PybP5FI%(#WZu++l%Av+ZUwB
z`mv~k$t0Wx46xMGq!PVOeh-Q79mPi7EW+=j_TXDeoa?aP*K8bR(uuFTfifK*2o5JV
z4xGv)yO#MFVJQ(z_!b4u)2BW;Y7XJ0ajhr@asgLG$`rcmD^UL{{EP;Xr(jUMCTO9k
zOUnZ|gGe#{!1dQ(zbGEZI<5?$b<&0kL(E@Qz24aNK#Ty{v8GfunvdPq)>aY4ORgx^
z@iyms?x-TE7Hd`6_rn_w0Fm>xczBK}Srw!f9ASICx(I}>gGc@#>CD*^5%dipAevrW
zwnPSfc^IRF$t(^M+Sdy#A?gkmeM)!@OjR^WHwu^KmPVr@1CfyA0G5EUk>qe=36^&d
zk!K1g=gO2Y;}mM90nR(e$sWOH+f3j%mWuQDMKPz9<w!NNP$Y7Ok-;P{45!sIl}>`n
zGV>6GUDggl<q6+M;J!`zm=mqFx8hI);Xf0PV;wgJpzSJ<0b^|+5<bPj!4OW51@|MV
z1A9uCck45^3OasKk+}N~)_wU0CprGe&*$+k`{GPW7F)ZR{$&`qv>3?klY&lG<B$<p
zq<OeTK-A2^2GF|cGn9v$Ks;mkP7OJ22xS)#oyoc(giOSupV+cXh{R>}kU!{bZAREF
zM39KufN5!ljC?Ni>1p^0lTgq@!joYX95ttBXKmd}*aD#g8zJchv*;o)0rJs)R`F;^
zhtSdoplV~xn1kl`eZ%!Vd~YW>fk%vKQ=ldKY4&~MajfIU0K2cbW~-^}sR~LJ(68+e
z`kE@P-I+1XCd=Gg0yw#Q_OqW2&${qkH{EWf>VCeykNExcjt1Mh7A14>tjXiW7L)g|
zUT><Or+9!z<?vqL@X4Gk$GyzfHk=a8QZYXERXvlcU-}V50m(2_^(+r#0q7_kPL5aO
z2~_RVmO`p~wvo|in1=>oJs^);p9edUk;j;+^B5b9_k3<(-b*%1#{Bo{>@c%NF{Gb<
z1d;^!zWRNLjgYQ(4nZhL+?$q+PU{5@JB04=EB-d|177oZ@&m_>0rvO%&t6|!3z-zp
zS^kbhNIPnYY`pHBISyRpg<*lkw1ap5=m4aH<5+4N&JNtEdgVR+fGu0MdV++@%eMX;
z7~#-;0aZ2sVve5g)nV!{BI^LXKLBYbQ?Oa&NW0e#H!U9Z381hpA*UILCgtROjf_S3
z*lVQOnlU*kguF-Qq(<OpdGk%ARqZ3dQT5kz2_Yv7Sw=&`!y{kO$P%{>N7x|gRaFDW
z0n~gi&A_l^!AK0|DLH%IDlhJ)sHdMFRV_M+1f~oz<p<8CKuGwUTW`Jfm_ecA#sHxX
zpTEAky1m<7X>Y7-BoWf1@NZnJz2rERllVB1vi*a7;&gy2^`~b1z=pN;bztkTw_EG^
zJyg?WRjd0H4j|jKDE)K>S)A!BaIiQ7fJ~D5E}$9~@3QF=h#!wl&Cu`Gs(hPwC^vjR
zAhUp!<SeaKwa*@=;~G7Lrl7X*f5Qhjc;J96R%)j4&LS9XswJj3nki;1*^*A%&l0vc
zVe{&wjU4wmhfVbBUV@?s{9GX}b`s(8xW(-Yyo&z0lA#?yvwDvjJ|jI0&LRU2qgH<3
zBjul$li9?qJcIUlfjGu>+!z2C@tkKq^BJ%0b-S00MjH#W%}^m=S79e~rYcpu5IZrM
ztdRxtERm9Vc1Tj4GC@Pt*M0b5<#mG>*q-mnCsVLbpU?1~g!T~vJ#(KXt~G_P*d5p9
zVl4OK`@L!gGthY~TP?5l=~T`GStKKnVAED`7KzeaQ0&=9;3El~2j5E=nUC?3t{YF-
zeA@EkW$A!U9lyq;FOi-<)5Lj@`LZ^?Hl_gh@pRM&W0-@2*T9X&V}M{vjt-7w0%J}h
z0}V2Md^z(blf_w>fet3bukiyh?JMw|CQ78GIp$`P<Hi8s!rA-ozu)ZIwF??O=!}Lr
zeh&~o6S@MPFn_qOp{Ij19Eh{eJ{xG?i~!C~V20q1<OHs=S$o}7?eqsIjZ;Y@q1IM%
zMZ(f+U_~ye;?2Og?&PVvdZ*pJGlGqsboyA!&*TrKl^VrMzYjy_4GTY8%q^7l<d8Km
z(EQ>VUbE2dAMI>LVXZZoi6nE-2|PWD{Comd3bSNf1)1$}#xPX=VzO9=fb1J=)eR&~
z4laiM=iq5DqGFD#HQ#dE&NySL?{$p_DLYLJ`Ee-q6gz@v6N^yi3=Ais`>tdA3UQ3<
zxG_KyNB?xnuG3fc@7s6Z&Ye56=RD_3a5RhnkN_fZgMLqu1Bm@I<;&3MymQVmd6r6s
zgR9U0-n)m&ogTARufbu7tIY$GFbh6Zn~rnidugxBiKdwP27FvK61A<l-Oa<hXGafx
zN=p8`_uvWOfRNBaY%v!{jc;Ueh?pFV&R#e%7ySNdT?iRzW`5p0_E=w+>y@|r^anca
zwvPZ<Ele~ZNn$k{)Y2aSxN@RpfR%VF;IV*GvkJ;J;1D9~sgO<ZZNzr6L)laj)Wnk0
zp_7LTMffV+Kct?2lvP;b7}oK_0hGFFZf?Gu-?F_}UEMJE-upmEP@OMP-SM9D^{4?d
zI(%@L5FY3)$u@TgYH}Mq{tC94=uidK>IXHmMSD<J-^6+lP`y{aG<#C^J!#pVI$?aB
zL@6h;0H>qhIQWr~1GUE%5SmUOC7LZ?RN)gxU(|K~^>IwMnzV;EeN+;76teWuM&CQB
zW8WacW9s?9Hk*l>oeM1M0;WTzTkY+JjV(RaGav#mRS#EW#!nw57BCytJ_0gcYX9o0
z-nVZbC7KySIoX3oyUA8KgvFW2s{0C+I0_-IqXG^cKo$zZ_DpdM>$ouhaQO$2)>sRH
zuq`buihJ(+>I=qs9yMnZ-KL{MTkS7GsoEUW1WmB_;Wf2wTcL_9l$1<}g<^WO(>cX!
z3OZI<7)+$S^6EaDsNg0T!8AZ55TSO$>PUjcB6T#eP&aU_*9{ysYF96UNOUwwOwI&s
zHR{=bWGJsyc$_WUy}p%w<nh>(z)%sOzc&+;^I?ce1`8*B3-vI{8VT(8HjubS6fjZ!
zTpWBr6F@+SThefw8lSa9rjiMy0J#8Ye@%D?LQhH7N9x2KN6UGK&mHa}sc`|V>d9ka
zplMc)saEi~F~CI^T{K3t`yjZpdDmT^JFmNM->X-<{fLR4veZcFHmJPx;$q@9sxAmL
z@27YL^Ye1&u6g?yq60tFk<t=OhcUFhx~9bQ{bZtW(uqqOI~Oc?-N*}1hT*-B*TEPe
zK9e-5j<*X|>{2aPNum4=<{=MN(1dDc#St|KhfPdt54}@4VZ1TUaoQ(9%z|xWWE7sq
z7Qn&YSMlRxW)3@pJkK~z9IJxzd|l=_nNw&|l()_d%mI9WT-3v>lxj$}46H+2AY+Ql
z=prco<s&5llU+=?6^-93fqNI$`y%>XQ>NWSQjFmwA5+EfafO0$a-V>(Z+rN`ul)<*
z%4Y`UV5aZ|eqigo216>}R^0-zjhCE_N4oI*+x|jOqE@EG6(9yLIOqJ<lQ>eD0Z<{K
zIje7RGWQqRMM<GUHcr;%Wc6fkhGNZ%pIecqFD*NdG2_Nilq#D01@M?75P?jQ`IfIa
z$?>w%wgC5zJi<prlFzjeA^3Bm-k;1Rn))A9>Aj7;{#p_it|o15ED~iRaN0S{@Q;j<
zj;uDY_01M+Kh!_8V!!|p$zffURRpOfM0tu3?q~&2Z)j~M4J3>ZeU#{H47{J9toza{
zU-`;P9K$-^3~+nD*S%!e?`_9Po@xdgrxn8iB6s{q1Fu-MB`0~qP$3;!OHKg0Ndj)+
z2sYT*#1DGr2>0M9XOOvq%tsHL)0a(DEs3_evLaa`PG@Ta>fXb!_+t))ST9zU@7)8T
zshEQR@NF;);<rUTO+1scb1Y2BB<BeSz8a|>2TLD?zz%IX8LsOGO1HhX@g2(3^Ba&K
z+G6M2E?e^jq7&Hv2_vWqurHl{&JLpZr@|5;RrCPu2=|Qdxsf4)+d(>x3IL%X=n}O0
zS(C{T6A5<{1h94pxf970CYqWA<dPl|$GDCw1Dt>U`FHQzcTl&G^@;(kudH`3MB2MK
zKi>?&u9~)wuxJp}36civec+|BEuaQ;XU7gN$rYaWxwINK5ZNKN5C(qqdn2I+8Tztu
zwq^6P8{NW}WhGTyM;c3s8zSVZp!#`yY7T$AArVQ|A{_9?^_jYjIuSJw>7Qy6U*gs7
zz`3kg-zNvd=`S35--Qgp@9xkSXjDFW@ywXjxCG8kv5%09z<R*SZ%bE5Ii|{ItqDNg
zB<2>zTINoxN`jk8WVvku4{uhf;H7Z<eBb&c190Tt9Z3gIK_WVZsty&8xk~uBG5|ME
zo?lq_+a^5jCTwC+lt28)qmP~rVuwvt1W^d$*`ZhWNgUU;bRZz<%v*0`!#_t!tR=Tr
z*Y#sw*oGs%K7GyLLRVG8k8WQAhTyYrh%|;IbkcBj=Pt|!p7$nX`hB=1lbJqMQk$gA
zGv++v_tG;BKSM?$qNl{rYXOhuRf&&KmS9#mqloI?n}T5t0s9Lv;kI72p(3dK0_Kle
z&l4V2qQEWUmSll}R+O;%2AL~lqm!fs$6*&}{3_vhvv-FZMJHF-|2vg>cjUqo2cjmq
zTO8v$?nR+m+PA;xMK6A6=V_;Nj(+D0pTFzUy?Y;+0TdjE#)SOg1+HM#qm;xoVuy=!
z=9w=LXKt$pWKB0~YEPKM_u%`Xj9m~XrS?#~*jo{1iQ#^ot*(OT`!%)8a5w@{HdIyO
zy#YT{hgx$?$auT&YZ0^<QW{&#r%xEpxN4)T=%n)fSvCrU9}7Dx>uR1@)f!<^#0qod
zoyLht;C=!XoJu;L{2nsVbaaf@T!{O*4;}wTl1X{6#|B|3@(7}fZ?~<iDwax9{Wz%m
zb>-e)S1RtNBZX=|KukPEdRV{^4v1r1$DIM*_{KMm@UwsAg)exKdFjhu@#SWF=A~Iy
zJr{N_4uTf*9J-B*J~N|zSV+lS0|6geIV4XxWru8U+lC7^C*j;#KOACmF_$2XWQJKv
zDx{oDK%2gO`*tRKB&C_AW$V_K*ulRi=Q9`7ww~{A;k(ILoHoXh?|e^USZfGo<FRLP
z+#c%^{eA#&5Qo~t{GQy$@CCg2MK9%G$hiPvVWQ@CEpUpF>i25q@EFIWTWEZwFc=I|
z6Cdo)wr5?^)3-X*$O1ur+lcHJU@3k81pdKkci7=}0C9u~+|&%XBi+O-ZUs!77S8Pz
z$GD!5vhdfx@r}FlboiG$Pd)XFXP<TU*8t1yYD8+Gmu@5ghmZjcRmp)(kSx&46G7`#
zuCG60^=c~l80a90<;VoJ$DYZ_Xja9zI-Y2cm6esRD{EU@Tl4+}d-eGqttYW|RYwhE
z6ozHKV+atn8x4KhdI+tMd&qh;iBv{pBs+ueTp+_hjd$?(3f@nxKp((s9GvIY9W!PD
zngda~34A26;hCW`8(3xm>pFm_E;KEKhNNm+!Tk$$11|6k!uv&h@$(Qt{XBQ6ou+vY
z_XWzYYZUrA_3xozK*J2d5sDx4wscQeXHaGB@4_grobk*vUxv`<$2Qiwr>IJ_IWEc7
z2p62fF6f&DF}>wpPmRapfVq-GhYtD4TQCg)aC6NY{Rn!3S)EhYxaUyb5Yo)wpn<Yz
zAb14O{AU*yY6kI|0tBCeF<=V6tqdP)9BX#_tS|p2WAIo|RH_cwVy~^}EASXIGc-#*
zwM+)`Oxg0Py^X(zeWPhE=%B6~JfLHb|MPudGH8!kFv4h@8uq^?jaD`+yvC-tKU>;r
zYoH|e6Zlu4YUgMluf9z)e`0F<>xUC2U^Ea(E6ix)J@moEF|H@9H}L)Me}8)6YcIMd
z4D}lpx9vC;rudXbyZuFYHZ=K$!WRUIXf`9sZW??<k;tqKq?X_&yc`!wf|5y^#Fb;;
zHplk_o;dhS3MK%>bP6w;@nMi8+Kfz4i3(wZr6Uz2GYK^gnMmt~_TR<hGaSQ>>fYZ|
z12h@|_kR$zHt?Y>G!KVA3We7sQ??BdRkVO4<qiTJ3Tm^c<?FqX!AWEU@B`-E&U6&;
zfzlr@F`QY>&aVt%aFn@F<#>M!lswN#`zwBm#W$=YvjQfKBJzj>IBgwwC3h=HKegH)
zy?M``Jw_bkdV<@--+%vwueoq1IQ)f;&fGTGDqJ%67?ffeC~n{G*hd%O;#1N*n}ZlS
zO;gS6Aj_mkoF+IX!?}8C#(Py*H+@p426QTMCE;YLtg1kN_TH935^$quLwv=@-DD~=
zHae>^uYEvZkG<eEZtW3(sgRfpsgYRJ!t?QEZcJN~fJHIVB(w&0!{f~Wk*dJBGLoXB
zVz<Fbkt$YURJuV{`Eqd13xEy-senF;pmum&p{;@m1fvHy(NG6{TodB=ryZ^4>s5CP
zPS;`LPj)G{MA@nldGx|x{N-QXFCNEw!UshB$dCTW?U4=!Q55{34&&#tR}fyykfCw?
z^|n^w__ZXszqo+lxHD4(p@(>quzVe|C0RGeC?W(CctWzQ7LJ83Od3W}gIh}BKH}c+
zAqhs}Qrh`mt1SHw|2Z6w$ts!*{~n*Xf+mTZO`cCkZG`){<}nkHLHU007?>boy54Js
zhPHSvl`!To-jNt)Mzz`<TO#&@x&g(&uqwj$TVzH}(285g^yNWYN7|b&$*pHKVc!>h
z<Fz|d{ZlV@RL>wGVO^#85$+G(@UQ;$RpN23W3C~4yzB4&?(a_PbY}kpJfaKo%07%3
z=H1#BcY_*ZBV|c2479h*fwMRg`rk7Iw{+*<kWe}V%#<lohC>CZwxz5jC$Dgo0(u&c
zA<CT5r{L~OKW>89YRHQQe!*v)_uG|kFyY^jMnAU0v7fsre6cNb27xCRLdAo0E`jKe
z@ERC{&sTxp7l0ja4MTj-SNg`*9m&Nu#Go3`Isv?jp*P0dR7wjE_d-L(onTbtk#uSn
zH2rO8fmgYD+j%kFfLh5~1F#6hPV)Y~kl3*~v=nWb-<uopLPlQVajqwg0j7&v!W2fl
zvnb6uPP*N|zpn{|JOo+J1ygFcxVRT}I^403kQ$kyCu@S{xGuPEoY&)#6(iZ-LZ<@Y
z64U5NtmODNVow;&1p8-%#upg8R~hLy_T{mmVQj_kf|@sQ?EF1GgKs3FXDYV#AwBOV
z@Ecz9%ozH{U%0tA*HWpn1Dtm>0^ZP&hUKrU`Dg7v=Nv~SthEo|a2wDhMH<Nw4fZ5V
z*g}l51PtKKAjOY(6+dADPaJu;;L|64m=2y6fXpSjTxdrxdFA=9{et)|)|1WvT(qsb
zci;B>%9j5cKjyjM@<&0YFFIR2%3?@J7evi*@V@i?VcdWj(5}K0xSYJ85u5IW5v(%<
z9R&j{4rHOUumZ)?2NH@)MP*@2QVyT?_b@BQ6opk}GBAjD;*|25f_{Z3xM8uqbJQ_>
z0?sBSxZ>k-G7A_?=-}ZMhJEJ>feExki5thnPBf2)eM`7JUh-jTY+3;&Zy+;J%tGyK
z!QuZIe&J7o60OO#ISlvmC#s2K;H958zFuTv>ul%kuf6yuE*IbBdP*4J=yk_?-jig@
z%Rd6q{Ym`7vq5%7Gb{L+L(qL45qsw9f*0TPPj=uuARylbyJ+A`WVlKh$IRlQ7k)xl
zW%!<m7Zn$*4dS$5xI1`%L$Y1pTDTP!|CJdi1uCix@5_ZB?9JnF#y7MqHIN?%?nq6l
z6%GMsHl|huU<BR*R){(Fx0VIW)L20H$qWc<fo8T;YJA3z4Tzi{-c*6^fQ3%8PQD)J
z_)@=@(4??qn*3pq=NUlNcmOq(5Bm`Fx0L<#j-5Mx{1vZw#dkd?=qYD_qZc*9t=C+0
zdcRE1jhi#<9NB=_uESRMa3g^^Ou7PSQ(b!LrS@3jULO0dyY33Q-3OZU$@bay^7594
zA9!FHzD5UbXa|?N1B%XBXSRW=ry%V*kME;Y(o19`LkiaHLpwbHaeM$=u%_sCFhIab
z!B<J)r+DVTZH(_57yfYs$k&8a1$k9=kZ0~7nZE<a`*~>fAC^bA`5gVoxrzPPUivFj
zu{va>8HslRP<ZEMmt9tf<FHOB1~?Jc$8WxQdnW9^gl2diNbvB=+8X!r*$x6OBAi%&
z{+?AjoQsrLa#}7!H*og<1JF?jZ{1LmQQ#MFt2;1gni-S9U&F`auySSwQSMf#k4tdO
z*NG!y|1B4_zwZqom?7LXjZpmdC6`?CHE|r*@$C-Y<cr(2AUpg!&;nN@Mm!g0<~Qf(
zXU*$gchOtF)%!Wg`z7E1{bxfH?1IU85hV15km#rsHU}K}m~rkv>|8&JR3F3#0?JWv
z=EWfG`SlSd&Yqb5<&NwqR(As7k^KUK)ZhNOOD?`u*5>E9uBSD?WYI+2^ub%M%(L;;
z@IA&VYMuv-?=pDdr#h)#dBFu2eD;6mICtD}N85}>FMy}=VxXUA!*7Aai)LlS!3xnN
zywLNF-+xSgb77~OWcQ?e80geZh(z9-=c9i*Uh4i^t*04avTpj&p3Ac=KZJDlUI0ps
zL6v_B(9ijamVXMe{EyFm_OA0F@sCFWB{a)CqM4V&i+?_xf^)!YKLqWtgUz#~fa2&B
zDIbIxxju@*8$b7{JOBIR{H|j^Iq~!ox9++1qCr`_QdY%B;rAy|E4imT9`9$`xzVuy
zE)4W9!q)%4KXLKJe<+U6l6!8r;k4Ab?Qk@^xUE6TSH*X72%ezzJ<kAl?AdcV?EX8d
zY;-m92~iNl-AC3}zQ`H_Kes^2W<!dbfW9w|)BFV>)G-%boXG2h**Wy7ShV{+E8lJ_
zcUu@HAz+*8V88nn7V;1JtXQg)$bw-}lyAXXmzzoal<e;LM6T~?2H11Uhkpl&s=LET
z6aeRXsZBl^#tW70v(~Wk8&|MKa46-c;N`y?artF8Tyxb0;v`z%vkb6%_boq`73KFi
zQz9>?w`b0MY0&Q@f4?5Ekdw_DECZ`6krUO+vUege_^6JeKY7o4-t%3LXgyKZ_ap;+
z?vBqb0b%^(W+ayZ-mLYD;u_ZPb=pd{+cVz#o^B1#qS3gFkYbGbRayPER>2vwGwt6H
zC&}9MP9WoMZOkqgnn9L{_4Cg^fBc;wV%q&Zx843n{b6ytvFVqQr^%`)sjMkNj<C=D
zeudg{s8b91nSr148~fwMEs?jY>MxD0F76L{=e_>*|NJvzldnz507T%v9|&Bt+1wd8
zb2h-5WuPa^u+gVEW6v2?MvZdw*}+Ks=D&RXPki05rCV<M$iE%u`N}w}KCO_MN64S|
zx@;$Mnp@U2gfgp82Q1`dQ%4fl)x4F75ebgWVv=l2qVS_>HooVl{*TLE_IT>>PNcOd
zq2PsuGuyph(OVe~`;m$6_6;GOHm7nk)7p`yyb>vxpPcUqmRg-V{oIFd`S8p7MZR+|
zOm9va+8Nh0!?I9u6e<%MIqD9TYtI<^09m%iDd9kB0$JorR#D-iejuxb<|DQ!elLj|
zfAqfh{pDM5*#A##;<YJ#fZ3hRknPn`H0!9IgN}xYp48nJrnfZLxN_^#yx6*J+xLC^
z;~(G7=WoCL_QkO&|6^dQR;!uJmQ}_6)G8=ckY%YBnP6G32)K2F82N^fk*~9<H}X!9
z(hX*`Tst%l)~f0XDb+{Y?ao`?^{#hp7n^u(N)5pNyOwVI9XdIHQk%ePUnxn8mT^Ot
zM|#6UqI>8u>8fm-;Lfpm`Rnld|H>(SUsaCR64^9t)P(o1Ta89g1VI^&QpZ7#N^=Xi
zpdKlQ@2CeyYtA~9NfIctF>=+m<hKgZxO2<a?eE6hE)tt`ZAuNmh7nc>M{wFmpt$mt
z;d0EP!YJYdPUBdj*_;<e(5OezmbMA#eOQ%co7>I@P1$NU#LT>6&n_UKg2Nh(Vi&JR
z04Fp3EPR53b?jlt>SN#IXOdX$->B}FDtKp@v|smE@BOn&#3o&vk^$KJ?|bh-IwaWb
z*cW9Q7e=8Qk9-NZYP33HW^q|8Zr@c8ktjxgtX*+QL#zMC<kdS&TD(nE_NNizpE}#n
zTjv^b1{Od}=lW)O?pxD*Q)iLOa!~rwZZr{e4%sZ~n!%p{8+feKX#M^Zy~*<djR|u0
z6SX#_31A=J)b;LH^(-IGACRFI0T{s-l=_XOB9R2KXMl?@yX=14{VX3NbPNV7D?5~G
zK6_kNms)54L?~cAMNkzb2=Ds|7bWroPR5*Z6xb-x&6!xtM}b?Oi<&7CIESh%>oq&G
zH}%T=O~P+u>8HSKs<kN@fEvIQW6iod?n1)nbR}&*7zC=>a%?nFh|ZMe{tM+db<0eq
zXt0rT@AV(t{nDby+AKdiWq!e}=Uu-Gc#;^=%e2x6`j^|{$MeDH&vn?kMM<6EpmVSc
zA`In2>xT|*8}@s@1P!q1h|je-8DKS&;jA_wJ|jQHxx3KRaL^hooEIFi=l9)%9?((q
zJLc7`Q)^B|GtEZm)yiBrZ&!P(GMLqV=0E2c_1A~n(&3<S|NZy9`K@n#>*MOcIZ@Z9
zv|F4G!f`Vi`Fb{DBmij&m9wT_RUvmDXZLU5Cu+%}_>TQ@iW51_L=Yxj9V1R87}awI
z_;;r>+wOGO4B8utlWc8H#|6M$3`c)xN;RGg-Hohu0CQM?t0EN&pn4oDFVw_De7mLm
zraVTovqxo0W;(4$y$#t(oJ<OI%aEm+Y1%yI=F1a(ZAufcw6w&zeF*7+&Q&e3UaiA3
z4<!t{Y_`}rP&ZX@C2{;6iRK(zHN%pfJT}oT88%!D`;RP;pDv<B1P8M_6_h8XOzX*9
zo00)IGDZ-YiviYD!Vh_}0&#qyT+ug((-U?C`}ZPB_>M$Fz~BRix}QIjz09LY6CA)m
z7eu~Eh$DLz7S=X3?*FaU=1d0<*?Sjy!j56Fqbhdn+h$8QCvjNox0dG!RuTFJ&hN0K
zmfWj@4;yd-NO(^EAPmf*QB{+>d}($VyY=<Olg<QeP9I=a%OU^_%$b86Hd%BfQ98o;
z9LL5{yKn~BM&%~mI^T8~hZw->DowMAH^FA0k>H?5Zur3Y!9n0R?{RnEefLSH0XC-z
zfOv+v_Im+Wfb+QJiYs-9c;3HG4gmRmoqbi9@5lho8O13BME5{+xP8*?%|=p;GCy>R
zX27{16i3bOKbh9%%mr|;!X#w#b9pBNqi6!SDsI5a?O3@f;r}8E0MJ`c9uIxPF(-qG
zcv20tm@HSEBh2mjz!&bEbIy6%2RIQH<9~v#tl-he)gKxj^wT@|nr8w^HT&%02$p5}
z9f{^RA;jSS$rf(@*f0a!=4PWRl;1aqGmD@k-uAY)J#7M>?8OqUPkeaKb0DZ&K+63|
zGT3|f1FM?bu9aop2-<B2N1hW#%jtf<t=YCpklAUrn!*+p6Z#w9_6xY-l6HPiKRaOp
zMgy%@i=*acdlvqm3q#+czR9b9zSTNm8Q|)xujY8T(>`+B%|9IK@EmUXij&=1j^_`w
zlHR*0vF(|~s-X8T{LWeR<Zh^M_yqkZ4#jvplxdN^5Kn*T+kFoJ1nx2YT=2m?Bz!m@
zSuq+Z+(ZXSpp?TZlQ80J0C5to6Ila9W7o)yFt>`KyLI~HMvhdFN`k6Hrbcm4I?Na{
zc7E$$Ebc;n;86FgqS`nF6S1WgH!r{QV;^a08Qk9+j~{yVt6$wcT9T18Y9vwc7I*;M
zoBVG#x?SZX01$o__w37dNGt*gJSiFAg!KU~z4X$Ya4+ZeDd7A$ZfoN;T@-a(FPle_
zJh4dXj3E2~fc79>xr*TLBDivIjN;^jND95dnDV{tD7f##H}ARY{n!8ffBmb!`YS)(
zouwm1={}a1`FdUaRRcmnJ@tDsmC=TPjGxv3Pv&AyA7)?#72nZ-Xi_uu+pV%huR@BJ
zU~LG}n{n>SPAGx?yRk7cfoaG+yfbs42-U$y$Jr;Mq5T`;1C1bkbt8`cJZ?2#uybaP
zTIE`xJflHgT@i+AGD=p6x)yMRoI_idLB;tn0l=V>G7LPSoxsa3yR3KJ%{Mo>!-nSm
zI-QOk4hE{xC=uwxFN0P{W(Ao*jLSkXl%q4y4nu2U%A<_q<&Y2*^&WkY^pE!*d6=6?
z8k6T=;dg+~l9^`oHUy4qkq~z#(Sq$IeQA0^_To}Cn^9GyV{*sS4DeJe)9-IU+LwJ!
zCf|UgSNJh(?Y6F@3!)K-oIv&4rj{iOgQL(DqcMB|&8eb(hi;mNlwBixzx01XeaObl
z{5yX2cmA!Pt?#5p8qqulasL06BDPGs8TSux@q%{Mp+lm%eY+d?yAgN96(`|3;c)<H
zfz<dd1+<Ki_vhSw*m+BccQ6?G2mrK}1{xuOr(O;QJ{pLV82N(IZ_F4)*7XlQ@KRfr
zzY1sW=Cy9`52nXgRdsu5sxS68(mlD~*U0J?uphtQ?_%P*D`}XH(xvX|>X*eyxHbh4
zRCc=?c@bC>Rf?M~vJ#kEus2$|G>~`?2vsGRAW&gvGL}7~z$QYsv|T@RXr~zs-U+B^
ze`@qETz>iGhexhleDP~Psipe6Ml<^N+Kk>($?9Lo+?^kW#q&>@o!z;mX@44@+ZBb$
ze-S6)+BB_U@4ou#*`(gf+mB`?1JoNZ!h5qO41>_AR*OD@gb(1x<5BGsz)?K-)qnVN
zC(IAI%Kg||-u{kHeXHXWaJuH2Yi1fjaJo_IY$epG@FZJ681JpB>LV9leDOhX60S|d
z03^^~Uv<@XZmr7d9pQ6#4Z(WAQp&i<oF*KA%x!5xXaZAj%ie$B3vV_>@#|8H-}#NV
z{{B0})9dTjrpW~mys7%F4dW9v>15Z<Led<-=dT)o^Axu#HpUYlIRH6&<h~bz_-_XL
zd|*@t|6V-3zG-c`?%*q~xMIo1adJcpusB4^bYwz6$A^<TX?OpY;mV^Qz+b7(>??ll
z9q)KdJiWeYZMtmWU@+)uzY}-r3GaOYFhi6y3KBnr{kNe}{X>ua{~-RdHTu%0iT~}_
zrelCNz3EM*LHtJ(KyyGxkbVFe!imgqkBIJ9zx1mBcwT`-@2|b(^2<Lbo?hQ}ZOVFp
z`|rPhm^4_cS)=#k@t9pe+^4YW?fc4$OqIVG37i{#{jLA*kHpjKJFZR10Gy&Z4#OUD
z0*<I4Y`?Dz>Ob<xwsN%opOHO!#74odil<=k;$~Z$c1YBlF1l!3A(5waVT+BN8|OyD
z-s+z^Ddw~eFMP{eF5f4fUjNIrsi%bPzxN+E=AwBgk<l;KSATwfX*r!=-u}9O^OoQJ
zs(5<+Z>>!~CG6eres_4<X{Y(z{%c<InsxE?I;QnM0e$<-4#;@Q$^ZZW07*qoM6N<$
Eg5&LG9RL6T

literal 0
HcmV?d00001

diff --git a/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png b/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e492f3430b078cb3d288cbb156f6da7a989d98a
GIT binary patch
literal 17075
zcmV(|K+(U6P)<h;3K|Lk000e1NJLTq003|R003|Z1^@s6#^Cfz00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsHLP$wOK~#7F?R{IU
zbys!XT=%ut-skrJ#>O_r24ez*Mv1soNrV9jH^N1rR1FWU%0u!J^`(!kRH^cF`&hNA
zDpk!(6p2c0S_r|ot-*nS0!dRsxW(AU1{+`g^Ph9}ZC&T;_{NxHuDQ>D4EFCUYL@i>
z=bXLQUVE)M<`{E~Z+v4+WB&H|xjrKEb9~%)-+k%3-u14s===GtZ@;a$<(50=aU7?O
zZSvLCll1htpCs+39XI1?yzNaJ^<!)8tVxn(9mmDCs?z%C=&hUgzW2R7U2Zf#hsV#2
z0LO8Re*gD>f3Hf@H>Y`iNTWTAq9ID?jX27>qZ<zU+ur(io99t$Og0`I9N;ruw_clV
zU1x3Ej>FI-jUAG%tMjNg(YEfhD_5RLw%wLav~^u?*V&EL!@u>B-#Uw;=;uP9uUi2^
zVE5mD|Iuo-x|v4z(rlI$B!sjm^5<fcwcBCanbr(hI*d_S44KVIKtpT_`Fz}U(Y!jc
zv#N^nEE`+?yBg9oO^UKK<-tK@nkIVm$tR;He(*$=<t8Da6?M~G&aya)<LIm#lPlKR
zD|ETzPk!=~gLxeuuR8&L`qQ6YkPL1eqv%FsZ9zBKHhq6q7DY|J4@r{Pq)Keu#ZgB>
z$w)Xf$Rn9fewLCxTsL&$u!-^BYSl%H1<n~pn~{(=1HTRd(`lxl^Kl((GuAj<XR|%c
z;<!w^VK_{Rq|D=}Zf$avCex#z`qZb^=5=(uE(G|EZ+s(r<dH`XNjSHezCR#MsFOHe
z8@p}dcxJQAj?)0sz|+WARYfmlB#=$a7a>7p!Qc2DKRXgMgid0mze*MspH7l%=t5aG
zknj^0U`N-+#K45G!!Qok#zSi3emhh}na)Xz=V_6j<hgmAEc3Ik2d#Wf1xVVKEEbEK
zZQH(OXxp++?3F5=t=py<pfwN_26z}OY0ZK)O+O1kKrn1Jjc5`MXj<1L5&l-8WZ_TN
z+F?{-CNvSCjUAiV#IBu&>UUsb%%XDG)~B>~#_6W6_ehvWW0Lg45Iy$oZ-4s<a;AFo
z8Xd2h0RP|*{@}L5#p2Gs@6FJ4R~Bj7wB(hjMx@Xh5@4SWal<BYh#@cxu4)mamXT0(
zpyxCL)^r}sAT$*MgwXjjtX=dPgwsqKsv4~mpmFc%_u*Q&2G(CT-}DdPw_2Z6NtPdF
zd0q}C{r+$M=5PMcyat}^t1ZCjfd?MgUoMxwoYEilW^-KR<2E5@0|T~j>lseOPdFds
zK_(bPF@rMTDi~e&^!1(uNX}2fUsOgzI;5nX4VzKChHEr+ZAdba3Q)g`PL5SW*%5Nu
z-_c|$=mlOU$&}+9y$5nzljV9%eo}rA#d(y?X5abfM?d=9tLeeMY6AS$x4xA>{N0Ct
zC6DdAZrdwanr@=f(70u>n8HnL*|`v5VUYB*ozomQuKXWs1`Vh=r!j0IY5g+fY04pM
zpP1T)%___$jXn!nKNH?-sO9P;r6geM1gsMZ*Tj1p+`ApiBAMMlFP_EA<@Z1FJHN9u
zufp-F2=EJE_`)sCx_NusoUY5fI?eN(*9;5*%~sgF2(y_TlVF{bbKsN|MumlQ^)u>)
z;ynBfr-TQWg1US!r_e!6DKrz`#oi}tkF0^?SSO*GRjtN%Mzrohn^|jV62PqMT8fE;
zYouw$0#q+{wO$u-Vykji9ga!yosWI&V^6-)+W3kJ@N=L09G>-EL$f{@hwj-lnbj~)
zF`Kl8W`AYH43cKB2N`IQ6U?+0O|CvnE1BU4@tkNUt()DhS?rUJw9F*o+QtqEecyI#
zM}0k>9S;3^&5jVvYhIWH0$1~yIa67d<)9jedw~{rtBxm#ey>`GdbynSskyPptFx@C
z{_5U)?`_O0bi85${Oo5xdz7@}J8JU5lQKS=#ioUKi1#R%rWxMQcw{_q=S?O?nw%RO
zUJq*&n@}f+ga#Sc!FlS5s_E0U5reI!Zql$eg7)FSxqIa8)~7WE_9bqRV?%XzGCQq-
zY8ez1@F9m=7jydAc5-c8cQb4=y0yJUS(HQ6eg6}m_(xBhSKxR>1o)ZHeCAfNLvL;C
z`mCDGeBg^gkiePD9J%avD{G5-fvjQp8N5EDncuT#ISClABTiFiM1%G&7*KwVe!`nw
zI{`zOxUODj1C6i5+x4LXzDL(sXIk;yt4_iY_IAl~z`0V#3J1=aVoqapQVmVBh|6-3
z&dlTY-1G6r&C7hm=4C$q=#T#A+lRV-D?Chsu7D{5d}Q}~iq$NeOAL~jtBeD6tVuDi
zTZD#eWB__M5I9fPtAPg^<`d2en==|v2$eP2X`oDo!nE|e2qBKJreTm9XVCbb+<mLl
z0?pR<^qC;MioS#Ib2E&H346CTc36w)9=7y)LS|b(BjAG_>C2ZxzqztG-rn}W1D|~-
z-9u_##^YtvKwy`odGDf;JfM-fLTg4_VgS3&$7G6CLc{PG#w(91yHvABBg;WE4YZ;!
zeqdcprr(#-;6Ss~JA~$8QedsppnW=jT7o9;Qh<Sr!isPW=I^54*G{AH9wuVrv{dgC
zn!a@t@LJ96$df6OZPQ$$Nxl4gfBzfbj-valc^QtEMSz5;<oo;k?`%&_W>K16!NcRh
zH2%V&9^Q=Nvwo04$FPphK?t3c@OO1$@VgG4zNh96uR&ws#meBj^@_B$r**b54Vy@O
zUuGwi1=rPBGYlOxCZtfO!@cs~q+wl^M2e+C+u)fR7bD_xx|Ty5V>&nKaZVMfdBsF(
zy5TU2^5~Y^Z~se5V|C^w9xqvd_ucnk`s?rO-+8vYGN*;>3I;KAo*LeV>C^ROa43l}
zQ~Z@JB=(a*5D!HKz%!c$57#iHDH_|=ZvF9)m=|Qhnu+heVY3-aAlpT0&gj}(66TTy
zTpbVGN83gN1W3_;qW8zniu07!aS6Rl2_fY3s$F;$0)>+n!h1N*KQI2JMSNJ~S$n)}
zzDsy&YhJ>Un3r(CY_{$9-__J7Ri2K|6=`AOe6)Sj(|wb-*4l_-zNn*LDBF`{G1j>;
z($A6?Id*l2pBNO<oS4i}OBOgMjY~BK6z!w)X%OUla~jV9gCgExGGc*@$8;D>m2~E4
zy&ey<&0;@U-?hk=H_k`1O;=q*u$<Y(v$5|ROe8{Iq8Qg9PnQ3VXE9wXF->pcLbN`{
zJ?ir!T94cz-YzB>-vgmHsipKJtcCnd2PWs(jcktT;7iQtJL>JG+1Bmi;AsEyop-+d
znJ<3vi`N}1UbhCqA)q+#&SrgjIg9h>bmqaU<KH*CuDzN*aa?-#26aZ`2;nY%(sPg*
z9EQRnD(Y$Kz37@(tya<7(&hZ1eBx7S+5MCFrnkJoG-t*hKShqj>~kx7^S}LWclqfR
zIV9?h>OBDj2=7tMt(CQP2w*lN=2zoFeLnyEZmouu0AQieo>~=E;|*m^tSJt%D&2ha
zqo4TB^#=Uct$}yH|L!+8_3FlGjIPp+TAr3=!~+}AUywoC_oJQ7kQb-fiY&oM(Zyi$
zeB?EOraS2wW^g>J2AHAdzX|Eb+G8+-F{8_D1}_pOX`~c7f=RxQ4LcV$qEpQqle5Je
zv%mR|@%Y1k80B^m-~8^#49m!#e!qyi=iZ&$?cdGE`InBz#kv_9nhYr>j3J<!GZayT
z$z@_%`v&^bh>@ZpVl5&QiTm=-4J-(L$M=_MIc_aMx_PDH15ZL&7Cci-mIc>?<CD5c
zlIMx(yRo%>d-U|P$Ftx2z27@F*Ku4|81c|U54~Z#Ilh&i;)K?n0rtOl*#o%Mv74#z
z?vS68b)YmFN_1|0fv^Ssa%)Kgk1u!Yj=Zk}wv$St>+0HqARFhE^x<3VBfmS=KY0Jx
zUWx4T2{SzW-_3aSTVx|oX(C)Twt3>+hr<*9d@(i&yiiqt#!hL8O*vE`&y+F`cpV|o
z1OnukU=grYc@Ft7!V8>(p9&lx9MX^pXbt|Q9(5AO3}e8jjOodhr=Pyz%U}M&E#^9o
z7cD@_CLAo6$8RO`e?mcaE2blh3vx0f)4gI81E!}B+-V$e7&r(IoE*SljD9c%ImF1v
z!By!P6{$^Vw)Cf%SD?ofR3i|l(K;NO{doJ#y#%X7W3wfJH6}W|#l*M&DoLg^mi`{w
z6^;K>ci%Lg-pb(vtN;x*<*;H*irx*Z9~?K}8bb;eN}i`n2J`)J9Lj{6MDHtMVQTJC
zCg7STvN$pldf*?~;eqa-W`BRRUN*Ns_~3(w=0zSaN`UkQDcSD3T1vUvKCaoTa_fa9
zyNE&2Bq{=4tTTe#cj8{V3;+&j0DF(Mxb`@Q*ByG`nx}8U05T94UKb0Qxe}r*IMsys
z@%ZW{#$fKZtD9`SzJZd%#<soTpC>;t_UZ4Kal0mg4)hvfuFZO$Z;yW=&1@{%BEY(8
zjAShAIC-E0TM3y^4d1I;7&ez|b&{y6L^%1L%RM@bv~xdW7w|IzMc3%vnu*U4TGchp
zc0~ZlUC7#)7je8ORDd4hEvDO;Sy8PDTK5<wu@)*t3rEJ_vO!YQipx(glP1#I(Igk7
zYgY7GN)eSBIG2<z5{3fIE}dg-W96E4P077P2bLY8b~!{DB^1meW5=Kw+L9JdT5v`a
z(LY1uKW<Oy2MM$9_;0?sp(nMnl>3cs5637jp)~^yDw*+yt}Un#4Q@gMPG;PU(DJq;
zAs7;(bC{fFVRD(S5ezlUI>3WGNqtO<5Xp9UW}D!x3t(-S<JGDo{9>8^<R_26jkNs*
zJ2fv@13&-y&tGa*s~gg|IK#{(s6S!N3t}R1`*BR%6Ynh+VlJUkB1Bn(5a{Z6XljOU
zEbcs_!E0V84g~%oF2rjLhBx{kk<}1I665r5wC<n2HvNRcA%h_a+$k8hK4EJ)|A_DC
zDKX4h53(v)bD=po3$XSkUH&B=ro%ZH54^70Ew2rHEzP{>vva7C#%J5J`hdcU%jN|h
zFGzqO9gXdH=V<FQ@~k>tzh*IFIJps+8QA`bG$fx@bAo}MAw9E~yOC_1aHlD$lm&vD
ztU^^e1ImP`5T0s-++R^RM+b>s`aO@>^CPtjCN9fSgc(lfF^YFH9ax_#!DQvm6wDSx
z$v7kjR;A%ISYl;4D2?35g4aDvEOu^y%i@0FkrOm1V1{J$t(%0Io5&(WapX$mAgw*?
zHk&&z=H}%R;8RaMbw@|06Zt$rD+Y&C#ycsXFqM-B(3Q?=_QV|Oq5`4>3@2x?equ7<
z`X1V%&j9aSk){w%#vZM#O|sUiqrgO_!6xG<0rVs-$kUoosF9&CB#QifW3tRhhGRWW
z>oX60#F(lA=w8ztnxgSvh}TMNISCu4*Gdqd=ve9J;W+W+86+OgoJP~QQJ$@i;A>14
z<s}I4{`>Er&-45enZC7}u+Ett(L9`0J9?hNR9yrRTVW^8-;wYX*jDY_+6^aSk$lBk
zr-ULk%esz;OC#BK<N)C`=wwl?Nn&;scGnHaT7{=p)gUArC2xlb1elFJuI3wNPku`N
zQ7IY5#c!5z(8L0aP$9yb1k~3A>l;1~MgV!miH=F(1f}Gx!3iAZ6qBT(uVPEnN2m4b
z>JgdJxp}DqJUTkMgWRx=W@@burh+u?hG6?^4v!=~g9q7h$LV(jyqz<>cuttC!aZo}
z61y6g!3^mdq_1<_q*RQ}gn-C^lamx%S_F5IC5Ep;hDIbpB>l5+w+;zd*Jm((a3yV|
zDK4ym8;5Nw<~lflTkch~YU1GFsDrq*Fwkz8(T2ySF_P<SoTit9pgI(a(KTijII3GL
z8JpQGd8_#u$4?dDpZv+69K}Ne1HWQ0**J}=>tNBBbjnUfp$NcR%77ySq0S7y?*;*y
zgrAsovCD9aS=!~rWDZh8x<+9v4VroO8-_-Aq&JSLa>K3`(tjlBsHN{aTehiM2u<AL
ze(F)e9R;^bGN+v6b-7CKTscajKMGyZMVO6|F)K^q@MwyQCu6}FtcUb)O{CxOc_ai5
z7S&nS#}%!GH<;@Y;3(kn9oy}?Ca7t^4D&NH&s{oa(z3y&h}6Ns!x3=Hp4qk@c}+vI
zlxK0_yi>=p24bVx^z$sSDLyma-%$<V>_)c(Z+SU6#N3(9YY%l$7(m#F$B5VQTG9(k
zjt909+*D1Ur)bdUk(tN+A&A#|Mm|#~0-QFRS&uA<^%AE@G1oNkL=o&~&bQc5&b02<
zD~hGw1Ol{qu>yoEn~ZJQj@e3I^B$#<8LKQXD=59AnFHDy7zW$A#I4TQvXJ)*cdd!u
zF31hL_LvmKguLub@M7Y*#9a_(oTCL!$LPJ#or8y?W+GMRyhF9$>s4nJEWqF5IEjPd
zfo(_QsOjG8x}kigIAWIbk4~d1F_}2j;nRsWb3iy-ANNylO+SO@tGC0Jpoa4A{GHpM
z7ooXOfY84EvV23|HcPwRj*9ygMpRtAMKHYJZQ}2mJT0G3(>Tx(Idy<B!)&(4a2f~S
zPI#fP6chC*hRfvR@3fzo+3Njy;kgvf=)9HDg%G2U1C2MOqlMs0ejag<L_;vh^F_9!
zjYXl@WfFlXESiL{Lom=NDh5~?$wE|7h;yoyVS%z`S@C@XYn=yS3xv(rbUuWlQf!2`
z>($wF?VC_V_ksoZ&2N6Q>TPqlUbT$|p5prJ{E(z8zIe;#gWw=F1-d@!;%=st64yCw
zuCg#N3q?pWGhwzA;Sgu1c9)anEi`|f%Dt%OaYEObSgdQiYn>C=7zFUniJ_A{o~qiR
z%xgFs5RRWrm>VwMRMR&r4+c(`Iq5UL%NC^Z!jkK*e9~9ETv>7eqqS~4#V4q}NmT_v
zoQQjAo3SRZEBne<zA}Ho0$i<DZ=})KCP{BWQCGK@gJw5kJ_gGslg4J$t(B7bo-n{U
z(;dJ)S?~;I;FvYc@ndE(h>Gm<Lm<ajX@<KnAq!hG94d79n}neSPccpcJSSKQBb-<1
z1jOE_9r)TXn+3;ni*bt4re_vQV!d`1p6e>t;x&;m(8Y-7RxGr14wrhkI{7dznkVg;
z_GlQ2jG4nq9_eP&&(rjcFGzqu0A^`=MA}!g8|@OaxN$a@Ji9idrh_CDAb|vQI$fvK
zd}3h0<WlXL>4P})DA1Ca5DlPx$kAv4O5<z!isC$%v~~j8^;pESvB4ieVGu?n5$Xnw
z%Z#YgA_FNbHxZcSi73L6?|?w~7dM%d?ynvxoS4dmNVwN!r<!j4vkCw{RZZ!4N$gn~
zh3LfRpjeesCcSNs98vnG3$W<>OT*B_6ud~uR3QU2NAOAy33e9By#|+Q5Skw{2W=GQ
zyNsJ@GV98Kg-sg1?lVr~xD2+M98D?d0IA0+9^>F^1o2bq5i}O04Dc9V>uiqKIx&%f
zr5#7LC_~^xh^EOHb&i%lIcFsgG8~t=vq-r!!LhD+JDTd?J~v6>z#)!Ri=^7Cp#^KP
z_v)R;&vhJJkkd!K=_zr3_)`T4=Y>Y|aMLwgc#vGw;TG`T(f5QlSFv_6lHwQe<boKk
z-uW`D2?%PD$e>_)zysl705xf?g9=pLc3sr9K!wS<^iLD1OyTHadd)5J=f!x9SVxmZ
z*2i()k#N`Zf(Coe5weset{(E%O}?H`A=VnV4&r&SG_>t14P(X3vAK}|$Q<LFuj8~1
z-=(}(9YahW&M_+DH4N<y`};SXhu3xlNTEZ~wCnx2Ya5*r$d{=Hs25j$C)7P$>~&U4
zb^>c)KH6+57vstxzDb}BIlJ5%;QO3kDmgZoG_cAvFxEmC9c0P3iHQT<&t&H`&;!}_
z8X<P0iPd2jaCz{IG`(L;Tv!R6V8%=yvOb64o-)z1g=FnzlFcOEb!-8?Umxl;M(Bw0
z9qKRWM1sdZ0qIjMh}~@3zG)V4FrQa|v)OQvj_HUQr$k&O=+s8him)Ca^A$rHh;!1i
z1I41}1gDxPoHOULXz}Q3Hz-30Q_1r&VG6^$JvmL()F}4J3p))gr<9bA2!Zba>ys46
z0LT`Z5{^butHycVa>-zW54asI-!juW_Tal>xQf3j(9L00FYEp2=!tAWY*6cnn3>^0
zG5H&vxP^pLx|VCk!Y6;-(!v-rX(=sSWSyG5=M|u}$=<52+rC#feF|KC!H5$cvIngT
z7x;@DGn$1$*>3(FGz&LdH_r3)A%JSKOV9Wla^IuDG@})Bf|*?K3v;8MFg`acB?}BM
z^qM5-82obwE}l4AAWzy#>f=MifG00#7LMo1Z0`Up@RQ9=xHg`+GD;xU^VC5zjb!?1
z&5$Zz2OXLs$U!=VK#4gMi95-DU<^*r8iL-sdTfTH=M^BO1@_Tf#hXBXVbLt{C|yiP
za9ZxXFtODW$w+fv$hLc8E8RG9Y3VS*R_eZ+zzydI?}W*`axClZb}GhHQ>U7{rE$Y|
zf%UbUPEst?8jq*B*GJR4Ni;bveDB3n7eAp#%6pO65EC(V8pK+A&M%y@EwvAEbPSM5
z0b^S{+ue#^rDt$`2tkVsju#47I%avj?QCmi;X3FA2)+w_u;>W)M3^9E)De@K=G;xj
zoW+Jms&SG&@J<%Nt&uPpxT&O9oO3#Zv)l9;gcgM><b)euIR^$_uFoN|Mh`wIY8;V@
zuXzDEWV{Fj1r358Tg@OGD}5$~yL3<)=X4-;u8CMo7H17gx5kM^mQv;o?OJub#;XUf
zni-?e$FbL7UDRAFK&}WAXDgibl66_WV_5fg)A!lK4?mn=Bf!}(T<*JV&v6);4o#P2
zj64*B+U(9b4^g}1A=3p|lbl)+i}%D`ZcOFLy5hn541go|AZc4W;m_Sn*Fz?Vb1a-$
zQw;{KLcP46gPvd+R4u$FHXI`a2O8rcofFm%av=&?l%@%~TmYfLy112?k-cT+$t?YP
zhWfy!nJfvX$uJJZL@xn^rV~S~h=fA?U7Nw<q-@7rdP<YXe6PrAkbKtb^$phuu-f0B
zmu1dlr?YSZTr<xJQM6naY6Z2GHO8*@ES~r<4o3~M6ykYJb?=g@5%^52fbg;)JV~S_
zWj0_p`-HB8tdclLMVN6{h&z0k$RuOr<4t9H3+yHF7}pH4^3?oYcqY_VAeQq?v{mPj
zAYll!9QPHxoah+#E^t?YW!bdWD!QbeCQK%$n0RtFthwP*W_f}%s3IoUW3^DZdBf9m
zUDY%_=h?U>90LbIx~G?$DA}d$<4yo+BWOWIW56lW%8c}2@z4z>GgFDOn30OPlSwsI
z%r+qXW?7&gC2oYE{mI#p^#c<HY&VQduufTZehLx_2J*ZUGx{h(K<=2&KyZY&U63vl
zCJ`&5bbkgFpe<QK+C`ptQ}X0;lo!G28`mj{&KbxJ_CzJN{SpIbwj3pxwFY${^uCN;
zq2&Qs1`_tccG7WN%?u9}%ah@y!z>ntGz4b2+|fWRiu7thHl)Kt%m`JN4iZz$r5{-P
z^olX6Wy+M6n(;VNoO1eX=>TD6TiYFsQO%bMOn+y1>H;1fb45ujFd;A*7-uC9JGwCQ
zH|{7PlJ=tzpgcKhV#0|=D>$v(omN8$Ctz5Ft(|~$fD<tN@Kz@>7tDL&c`yp2>36CZ
zpy!wXW7aW|FhYWQX754sY0}wdU21lM|NG-V{^OiZrPyk1)g+=pfSRn3DyQ(1u(5`T
z`tDLM_&I9@e&Y0#%f90w)fDJMsduKBAASew!VLx-r>1mkl!6Fc<Wf3R#*v0NPD=7&
zya08Xe(D^wNHOvKZyf(cX_5Y8^d{gkPBuF)Q0|Qqxb#d&)JoTifvbuWmt9Z+;GDRd
zuugW4th6_2Tt<WM3doEnhczY-CJmRNr83T(XC$W*jt!hl#HR$h<X(Vu18E-(kq)-b
z#&AIv!jbFH-~vp>L|Fp}>N%}>tzd|aSy(RpRA{)6*s1PL)<z#&xf>P`Tlk)eeF9_E
z^+N!GWQr4^&2EMkX)o%v<FSlECPH5)G}Oin0xVos0Fy@2L;|v7)?xkHY$SuuLMb%7
zLA|_;4Rc2Oi9ygfE=;4H7>tHh4y|Diz3{$5k?-|WdaN*DE))U1V@h>RwIH}Rnk?z1
zOP6@9<u&l~<;!WeJ!AY&1&H-UW~F713)m&4tt7QyIOxm>4-_vegSsUd(PD1>jakQ|
zq2-5{1~-gci=OOiADzq(*ksL^Z0JH2343G4tdyC|PK}MD(BxSMr!^$MdE}CQ3Zso?
z2Z>SPQpCt0HGC%qrL&4b>UJV+(fxxRUX0sKH}36Kq~-WNi9r{|ZmFEk3_y!r+Qq1Y
zr2ED5?9^Fk@Gb(Yqkc#wZ))Nlevv#MCKr#5>lcT)o1i3WXsvDAvomO*>yOej#Xt{K
zx}2L*9=tua!aR#(Z6Gj=O5){Qoa0oc^SMO~$BD{pDqzt`(JLp$2-X>*8=9VCVK)*Y
zARgsVfz4^*nav?`uWKp=2FbNN%5mq19^}JBF-ppuciVG@Me>tVg{@=8l~el>jpwY3
z-_&zeAU*^-7>Pm(%nQ(wo0;GwmIiR6kM*?R$C1bIJy_edct~I4%)K4JLT4vKoS5}G
zg~s(eURL27!ST&4+X!fi40O&H(%hJ?O~}sUvz)|q>aT$+3x5_znlzOZRP1wdS?G;=
zD*ANeF*m{!GpE`u2vHnK423xqO|%J>+j&mR2s;}yHQ%$xd~UBW3Ta6}&QzT=3nre%
zZ-^nq(Q=stm*wYRpHAId2;QoI1ZN<eFM#nGof8&21_EneCFT;}fgEb?96aF5#>hIH
z+LXYKDDwi$i-Lq&TLp-fuhIqe2y7ymZ7gXQJZ$f{|9f2Lo=6)<`s~`*NXQp9MtsSs
z;zv;b(DT$8JY~rTPk@E9p*4H0(|QcX9>-M;YwI{f_8Mio$SLJTVepR2<hD<=2hM>M
z<xYA>O{UML8zE_N!y%uYk%P5~?rG^A5@F}<#DIk`-t^jew#VzNS~F#yw{EhkC1Rk2
zY&k81lNU-^SAywgocn`{D^vxkrvc56*E^RPH%=(HIlxT?2f5Zii01Cp{Nc6H)e|Ua
z>#E46dO?TIsL9sZuD#Nf6{k!A)Dq5}$zxvVg>giP#6<FMj7DGbY^D^Brl>UUiSL|y
zS6;o*!Z(-IHB*}OwNaRq*2!#);;IEx?Prcm%#(HHnmoiZuIeay4vw1<N^6AjFlPtw
zqw6>0HDw$dj?K8=rjs-fd972>0Y=Isbp?#RhQJ9JCWW=vOki-9sh2mf8_h}H#(1iF
z?1?_H)%Al-Bs0(!OdzTp>Z7&mjl&o5Ie5HSche{Uv*m$yVYI*t#bbBQ8)n9IqZ}}q
zkm7Yy5KTfsrh!~{ADhBy@qzxJ&0+D$(z6%jwbD$4Vb^oC1C?JvfA^kSU-i&Xg(s6=
zZbabPdUH%C5M4|t)EJSW3uJXY3UhF}KtmXziBx8>azuqjF!;|)r@x9_?xv9idZH8v
z*AlbPxIs}zspIfr!#!No!O++$BXg4mnR^U+AGn+2^V-qL3+0*wM-bKl4jU&(Oe+ND
z!r>lWr(+@72yH5ZOp3sdnRAGgiQPq7eWakY)K*NK9>_w$a&>3~Ovrh1giVETJ}e!5
zelnqiXi(NAP5eW-xKBGy$Y6=r$uXJ@S`xd5^*}b8oIJ=QCXA*)P<wPk3a?3A)%$e;
zYbYohT_^1%3r6>oNXphEzGMwI0s?SXBu94Q_qoeLa?XT~7m%FLE+jUh-S{2_Av6sp
z%xT<5>M0f_(;uQzofdf?&FwZp6Fi<Ay3SkclD@-;c#@ks&}39^S}{(Z{P>)Uot1{D
zOgAN1O;kl1^E@MWr0l!^M+)2Wf@X12xmhhX7@EXFaW4P7k~K{MTVLny%CEG1jJ-Bj
zzYuq^cdh#&toV_&XD5@<DZeK6HH9I}rkWU18`N5)<b^(eIo4!8fr*lwBfTGi4yE`e
zcB!t!x$icxBseFg>^<5#S7h#GEh}ARk(CaH&SEJHCkb1^kMq1&%|hrAm630j?ywH}
zdFHJdUPyyl%P^<N^p*w=?1}LLq!g3Iq)44hJF%XVD8%Mqzp>twE(;Dwhheu-lB%uC
zFkqm8nT8}G%~Xr|DV<m9OiVLT6|{m^Oo$SFTOa5aW^#U5sE#E*QZ`~IBd__~bNE^`
zJvPUsT9`>{HOMosBIV>L6HSH4H6gA5WxbgYD@BR$w}wzU@p9LUL6gMD$cIe0iFLOa
zaS!asIPX*9-KnXAejl_o>r-iEg8vqaMc;4FM3{_rn5pY~CyZ)>N=MBR#sie3cEY7R
zfQ=b7U_pswxyunlXcqBHGL>2<hP|x0sm67)5wEofOb-T$5S?T%C!DT}1zSY%!Qj^b
z2EsLy-NZaF5mW2Oi#6|@BQt2@1aP#i#FD<g-^hK!sj~9y2KD(G;FC2n>5xT9HYKq6
zS*@7i+O2mA)^F=gf;B78Q*@x=?;#h8&?Yj;6#bAY_)w;yw1Wog){~vWEf-v)+!Dmo
zqV-eJqQBJ;d#04S?p**l8#8hJIZ%y2jo&R^QD+CgPbFog(FCkg2Vi#KoG5QnDd(Mg
zUu)u<fY79CfC$t$Gc$2%Mih5m6!+~&P-GbMo;>1U4bH5qMxZ-AGYGn5=ea#C-qrbO
zys9A;3yaq9sWzfua2gt3%??`l4mv){!GV{n70gO2ly59{s(NBJ@k1=N6|}6`gn*>B
z@dCWOyxh=Wc&3&2I-O$@yE?wuQREwAc7$R~K&x<|ZyPj=vzgNHGhfrrb>>csbR8^Q
zjO8-}#Z=)Nrej!(XcEB1$9lpJ1ldqFz8C_n%ymDJDjY+SZ)7;*p>3Mgqs8^%KxKAv
z(>r#;YMR)aIPNrbn4ZhJECY{4C$te=?`orCF|n^hq3F1Ze^FWeU3?HhZrGVhdPgs@
zTpf)rRr~w<lLkI!9_wNIxV^q3@M!azur!LPe(XsJg<RJujos8~QElRa#d>mBhK;6$
zB#{|A$44J3&$Kgy^>hv+6WmBK44MK-e{FUI;F*%fz-)Ed>|`AC7WJH#d%~c-37uP`
zH%x2Bb}%Cn7B;7Rb9y2T3JTWZwd<L!nHHa~b0N_lI`ugRkDDRbi36my6w`!{eHY=f
znQA%o+=)mm84$fr?;uAMwTR^@B_)+fUsQ1}7bA#Ka9ZZ`dG7`Ip$~r;S%`twpG3Ki
z@ScPg-vsH9!KL<PLk^$Pahi%XvQMV6Db8TKVizUN>J8@{Qb>)uA~ArTw%kA=^{9(3
z`0I^06*AMEsdZsXP4Lr?tAl6Saqr=FNty4{wdt-dO?P}|di=Y3M!(bFr>$wt(UVt;
z%in=HYFye#`6o*MR|m_uf!v{m_^?O90wo<K)dag~VawKWUo|mnv#EKWmf)%2Ju}<4
zk(RLxJ#9?-G_^6UJ<Zp@{`D!0!0MkSWs~RV#a4?8*eDzpv-*zQ7pC+iCfMR!*;0e+
zn!9nuo6cm+m0r-ef=)9Xtt(0M=_^OqKPV1-{XEkaY49pn;e+#1_g%`R!GUg7ga-86
z#qIyDZ4Q_1Rq_o^Y3`B0M#@v-_x5Zw?e?JC<Zt@-KUuut*c3%j%dp#@1`{OL#Ip;;
zJ5RoC{dpR0`2v_?dd{%+QMWG;09(kv8qm)j|0b+N4*4?*xhb<Dr_3jYSodw3ptNCF
z7ey&_xZnnXqR8y1=p6{L@%8O(7Zhobc`FXwOm+fjUHP(fXei9I_}9*4PBT}by5(x+
zao4GaZsREy(>kl@$H0_!ocGw}cYJAk>D~Xjj^FZ3yQ;?Ml<wuKHT{y7hVf0S_R=r^
zhsSUI#s4~0B<+Sd%14FmY~4gf_g#$_H3VXy<NRP7Z5|Z6UU9gujoYF?V%yCSY|PaN
zPqZJVBB8KJo_4`dkc9gXz;Ub6WZU<?YTA>U+IYPjn&?I{gPVks6Sk8Cq-4BtbTnv^
z0iRV7T2FZ|tZ9%=vT@ab9Y-b!>rj$$&ER09nG)M`dW}iI?96nWBz4IAs2aPC>m<o4
zTW`R^PKKm1=<XGR)P%w5K`3j$J&rxm3WOpaOuFvlcfRkx+>-8p*FN)ukC@HzFOCDH
zSoh!XNPpuU|NGIKf9WBmJUT}W$V-GVl#fgMEM=;-%QlsU3I?Pq3U-sxr@vrg*`bmm
zE~a|e5(FeZXXd&#QKDzuHbN515Ta0G8?hn8M#?biwmw;wU{aEx2xmx?&L59*4cGmc
zh9v9b?C^#|zY~CWl>vqR->-i4y;skkJ?1rORu27omj$hz6ch{9FNf!*1t5ytYt1|3
zly2Pvnvn+l5gEjlpdSJ2TC);*Z<^T{T((33VV{|B1J3st?9u{ryA3=)VUSHbz;N|d
zD!ECmKU}#|G2hI9&X;?h_9tAfI=@cob84)nS$E;8_E!6Ehxe-%Mo}mI8`r~f!8H7A
zcYi3nzehewb@|}Z*|z)34}bW>^^OSz*R>tTmMnFSFWH{di7vS8mC=6?Uhmv#o{5`{
zyRp_0jvDX!YkZ^VN#?jByp5ZK!w@%xgj%#4QO8L0hblb1&vj66s>LnZS%Tv=${c82
zd&qqA$jwGN-E-$CGGP*f$v%Sch%4u5YLO01TN`-RaHeLnso+z61s@IsAqf+idugoR
z1yGwli}HfhS=06@+ER==Jkfi(Gt*5JrJYGT5}uC|cWNW@G~JL#mU-9)fo7(Grf^1-
zYJj+9L+Pd&?_(sM6SKIw-7XWRkX+v2H{6hsltn#fX9x?q(g!%Et81TA>;hVbcAr-b
zn^HBIj}=j@qQqlu9-x{3&Sgt@+#PjLb8m>Rz_ezn#0r8SO+d#*_Lilg(3G$hfPy<r
z6@?GL@qKG|&+1v@xm$-Li-+6zVL)uD@k&)C7i>e&aMHSUad|b*uv-eur?)CQ6$Me>
zpTuQ)I4%+PB*>D+kg+CpQ?AnG*~{sE6j`<$7RMad4Vx^MKzN8uR{D`bE6SMg55d_e
z6l-YRDO_ws*xFE!B%D)|6}&$KPV;>>4Y)y>Xk(RC4p?BwOG}p#BQo`!R%z(mw9OoX
z-U42t;Xs)IXIbwI|4%S3NW{1|(Nu~bxn{xgJ`sS+*u%uVCwLzd14?2gqd@RtQ;0z3
zq&*?49QTaf@CumO0xh)MzDqVEzkp!Ddaz9;nHlRC%M&|5CLqu*vN&uBXR}#E0OyQE
zw$qw<M+1-B_6)5v7i4RFK;BJ_T9wuSk96izJBpx-7HaGMeAJjoc{4BrnsUjqsi;wZ
zF0yPYiV50QiRl(+Nijk$07-i9e#5M-x^TlR0@5=90~Ak$@N~;Lt>Fv1L%A>Z8%l<y
z1&XYQNtb+|Z~WjA+w09$*3fWkAI+F(ppWFV7K931C?5F^mBa=2AzP36r%i*ZIP3y&
z^?3z|g>hEyt<rf`bS_h@Z5T73E0e`oxt}P-p4{q!2UH!J)R_<b4l{s>py)iVl`Biz
zwcAhvtUgTca&t?E*hFrPkeyVt>%7~F$B~E|mp4?jL@`u&iTHfDo@!!t8t<t^ie6hC
z4Rz#{VXo`el=4~lb|wD$<QsT~o6FYpE)3dRNNJnGX=xDBXu7Q7?7rnNshZD=y?M5L
z&wJjpeO>|LSYEkuJlM3*bwi3aL&`xHg|Lx6x}T}p)Qzump@^pyx=N(AOK`#rE5RqE
zAgYrD=Rq?MSf3CC^JHn4sd~CX0-p8&)CmMg3KQrkmRh`nqV)F|<`~0LH^oLZ(}BOk
zVina)@dIS?DVxA&+LNh!6q@)=30@&*@%7xZX>%doo*>`z`|v8REIxuGG|$rF+0*Uu
z`6AY91lZ>JF*dtc?CmAW4AUFr7FwBf^b^m``mTPUz~`<?R|iVbhu)K$<X{{y%w#k&
z+ktPYmV0EP(VST23nE#wR-HZXq4MeIBGIkv(dtU{Zu<MK!#KK&)~T2Qg2vM}yhgeE
zRKa?Zu><uh=aEiszf82+Q7C;qh?}fZk{0_`D482W^~`k>E#=|NxJjVEatd^)w<?Zb
zjVfYFWfbw=-rkk-^13jC{eQmt)jOJgd--^IdZH#x*93iNrS%<yey(n=+ek`#pdmRs
zt19-q!aev<GHtg4l<Rk@+4ME)*~DB6x0O@v*BC9l1~lz(^<?y><n-O;u>3$`&)xw@
zVMz8K9n8U3epKG@jc5CV&Ms2+B69|c(>QT^5bFN)>@8A;T<hrh+ObwHP5s@%Jp}dM
z`B}P&VHfs;NrG*NcpQA^DTl$jShR5ySJ(9U9^s4GeEDm?_G=HHm(_($&ncRGHd%K!
z=3`FK!`Q=NY3<ZyAtP@PjuT8F7jF{$fCr?RVqD0<@KMrmqjE#uFD>#7QqfGoUtL*e
zJUbVHZT3C3r^^|Xo)rVlWHDn>N+xdkev*^Jnz;=amk|=o!Yq^hqoA-ibythq;-~*<
z(*5Wk$NjU1QS&sHSSQ6B%$VQw+iz*l{%{_><=;G<-Et-F>ZopVZ187Fy8pEihexQ4
z9O&b+qk7)#gpir*g)(Sh)d*R!UDg>b6N4w|*Fabm@<Qh{R_$gPVT|B;56ysUJIgVc
zsV@yT|6}+q0}~)&XDXi0(>TrY8A<pD7s={E4FoFl7hn6@FHo8#+io^X24fv&sk2EN
z4ft040V<+_>_yEBCJl0R@^<Pkie_?+@)BK2M_p=-0~ZQFXVPO#8;xJ0+58J<fAP<X
z?vdX$_Lw|2v>20RWsFjTBE8WZk~zQgfBf~~Fa3*kyx(p(wku4yF7o=BO&gNvJx-hy
zDLW6h7Lr!UIWy>RE*um^YxH@~qblB1XOiX7z3)}~RD<V5F`pkEj=%KY_x|-oo$N2{
zl?GIXp6JQ4sum@p|IShRHp8f{H{AHfOq4p^&_hubHFL_q3Y-3D&JlO%X&RlF5WRW!
zf;DyH90aW<(zQoYG7^T|RsZmp^ZxPQHsiBNL>a;;r|9j*H<{$k?=S>$m<WEdeU8wT
z$3FJ<<>UVV*IaP3@+ti#DV&biD<o-|s~Ya`!X|qd6`=RE>*TD!Dd8}ImW>+C>oW0<
z=Z<}?&#A)WPKe~Z$g+_5E$U*|;fd2#l!i>_`Ce`9Q_r^z!G!|ELGJ1q#lUCjqL_O}
zCP{oJ_qAL5v{M7VG;ECO*MVVhshZME?6avib>$PI8}E$@lRHfJ44y0L+1uGJRvK-e
z{VhuR%?JWuvuTo)g!d~ZefP&ryoU}|DAlF+`m0IWKK;qVZade>qysDU5ptiUkw!+q
zGv_Xu+qsf5#yLs2bLW8RJz!&IDR!--QYn@gn%8R^B1qzW_QTqH#T;9c6E|a`v{;>a
zmKS4EuHXOu_doBxO3y1mNc@?T%@cXKH-{aT8R!69Pa)s<eH%LG^5YOQB-HYJZ_f{O
z$ocT?COg3kt#jWoi=}r==Ueq-hK{aHmD2d6hFo%Wm!fqsHtToVp7MWvPydj8CkW@M
z?-={YLxkC$8NmDy>_}^7G^}s08WG^!d6pq%5#OU72{oDQ8}DS&oB&~oveq?GJ-FRq
zbYdt-Q8@mNzNgm8xX@;b9j7g0c?^ra{mo|c<Da$($ny#i$36Glb4n*1r>2-QG1XP0
z>iVXn)6{u{ifSMnP@BHqY~raCk-QJnF>z)Z6J|2tpv0*9=@MsB#N;$)VkgJ0gj-OH
z%BKC0(x?`;B~Xe08r109?bdWZe#A82`?~4RPL1t)@`_1-^l#`vUKwMhyW={thy7I6
z%=g<(EwFg0Kxg+}Ag*PnTkA;n0)kk$#zg8DWPV8z=7Fi}puk7HY@yL}E)>rm%T}}p
zhx3XC{EWbr=YE=ueyRX*>|ee52z|qh9xU@NdoeM{IO(~yQ%hl(!DZ{6Bjs`oK{>NP
za<%UguT%wYgafC9-d9tM!D1YgC(Bfxtk=SQoTdq7B+I9Up1j_M{N|dpZ`+z-wK8_K
zHg>(GziFa0&`ttUZFyy#R!hE4Jn?x{5Xx)O@6n<kHjgt2Gt`Me2qKe9Gxu?%p-@vu
z`bp6oDQTOyo;YW<T6vaQI#`}mgczk`AI(;6``FKt&(9R#UH9JGWc&L+n$7chSkaSR
zfZ1uLTbq?~$u@U6+>A<#S176rXnR|~rcD((%7W8QhBBBMEW3JqE4jVC&D(8q_(l3T
zcFUSHZX^G|jX7P??`!w_#&iHel7l}#GxLpl)w?Mk`JwD;{0<1NcBKYNa{#%ycEu*z
zZ$?PD*0cL??s7FDOe#n$9}H8{q&z%07{p{EeJ4&)RTPUR?yivbt$vn#ex?9%yzhPQ
zdlF6XXll&WBUORzmQYD<Py>E0cHt2zJ%d^Egp(URO@xW2Am~M7rao)}21ndEL-KgT
zM0Taoe5SbN59{cr?`~JAsn2@)*P3?O$v^tLSz5C_B`ap%`0T2<<v)jsUID46BsE{R
z+tor$q;Pi^JQMPFjck~~OoMPzX#)r)d}%1e4S~?`#{t+v))Jf+W3$Nj3PiSd-+j-c
z<^>!tNPtKYEpEK=d$TN?6K<C%G9q~7F2ye97A28qvo($oq&c<lno1y&ftx0Rb`MnK
zqHuy*ZwBAwHQY1{$I1NgbaU{we^r-ndve<xm}Wx`!8)UVDgB;N$ha_FdFQgd;qCwO
z$49q+Pob_{;lM2O8I*~}E}iu?B(T}Ek+Y{!I<pAKO}CVjeUZu_(d)qQLckAbE7KHR
z6L&;d=mJ%iQCg(wK~`0N6KN3pvt(ml#PQ(gKmRrp4~Jc2PkTo;Wfwk@vga^xl{)a)
zb4B4*3g5FZAuOiX4re<Ch?AvGa}jfL&$5~B4k}bP1-jWhQTDv+`{<TuAA4JV<$J#!
zub=&O)14im9)6_tE?V69P4kAk{?kv6Zu|58=qB3){oin(m9qjN{Q*C<>8plC8u%+D
zrq94#>^D>2Gj>?W15e$gZ32#{OkQz{P=m>#1O@*j&La}u@&h0E!1v7yJYJLlVMZQ$
z=%IJnW|j2qc&1pQ=FrqkXr=&zA=}JMRYtNF$d=t~?}KIu4o>puj-oH921=8;MM;_R
za3(gG>}^!DOOIM|LhMdX;(goPINMygW9$jfE02Eo+|lKyhU&0OGnlcxQPW&n`=J`6
zlS!!>_&ar36z1E2SnF_Jz=Cqm6DP*+wPYrKkWLb%8+HyvkTN!5WmDX`H;!3S9UT1C
zi`ifPMF|kcqmMpV{^-&17rS;<4}HAV0npx>I0xLBu(DV8*HyHEwZ#!walUX@To^)L
zS+T!w2*MlD+>X2S>h?6KM^97Xx&(Zg$w3hGrsswLwMlJ`mM2EG_K~$x&w-iSSj!|L
zq0VR1HH^{&r;G_0;9U5_2nnTs-1A}LRF#&ZO>Ln?Xs*9pKGjR&eC<D~6NhqlrCAgU
zI_29h#Bq5^0>ts)ga7T&^ow`U6gxpfZp<`zR$HGt8#qs=3@{%{xxw=p2IozxHRH7-
z$i{n?nweri8z36WJLx^gQ??3FWIv9l4)mc3gjQ?67OfTz3v>k6m0oX{H1H7h`IJSi
z_oEX~dRxb~b3Md0L93HRC(m^MuDJpE6j5T2hPe1X3Gc+b$m6;Mh~rE5-+voT*IS3S
zJ&w?0G=R2zc~zJ$3N$r@lq5O2VFGcuriAOMe*XL*E5S-la|jS8sx375Q50;<WhT=W
zq9uBtHt<d-lPVaf_5>AH`ecUX0HD1mkRK(SH7-_uj+$H1@|K-2XmPo>cWKD;AAj(J
zAAG`G$MJ%^(2I@_{>E=S5z`l^MRA$npH$Z+ycgE*`S!$&m1f*kqIA>--sEW``!(o>
z8DS8eWfOH@g|ibAb}ME(<9*r6#!Y}`0@-aCml>gH=r!g64l5HUC^4^V-`-LT#AF$8
zzh|yrs`5F7)z)$GrBwM&8#m7{&;7*H<sgc>G(V^ghul6*$CKtdkL%VzJ-+h4zH%qI
zQ<qnp&DGwQL7mgaMh0s=4BkuQz|{fc_FOt@#({Ig$c)Zf&$D!9Pirv5v`Os&lWu)*
zKH-`gdawtGt-ll5GDz2G&M>$&khQaIdA*cQOtWh@*($Vok0xw~9co8N_*Gz<d8lp^
zOj;7@g7HCYveUcox#!^*y5aFf$8~F<9zVYF<Hyq6K37)R(VmMD`C$W!To#a!bR&((
zYoRc+bl-){C2TPW&`#x1iaF}M@U(&`Y^1*I#3b&T%fZ8cKu=~4%JaoCZjID-DLnYz
z=~#?ygzclku7+_mff2ICmXt6@76IXo0`PLq5VWGE93f>Z;K>(bzK_kMpFTNx<fRCY
z@7uf#2bv3f^Uwb5j_u~`rcJ%Mx}l+%xvqjb`$M-o3^Pn2{7pC_;=P{wPDQ#7;%~)S
zyH&78##3<(j;Z&j#F|Pe)KgR=!hMf$U+N_m#Z)Q~LSHyf*Gr*?I0UKRrN(28AIBn5
zkX{<S)4lHHQrAIhdaxjA$Hg(d{unteFDO|5X~)YVKt15tBzb;o*S06*x=RJAtABup
zrt3)P_Co_8G`v5AEH184Ej_8p2K*AeCSJqZw{|;;sldPyl^TO7V_!H1w62LEN5>!T
z8cbb8rXs+2HSM!lESUDtxz=Kg8aZtY>nikmO1-bLEKjPO0NC-$M?UhAM_;Pu>G84(
z5LApWe({Sp=23Lp(D&=jdfj?gyU}I_Sy1m#8(BNtpkt#A=Z)esQheg}a96gPBNd@O
zA>6J8KT+SV^#xkfp`8VNw+&Rl;yNx|$zASG&sD*lN0#&%!^x-DM4+#pr<T9@H4=gP
zVv*AyM>Kz*_}~YB<GQ@f=R00j0qXI<0}mXOiG4?wCfl>q?N)ar)0of)^w+>wvBx6e
zNW?*%!xTG(?z~`_#&wC>r5V=TNQi6j`iVAyBjmMeEQw}3Q-D2DEOg%{MOZ@k&(~QP
z5txVF+_S<Y=ViQzNuk@M{G02E^M2OxlAV}~4kUs%o%z;K+j#Gw+Dom?kw2UJ?tFtE
zAcf4j0NPU2#P7WxPdixG+;p}!;lAv;4yjg4i^iOLuO$7{4rC%F4?(q%<9sS<%V`}P
zD6t;mjiShfX_GF@@mT3OS_OV`{-uml%As9K2_7Tiedm=B9*$Q;1NFe>y$5Ca<|519
zIL5=$a=G5L?kKDjVum<;-xMS9Bx1LvYkj4RF^0(8F3>vj6&#+z4hW{QVf}-mKRA?H
zuLw%$^r+xN)JJoa%B16zkZXR#?LT7KBB3a&GK!PE?Ycd_bo0%Ry%=os#U8Jy0QGqA
z)1O|%M@M(1QJ*%QIg6rpKt2v_tF#dSa(!z@tA_v(plkjxq{QP~MK*B2gpT9{DIMZG
zO5-O(0BMEHFfHzkUCR=w!50`U4q`a1b(93N{2gMaZh6ROc{Hb4X;+Q?0W6Vug^yQ7
zfH)q!@4mGC)nC0iGv=0IsN2}sGcI>7v~ht9n!5TS>sn{Onzw1~63i2+nDgl=Etu4x
zI(9)nJXY-lZya+>*I->|C-&Rmy-k>8&8$ecv5GW{$@e-&RbI~aOj<s5_uY3tK5ZQN
z${w$p0QLCOKmF60Jw1IhEohf)-)~xL*D9<DaCQy!Tr3$<(uMIhb<jPJokEK=bB++B
z4!EULzZ;3=R8T^RkQ|+cHa!=jV2knnLBTYgP=c>Q-dQ}W(pjEl``gx@tlIX`kAM8*
z8}lk2uK|Sudi}Zp_4wM?zP3MXPv1;X%3?6%x~XlALDbLzKXnJ|^UP*7sc?$cuH@Tq
zCSqk@!`3+>zJj)p8pT$#<IZ=~Yx{;o!Jb7S#HW*M=Fk{&EQ>Ub56MwEJFDv_KK8MX
zT{W-4@tO$`2N0YufBDOY<c!>uj^jbsZNU9o_3Mu52@?_$y6_TEhJ`M^HJ8!Wm&v(i
zeY@DKnordvd8hQv<g}9%G)!~<4pYr(=FE~RONy*ofieA|4}IwL<qFEL=Xgy8s0Rf3
zna_M?cFWPx4Q*Xt-VUhJ9=0@MHMT+*uo<M;%33F|iQuaM!L@6e9_M2_^+Xli4olx~
z_y9e{HmqbI$uP%hiuQ@tCMCLfJo}+9eQ6Wjcb_${@$tG4V0a+(Ah_yMNikG0%l2Dx
z50YVMo3ky{Y|ssZad375*>}ygx$>~EHbb)lO#sOuv=|))L(HyZ6L3xLV1exBVv(9|
zC_&XMs%o|Fy5qyc!{b*nB)FdAbtgbQpq1F@@TsSs!mgr=yzh^iv1P!6oS(MqyMfTw
zVQ-Q3baIc%rdHRjPG}tJ_y}O&nwD47ezy=-LZ2IRLoov>8un5n86xAFMEU7v7?#J!
z$7i4X<R`c0b$YyR1$fbcT}I7vc}SkgUV*Km^JoDtCyBw}rq!&&lD8p~x)?U?+9cQ(
zFGrnAmMn@zoX$|#nVFN5=hCs|#s~CS0_{*_h%UzCcuK-Pz4zXG8}oB={9Fm}{BhrX
z_r>J>B>=H=I%x3Iq-pXr?czQ^NRXTaePLc*>M151yEN^uT)9F%Q%^Fp9ct6x^Pczg
iucZ_6x5xkI$NvK&GRti`BD8P-0000<MNUMnLSTX>`;IOE

literal 0
HcmV?d00001

diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
new file mode 100644
index 0000000000..d323c05c7e
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
@@ -0,0 +1,106 @@
+import React, { useCallback, useRef, useState } from 'react'
+import Dialog from 'widgets/Dialog'
+import { useTranslation } from 'react-i18next'
+import { setCkbNodeDataPath } from 'services/remote'
+import { isSuccessResponse } from 'utils'
+import { Attention } from 'widgets/Icons/icon'
+import Button from 'widgets/Button'
+import AlertDialog from 'widgets/AlertDialog'
+import styles from './migrateCkbDataDialog.module.scss'
+
+const MigrateCkbDataDialog = ({
+  show,
+  prevPath,
+  currentPath,
+  onCancel,
+  onConfirm,
+}: {
+  show: boolean
+  prevPath: string
+  currentPath: string
+  onCancel: () => void
+  onConfirm: (dataPath: string) => void
+}) => {
+  const [t] = useTranslation()
+  const resyncRef = useRef<HTMLButtonElement | null>(null)
+  const [failureMessage, setFailureMessage] = useState('')
+  const [savingType, setSavingType] = useState<string | undefined>()
+  const startSync = useCallback(
+    (syncType: string) => {
+      setFailureMessage('')
+      setSavingType(syncType)
+      setCkbNodeDataPath({
+        dataPath: currentPath,
+        clearCache: syncType === 'resync',
+      })
+        .then(res => {
+          if (isSuccessResponse(res)) {
+            onConfirm(currentPath)
+          } else {
+            setFailureMessage(typeof res.message === 'string' ? res.message : res.message.content!)
+          }
+        })
+        .finally(() => {
+          setSavingType(undefined)
+        })
+    },
+    [currentPath, onConfirm]
+  )
+  const onActionClick = useCallback(
+    (e: React.MouseEvent<HTMLDivElement>) => {
+      if (e.currentTarget.dataset.syncType) {
+        startSync(e.currentTarget.dataset.syncType)
+      }
+    },
+    [startSync]
+  )
+  return (
+    <>
+      <Dialog show={show} title={t('settings.data.ckb-node-storage')} onCancel={onCancel} showFooter={false}>
+        <div className={styles.dialogContainer}>
+          <div>{t('settings.data.remove-ckb-data-tip', { prevPath, currentPath })}</div>
+          <div className={styles.attention}>
+            <Attention />
+            {t('settings.data.resync-ckb-node-describe')}
+          </div>
+
+          <div className={styles.footer}>
+            <Button
+              ref={resyncRef}
+              disabled={!!savingType}
+              className={styles.footerBtn}
+              data-sync-type="resync"
+              label={t('settings.data.re-sync')}
+              type="primary"
+              onClick={onActionClick}
+              loading={savingType === 'resync'}
+            />
+
+            <Button
+              disabled={!!savingType}
+              className={styles.footerBtn}
+              data-sync-type="move"
+              label={t('settings.data.move-data-finish')}
+              type="primary"
+              onClick={onActionClick}
+              loading={savingType === 'move'}
+            />
+          </div>
+        </div>
+      </Dialog>
+      <AlertDialog
+        show={!!failureMessage}
+        title={t('settings.data.ckb-node-data')}
+        message={failureMessage}
+        type="warning"
+        onCancel={() => setFailureMessage('')}
+        onOk={() => {
+          startSync('resync')
+        }}
+      />
+    </>
+  )
+}
+
+MigrateCkbDataDialog.displayName = 'MigrateCkbDataDialog'
+export default MigrateCkbDataDialog
diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss
new file mode 100644
index 0000000000..7a63ba0859
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss
@@ -0,0 +1,69 @@
+@import '../../styles/mixin.scss';
+
+.dialogContainer {
+  max-width: 700px;
+  color: var(--main-text-color);
+  font-size: 14px;
+  line-height: 24px;
+
+  .attention {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 8px;
+    width: 80%;
+    margin: 32px auto 0;
+    background: var(--warn-background-color);
+    border: 1px solid rgba(252, 136, 0, 0.2);
+    border-radius: 4px;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 24px;
+    color: var(--warn-text-color);
+
+    @media (prefers-color-scheme: dark) {
+      border: none;
+    }
+
+    svg {
+      margin-right: 4px;
+      width: 14px;
+    }
+  }
+}
+
+.footer {
+  padding: 24px 0;
+  @include dialog-footer;
+  --footer-background-color: #ecf9f0;
+  @media (prefers-color-scheme: dark) {
+    --footer-background-color: #2d3534;
+  }
+
+  .footerBtn {
+    padding: 0 20px;
+    background: var(--footer-background-color);
+    color: var(--primary-color);
+    &:not([disabled]) {
+      &:hover,
+      &:focus {
+        background-color: var(--footer-background-color);
+        color: color-mix(in srgb, #000000 20%, var(--primary-color));
+      }
+
+      &:active {
+        background-color: var(--footer-background-color);
+        color: color-mix(in srgb, #000000 20%, var(--primary-color));
+      }
+    }
+    &:last-of-type {
+      margin-left: 24px;
+    }
+    svg {
+      g,
+      path {
+        fill: var(--primary-color);
+      }
+    }
+  }
+}
diff --git a/packages/neuron-wallet/.env b/packages/neuron-wallet/.env
index 70dda01370..b86de40909 100644
--- a/packages/neuron-wallet/.env
+++ b/packages/neuron-wallet/.env
@@ -117,4 +117,5 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
 MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
 
 # CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0x1d46fe5bb62d19a004eadd7ba40564c45620905ab260d8a546a9e4b9d7cc0f85'
+CKB_NODE_ASSUME_VALID_TARGET='0xe88730476c6ef0508f4767b233c82a0f20c6365fb1572bf020cb1dce2a0e704b'
+CKB_NODE_DATA_SIZE=49
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 5545842aab..70c9526c7f 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -632,29 +632,62 @@ export default class ApiController {
       return { status: ResponseCode.Success, result: true }
     })
 
-    handle('get-ckb-node-data-path', () => {
+    handle('get-first-sync-info', () => {
+      const currentNetwork = NetworksService.getInstance().getCurrent()
       return {
         status: ResponseCode.Success,
-        result: SettingsService.getInstance().getNodeDataPath(),
+        result: {
+          isFirstSync: SettingsService.getInstance().isFirstSync && currentNetwork.type === NetworkType.Default,
+          needSize: Math.ceil(+process.env.CKB_NODE_DATA_SIZE! * 1.2),
+          ckbNodeDataPath: SettingsService.getInstance().getNodeDataPath(),
+        },
       }
     })
 
-    handle('set-ckb-node-data-path', async (_, { dataPath, clearCache }: { dataPath: string; clearCache: boolean }) => {
-      if (!clearCache && !fs.existsSync(path.join(dataPath, 'ckb.toml'))) {
-        return {
-          status: ResponseCode.Fail,
-          message: t('messages.no-exist-ckb-node-data', { path: dataPath }),
-        }
+    handle('start-sync', () => {
+      SettingsService.getInstance().isFirstSync = false
+      this.#networksController.activate(this.#networksController.currentID().result)
+      return {
+        status: ResponseCode.Success,
       }
-      await cleanChain()
-      SettingsService.getInstance().setNodeDataPath(dataPath)
-      await startMonitor('ckb', true)
+    })
+
+    handle('get-ckb-node-data-path', () => {
       return {
         status: ResponseCode.Success,
         result: SettingsService.getInstance().getNodeDataPath(),
       }
     })
 
+    handle(
+      'set-ckb-node-data-path',
+      async (
+        _,
+        { dataPath, clearCache, onlySetPath }: { dataPath: string; clearCache: boolean; onlySetPath?: boolean }
+      ) => {
+        if (onlySetPath) {
+          SettingsService.getInstance().setNodeDataPath(dataPath)
+          return {
+            status: ResponseCode.Success,
+            result: SettingsService.getInstance().getNodeDataPath(),
+          }
+        }
+        if (!clearCache && !fs.existsSync(path.join(dataPath, 'ckb.toml'))) {
+          return {
+            status: ResponseCode.Fail,
+            message: t('messages.no-exist-ckb-node-data', { path: dataPath }),
+          }
+        }
+        await cleanChain()
+        SettingsService.getInstance().setNodeDataPath(dataPath)
+        await startMonitor('ckb', true)
+        return {
+          status: ResponseCode.Success,
+          result: SettingsService.getInstance().getNodeDataPath(),
+        }
+      }
+    )
+
     handle('start-process-monitor', (_, monitorName: string) => {
       startMonitor(monitorName, true)
       return {
diff --git a/packages/neuron-wallet/src/controllers/app/subscribe.ts b/packages/neuron-wallet/src/controllers/app/subscribe.ts
index 8de629a2cd..84f5d8e436 100644
--- a/packages/neuron-wallet/src/controllers/app/subscribe.ts
+++ b/packages/neuron-wallet/src/controllers/app/subscribe.ts
@@ -16,6 +16,7 @@ import MigrateSubject from '../../models/subjects/migrate-subject'
 import startMonitor, { stopMonitor } from '../../services/monitor'
 import { clearCkbNodeCache } from '../../services/ckb-runner'
 import ShowGlobalDialogSubject from '../../models/subjects/show-global-dialog'
+import NoDiskSpaceSubject from '../../models/subjects/no-disk-space'
 
 interface AppResponder {
   sendMessage: (channel: string, arg: any) => void
@@ -124,4 +125,9 @@ export const subscribe = (dispatcher: AppResponder) => {
   ShowGlobalDialogSubject.subscribe(params => {
     BrowserWindow.getFocusedWindow()?.webContents.send('show-global-dialog', params)
   })
+
+  NoDiskSpaceSubject.subscribe(params => {
+    stopMonitor()
+    dispatcher.sendMessage('no-disk-space', params)
+  })
 }
diff --git a/packages/neuron-wallet/src/models/subjects/no-disk-space.ts b/packages/neuron-wallet/src/models/subjects/no-disk-space.ts
new file mode 100644
index 0000000000..8db077e777
--- /dev/null
+++ b/packages/neuron-wallet/src/models/subjects/no-disk-space.ts
@@ -0,0 +1,5 @@
+import { Subject } from 'rxjs'
+
+const NoDiskSpaceSubject = new Subject<boolean>()
+
+export default NoDiskSpaceSubject
diff --git a/packages/neuron-wallet/src/services/ckb-runner.ts b/packages/neuron-wallet/src/services/ckb-runner.ts
index 0439e1c9fd..aeb1128d4c 100644
--- a/packages/neuron-wallet/src/services/ckb-runner.ts
+++ b/packages/neuron-wallet/src/services/ckb-runner.ts
@@ -11,6 +11,7 @@ import { resetSyncTaskQueue } from '../block-sync-renderer'
 import { getUsablePort } from '../utils/get-usable-port'
 import { updateToml } from '../utils/toml'
 import { BUNDLED_URL_PREFIX } from '../utils/const'
+import NoDiskSpaceSubject from '../models/subjects/no-disk-space'
 
 const platform = (): string => {
   switch (process.platform) {
@@ -113,10 +114,9 @@ export const startCkbNode = async () => {
     network: `listen_addresses = ["/ip4/0.0.0.0/tcp/${listenPort}"]`,
   })
   const options = ['run', '-C', SettingsService.getInstance().getNodeDataPath(), '--indexer']
-  const stdio: (StdioNull | StdioPipe)[] = ['ignore', 'ignore', 'pipe']
+  const stdio: (StdioNull | StdioPipe)[] = ['ignore', 'pipe', 'pipe']
   if (app.isPackaged && process.env.CKB_NODE_ASSUME_VALID_TARGET) {
     options.push('--assume-valid-target', process.env.CKB_NODE_ASSUME_VALID_TARGET)
-    stdio[1] = 'pipe'
   }
   logger.info(`CKB:\tckb full node will with rpc port ${rpcPort}, listen port ${listenPort}, with options`, options)
   const currentProcess = spawn(ckbBinary(), options, { stdio })
@@ -130,6 +130,11 @@ export const startCkbNode = async () => {
   })
   currentProcess.stdout?.on('data', data => {
     const dataString: string = data.toString()
+    if (/No space left/.test(dataString)) {
+      NoDiskSpaceSubject.next(true)
+      logger.error('CKB:\trun fail:', dataString)
+      return
+    }
     if (
       dataString.includes(
         `can't find assume valid target temporarily, hash: Byte32(${process.env.CKB_NODE_ASSUME_VALID_TARGET})`
@@ -150,8 +155,8 @@ export const startCkbNode = async () => {
     }
   })
 
-  currentProcess.on('close', () => {
-    logger.info('CKB:\tprocess closed')
+  currentProcess.on('close', code => {
+    logger.info(`CKB:\tprocess closed with code ${code}`)
     isLookingValidTarget = false
     if (Object.is(ckb, currentProcess)) {
       ckb = null
diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts
index 37e302e4d9..d9731d2328 100644
--- a/packages/neuron-wallet/src/services/node.ts
+++ b/packages/neuron-wallet/src/services/node.ts
@@ -19,6 +19,7 @@ import { rpcRequest } from '../utils/rpc-request'
 import { generateRPC } from '../utils/ckb-rpc'
 import startMonitor, { stopMonitor } from './monitor'
 import { CKBLightRunner } from './light-runner'
+import SettingsService from './settings'
 
 export enum VerifyCkbVersionResult {
   Same,
@@ -135,6 +136,10 @@ class NodeService {
     await stopMonitor('ckb')
     const isDefaultCKBNeedStart = await this.isDefaultCKBNeedRestart()
     if (isDefaultCKBNeedStart) {
+      if (SettingsService.getInstance().isFirstSync) {
+        logger.info("CKB:\tThis is the first sync, please wait for the user's confirmation")
+        return
+      }
       logger.info('CKB:\texternal RPC on default uri not detected, starting bundled CKB node.')
       const redistReady = await redistCheck()
       await (redistReady ? this.#startNodeSubject.next() : this.showGuideDialog())
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
index 719552dc60..55dd2a3e16 100644
--- a/packages/neuron-wallet/src/services/settings.ts
+++ b/packages/neuron-wallet/src/services/settings.ts
@@ -1,4 +1,5 @@
 import { BrowserWindow, nativeTheme } from 'electron'
+import fs from 'node:fs'
 import env from '../env'
 import Store from '../models/store'
 import { changeLanguage } from '../locales/i18n'
@@ -52,6 +53,14 @@ export default class SettingsService extends Store {
     this.writeSync('indexerDataPath', dataPath)
   }
 
+  get isFirstSync(): boolean {
+    return this.readSync('isFirstSync')
+  }
+
+  set isFirstSync(isFirstSync: boolean) {
+    this.writeSync('isFirstSync', isFirstSync)
+  }
+
   getNodeDataPath(chain?: string) {
     return this.readSync<string>(
       `${settingKeys.nodeDataPath}_${chain ?? NetworksService.getInstance().getCurrent().chain}`
@@ -78,11 +87,15 @@ export default class SettingsService extends Store {
       JSON.stringify({
         locale: app.getLocale(),
         ckbDataPath: path.resolve(app.getPath('userData'), 'chains/mainnet'),
+        isFirstSync: true,
       })
     )
     if (!this.getNodeDataPath(LIGHT_CLIENT_MAINNET) || !this.getNodeDataPath('ckb')) {
       this.migrateDataPath()
     }
+    if (this.isFirstSync === undefined) {
+      this.isFirstSync = !fs.existsSync(path.join(this.getNodeDataPath(), 'ckb.toml'))
+    }
   }
 
   private onLocaleChanged = (lng: Locale) => {
diff --git a/packages/neuron-wallet/tests/services/ckb-runner.test.ts b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
index b36662f753..451d9b2462 100644
--- a/packages/neuron-wallet/tests/services/ckb-runner.test.ts
+++ b/packages/neuron-wallet/tests/services/ckb-runner.test.ts
@@ -145,7 +145,7 @@ describe('ckb runner', () => {
           expect(stubbedSpawn).toHaveBeenCalledWith(
             expect.stringContaining(path.join(platformPath, 'ckb')),
             ['run', '-C', ckbDataPath, '--indexer'],
-            { stdio: ['ignore', 'ignore', 'pipe'] }
+            { stdio: ['ignore', 'pipe', 'pipe'] }
           )
         })
       })
@@ -179,7 +179,7 @@ describe('ckb runner', () => {
             expect(stubbedSpawn).toHaveBeenCalledWith(
               expect.stringContaining(path.join(platformPath, 'ckb')),
               ['run', '-C', ckbDataPath, '--indexer'],
-              { stdio: ['ignore', 'ignore', 'pipe'] }
+              { stdio: ['ignore', 'pipe', 'pipe'] }
             )
           })
         })
diff --git a/packages/neuron-wallet/tests/services/node.test.ts b/packages/neuron-wallet/tests/services/node.test.ts
index 12eaadb52b..29fafa3f4d 100644
--- a/packages/neuron-wallet/tests/services/node.test.ts
+++ b/packages/neuron-wallet/tests/services/node.test.ts
@@ -30,6 +30,7 @@ describe('NodeService', () => {
   const getLocalNodeInfoMock = jest.fn()
   const pathJoinMock = jest.fn()
   const redistCheckMock = jest.fn()
+  const isFirstSyncMock = jest.fn()
 
   const fakeHTTPUrl = 'http://fakeurl'
 
@@ -57,6 +58,7 @@ describe('NodeService', () => {
     stubbedStopLightNode.mockReset()
     pathJoinMock.mockReset()
     redistCheckMock.mockReset()
+    isFirstSyncMock.mockReset()
   }
 
   beforeEach(() => {
@@ -182,6 +184,16 @@ describe('NodeService', () => {
 
     jest.doMock('utils/redist-check', () => redistCheckMock)
 
+    jest.doMock('services/settings', () => ({
+      getInstance() {
+        return {
+          get isFirstSync() {
+            return isFirstSyncMock()
+          },
+        }
+      },
+    }))
+
     stubbedRxjsDebounceTime.mockReturnValue((x: any) => x)
     getChainMock.mockRejectedValue('no chain')
   })
@@ -556,4 +568,25 @@ describe('NodeService', () => {
       })
     })
   })
+  describe('test start default node', () => {
+    beforeEach(() => {
+      const NodeService = require('../../src/services/node').default
+      stubbedNetworsServiceGet.mockReturnValue({ remote: BUNDLED_CKB_URL, readonly: true })
+      getLocalNodeInfoMock.mockRejectedValue('not start')
+      nodeService = new NodeService()
+    })
+    it('is first sync', async () => {
+      isFirstSyncMock.mockReturnValue(true)
+      await nodeService.tryStartNodeOnDefaultURI()
+      expect(stubbedLoggerInfo).toBeCalledWith(`CKB:\tThis is the first sync, please wait for the user's confirmation`)
+    })
+    it('is not first sync', async () => {
+      isFirstSyncMock.mockReturnValue(false)
+      redistCheckMock.mockResolvedValue(true)
+      await nodeService.tryStartNodeOnDefaultURI()
+      expect(stubbedLoggerInfo).toBeCalledWith(
+        `CKB:\texternal RPC on default uri not detected, starting bundled CKB node.`
+      )
+    })
+  })
 })
diff --git a/packages/neuron-wallet/tests/services/setting.test.ts b/packages/neuron-wallet/tests/services/setting.test.ts
index 609c5dfe8e..aec2419474 100644
--- a/packages/neuron-wallet/tests/services/setting.test.ts
+++ b/packages/neuron-wallet/tests/services/setting.test.ts
@@ -3,6 +3,7 @@ import SettingsService from '../../src/services/settings'
 const readSyncMock = jest.fn()
 const writeSyncMock = jest.fn()
 const resolveMock = jest.fn()
+const joinMock = jest.fn()
 const getLocaleMock = jest.fn()
 const getPathMock = jest.fn()
 const updateApplicationMenuMock = jest.fn()
@@ -11,6 +12,7 @@ function resetMock() {
   readSyncMock.mockReset()
   writeSyncMock.mockReset()
   resolveMock.mockReset()
+  joinMock.mockReset()
   getLocaleMock.mockReset()
   getPathMock.mockReset()
   updateApplicationMenuMock.mockReset()
@@ -45,6 +47,7 @@ jest.mock('electron', () => ({
 
 jest.mock('path', () => ({
   resolve: () => resolveMock(),
+  join: () => joinMock(),
 }))
 
 jest.mock('env', () => ({
diff --git a/scripts/update-valid-target.js b/scripts/update-valid-target.js
deleted file mode 100644
index 4ca12b6e55..0000000000
--- a/scripts/update-valid-target.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const fs = require('node:fs')
-const path = require('node:path')
-
-async function rpcRequest(method, params = []) {
-  const result = await fetch(
-    'https://mainnet.ckb.dev/rpc',
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        id: 0,
-        jsonrpc: '2.0',
-        method,
-        params,
-      }),
-      timeout: 10000,
-    }
-  )
-  return result.json()
-}
-
-const ESTIMATE_BLOCK_COUNT_PER_DAY = 8_000
-const envFilePath = path.resolve(__dirname, '../packages/neuron-wallet/.env')
-const validTargetReg = /(CKB_NODE_ASSUME_VALID_TARGET=)[\S]*/
-
-;(async function () {
-  try {
-    console.info('start update env file')
-    const tipBlockNumber = (await rpcRequest('get_tip_block_number')).result
-    const validTargetBlockNumber = `0x${(BigInt(tipBlockNumber) - BigInt(ESTIMATE_BLOCK_COUNT_PER_DAY)).toString(16)}`
-    const blockHash = (await rpcRequest('get_block_hash', [validTargetBlockNumber])).result
-    const originEnvContent = fs.readFileSync(envFilePath).toString('utf-8')
-    fs.writeFileSync(envFilePath, originEnvContent.replace(validTargetReg, `CKB_NODE_ASSUME_VALID_TARGET='${blockHash}'`))
-    console.info('write success')
-  } catch (error) {
-    console.error('write failed', error)
-  }
-})()
diff --git a/scripts/update-wallet-env.js b/scripts/update-wallet-env.js
new file mode 100644
index 0000000000..f0a9dee2c0
--- /dev/null
+++ b/scripts/update-wallet-env.js
@@ -0,0 +1,56 @@
+const fs = require('node:fs')
+const path = require('node:path')
+
+async function rpcRequest(method, params = []) {
+  const result = await fetch(
+    'https://mainnet.ckb.dev/rpc',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        id: 0,
+        jsonrpc: '2.0',
+        method,
+        params,
+      }),
+      timeout: 10000,
+    }
+  )
+  return result.json()
+}
+
+const ESTIMATE_BLOCK_COUNT_PER_DAY = 8_000
+const envFilePath = path.resolve(__dirname, '../packages/neuron-wallet/.env')
+const validTargetReg = /(CKB_NODE_ASSUME_VALID_TARGET=)[\S]*/
+const ckbNodeDataSizeReg = /(CKB_NODE_DATA_SIZE=)[\S]*/
+
+async function getValidTarget() {
+  const tipBlockNumber = (await rpcRequest('get_tip_block_number')).result
+  const validTargetBlockNumber = `0x${(BigInt(tipBlockNumber) - BigInt(ESTIMATE_BLOCK_COUNT_PER_DAY)).toString(16)}`
+  return (await rpcRequest('get_block_hash', [validTargetBlockNumber])).result
+}
+
+async function getCKBNodeSize() {
+  const res = await fetch('https://ckb-node-info.magickbase.com/api')
+  const { data_size_g } = await res.json()
+  return Math.ceil(data_size_g)
+}
+
+;(async function () {
+  try {
+    console.info('start updating env file')
+    const blockHash = await getValidTarget()
+    const ckbNodeDataSize = await getCKBNodeSize()
+    const originEnvContent = fs.readFileSync(envFilePath).toString('utf-8')
+    fs.writeFileSync(
+      envFilePath,
+      originEnvContent.replace(validTargetReg, `CKB_NODE_ASSUME_VALID_TARGET='${blockHash}'`)
+        .replace(ckbNodeDataSizeReg, `CKB_NODE_DATA_SIZE=${ckbNodeDataSize}`)
+    )
+    console.info('write success')
+  } catch (error) {
+    console.error('write failed', error)
+  }
+})()

From 46c24a248a35bb0af7f234e16009640b6ce6fe0d Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Thu, 8 Feb 2024 22:07:21 +0800
Subject: [PATCH 42/68] fix: The sync child process broken and not restart
 (#3025)

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 packages/neuron-wallet/src/block-sync-renderer/task.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/block-sync-renderer/task.ts b/packages/neuron-wallet/src/block-sync-renderer/task.ts
index b0e0cc6c27..e10291360e 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/task.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/task.ts
@@ -86,7 +86,11 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
     }
 
     case 'queryIndexer': {
-      res = message ? await syncQueue?.getIndexerConnector()?.getLiveCellsByScript(message) : []
+      try {
+        res = message ? await syncQueue?.getIndexerConnector()?.getLiveCellsByScript(message) : []
+      } catch (error) {
+        logger.error(`Block Sync Task: queryIndexer:\t`, error)
+      }
       break
     }
     case 'append_scripts': {
@@ -104,4 +108,8 @@ export const listener = async ({ type, id, channel, message }: WorkerMessage) =>
 
 process.on('message', listener)
 
+process.on('unhandledRejection', reason => {
+  logger.error('Unhandled Rejection in task:\tReason:', reason)
+})
+
 registerTxStatusListener()

From dfa60d5abfb51c0071de83c47b94db8de5cd62d2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 11:19:43 +0800
Subject: [PATCH 43/68] Update ckb client versions (#3035)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-light-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ckb-light-version b/.ckb-light-version
index 03f2afa1b4..d379b578ae 100644
--- a/.ckb-light-version
+++ b/.ckb-light-version
@@ -1 +1 @@
-v0.3.5
+v0.3.6

From 0aecb45f3481d7546d9a12ddf224a1a906197811 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Sun, 11 Feb 2024 03:18:21 +0900
Subject: [PATCH 44/68] chore: update copyright duration (#3036)

---
 COPYING                                     | 2 +-
 packages/neuron-wallet/electron-builder.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/COPYING b/COPYING
index 5abae3896f..f9c0eb0413 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2023 Nervos Foundation
+Copyright (c) 2019-2024 Nervos Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml
index 1e4aa42855..32ab135725 100644
--- a/packages/neuron-wallet/electron-builder.yml
+++ b/packages/neuron-wallet/electron-builder.yml
@@ -1,5 +1,5 @@
 appId: com.nervos.neuron
-copyright: Copyright (C) 2019-2023 Nervos Foundation.
+copyright: Copyright (C) 2019-2024 Nervos Foundation.
 productName: Neuron
 
 # This property will replace to false in package for test action

From 1d31fe1f8b02afb40de852336f940cccb04c53d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 22 Feb 2024 02:28:14 +0000
Subject: [PATCH 45/68] Add left time for sync progress (#3014)

feat: Add left time.

1. Add left time for sync
2. Move global loading to button when clear cache.

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../ClearCache/clearCache.module.scss         | 24 +++++++----------
 .../src/components/ClearCache/index.tsx       | 24 ++++++++---------
 .../src/components/PageContainer/index.tsx    |  3 ++-
 .../src/components/SyncStatus/index.tsx       | 13 ++++++++--
 .../SyncStatus/syncStatus.module.scss         |  4 ++-
 packages/neuron-ui/src/locales/en.json        |  3 ++-
 packages/neuron-ui/src/locales/es.json        |  3 ++-
 packages/neuron-ui/src/locales/fr.json        |  3 ++-
 packages/neuron-ui/src/locales/zh-tw.json     |  3 ++-
 packages/neuron-ui/src/locales/zh.json        |  3 ++-
 .../src/tests/getSyncLeftTime/fixtures.json   | 26 ++++++++++++++-----
 .../neuron-ui/src/utils/getSyncLeftTime.ts    |  8 +++---
 12 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss b/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss
index 807b9ad684..fbcb1ca54e 100644
--- a/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss
+++ b/packages/neuron-ui/src/components/ClearCache/clearCache.module.scss
@@ -5,26 +5,22 @@
   font-size: 12px;
 }
 
-.clearDialog {
-  height: 180px;
-  width: 360px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  p {
-    font-weight: 500;
-    font-size: 16px;
-    color: var(--main-text-color);
-  }
-}
-
 .clearBtn {
   &[disabled] {
     opacity: 0.5;
     box-shadow: none !important;
     cursor: not-allowed;
   }
+
+  .spinner {
+    width: 16px;
+    height: 16px;
+    vertical-align: sub;
+    margin-left: 4px;
+    & > path {
+      fill: var(--secondary-text-color);
+    }
+  }
 }
 
 .options {
diff --git a/packages/neuron-ui/src/components/ClearCache/index.tsx b/packages/neuron-ui/src/components/ClearCache/index.tsx
index 1007687528..1788620ef4 100644
--- a/packages/neuron-ui/src/components/ClearCache/index.tsx
+++ b/packages/neuron-ui/src/components/ClearCache/index.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Spinner from 'widgets/Spinner'
-import Dialog from 'widgets/Dialog'
 import Toast from 'widgets/Toast'
 import { StateDispatch, addPopup } from 'states'
 import { clearCellCache } from 'services/remote'
@@ -9,7 +8,7 @@ import { cacheClearDate } from 'services/localCache'
 import { isSuccessResponse, uniformTimeFormatter } from 'utils'
 import styles from './clearCache.module.scss'
 
-const ClearCacheDialog = ({
+const ClearCache = ({
   dispatch,
   className,
   btnClassName,
@@ -50,20 +49,21 @@ const ClearCacheDialog = ({
           onClick={handleSubmit}
           disabled={isClearing}
         >
-          {t('settings.data.refresh')}
+          {isClearing ? (
+            <>
+              <Spinner className={styles.spinner} />
+              &nbsp;&nbsp;
+              {t('settings.data.clearing-cache')}
+            </>
+          ) : (
+            t('settings.data.refresh')
+          )}
         </button>
       </div>
-
-      <Dialog show={isClearing} showHeader={false} showFooter={false}>
-        <div className={styles.clearDialog}>
-          <Spinner size={3} />
-          <p>{t('settings.data.clearing-cache')}</p>
-        </div>
-      </Dialog>
       <Toast content={notice} onDismiss={() => setNotice('')} />
     </>
   )
 }
 
-ClearCacheDialog.displayName = 'ClearCacheDialog'
-export default ClearCacheDialog
+ClearCache.displayName = 'ClearCache'
+export default ClearCache
diff --git a/packages/neuron-ui/src/components/PageContainer/index.tsx b/packages/neuron-ui/src/components/PageContainer/index.tsx
index 7ee23aad18..8a665470e2 100755
--- a/packages/neuron-ui/src/components/PageContainer/index.tsx
+++ b/packages/neuron-ui/src/components/PageContainer/index.tsx
@@ -41,7 +41,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
   const {
     app: { showWaitForFullySynced },
     chain: {
-      syncState: { bestKnownBlockNumber, cacheTipBlockNumber, syncStatus, isLookingValidTarget, validTarget },
+      syncState: { bestKnownBlockNumber, cacheTipBlockNumber, syncStatus, isLookingValidTarget, validTarget, estimate },
       connectionStatus,
       networkID,
     },
@@ -141,6 +141,7 @@ const PageContainer: React.FC<ComponentProps> = props => {
               isLightClient={isLightClient}
               onOpenSetStartBlock={openDialog}
               startBlockNumber={walletStartBlockNumber}
+              estimate={estimate}
             />
           </div>
         </div>
diff --git a/packages/neuron-ui/src/components/SyncStatus/index.tsx b/packages/neuron-ui/src/components/SyncStatus/index.tsx
index 01a7d4ccac..5735881e07 100644
--- a/packages/neuron-ui/src/components/SyncStatus/index.tsx
+++ b/packages/neuron-ui/src/components/SyncStatus/index.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { SyncStatus as SyncStatusEnum, ConnectionStatus, clsx, localNumberFormatter } from 'utils'
+import { SyncStatus as SyncStatusEnum, ConnectionStatus, clsx, localNumberFormatter, getSyncLeftTime } from 'utils'
 import { Confirming, NewTab } from 'widgets/Icons/icon'
 import { ReactComponent as UnexpandStatus } from 'widgets/Icons/UnexpandStatus.svg'
 import { ReactComponent as StartBlock } from 'widgets/Icons/StartBlock.svg'
@@ -14,6 +14,7 @@ const SyncDetail = ({
   isLightClient,
   onOpenSetStartBlock,
   startBlockNumber,
+  estimate,
 }: {
   syncBlockNumbers: string
   isLookingValidTarget: boolean
@@ -21,6 +22,7 @@ const SyncDetail = ({
   isLightClient: boolean
   onOpenSetStartBlock: () => void
   startBlockNumber?: string
+  estimate?: number
 }) => {
   const [t] = useTranslation()
   return (
@@ -45,11 +47,15 @@ const SyncDetail = ({
         </div>
       )}
       {isLightClient && startBlockNumber ? (
-        <div className={styles.startBlockNumber}>
+        <div className={styles.item}>
           <div className={styles.title}>{t('network-status.tooltip.start-block-number')}:</div>
           <div className={styles.number}>{localNumberFormatter(startBlockNumber)}</div>
         </div>
       ) : null}
+      <div className={styles.item}>
+        <div className={styles.title}>{t('network-status.left-time')}</div>
+        <div className={styles.number}>{getSyncLeftTime(estimate)}</div>
+      </div>
       {isLightClient && (
         <div
           role="link"
@@ -79,6 +85,7 @@ const SyncStatus = ({
   isLightClient,
   onOpenSetStartBlock,
   startBlockNumber,
+  estimate,
 }: React.PropsWithoutRef<{
   syncStatus: SyncStatusEnum
   connectionStatus: State.ConnectionStatus
@@ -90,6 +97,7 @@ const SyncStatus = ({
   isLightClient: boolean
   onOpenSetStartBlock: () => void
   startBlockNumber?: string
+  estimate?: number
 }>) => {
   const [t] = useTranslation()
   const [isOpen, setIsOpen] = useState(false)
@@ -127,6 +135,7 @@ const SyncStatus = ({
           isLightClient={isLightClient}
           onOpenSetStartBlock={onOpenSetStartBlock}
           startBlockNumber={startBlockNumber}
+          estimate={estimate}
         />
       }
       trigger="click"
diff --git a/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss b/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
index 9afd0e19e6..0392091b75 100755
--- a/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
+++ b/packages/neuron-ui/src/components/SyncStatus/syncStatus.module.scss
@@ -46,6 +46,8 @@
 .tipContainer {
   .tip {
     padding: 12px;
+    // set left 40% to avoid horizontal scroll bar when find valid target
+    left: 40% !important;
   }
   .blockSynced {
     font-size: 12px;
@@ -92,7 +94,7 @@
     }
   }
 
-  .startBlockNumber {
+  .item {
     margin-top: 8px;
     .title {
       font-size: 12px;
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index db3b2d4754..51bcfd0e84 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -35,7 +35,8 @@
         "start-block-number": "Start block number",
         "set-start-block-number": "Set start block number"
       },
-      "migrating": "migrating..."
+      "migrating": "migrating...",
+      "left-time": "Left Time"
     },
     "import-hardware": {
       "title": {
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 9308fdfa2f..f003afb51d 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -34,7 +34,8 @@
         "looking-valid-target": "Buscando objetivo válido asumido",
         "set-start-block-number": "Establecer el número de bloque inicial"
       },
-      "migrating": "migrando..."
+      "migrating": "migrando...",
+      "left-time": "Tiempo restante"
     },
     "import-hardware": {
       "title": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 873641eea1..2824ca14ec 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -35,7 +35,8 @@
         "start-block-number": "bloc de départ",
         "set-start-block-number": "Définir le numéro de bloc de départ"
       },
-      "migrating": "migration en cours..."
+      "migrating": "migration en cours...",
+      "left-time": "Temps restant"
     },
     "import-hardware": {
       "title": {
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index cd7e92d5f4..07fcb9cad2 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -35,7 +35,8 @@
         "start-block-number": "起始區塊",
         "set-start-block-number": "設置同步起始區塊"
       },
-      "migrating": "正在數據遷移..."
+      "migrating": "正在數據遷移...",
+      "left-time": "剩余時間"
     },
     "import-hardware": {
       "title": {
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 37c2f45e91..402db46a6c 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -35,7 +35,8 @@
         "start-block-number": "起始区块",
         "set-start-block-number": "设置同步起始区块"
       },
-      "migrating": "正在数据迁移..."
+      "migrating": "正在数据迁移...",
+      "left-time": "剩余时间"
     },
     "import-hardware": {
       "title": {
diff --git a/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json b/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
index b677363a57..85cc88cb20 100644
--- a/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
+++ b/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
@@ -3,20 +3,32 @@
     "estimate": null,
     "expected": "-"
   },
-  "should return 00:01 when estimate is 60_000": {
+  "should return 00:00:00 when estimate is less than 1_000": {
+    "estimate": 999,
+    "expected": "00:00:00"
+  },
+  "should return 00:00:01 when estimate is 1_000": {
+    "estimate": 1000,
+    "expected": "00:00:01"
+  },
+  "should return 00:01:00 when estimate is 60_000": {
     "estimate": 60000,
-    "expected": "00:01"
+    "expected": "00:01:00"
+  },
+  "should return 00:01:59 when estimate is 119_999": {
+    "estimate": 119999,
+    "expected": "00:01:59"
   },
   "should return 01:00 when estimate is 60 * 60_000": {
     "estimate": 3600000,
-    "expected": "01:00"
+    "expected": "01:00:00"
   },
-  "should return 00:00 when estimate is less than 30_000": {
-    "estimate": 29999,
-    "expected": "00:00"
+  "should return 01:59:59 when estimate is 60 * 60_000 + 59 * 60_000 + 59 * 1_000": {
+    "estimate": 7199000,
+    "expected": "01:59:59"
   },
   "should return 00:01 when estimate is less than 60_000 but greater than 30_000": {
     "estimate": 30001,
-    "expected": "00:01"
+    "expected": "00:00:30"
   }
 }
diff --git a/packages/neuron-ui/src/utils/getSyncLeftTime.ts b/packages/neuron-ui/src/utils/getSyncLeftTime.ts
index c717f0a300..9b45a9f274 100644
--- a/packages/neuron-ui/src/utils/getSyncLeftTime.ts
+++ b/packages/neuron-ui/src/utils/getSyncLeftTime.ts
@@ -1,4 +1,5 @@
-const MINS_PER_HOUR = 60
+const MILLISECS_PER_SEC = 1_000
+const MILLISECS_PER_MIN = 60_000
 const MILLISECS_PER_HOUR = 3600_000
 
 export const getSyncLeftTime = (estimate: number | undefined) => {
@@ -6,8 +7,9 @@ export const getSyncLeftTime = (estimate: number | undefined) => {
   if (typeof estimate === 'number') {
     const time = estimate / MILLISECS_PER_HOUR
     const hrs = Math.floor(time)
-    const mins = Math.round((time - hrs) * MINS_PER_HOUR)
-    leftTime = `${hrs.toString().padStart(2, '0')}:${mins.toString().padStart(2, '0')}`
+    const mins = Math.floor((estimate - hrs * MILLISECS_PER_HOUR) / MILLISECS_PER_MIN)
+    const secs = Math.floor((estimate - hrs * MILLISECS_PER_HOUR - mins * MILLISECS_PER_MIN) / MILLISECS_PER_SEC)
+    leftTime = [hrs, mins, secs].map(v => v.toString().padStart(2, '0')).join(':')
   }
   return leftTime
 }

From 76db5ecb3a33a72bf0d7974c05bb25bee7a9e190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 23 Feb 2024 09:39:01 +0000
Subject: [PATCH 46/68] fix: Fix language select (#3043)

---
 .../src/components/LanguageDialog/languageDialog.module.scss   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/neuron-ui/src/components/LanguageDialog/languageDialog.module.scss b/packages/neuron-ui/src/components/LanguageDialog/languageDialog.module.scss
index 61b2177b46..c357cb4231 100644
--- a/packages/neuron-ui/src/components/LanguageDialog/languageDialog.module.scss
+++ b/packages/neuron-ui/src/components/LanguageDialog/languageDialog.module.scss
@@ -33,6 +33,9 @@
   .selects {
     position: fixed;
     width: 648px;
+    max-height: calc(100vh - 400px);
+    overflow-y: auto;
+    overflow-x: hidden;
     margin-top: 8px;
     padding: 16px 0;
     z-index: 2;

From 7e022ebe0a36b2d56dd8675a59ef3249c833ed78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Mon, 26 Feb 2024 07:30:25 +0000
Subject: [PATCH 47/68] fix: Save sync_progress with chunk (#3021)

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../sync/light-synchronizer.ts                   |  2 +-
 .../neuron-wallet/src/services/sync-progress.ts  | 16 +++++++++-------
 .../light-synchronizer.test.ts                   |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
index d8af5d0d61..1adccf187b 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts
@@ -231,7 +231,7 @@ export default class LightSynchronizer extends Synchronizer {
     const deleteScript = syncScripts.filter(v => !allScriptHashes.has(scriptToHash(v.script)))
     await this.lightRpc.setScripts(deleteScript, 'delete')
     const walletIds = [...new Set(this.addressMetas.map(v => v.walletId))]
-    await SyncProgressService.resetSyncProgress(addScripts)
+    await SyncProgressService.initSyncProgress(addScripts)
     await SyncProgressService.updateSyncProgressFlag(walletIds)
     await SyncProgressService.removeByHashesAndAddressType(
       SyncAddressType.Multisig,
diff --git a/packages/neuron-wallet/src/services/sync-progress.ts b/packages/neuron-wallet/src/services/sync-progress.ts
index 92d8f02a21..47362710a4 100644
--- a/packages/neuron-wallet/src/services/sync-progress.ts
+++ b/packages/neuron-wallet/src/services/sync-progress.ts
@@ -5,7 +5,7 @@ import WalletService from './wallets'
 import { getConnection } from '../database/chain/connection'
 
 export default class SyncProgressService {
-  static async resetSyncProgress(
+  static async initSyncProgress(
     params: {
       script: CKBComponents.Script
       scriptType: CKBRPC.ScriptType
@@ -14,13 +14,15 @@ export default class SyncProgressService {
       blockNumber: string
     }[]
   ) {
-    await getConnection()
+    const syncProgresses = params.map(v => SyncProgress.fromObject(v))
+    const existProgresses = await getConnection()
       .getRepository(SyncProgress)
-      .createQueryBuilder()
-      .insert()
-      .orIgnore()
-      .values(params.map(v => SyncProgress.fromObject(v)))
-      .execute()
+      .find({
+        select: ['hash'],
+      })
+    const existHashes = new Set(existProgresses.map(v => v.hash))
+    const newSyncProgreses = syncProgresses.filter(v => !existHashes.has(v.hash))
+    await getConnection().manager.save(newSyncProgreses, { chunk: 100 })
   }
 
   static async updateSyncProgressFlag(existWalletIds: string[]) {
diff --git a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
index 4b23436501..8e3b83be0c 100644
--- a/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
+++ b/packages/neuron-wallet/tests/block-sync-renderer/light-synchronizer.test.ts
@@ -5,7 +5,7 @@ import AddressMeta from '../../src/database/address/meta'
 const getSyncStatusMock = jest.fn()
 const getCurrentWalletMinSyncedBlockNumberMock = jest.fn()
 const getAllSyncStatusToMapMock = jest.fn()
-const resetSyncProgressMock = jest.fn()
+const initSyncProgressMock = jest.fn()
 const updateSyncStatusMock = jest.fn()
 const updateSyncProgressFlagMock = jest.fn()
 const getWalletMinLocalSavedBlockNumberMock = jest.fn()
@@ -28,7 +28,7 @@ function mockReset() {
   getSyncStatusMock.mockReset()
   getCurrentWalletMinSyncedBlockNumberMock.mockReset()
   getAllSyncStatusToMapMock.mockReset()
-  resetSyncProgressMock.mockReset()
+  initSyncProgressMock.mockReset()
   updateSyncStatusMock.mockReset()
   getWalletMinLocalSavedBlockNumberMock.mockReset()
   getOtherTypeSyncProgressMock.mockReset()
@@ -52,7 +52,7 @@ jest.mock('../../src/services/sync-progress', () => {
     static getSyncStatus: any = () => getSyncStatusMock()
     static getCurrentWalletMinSyncedBlockNumber: any = () => getCurrentWalletMinSyncedBlockNumberMock()
     static getAllSyncStatusToMap: any = () => getAllSyncStatusToMapMock()
-    static resetSyncProgress: any = (arg: any) => resetSyncProgressMock(arg)
+    static initSyncProgress: any = (arg: any) => initSyncProgressMock(arg)
     static updateSyncStatus: any = (hash: string, update: any) => updateSyncStatusMock(hash, update)
     static updateSyncProgressFlag: any = (walletIds: string[]) => updateSyncProgressFlagMock(walletIds)
     static getWalletMinLocalSavedBlockNumber: any = () => getWalletMinLocalSavedBlockNumberMock()
@@ -166,7 +166,7 @@ describe('test light synchronizer', () => {
         'partial'
       )
       expect(setScriptsMock).toHaveBeenLastCalledWith([], 'delete')
-      expect(resetSyncProgressMock).toBeCalledWith([
+      expect(initSyncProgressMock).toBeCalledWith([
         {
           script: addressMeta.generateACPLockScript().toSDK(),
           scriptType: 'lock',

From ac43699d3733a01c73420aa30d6d9d27edf622c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 1 Mar 2024 10:50:25 +0800
Subject: [PATCH 48/68] fix: Add `transfer-to-sudt` and `withdraw-cheque` for
 hardware sign. (#3044)

---
 packages/neuron-ui/src/components/HardwareSign/hooks.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/components/HardwareSign/hooks.ts b/packages/neuron-ui/src/components/HardwareSign/hooks.ts
index e3cdf418c8..cec9567a50 100644
--- a/packages/neuron-ui/src/components/HardwareSign/hooks.ts
+++ b/packages/neuron-ui/src/components/HardwareSign/hooks.ts
@@ -229,7 +229,8 @@ export default ({
         case 'send-nft':
         case 'destroy-asset-account':
         case 'send-cheque':
-        case 'claim-cheque': {
+        case 'claim-cheque':
+        case 'withdraw-cheque': {
           if (isSending) {
             break
           }
@@ -278,7 +279,8 @@ export default ({
         case 'send-ckb-asset':
         case 'send-acp-sudt-to-new-cell':
         case 'send-acp-ckb-to-new-cell':
-        case 'send-sudt': {
+        case 'send-sudt':
+        case 'transfer-to-sudt': {
           let skipLastInputs = true
           if (actionType === 'send-acp-sudt-to-new-cell' || actionType === 'send-acp-ckb-to-new-cell') {
             skipLastInputs = false

From 151d30caabf0af550e4622e5cd0ce202452a3c8b Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 5 Mar 2024 22:32:40 +0900
Subject: [PATCH 49/68] ci: specify environments in some workflows (#3059)

---
 .github/workflows/package.yml                    | 2 ++
 .github/workflows/update_ckb_client_versions.yml | 1 +
 .github/workflows/update_neuron_compatible.yml   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index c22478947d..8243b58b3a 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -20,6 +20,8 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    environment: Release
+
     name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
 
     steps:
diff --git a/.github/workflows/update_ckb_client_versions.yml b/.github/workflows/update_ckb_client_versions.yml
index 2719acf71d..b2834a34bf 100644
--- a/.github/workflows/update_ckb_client_versions.yml
+++ b/.github/workflows/update_ckb_client_versions.yml
@@ -8,6 +8,7 @@ jobs:
   default:
     name: Update CKB client versions
     runs-on: ubuntu-latest
+    environment: neuron-bot
     permissions:
       pull-requests: write # open PR
       contents: write # update version files
diff --git a/.github/workflows/update_neuron_compatible.yml b/.github/workflows/update_neuron_compatible.yml
index ac4764a899..0442127f93 100644
--- a/.github/workflows/update_neuron_compatible.yml
+++ b/.github/workflows/update_neuron_compatible.yml
@@ -11,6 +11,7 @@ jobs:
   update-neuron-compatible:
     name: Update Neuron compatibility table
     runs-on: ubuntu-latest
+    environment: neuron-bot
     permissions:
       pull-requests: write # open PR
       contents: write # update version files

From 520840f8d545e822b443c9e854cbe01238ca8202 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:32:16 +0800
Subject: [PATCH 50/68] Update ckb client versions (#3061)

feat: update ckb client versions

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 .ckb-version    | 2 +-
 compatible.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.ckb-version b/.ckb-version
index cff1fcdc66..de4d9773e7 100644
--- a/.ckb-version
+++ b/.ckb-version
@@ -1 +1 @@
-v0.113.1
+v0.114.0
diff --git a/compatible.json b/compatible.json
index a28669ae51..ec18d9af2e 100644
--- a/compatible.json
+++ b/compatible.json
@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.114",
     "0.113",
     "0.112",
     "0.111",
@@ -19,6 +20,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.114",
         "0.113",
         "0.112",
         "0.111",
@@ -32,6 +34,7 @@
     },
     "0.110": {
       "full": [
+        "0.114",
         "0.113",
         "0.112",
         "0.111",
@@ -61,6 +64,7 @@
     },
     "0.112": {
       "full": [
+        "0.114",
         "0.113",
         "0.112",
         "0.111",

From 9d5db26fb6cdf1887524a83a5a5f0344339e5191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Wed, 6 Mar 2024 17:20:01 +0800
Subject: [PATCH 51/68] feat: Non-Native token transfer in history add more
 details about CKB (#3040)

---
 .../CellInfoDialog/cellInfoDialog.module.scss | 272 +++++++++++++++++
 .../src/components/CellInfoDialog/index.tsx   | 158 ++++++++++
 .../src/components/CellManagement/hooks.ts    |  57 +---
 .../src/components/CellManagement/index.tsx   |  75 +----
 .../formattedTokenAmount.module.scss          |   9 +-
 .../components/FormattedTokenAmount/index.tsx |  52 +++-
 .../components/History/history.module.scss    |  10 +-
 .../neuron-ui/src/components/History/hooks.ts |   4 +-
 .../src/components/History/index.tsx          |  33 +-
 .../historyDetailPage.module.scss             |  75 +++--
 .../src/components/HistoryDetailPage/hooks.ts |  32 ++
 .../components/HistoryDetailPage/index.tsx    | 286 +++++++++++++-----
 .../transactionStatusWrap.module.scss         |   1 +
 packages/neuron-ui/src/locales/en.json        |  21 +-
 packages/neuron-ui/src/locales/es.json        |  21 +-
 packages/neuron-ui/src/locales/fr.json        |  21 +-
 packages/neuron-ui/src/locales/zh-tw.json     |  19 +-
 packages/neuron-ui/src/locales/zh.json        |  21 +-
 packages/neuron-ui/src/services/chain.ts      |   2 -
 .../src/services/remote/remoteApiWrapper.ts   |   1 +
 .../src/services/remote/transactions.ts       |   2 +
 .../neuron-ui/src/services/remote/wallets.ts  |   1 +
 .../neuron-ui/src/tests/parsers/index.test.ts |  18 ++
 packages/neuron-ui/src/types/App/index.d.ts   |   1 +
 packages/neuron-ui/src/utils/parsers.ts       |   2 +
 .../neuron-ui/src/widgets/Switch/index.tsx    |  28 ++
 .../src/widgets/Switch/switch.module.scss     |  34 +++
 .../neuron-ui/src/widgets/Table/index.tsx     |  34 ++-
 packages/neuron-wallet/src/controllers/api.ts |  12 +-
 .../src/controllers/cell-management.ts        |   8 +-
 packages/neuron-wallet/src/controllers/dao.ts |  30 +-
 .../src/controllers/transactions.ts           |  14 +-
 .../models/chain/transaction-with-status.ts   |  10 +-
 .../src/models/chain/transaction.ts           |   1 +
 packages/neuron-wallet/src/services/cells.ts  |  39 ++-
 .../src/services/tx/transaction-service.ts    |  52 +++-
 .../neuron-wallet/src/types/controller.d.ts   |   2 +
 .../tests/services/cells.test.ts              | 145 +++++++--
 38 files changed, 1265 insertions(+), 338 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
 create mode 100644 packages/neuron-ui/src/components/CellInfoDialog/index.tsx
 create mode 100644 packages/neuron-ui/src/components/HistoryDetailPage/hooks.ts
 create mode 100644 packages/neuron-ui/src/widgets/Switch/index.tsx
 create mode 100644 packages/neuron-ui/src/widgets/Switch/switch.module.scss

diff --git a/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss b/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
new file mode 100644
index 0000000000..148d7b4f99
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
@@ -0,0 +1,272 @@
+.cellInfoDialog {
+  min-width: 650px;
+}
+
+.title {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 14px;
+
+  .outPoint {
+    display: flex;
+    padding: 5px 8px;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+    border-radius: 16px;
+    border: 1px solid var(--divide-line-color);
+    background: var(--input-disabled-color);
+    font-weight: 400;
+    color: var(--main-text-color);
+
+    .hash {
+      font-family: 'JetBrains Mono';
+    }
+
+    & > svg {
+      path {
+        fill: var(--secondary-text-color);
+      }
+    }
+  }
+}
+
+.head {
+  display: flex;
+  gap: 4px;
+  align-items: center;
+  margin-bottom: 12px;
+
+  & > svg {
+    transform: rotate(-90deg);
+    path {
+      fill: var(--border-color);
+    }
+  }
+
+  [data-type='hash'] {
+    color: var(--third-text-color);
+    font-family: 'JetBrains Mono';
+  }
+
+  .liveIcon {
+    width: 8px;
+    height: 8px;
+    border-radius: 8px;
+    background-color: var(--primary-color);
+  }
+}
+
+.tabsClassName {
+  .tabsWrapClassName {
+    position: relative;
+    display: flex;
+    margin-bottom: 16px;
+    border-bottom: 1px solid var(--divide-line-color);
+
+    .tabsColumnClassName {
+      position: relative;
+      padding: 10px 20px;
+      font-size: 14px;
+      font-weight: 500;
+      color: var(--tabs-default-color);
+      background-color: transparent;
+      border: none;
+      margin-right: 10px;
+
+      &:hover {
+        font-weight: bold;
+        color: var(--tabs-active);
+      }
+
+      &.active {
+        color: var(--tabs-active);
+        border-bottom: 2px solid var(--tabs-active);
+      }
+    }
+  }
+}
+
+.scriptTable {
+  border-collapse: separate;
+  border-spacing: 0px;
+  width: 100%;
+  color: var(--main-text-color);
+
+  td {
+    padding: 8px;
+    border: 1px solid var(--divide-line-color);
+    text-align: center;
+  }
+
+  thead {
+    td {
+      border-bottom: 0;
+      &:nth-child(1) {
+        border-top-left-radius: 8px;
+        border-right: 0;
+      }
+      &:nth-last-child(1) {
+        border-top-right-radius: 8px;
+      }
+    }
+  }
+
+  tbody {
+    tr {
+      &:not(:nth-last-child(1)) {
+        td {
+          border-bottom: 0;
+        }
+      }
+      &:nth-last-child(1) {
+        td {
+          &:nth-child(1) {
+            border-bottom-left-radius: 8px;
+          }
+          &:nth-last-child(1) {
+            border-bottom-right-radius: 8px;
+          }
+        }
+      }
+    }
+    td {
+      &:not(:nth-last-child(1)) {
+        border-right: 0;
+      }
+    }
+  }
+}
+
+.content {
+  position: relative;
+
+  .switchFormat {
+    position: absolute;
+    right: 0;
+    top: 10px;
+    color: var(--main-text-color);
+    display: flex;
+    align-items: center;
+  }
+}
+
+.preStyle {
+  border: 1px solid var(--lock-info-title-border);
+  border-radius: 12px;
+  padding: 16px;
+  overflow-y: auto;
+  margin: 0;
+  color: var(--main-text-color);
+  font-family: 'JetBrains Mono';
+  display: block;
+  width: calc(100% - 32px);
+
+  &::selection {
+    background-color: var(--primary-color);
+    color: var(--primary-text-color);
+  }
+}
+
+.capacityUsed {
+  padding: 0 16px 16px;
+  .slider {
+    width: 616px;
+    height: 16px;
+    border-radius: 8px;
+    border: 1px solid var(--divide-line-color);
+    background-color: var(--secondary-background-color);
+    position: relative;
+
+    & > div {
+      position: absolute;
+      left: -1px;
+      top: -1px;
+      height: 100%;
+      border-radius: 8px;
+      border: 1px solid var(--primary-color);
+      background-color: var(--primary-color);
+    }
+  }
+  .capacityDetail {
+    color: var(--main-text-color);
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    margin-top: 12px;
+  }
+}
+
+.dataAction {
+  position: fixed;
+  width: 496px;
+  border-radius: 8px;
+  background: var(--secondary-background-color);
+  box-shadow: 0px 2px 10px 0px var(--main-shadow-color);
+
+  .dataView {
+    color: var(--main-text-color);
+    font-weight: 500;
+    padding: 12px;
+    border-bottom: 1px solid var(--divide-line-color);
+    display: flex;
+    align-items: center;
+
+    .formatTypeBtn {
+      border: none;
+      cursor: pointer;
+      background-color: transparent;
+
+      &:hover,
+      &[data-activity='true'] {
+        color: var(--primary-color);
+      }
+
+      &[data-open='true'] {
+        & > svg {
+          transform: rotate(180deg);
+        }
+      }
+
+      & > svg {
+        margin-left: 4px;
+        path {
+          fill: var(--primary-color);
+        }
+      }
+    }
+
+    .dropdown {
+      position: relative;
+      margin-left: 12px;
+      .formatTypes {
+        position: absolute;
+        top: 100%;
+        left: 0;
+        background-color: var(--secondary-background-color);
+        border-radius: 4px;
+        box-shadow: 0px 2px 10px 0px var(--main-shadow-color);
+        display: flex;
+        flex-direction: column;
+        padding: 12px 8px;
+        margin: 0;
+        gap: 16px;
+        white-space: nowrap;
+        z-index: 10;
+      }
+    }
+  }
+
+  .dataFormat {
+    padding: 12px;
+    word-wrap: break-word;
+  }
+}
+
+.copyAddress {
+  margin-left: 4px;
+  position: relative;
+  top: 4px;
+  cursor: pointer;
+}
diff --git a/packages/neuron-ui/src/components/CellInfoDialog/index.tsx b/packages/neuron-ui/src/components/CellInfoDialog/index.tsx
new file mode 100644
index 0000000000..20bc08a669
--- /dev/null
+++ b/packages/neuron-ui/src/components/CellInfoDialog/index.tsx
@@ -0,0 +1,158 @@
+import React, { useMemo, useState } from 'react'
+import Dialog from 'widgets/Dialog'
+import { calculateUsedCapacity, shannonToCKBFormatter } from 'utils'
+import { useTranslation } from 'react-i18next'
+import Tabs from 'widgets/Tabs'
+import { type TFunction } from 'i18next'
+import { Script } from '@ckb-lumos/base'
+import Switch from 'widgets/Switch'
+import styles from './cellInfoDialog.module.scss'
+
+type ScriptRenderType = 'table' | 'raw'
+
+const ScriptRender = ({ script, renderType }: { script?: Script; renderType: ScriptRenderType }) => {
+  if (renderType === 'raw') {
+    const scriptRaw = script
+      ? `{
+  "code_hash": "${script.codeHash}"
+  "hash_type": "${script.hashType}"
+  "args": "${script.args}"
+}`
+      : `{
+  "null"
+}`
+    return <pre className={styles.preStyle}>{scriptRaw}</pre>
+  }
+  return (
+    <table className={styles.scriptTable}>
+      <thead>
+        <tr>
+          <td>KEY</td>
+          <td>VALUE</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>code_hash</td>
+          <td>{script?.codeHash ?? '--'}</td>
+        </tr>
+        <tr>
+          <td>hash_type</td>
+          <td>{script?.hashType ?? '--'}</td>
+        </tr>
+        <tr>
+          <td>args</td>
+          <td>{script?.args ?? '--'}</td>
+        </tr>
+      </tbody>
+    </table>
+  )
+}
+
+const tabIds = {
+  lock: 'lock',
+  type: 'type',
+  data: 'data',
+  capacityUsage: 'capacityUsage',
+}
+
+const useTabs = ({ t, output }: { t: TFunction; output?: State.DetailedOutput }) => {
+  const [scriptRenderType, setScriptRenderType] = useState<ScriptRenderType>('table')
+  const usedCapacity = useMemo(() => (output ? calculateUsedCapacity(output) : 0), [output])
+  const tabs = [
+    {
+      id: tabIds.lock,
+      label: 'Lock Script',
+      render() {
+        return <ScriptRender renderType={scriptRenderType} script={output?.lock} />
+      },
+    },
+    {
+      id: tabIds.type,
+      label: 'Type Script',
+      render() {
+        return <ScriptRender renderType={scriptRenderType} script={output?.type} />
+      },
+    },
+    {
+      id: tabIds.data,
+      label: 'Data',
+      render() {
+        return <pre className={styles.preStyle}>{output?.data}</pre>
+      },
+    },
+    {
+      id: tabIds.capacityUsage,
+      label: t('cell-manage.cell-detail-dialog.capacity-used'),
+      render() {
+        return (
+          <section className={styles.capacityUsed}>
+            <div className={styles.slider}>
+              <div style={{ width: `${(100 * usedCapacity) / +shannonToCKBFormatter(output?.capacity ?? '')}%` }} />
+            </div>
+            <div className={styles.capacityDetail}>
+              {`Occupied ${usedCapacity} CKB, Declared ${shannonToCKBFormatter(output?.capacity ?? '')} CKB`}
+            </div>
+          </section>
+        )
+      },
+    },
+  ]
+  const [currentTab, setCurrentTab] = useState(tabs[0])
+  return {
+    currentTab,
+    setCurrentTab,
+    tabs,
+    setScriptRenderType,
+    scriptRenderType,
+  }
+}
+
+const CellInfoDialog = ({ onCancel, output }: { onCancel: () => void; output?: State.DetailedOutput }) => {
+  const [t] = useTranslation()
+
+  const { tabs, currentTab, setCurrentTab, scriptRenderType, setScriptRenderType } = useTabs({
+    t,
+    output,
+  })
+  if (!output) {
+    return null
+  }
+  return (
+    <Dialog
+      show
+      title={
+        <div className={styles.title}>
+          <span>{t('cell-manage.cell-detail-dialog.title')}</span>
+        </div>
+      }
+      onCancel={onCancel}
+      showFooter={false}
+      className={styles.cellInfoDialog}
+    >
+      <div className={styles.content}>
+        <Tabs
+          tabs={tabs}
+          onTabChange={setCurrentTab}
+          tabsClassName={styles.tabsClassName}
+          tabsWrapClassName={styles.tabsWrapClassName}
+          tabsColumnClassName={styles.tabsColumnClassName}
+          activeColumnClassName={styles.active}
+        />
+        {[tabIds.lock, tabIds.type].includes(currentTab.id) ? (
+          <div className={styles.switchFormat}>
+            Raw Data&nbsp;&nbsp;
+            <Switch
+              checked={scriptRenderType === 'raw'}
+              onChange={checked => setScriptRenderType(checked ? 'raw' : 'table')}
+            />
+          </div>
+        ) : null}
+      </div>
+    </Dialog>
+  )
+}
+
+CellInfoDialog.displayName = 'CellInfoDialog'
+
+export default CellInfoDialog
diff --git a/packages/neuron-ui/src/components/CellManagement/hooks.ts b/packages/neuron-ui/src/components/CellManagement/hooks.ts
index 6dca24e92f..9076750ece 100644
--- a/packages/neuron-ui/src/components/CellManagement/hooks.ts
+++ b/packages/neuron-ui/src/components/CellManagement/hooks.ts
@@ -1,21 +1,12 @@
 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 {
-  LockScriptCategory,
-  RoutePath,
-  TypeScriptCategory,
-  calculateUsedCapacity,
-  getExplorerUrl,
-  isSuccessResponse,
-  outPointToStr,
-} from 'utils'
+import { LockScriptCategory, RoutePath, TypeScriptCategory, isSuccessResponse, outPointToStr } from 'utils'
 import { SortType } from 'widgets/Table'
 
 const cellTypeOrder: Record<string, number> = {
@@ -351,52 +342,6 @@ export const useSelect = (liveCells: State.LiveCellWithLocalInfo[]) => {
   }
 }
 
-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('')
diff --git a/packages/neuron-ui/src/components/CellManagement/index.tsx b/packages/neuron-ui/src/components/CellManagement/index.tsx
index 62769ac99a..e8752c869c 100644
--- a/packages/neuron-ui/src/components/CellManagement/index.tsx
+++ b/packages/neuron-ui/src/components/CellManagement/index.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react'
-import { Attention, Consume, Copy, DetailIcon, EyesClose, EyesOpen, LockCell, NewTab, UnLock } from 'widgets/Icons/icon'
+import { Attention, Consume, DetailIcon, EyesClose, EyesOpen, LockCell, UnLock } from 'widgets/Icons/icon'
 import PageContainer from 'components/PageContainer'
 import { useTranslation } from 'react-i18next'
 import Breadcrum from 'widgets/Breadcrum'
@@ -10,9 +10,6 @@ import {
   shannonToCKBFormatter,
   uniformTimeFormatter,
   usePagination,
-  isMainnet as isMainnetUtil,
-  useCopy,
-  clsx,
   outPointToStr,
   LockScriptCategory,
   getLockTimestamp,
@@ -20,12 +17,13 @@ import {
 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 { useSearchParams } from 'react-router-dom'
-import { Actions, useAction, useLiveCells, usePassword, useSelect, useViewCell } from './hooks'
+import CellInfoDialog from 'components/CellInfoDialog'
+import { computeScriptHash } from '@ckb-lumos/base/lib/utils'
+import { Actions, useAction, useLiveCells, usePassword, useSelect } from './hooks'
 import styles from './cellManagement.module.scss'
 
 const getColumns = ({
@@ -218,12 +216,9 @@ const CellManagement = () => {
     app: { epoch },
     wallet: { balance = '' },
     chain: {
-      networkID,
       syncState: { bestKnownBlockTimestamp },
     },
-    settings: { networks },
   } = useGlobalState()
-  const isMainnet = isMainnetUtil(networks, networkID)
   const [t] = useTranslation()
   const [searchParams] = useSearchParams()
   const breadPages = useMemo(() => [{ label: t('cell-manage.title') }], [t])
@@ -277,11 +272,6 @@ const CellManagement = () => {
       bestKnownBlockTimestamp,
     ]
   )
-  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]
@@ -332,57 +322,14 @@ const CellManagement = () => {
         pageNo={pageNo}
         onChange={onPageChange}
       />
-      <Dialog
-        show={action === Actions.View}
-        title={t('cell-manage.cell-detail-dialog.title')}
+      <CellInfoDialog
+        output={
+          action === Actions.View
+            ? { ...operateCells[0]!, lockHash: computeScriptHash(operateCells[0]!.lock) }
+            : undefined
+        }
         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`)}
diff --git a/packages/neuron-ui/src/components/FormattedTokenAmount/formattedTokenAmount.module.scss b/packages/neuron-ui/src/components/FormattedTokenAmount/formattedTokenAmount.module.scss
index d82b115329..74cd2d5637 100644
--- a/packages/neuron-ui/src/components/FormattedTokenAmount/formattedTokenAmount.module.scss
+++ b/packages/neuron-ui/src/components/FormattedTokenAmount/formattedTokenAmount.module.scss
@@ -1,3 +1,8 @@
-.isReceive {
-  color: var(--primary-color);
+.amount {
+  &[data-direction='receive'] {
+    color: var(--primary-color);
+  }
+  &[data-direction='send'] {
+    color: var(--error-color);
+  }
 }
diff --git a/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx b/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
index 63d82b449b..4a180ba15f 100644
--- a/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
+++ b/packages/neuron-ui/src/components/FormattedTokenAmount/index.tsx
@@ -8,18 +8,20 @@ import { HIDE_BALANCE } from 'utils/const'
 
 import styles from './formattedTokenAmount.module.scss'
 
-type FormattedTokenAmountProps = { item: State.Transaction; show: boolean; symbolClassName?: string }
+type FormattedTokenAmountProps = { item: State.Transaction; show: boolean; symbolClassName?: string; symbol?: string }
 type AmountProps = Omit<FormattedTokenAmountProps, 'isNeedCopy'> & {
-  sudtAmount: string
+  sudtAmount?: string
   isReceive: boolean
   amount: string
   symbolClassName?: string
 }
 
-const Amount = ({ sudtAmount, show, item, isReceive, amount, symbolClassName }: AmountProps) => {
+const Amount = ({ sudtAmount, show, item, isReceive, amount, symbolClassName, symbol }: AmountProps) => {
   return sudtAmount ? (
-    <div className={show && !sudtAmount.includes('-') ? styles.isReceive : ''}>
-      {show ? `${!sudtAmount.includes('-') ? '+' : ''}${sudtAmount}` : HIDE_BALANCE}&nbsp;
+    <div>
+      <span className={show ? styles.amount : ''} data-direction={isReceive ? 'receive' : 'send'}>
+        {show ? `${isReceive ? '+' : ''}${sudtAmount}` : HIDE_BALANCE}&nbsp;
+      </span>
       <UANTonkenSymbol
         className={symbolClassName}
         name={item.sudtInfo!.sUDT.tokenName}
@@ -27,7 +29,12 @@ const Amount = ({ sudtAmount, show, item, isReceive, amount, symbolClassName }:
       />
     </div>
   ) : (
-    <span className={show && isReceive ? styles.isReceive : ''}>{amount}</span>
+    <div>
+      <span className={show ? styles.amount : ''} data-direction={isReceive ? 'receive' : 'send'}>
+        {amount}
+      </span>
+      &nbsp;{symbol}
+    </div>
   )
 }
 
@@ -36,6 +43,7 @@ export const FormattedTokenAmount = ({ item, show, symbolClassName }: FormattedT
   let sudtAmount = ''
   let copyText = amount
   let isReceive = false
+  let symbol = ''
 
   if (item.blockNumber !== undefined) {
     if (item.nftInfo) {
@@ -43,20 +51,46 @@ export const FormattedTokenAmount = ({ item, show, symbolClassName }: FormattedT
       const { type, data } = item.nftInfo
       amount = show ? `${type === 'receive' ? '+' : '-'}${nftFormatter(data)}` : `${HIDE_BALANCE}mNFT`
       copyText = amount
+      symbol = amount.includes('mNFT') ? 'mNFT' : ''
+      amount = amount.replace('mNFT', '')
       isReceive = type === 'receive'
     } else if (item.sudtInfo?.sUDT) {
       if (item.sudtInfo.sUDT.decimal) {
         sudtAmount = sUDTAmountFormatter(sudtValueToAmount(item.sudtInfo.amount, item.sudtInfo.sUDT.decimal))
         copyText = `${sudtValueToAmount(item.sudtInfo.amount, item.sudtInfo.sUDT.decimal)} ${item.sudtInfo.sUDT.symbol}`
+        isReceive = !sudtAmount.includes('-')
       }
     } else {
-      amount = show ? `${shannonToCKBFormatter(item.value, true)} CKB` : `${HIDE_BALANCE} CKB`
+      amount = show ? `${shannonToCKBFormatter(item.value, true)}` : `${HIDE_BALANCE}`
       isReceive = !amount.includes('-')
-      copyText = amount
+      copyText = `${amount} CKB`
+      symbol = 'CKB'
     }
   }
 
-  const props = { sudtAmount, show, item, isReceive, amount, symbolClassName }
+  const props = { sudtAmount, show, item, isReceive, amount, symbolClassName, symbol }
+
+  return show ? (
+    <CopyZone content={copyText}>
+      <Amount {...props} />
+    </CopyZone>
+  ) : (
+    <Amount {...props} />
+  )
+}
+
+export const FormattedCKBBalanceChange = ({ item, show, symbolClassName }: FormattedTokenAmountProps) => {
+  let amount = '--'
+  let copyText = amount
+  let isReceive = false
+
+  if (item.blockNumber !== undefined) {
+    amount = show ? `${shannonToCKBFormatter(item.value, true)}` : `${HIDE_BALANCE}`
+    isReceive = !amount.includes('-')
+    copyText = amount
+  }
+
+  const props = { show, item, isReceive, amount, symbolClassName }
 
   return show ? (
     <CopyZone content={copyText}>
diff --git a/packages/neuron-ui/src/components/History/history.module.scss b/packages/neuron-ui/src/components/History/history.module.scss
index c389de4ac8..c749dc8d9e 100644
--- a/packages/neuron-ui/src/components/History/history.module.scss
+++ b/packages/neuron-ui/src/components/History/history.module.scss
@@ -88,11 +88,16 @@ body {
 
     .infoBox {
       display: flex;
+      .infoBlock {
+        margin-bottom: 0;
+      }
     }
 
     .infoBlock {
+      display: flex;
+      margin-bottom: 20px;
       &Title {
-        margin-bottom: 8px;
+        margin-right: 12px;
         color: $history-info-title-color;
       }
 
@@ -104,7 +109,7 @@ body {
       }
 
       .descText {
-        padding-bottom: 16px;
+        padding-bottom: 20px;
         word-break: break-all;
         cursor: pointer;
         &:hover {
@@ -130,7 +135,6 @@ body {
 
     .infoOperationBox {
       display: flex;
-      margin-top: 20px;
       gap: 20px;
 
       .explorerNavButton,
diff --git a/packages/neuron-ui/src/components/History/hooks.ts b/packages/neuron-ui/src/components/History/hooks.ts
index 94ba80e0e7..19a40d836f 100644
--- a/packages/neuron-ui/src/components/History/hooks.ts
+++ b/packages/neuron-ui/src/components/History/hooks.ts
@@ -4,6 +4,7 @@ import { listParams, backToTop } from 'utils'
 
 export const useSearch = (search: string, walletID: string, dispatch: React.Dispatch<any>) => {
   const [keywords, setKeywords] = useState('')
+  const [sortInfo, setSortInfo] = useState({ sort: '', direction: '' })
 
   const onKeywordsChange = (_e?: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>, newValue?: string) => {
     if (undefined !== newValue) {
@@ -15,9 +16,10 @@ export const useSearch = (search: string, walletID: string, dispatch: React.Disp
     backToTop()
     const params = listParams(search)
     setKeywords(params.keywords)
+    setSortInfo({ sort: params.sort, direction: params.direction })
     updateTransactionList({ ...params, keywords: params.keywords, walletID })(dispatch)
   }, [search, walletID, dispatch])
-  return { keywords, onKeywordsChange, setKeywords }
+  return { keywords, onKeywordsChange, setKeywords, sortInfo }
 }
 
 export default {
diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
index 38c96c5429..73a9bdbb55 100644
--- a/packages/neuron-ui/src/components/History/index.tsx
+++ b/packages/neuron-ui/src/components/History/index.tsx
@@ -10,7 +10,7 @@ import { Download, Search, ArrowNext, Clean } from 'widgets/Icons/icon'
 
 import PageContainer from 'components/PageContainer'
 import TransactionStatusWrap from 'components/TransactionStatusWrap'
-import FormattedTokenAmount from 'components/FormattedTokenAmount'
+import FormattedTokenAmount, { FormattedCKBBalanceChange } from 'components/FormattedTokenAmount'
 import { useState as useGlobalState, useDispatch } from 'states'
 import { exportTransactions } from 'services/remote'
 
@@ -45,8 +45,11 @@ const History = () => {
   const [isExporting, setIsExporting] = useState(false)
   const isMainnet = isMainnetUtil(networks, networkID)
 
-  const { keywords, onKeywordsChange } = useSearch(search, id, dispatch)
-  const onSearch = useCallback(() => navigate(`${RoutePath.History}?keywords=${keywords}`), [navigate, keywords])
+  const { keywords, onKeywordsChange, sortInfo } = useSearch(search, id, dispatch)
+  const onSearch = useCallback(
+    () => navigate(`${RoutePath.History}?keywords=${keywords}&sort=${sortInfo.sort}&direction=${sortInfo.direction}`),
+    [navigate, keywords]
+  )
   const onClean = useCallback(() => onKeywordsChange(undefined, ''), [onKeywordsChange])
   const onExport = useCallback(() => {
     setIsExporting(true)
@@ -109,7 +112,7 @@ const History = () => {
       title: t('history.table.type'),
       dataIndex: 'type',
       align: 'left',
-      minWidth: '120px',
+      minWidth: '100px',
       render: (_, __, item) => {
         return (
           <TransactionType
@@ -120,23 +123,36 @@ const History = () => {
           />
         )
       },
+      sortable: true,
     },
     {
       title: t('history.table.amount'),
       dataIndex: 'amount',
       align: 'left',
       isBalance: true,
-      minWidth: '200px',
+      minWidth: '140px',
       render(_, __, item, show) {
         return <FormattedTokenAmount item={item} show={show} symbolClassName={styles.symbol} />
       },
     },
+    {
+      title: t('history.table.balance'),
+      dataIndex: 'value',
+      align: 'left',
+      isBalance: true,
+      minWidth: '140px',
+      render(_, __, item, show) {
+        return <FormattedCKBBalanceChange item={item} show={show} symbolClassName={styles.symbol} />
+      },
+      sortable: true,
+    },
     {
       title: t('history.table.timestamp'),
       dataIndex: 'timestamp',
       align: 'left',
       minWidth: '150px',
       render: (_, __, item) => uniformTimeFormatter(item.timestamp),
+      sortable: true,
     },
     {
       title: t('history.table.status'),
@@ -216,6 +232,9 @@ const History = () => {
         )}
         expandedRow={expandedRow}
         onRowClick={(_, __, idx) => handleExpandClick(idx)}
+        onSorted={(key, type) => {
+          navigate(`${RoutePath.History}?pageNo=${pageNo}&keywords=${keywords}&sort=${key}&direction=${type}`)
+        }}
       />
 
       <div className={styles.container}>
@@ -225,7 +244,9 @@ const History = () => {
             pageSize={pageSize}
             pageNo={pageNo}
             onChange={(no: number) => {
-              navigate(`${RoutePath.History}?pageNo=${no}&keywords=${keywords}`)
+              navigate(
+                `${RoutePath.History}?pageNo=${no}&keywords=${keywords}&sort=${sortInfo.sort}&direction=${sortInfo.direction}`
+              )
             }}
           />
         </div>
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss b/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
index c3242948b3..066467f75b 100644
--- a/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/historyDetailPage.module.scss
@@ -1,26 +1,36 @@
 @import '../../styles/mixin.scss';
 
-.basicInfoWrap {
+.tx {
+  @include card;
   margin-bottom: 16px;
+}
 
-  .basicInfoTitle {
-    font-weight: 500;
-    font-size: 16px;
+.basicInfoWrap {
+  .basicInfoItemBox {
+    display: flex;
+    font-size: 14px;
     padding: 16px;
-  }
 
-  .basicInfoItemWrap {
-    .basicInfoItemBox {
-      display: flex;
-      font-size: 14px;
-      padding: 16px;
-
-      .infoItemLabel {
-        min-width: 125px;
-      }
+    .infoItemLabel {
+      min-width: 125px;
     }
-    .basicInfoMiddleWrap {
-      display: flex;
+  }
+  .twoColumns {
+    display: flex;
+  }
+  .txHash {
+    flex: 1;
+    border: 1px solid var(--table-head-border-color);
+    border-left: none;
+    border-right: none;
+  }
+  .flexItem {
+    display: flex;
+    align-items: center;
+
+    & > svg {
+      margin-left: 8px;
+      cursor: pointer;
     }
   }
 }
@@ -81,22 +91,6 @@
   }
 }
 
-.income {
-  display: flex;
-  align-items: center;
-
-  .incomeCopy {
-    height: 20px;
-    line-height: 20px;
-    cursor: pointer;
-  }
-
-  & > svg {
-    margin-left: 8px;
-    cursor: pointer;
-  }
-}
-
 .amount {
   height: 32px;
   line-height: 32px;
@@ -115,3 +109,20 @@
 .scriptTag:hover {
   color: var(--primary-color);
 }
+
+.cellInfo {
+  display: flex;
+  align-items: center;
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  &:hover {
+    & > span {
+      color: var(--primary-color);
+    }
+  }
+  & > span {
+    color: var(--main-text-color);
+    margin-right: 4px;
+  }
+}
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/hooks.ts b/packages/neuron-ui/src/components/HistoryDetailPage/hooks.ts
new file mode 100644
index 0000000000..f8c8d65832
--- /dev/null
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/hooks.ts
@@ -0,0 +1,32 @@
+import { TFunction } from 'i18next'
+import { useCallback, useState } from 'react'
+
+export const TabId = {
+  Basic: 'Basic',
+  Topology: 'Topology',
+}
+
+export const useTxTabs = ({ t }: { t: TFunction }) => {
+  const tabs = [
+    { id: TabId.Basic, label: t('send-tx-detail.basic-info') },
+    { id: TabId.Topology, label: t('send-tx-detail.topology') },
+  ]
+  const [currentTab, setCurrentTab] = useState(tabs[0])
+  return {
+    currentTab,
+    setCurrentTab,
+    tabs,
+  }
+}
+
+export const useCellInfoDialog = () => {
+  const [outputCell, setOutputCell] = useState<State.DetailedOutput | undefined>()
+  const onCancel = useCallback(() => {
+    setOutputCell(undefined)
+  }, [])
+  return {
+    outputCell,
+    setOutputCell,
+    onCancel,
+  }
+}
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
index 5dbc8515e4..7a6b141652 100644
--- a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
@@ -2,16 +2,16 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
-import { getTransaction } from 'services/remote'
+import { calculateUnlockDaoMaximumWithdraw, getTransaction } from 'services/remote'
 import { showPageNotice, transactionState, useDispatch, useState as useGlobalState } from 'states'
 import PageContainer from 'components/PageContainer'
 import LockInfoDialog from 'components/LockInfoDialog'
 import ScriptTag from 'components/ScriptTag'
 import AlertDialog from 'widgets/AlertDialog'
 import Tabs from 'widgets/Tabs'
-import Table from 'widgets/Table'
+import Table, { TableProps } from 'widgets/Table'
 import CopyZone from 'widgets/CopyZone'
-import { BalanceHide, BalanceShow, Copy } from 'widgets/Icons/icon'
+import { ArrowNext, BalanceHide, BalanceShow, Copy } from 'widgets/Icons/icon'
 import Tooltip from 'widgets/Tooltip'
 import Breadcrum from 'widgets/Breadcrum'
 
@@ -22,9 +22,16 @@ import {
   shannonToCKBFormatter,
   isSuccessResponse,
   isMainnet as isMainnetUtil,
+  calculateFee,
 } from 'utils'
-import { HIDE_BALANCE } from 'utils/const'
+import { CONFIRMATION_THRESHOLD, HIDE_BALANCE } from 'utils/const'
 
+import TxTopology from 'components/SendTxDetail/TxTopology'
+import FormattedTokenAmount, { FormattedCKBBalanceChange } from 'components/FormattedTokenAmount'
+import TransactionStatusWrap from 'components/TransactionStatusWrap'
+import CellInfoDialog from 'components/CellInfoDialog'
+import TransactionType from 'components/TransactionType'
+import { TabId, useCellInfoDialog, useTxTabs } from './hooks'
 import styles from './historyDetailPage.module.scss'
 
 type InputOrOutputType = (State.DetailedInput | State.DetailedOutput) & { idx: number }
@@ -36,18 +43,147 @@ const InfoItem = ({ label, value, className }: { label: string; value: React.Rea
   </div>
 )
 
+const BasicInfo = ({
+  transaction,
+  cacheTipBlockNumber,
+  bestKnownBlockNumber,
+  txFee,
+}: {
+  transaction: State.DetailedTransaction
+  cacheTipBlockNumber: number
+  bestKnownBlockNumber: number
+  txFee: string
+}) => {
+  const [t] = useTranslation()
+  const dispatch = useDispatch()
+  const onCopy = useCallback(() => {
+    window.navigator.clipboard.writeText(transaction.hash)
+    showPageNotice('common.copied')(dispatch)
+  }, [transaction.hash, dispatch])
+  const [isAmountShow, setIsAmountShow] = useState(true)
+  const onChangeAmountShow = useCallback(() => {
+    setIsAmountShow(v => !v)
+  }, [])
+  const [isBalanceShow, setIsBalanceShow] = useState(true)
+  const onChangeBalanceShow = useCallback(() => {
+    setIsBalanceShow(v => !v)
+  }, [])
+  const bestBlockNumber = Math.max(cacheTipBlockNumber, bestKnownBlockNumber)
+  const confirmationCount = 1 + bestBlockNumber - +transaction.blockNumber
+  const status =
+    transaction.status === 'success' && confirmationCount < CONFIRMATION_THRESHOLD ? 'confirming' : transaction.status
+
+  const infos = {
+    hash: {
+      label: t('transaction.transaction-hash'),
+      value: (
+        <div content={transaction.hash} className={styles.address}>
+          {transaction.hash}
+          <Copy onClick={onCopy} />
+        </div>
+      ),
+    },
+    blockNumber: {
+      label: t('transaction.block-number'),
+      value: transaction.blockNumber ? localNumberFormatter(transaction.blockNumber) : 'none',
+    },
+    time: {
+      label: t('transaction.date'),
+      value: +(transaction.timestamp || transaction.createdAt)
+        ? uniformTimeFormatter(+(transaction.timestamp || transaction.createdAt))
+        : 'none',
+    },
+    type: {
+      label: t('transaction.type'),
+      value: (
+        <TransactionType
+          item={transaction}
+          cacheTipBlockNumber={cacheTipBlockNumber}
+          bestKnownBlockNumber={bestKnownBlockNumber}
+          tokenNameClassName={styles.tokenName}
+        />
+      ),
+    },
+    fee: {
+      label: t('transaction.fee'),
+      value: `${shannonToCKBFormatter(txFee)} CKB`,
+    },
+    amount: {
+      label: t('transaction.assets'),
+      value: (
+        <div className={styles.flexItem}>
+          <FormattedTokenAmount item={transaction} show={isAmountShow} symbolClassName={styles.symbol} />
+          {isAmountShow ? <BalanceShow onClick={onChangeAmountShow} /> : <BalanceHide onClick={onChangeAmountShow} />}
+        </div>
+      ),
+    },
+    balance: {
+      label: t('transaction.balance'),
+      value: (
+        <div className={styles.flexItem}>
+          <FormattedCKBBalanceChange item={transaction} show={isBalanceShow} symbolClassName={styles.symbol} />
+          {isBalanceShow ? (
+            <BalanceShow onClick={onChangeBalanceShow} />
+          ) : (
+            <BalanceHide onClick={onChangeBalanceShow} />
+          )}
+        </div>
+      ),
+    },
+    status: {
+      label: t('transaction.status'),
+      value: <TransactionStatusWrap status={status} confirmationCount={confirmationCount} />,
+    },
+    size: {
+      label: t('transaction.size'),
+      value: `${transaction.size} Bytes`,
+    },
+    cycles: {
+      label: t('transaction.cycles'),
+      value: transaction.cycles ? +transaction.cycles : '--',
+    },
+  }
+  return (
+    <div className={styles.basicInfoWrap}>
+      <InfoItem {...infos.hash} className={styles.txHash} />
+      <div className={styles.twoColumns}>
+        <InfoItem {...infos.blockNumber} className={styles.borderBottom} />
+        <InfoItem {...infos.time} className={styles.borderBottom} />
+      </div>
+      <div className={styles.twoColumns}>
+        <InfoItem {...infos.type} className={styles.borderBottom} />
+        <InfoItem {...infos.fee} className={styles.borderBottom} />
+      </div>
+      <div className={styles.twoColumns}>
+        <InfoItem {...infos.amount} className={styles.borderBottom} />
+        <InfoItem {...infos.balance} className={styles.borderBottom} />
+      </div>
+      <div className={styles.twoColumns}>
+        <InfoItem {...infos.status} className={styles.borderBottom} />
+        <InfoItem {...infos.size} className={styles.borderBottom} />
+      </div>
+      <InfoItem {...infos.cycles} className={styles.borderBottom} />
+    </div>
+  )
+}
+
 const HistoryDetailPage = () => {
   const { hash } = useParams()
   const navigate = useNavigate()
   const {
     app: { pageNotice },
-    chain: { networkID },
+    chain: {
+      networkID,
+      syncState: { cacheTipBlockNumber, bestKnownBlockNumber },
+      transactions: { items = [] },
+    },
     settings: { networks },
     wallet: currentWallet,
   } = useGlobalState()
   const isMainnet = isMainnetUtil(networks, networkID)
   const [t] = useTranslation()
   const [transaction, setTransaction] = useState(transactionState)
+  const [daoMaximumWithdraw, setDaoMaximumWithdraw] = useState<undefined | string>()
   const [error, setError] = useState({ code: '', message: '' })
   const [failedMessage, setFailedMessage] = useState('')
   const [lockInfo, setLockInfo] = useState<CKBComponents.Script | null>(null)
@@ -61,7 +197,8 @@ const HistoryDetailPage = () => {
       getTransaction({ hash, walletID: currentWallet.id })
         .then(res => {
           if (isSuccessResponse(res)) {
-            setTransaction(res.result)
+            const tx = items.find(v => v.hash === hash)
+            setTransaction({ ...tx, ...res.result, nervosDao: tx?.nervosDao ?? res.result.nervosDao })
           } else {
             setFailedMessage(t(`messages.codes.${ErrorCode.FieldNotFound}`, { fieldName: 'transaction' }))
           }
@@ -75,57 +212,15 @@ const HistoryDetailPage = () => {
     }
   }, [t, hash, currentWallet])
 
-  const dispatch = useDispatch()
-  const onCopy = useCallback(() => {
-    window.navigator.clipboard.writeText(transaction.hash)
-    showPageNotice('common.copied')(dispatch)
-  }, [transaction.hash, dispatch])
-  const [isIncomeShow, setIsIncomeShow] = useState(true)
-  const onChangeIncomeShow = useCallback(() => {
-    setIsIncomeShow(v => !v)
-  }, [])
-
-  const infos = [
-    {
-      label: t('transaction.transaction-hash'),
-      value: (
-        <div content={transaction.hash} className={styles.address}>
-          {transaction.hash}
-          <Copy onClick={onCopy} />
-        </div>
-      ),
-    },
-    {
-      label: t('transaction.block-number'),
-      value: transaction.blockNumber ? localNumberFormatter(transaction.blockNumber) : 'none',
-    },
-    {
-      label: t('transaction.date'),
-      value: +(transaction.timestamp || transaction.createdAt)
-        ? uniformTimeFormatter(+(transaction.timestamp || transaction.createdAt))
-        : 'none',
-    },
-    {
-      label: t('transaction.income'),
-      value: isIncomeShow ? (
-        <div className={styles.income}>
-          <CopyZone
-            content={shannonToCKBFormatter(transaction.value, false, '')}
-            className={styles.incomeCopy}
-            maskRadius={8}
-          >
-            {`${shannonToCKBFormatter(transaction.value)} CKB`}
-          </CopyZone>
-          <BalanceShow onClick={onChangeIncomeShow} />
-        </div>
-      ) : (
-        <div className={styles.income}>
-          {`${HIDE_BALANCE} CKB`}
-          <BalanceHide onClick={onChangeIncomeShow} />
-        </div>
-      ),
-    },
-  ]
+  useEffect(() => {
+    if (hash) {
+      calculateUnlockDaoMaximumWithdraw(hash).then(res => {
+        if (isSuccessResponse(res) && res.result) {
+          setDaoMaximumWithdraw(res.result)
+        }
+      })
+    }
+  }, [hash])
 
   const inputsTitle = useMemo(
     () => `${t('transaction.inputs')} (${transaction.inputs.length}/${localNumberFormatter(transaction.inputsCount)})`,
@@ -180,19 +275,11 @@ const HistoryDetailPage = () => {
     )
   }
 
-  const columns: {
-    title: string
-    dataIndex: string
-    isBalance?: boolean
-    render?: (v: any, idx: number, item: InputOrOutputType, showBalance: boolean) => React.ReactNode
-    width?: string
-    align?: 'left' | 'right' | 'center'
-    className?: string
-  }[] = [
+  const columns: TableProps<InputOrOutputType>['columns'] = [
     {
       title: t('transaction.index'),
       dataIndex: 'idx',
-      width: '90px',
+      width: '60px',
       render(_, __, item) {
         return <>{item.idx}</>
       },
@@ -201,7 +288,7 @@ const HistoryDetailPage = () => {
       title: t('transaction.address'),
       dataIndex: 'type',
       align: 'left',
-      width: '580px',
+      width: '560px',
       render: (_, __, item) => {
         const { address } = handleListData(item)
         return (
@@ -245,8 +332,39 @@ const HistoryDetailPage = () => {
     },
   ]
 
+  const { setOutputCell, outputCell, onCancel } = useCellInfoDialog()
+
+  const cellInfoColumn: TableProps<InputOrOutputType>['columns'][number] = {
+    title: '',
+    dataIndex: 'cellInfo',
+    align: 'left',
+    width: '100px',
+    render(_, __, item) {
+      return (
+        <button className={styles.cellInfo} type="button" onClick={() => setOutputCell(item as State.DetailedOutput)}>
+          <span>{t('transaction.cell-detail')}</span>
+          <ArrowNext />
+        </button>
+      )
+    },
+  }
+
   const breadPages = useMemo(() => [{ label: t('history.title-detail') }], [t])
 
+  const { tabs: txTabs, setCurrentTab: setTxCurrentTab, currentTab: currentTxTab } = useTxTabs({ t })
+  const txFee = useMemo(() => {
+    if (daoMaximumWithdraw) {
+      return (
+        BigInt(daoMaximumWithdraw) -
+        transaction.outputs.reduce(
+          (result: bigint, output: { capacity: string }) => result + BigInt(output.capacity),
+          BigInt(0)
+        )
+      ).toString()
+    }
+    return calculateFee(transaction)
+  }, [transaction, daoMaximumWithdraw])
+
   return (
     <PageContainer
       onContextMenu={e => {
@@ -256,16 +374,25 @@ const HistoryDetailPage = () => {
       head={<Breadcrum pages={breadPages} showBackIcon />}
       notice={pageNotice}
     >
-      <div className={styles.basicInfoWrap}>
-        <div className={`${styles.basicInfoTitle} ${styles.borderBottom}`}>{t('history.basic-information')}</div>
-        <div className={styles.basicInfoItemWrap}>
-          <InfoItem {...infos[0]} className={styles.borderBottom} />
-          <div className={styles.basicInfoMiddleWrap}>
-            <InfoItem {...infos[1]} className={styles.borderBottom} />
-            <InfoItem {...infos[2]} className={styles.borderBottom} />
-          </div>
-          <InfoItem {...infos[3]} />
-        </div>
+      <div className={styles.tx}>
+        <Tabs
+          tabs={txTabs}
+          onTabChange={setTxCurrentTab}
+          tabsClassName={styles.tabsClassName}
+          tabsWrapClassName={styles.tabsWrapClassName}
+          tabsColumnClassName={styles.tabsColumnClassName}
+          activeColumnClassName={styles.active}
+        />
+        {currentTxTab.id === TabId.Basic ? (
+          <BasicInfo
+            transaction={transaction}
+            cacheTipBlockNumber={cacheTipBlockNumber}
+            bestKnownBlockNumber={bestKnownBlockNumber}
+            txFee={txFee}
+          />
+        ) : (
+          <TxTopology tx={{ ...transaction, fee: txFee }} isMainnet={isMainnet} />
+        )}
       </div>
       <div className={styles.listWrap}>
         <Table
@@ -279,7 +406,7 @@ const HistoryDetailPage = () => {
               activeColumnClassName={styles.active}
             />
           }
-          columns={columns}
+          columns={currentTab.id === tabs[0].id ? columns : [...columns, cellInfoColumn]}
           dataSource={currentTab.id === tabs[0].id ? inputsData : outputsData}
           noDataContent={t('overview.no-recent-activities')}
           hasHoverTrBg={false}
@@ -295,6 +422,7 @@ const HistoryDetailPage = () => {
         type="failed"
         onCancel={() => navigate(-1)}
       />
+      <CellInfoDialog output={outputCell} onCancel={onCancel} />
     </PageContainer>
   )
 }
diff --git a/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss b/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
index c19f1df9b9..90ce8c1e9f 100644
--- a/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
+++ b/packages/neuron-ui/src/components/TransactionStatusWrap/transactionStatusWrap.module.scss
@@ -5,6 +5,7 @@
   width: fit-content;
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
 
   .confirm {
     @include infinite-rotation;
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 51bcfd0e84..fb0619c3d2 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -308,6 +308,7 @@
       "table": {
         "name": "Wallet Name",
         "type": "Type",
+        "balance": "Balance",
         "amount": "Amount",
         "timestamp": "Time",
         "status": "Status",
@@ -327,7 +328,8 @@
       "copy-balance": "Copy Balance",
       "copy-address": "Copy Address",
       "create": "Create {{name}} Asset Account",
-      "destroy": "Destroy {{name}} Asset Account"
+      "destroy": "Destroy {{name}} Asset Account",
+      "fee": "Transaction Fee"
     },
     "transaction": {
       "window-title": "Transaction: {{hash}}",
@@ -344,7 +346,15 @@
       "cell-from-cellbase": "From cellbase",
       "lock-script": "Lock Script",
       "lock-script-title": "Address Information",
-      "deprecated-address-format": "Address in deprecated format"
+      "deprecated-address-format": "Address in deprecated format",
+      "type": "Type",
+      "fee": "Transaction Fee",
+      "assets": "Assets",
+      "balance": "Balance",
+      "status": "Status",
+      "size": "Size",
+      "cycles": "Cycles",
+      "cell-detail": "Cell Detail"
     },
     "addresses": {
       "title": "Address Book",
@@ -1191,7 +1201,12 @@
         "capacity-used": "Used Capacity",
         "data": "Data",
         "total": "Total",
-        "used": "Used"
+        "used": "Used",
+        "view-raw-data": "Raw data",
+        "UTF8": "UTF-8",
+        "address": "Address",
+        "number": "Number",
+        "bigEndian": "Big-Endian"
       },
       "locked-reason": {
         "multi-locktime": "The cell has a time lock and you can't use it until {{time}}.",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index f003afb51d..5933db645b 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -300,6 +300,7 @@
       "table": {
         "name": "Nombre de la Billetera",
         "type": "Tipo",
+        "balance": "Saldo",
         "amount": "Cantidad",
         "timestamp": "Tiempo",
         "status": "Estado",
@@ -319,7 +320,8 @@
       "copy-balance": "Copiar Saldo",
       "copy-address": "Copiar Dirección",
       "create": "Crear Cuenta de Activos {{name}}",
-      "destroy": "Destruir Cuenta de Activos {{name}}"
+      "destroy": "Destruir Cuenta de Activos {{name}}",
+      "fee": "Tarifa de transacción"
     },
     "transaction": {
       "window-title": "Transacción: {{hash}}",
@@ -336,7 +338,15 @@
       "cell-from-cellbase": "Desde cellbase",
       "lock-script": "Script de Bloqueo",
       "lock-script-title": "Información de Dirección",
-      "deprecated-address-format": "Dirección en formato obsoleto"
+      "deprecated-address-format": "Dirección en formato obsoleto",
+      "type": "Tipo",
+      "fee": "Tarifa de transacción",
+      "assets": "Activos",
+      "balance": "Saldo",
+      "status": "Estado",
+      "size": "Tamaño",
+      "cycles": "Ciclos",
+      "cell-detail": "Detalles de la Cell"
     },
     "addresses": {
       "title": "Libro de Direcciones",
@@ -1170,7 +1180,12 @@
         "capacity-used": "Capacidad utilizada",
         "data": "Datos",
         "total": "Total",
-        "used": "Usado"
+        "used": "Usado",
+        "view-raw-data": "Datos sin procesar",
+        "UTF8": "UTF-8",
+        "address": "Dirección",
+        "number": "Número",
+        "bigEndian": "Big-Endian"
       },
       "locked-reason": {
         "multi-locktime": "La Cell tiene un bloqueo de tiempo y no se puede usar hasta {{time}}.",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 2824ca14ec..76affbaa48 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -307,6 +307,7 @@
       "table": {
         "name": "Nom du Wallet",
         "type": "Type",
+        "balance": "Solde",
         "amount": "Montant",
         "timestamp": "Heure",
         "status": "Statut",
@@ -326,7 +327,8 @@
       "copy-balance": "Copier le solde",
       "copy-address": "Copier l'adresse",
       "create": "Créer le compte d'actif {{name}}",
-      "destroy": "Détruire le compte d'actif {{name}}"
+      "destroy": "Détruire le compte d'actif {{name}}",
+      "fee": "Frais de transaction"
     },
     "transaction": {
       "window-title": "Transaction : {{hash}}",
@@ -343,7 +345,15 @@
       "cell-from-cellbase": "De cellbase",
       "lock-script": "Script de verrouillage",
       "lock-script-title": "Informations sur l'adresse",
-      "deprecated-address-format": "Adresse au format obsolète"
+      "deprecated-address-format": "Adresse au format obsolète",
+      "type": "Type",
+      "fee": "Frais de transaction",
+      "assets": "Actifs",
+      "balance": "Solde",
+      "status": "Statut",
+      "size": "taille",
+      "cycles": "Cycles",
+      "cell-detail": "Détail de la cellule"
     },
     "addresses": {
       "title": "Carnet d'adresses",
@@ -1181,7 +1191,12 @@
         "capacity-used": "Capacité utilisée",
         "data": "Données",
         "total": "Total",
-        "used": "Utilisé"
+        "used": "Utilisé",
+        "view-raw-data": "Données",
+        "UTF8": "UTF-8",
+        "address": "Adresse",
+        "number": "Numéro",
+        "bigEndian": "Big-Endian"
       },
       "locked-reason": {
         "multi-locktime": "La cellule est verrouillée dans le temps et vous ne pouvez pas l'utiliser avant {{time}}.",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 07fcb9cad2..e08c32e39a 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -303,6 +303,7 @@
       "table": {
         "name": "錢包名稱",
         "type": "類型",
+        "balance": "余額",
         "amount": "金額",
         "timestamp": "時間",
         "status": "狀態",
@@ -322,7 +323,8 @@
       "copy-balance": "複製餘額",
       "copy-address": "複製地址",
       "create": "創建 {{name}} 資產賬戶",
-      "destroy": "銷毀 {{name}} 資產賬戶"
+      "destroy": "銷毀 {{name}} 資產賬戶",
+      "fee": "交易費用"
     },
     "transaction": {
       "window-title": "交易: {{hash}}",
@@ -339,7 +341,15 @@
       "cell-from-cellbase": "來自 Cellbase",
       "lock-script": "腳本鎖定",
       "lock-script-title": "地址資訊",
-      "deprecated-address-format": "已棄用格式的地址"
+      "deprecated-address-format": "已棄用格式的地址",
+      "type": "類型",
+      "fee": "交易費用",
+      "assets": "資產",
+      "balance": "余額",
+      "status": "狀態",
+      "size": "大小",
+      "cycles": "周期",
+      "cell-detail": "Cell詳情"
     },
     "addresses": {
       "title": "地址簿",
@@ -1021,7 +1031,7 @@
         "address": "簽名者地址",
         "alias": "别名",
         "type": "類型",
-        "balance": "余额",
+        "balance": "余額",
         "copy-address": "復製地址",
         "action": "操作",
         "more": "更多",
@@ -1162,7 +1172,8 @@
         "capacity-used": "容量使用",
         "data": "數據",
         "total": "總量",
-        "used": "已用"
+        "used": "已用",
+        "view-raw-data": "原始數據"
       },
       "locked-reason": {
         "multi-locktime": "這是壹個有時間鎖的 cell, 只能在 {{time}} 之後使用。",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 402db46a6c..036ab6d4dd 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -301,6 +301,7 @@
       "table": {
         "name": "钱包名称",
         "type": "类型",
+        "balance": "余额",
         "amount": "金额",
         "timestamp": "时间",
         "status": "状态",
@@ -320,7 +321,8 @@
       "copy-balance": "复制余额",
       "copy-address": "复制地址",
       "create": "创建 {{name}} 资产账户",
-      "destroy": "销毁 {{name}} 资产账户"
+      "destroy": "销毁 {{name}} 资产账户",
+      "fee": "交易费用"
     },
     "transaction": {
       "window-title": "交易: {{hash}}",
@@ -337,7 +339,15 @@
       "cell-from-cellbase": "来自 Cellbase",
       "lock-script": "脚本锁定",
       "lock-script-title": "地址信息",
-      "deprecated-address-format": "已弃用格式的地址"
+      "deprecated-address-format": "已弃用格式的地址",
+      "type": "类型",
+      "fee": "交易费用",
+      "assets": "资产",
+      "balance": "余额",
+      "status": "状态",
+      "size": "大小",
+      "cycles": "周期",
+      "cell-detail": "Cell详情"
     },
     "addresses": {
       "title": "地址簿",
@@ -1183,7 +1193,12 @@
         "capacity-used": "容量使用",
         "data": "数据",
         "total": "总量",
-        "used": "已用"
+        "used": "已用",
+        "view-raw-data": "原始数据",
+        "UTF8": "UTF-8",
+        "address": "地址",
+        "number": "数字",
+        "bigEndian": "大端序"
       },
       "locked-reason": {
         "multi-locktime": "这是一个有时间锁的 cell, 只能在 {{time}} 之后使用。",
diff --git a/packages/neuron-ui/src/services/chain.ts b/packages/neuron-ui/src/services/chain.ts
index ac21b7dd2e..0ca47c4951 100644
--- a/packages/neuron-ui/src/services/chain.ts
+++ b/packages/neuron-ui/src/services/chain.ts
@@ -4,8 +4,6 @@ export const ckbCore = new CKBCore('')
 export const { getHeader, getBlockchainInfo, getTipHeader, getHeaderByNumber, getFeeRateStats, getTransaction } =
   ckbCore.rpc
 
-export const { calculateDaoMaximumWithdraw } = ckbCore
-
 export const { toUint64Le, parseEpoch } = ckbCore.utils
 
 export default {
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 5e176dd251..a1f270ce63 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -85,6 +85,7 @@ type Action =
   | 'generate-dao-deposit-all-tx'
   | 'start-withdraw-from-dao'
   | 'withdraw-from-dao'
+  | 'calculate-unlock-dao-maximum-withdraw'
   // Special Assets
   | 'get-customized-asset-cells'
   | 'generate-withdraw-customized-cell-tx'
diff --git a/packages/neuron-ui/src/services/remote/transactions.ts b/packages/neuron-ui/src/services/remote/transactions.ts
index 73a6f81249..0877418a24 100644
--- a/packages/neuron-ui/src/services/remote/transactions.ts
+++ b/packages/neuron-ui/src/services/remote/transactions.ts
@@ -5,6 +5,8 @@ export interface GetTransactionListParams {
   pageSize: number
   keywords?: string
   walletID: string
+  sort?: string
+  direction?: string
 }
 
 export const getTransactionList = remoteApi<GetTransactionListParams>('get-transaction-list')
diff --git a/packages/neuron-ui/src/services/remote/wallets.ts b/packages/neuron-ui/src/services/remote/wallets.ts
index 33c26d1f82..3f97e5b4ea 100644
--- a/packages/neuron-ui/src/services/remote/wallets.ts
+++ b/packages/neuron-ui/src/services/remote/wallets.ts
@@ -31,6 +31,7 @@ export const generateDaoDepositAllTx = remoteApi<Controller.GenerateDepositAllTr
 )
 export const generateDaoWithdrawTx = remoteApi<Controller.WithdrawParams>('start-withdraw-from-dao')
 export const generateDaoClaimTx = remoteApi<Controller.ClaimParams>('withdraw-from-dao')
+export const calculateUnlockDaoMaximumWithdraw = remoteApi<string, string>('calculate-unlock-dao-maximum-withdraw')
 
 // Sign and Verify
 export const signMessage = remoteApi<Controller.SignMessageParams>('sign-message')
diff --git a/packages/neuron-ui/src/tests/parsers/index.test.ts b/packages/neuron-ui/src/tests/parsers/index.test.ts
index 2ab0f07925..a7a240565b 100644
--- a/packages/neuron-ui/src/tests/parsers/index.test.ts
+++ b/packages/neuron-ui/src/tests/parsers/index.test.ts
@@ -9,6 +9,8 @@ describe('listParams', () => {
         pageNo: 1,
         pageSize: 15,
         keywords: 'foo',
+        sort: '',
+        direction: '',
       },
     }
     expect(listParams(fixture.params)).toEqual(fixture.expected)
@@ -21,6 +23,22 @@ describe('listParams', () => {
         pageNo: 2,
         pageSize: 30,
         keywords: 'foo',
+        sort: '',
+        direction: '',
+      },
+    }
+    expect(listParams(fixture.params)).toEqual(fixture.expected)
+  })
+
+  it('should use passed sort and direction', () => {
+    const fixture = {
+      params: '?sort=foo&direction=asc',
+      expected: {
+        pageNo: 1,
+        pageSize: 15,
+        keywords: '',
+        sort: 'foo',
+        direction: 'asc',
       },
     }
     expect(listParams(fixture.params)).toEqual(fixture.expected)
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index a7187731a4..b8559efbb0 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -54,6 +54,7 @@ declare namespace State {
     witnesses: string[]
     size?: number
     isLastChange?: boolean
+    cycles?: string
   }
   interface Output {
     address: string | undefined
diff --git a/packages/neuron-ui/src/utils/parsers.ts b/packages/neuron-ui/src/utils/parsers.ts
index d53d3ecf3d..28663dd69c 100644
--- a/packages/neuron-ui/src/utils/parsers.ts
+++ b/packages/neuron-ui/src/utils/parsers.ts
@@ -9,6 +9,8 @@ export const listParams = (search: string) => {
     pageNo: +(query.get('pageNo') || 1),
     pageSize: +(query.get('pageSize') || PAGE_SIZE),
     keywords,
+    sort: query.get('sort') || '',
+    direction: query.get('direction') || '',
   }
   return params
 }
diff --git a/packages/neuron-ui/src/widgets/Switch/index.tsx b/packages/neuron-ui/src/widgets/Switch/index.tsx
new file mode 100644
index 0000000000..6f79bb3bb8
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Switch/index.tsx
@@ -0,0 +1,28 @@
+import React from 'react'
+import styles from './switch.module.scss'
+
+const Switch = ({
+  disabled,
+  checked,
+  onChange,
+}: {
+  disabled?: boolean
+  checked: boolean
+  onChange: (checked: boolean) => void
+}) => {
+  return (
+    <button
+      type="button"
+      className={styles.switchRoot}
+      disabled={disabled}
+      data-checked={!!checked}
+      onClick={() => onChange(!checked)}
+    >
+      <span className={styles.slider} />
+    </button>
+  )
+}
+
+Switch.displayName = 'Switch'
+
+export default Switch
diff --git a/packages/neuron-ui/src/widgets/Switch/switch.module.scss b/packages/neuron-ui/src/widgets/Switch/switch.module.scss
new file mode 100644
index 0000000000..f86653d99c
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Switch/switch.module.scss
@@ -0,0 +1,34 @@
+.switchRoot {
+  border: none;
+  border-radius: 8px;
+  background-color: var(--primary-color);
+  width: 26px;
+  height: 14px;
+  display: flex;
+  align-items: center;
+  position: relative;
+  cursor: pointer;
+
+  .slider {
+    width: 12px;
+    height: 12px;
+    border-radius: 12px;
+    background-color: var(--primary-text-color);
+    display: inline-block;
+    position: absolute;
+    right: 2px;
+    transition: right 0.25s;
+  }
+
+  &[data-checked='false'] {
+    background-color: var(--secondary-text-color);
+    .slider {
+      right: calc(100% - 14px);
+    }
+  }
+
+  &[disabled] {
+    cursor: not-allowed;
+    background-color: var(--secondary-text-color);
+  }
+}
diff --git a/packages/neuron-ui/src/widgets/Table/index.tsx b/packages/neuron-ui/src/widgets/Table/index.tsx
index 2cb92df1c0..e94ba2e65e 100755
--- a/packages/neuron-ui/src/widgets/Table/index.tsx
+++ b/packages/neuron-ui/src/widgets/Table/index.tsx
@@ -58,10 +58,22 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
     onSorted,
     initSortInfo,
   } = props
-  const [showBalance, setShowBalance] = useState(true)
-  const onClickBalanceIcon = useCallback(() => {
-    setShowBalance(v => !v)
-  }, [setShowBalance])
+  const [showBalance, setShowBalance] = useState<Record<string, boolean>>(
+    columns.filter(v => v.isBalance).reduce((pre, cur) => ({ ...pre, [cur.dataIndex]: true }), {})
+  )
+  const onClickBalanceIcon = useCallback(
+    (e: React.SyntheticEvent<SVGSVGElement, MouseEvent>) => {
+      const {
+        dataset: { index },
+      } = e.currentTarget
+      if (!index) return
+      setShowBalance(v => ({
+        ...v,
+        [index]: !v[index],
+      }))
+    },
+    [setShowBalance]
+  )
 
   const handleRowClick = (e: React.SyntheticEvent, item: T, idx: number) => {
     onRowClick?.(e, item, idx)
@@ -141,9 +153,17 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
                         <div className={styles.headWithBalance} style={{ justifyContent: align }}>
                           {title}
                           {showBalance ? (
-                            <BalanceShow onClick={onClickBalanceIcon} className={styles.balanceIcon} />
+                            <BalanceShow
+                              onClick={onClickBalanceIcon}
+                              data-index={dataIndex}
+                              className={styles.balanceIcon}
+                            />
                           ) : (
-                            <BalanceHide onClick={onClickBalanceIcon} className={styles.balanceIcon} />
+                            <BalanceHide
+                              onClick={onClickBalanceIcon}
+                              data-index={dataIndex}
+                              className={styles.balanceIcon}
+                            />
                           )}
                         </div>
                       ) : (
@@ -200,7 +220,7 @@ const Table = <T extends Record<string, any>>(props: TableProps<T>) => {
                           expandedRow === idx && rowExtendRender ? styles.noBorder : ''
                         }`}
                       >
-                        {render ? render(item[dataIndex], idx, item, showBalance) : item[dataIndex]}
+                        {render ? render(item[dataIndex], idx, item, showBalance[dataIndex]) : item[dataIndex]}
                       </td>
                     )
                   )}
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 70c9526c7f..1f0bae8933 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -33,7 +33,6 @@ import NetworksController from '../controllers/networks'
 import UpdateController from '../controllers/update'
 import MultisigController from '../controllers/multisig'
 import Transaction from '../models/chain/transaction'
-import OutPoint from '../models/chain/out-point'
 import SignMessageController from '../controllers/sign-message'
 import CustomizedAssetsController from './customized-assets'
 import SystemScriptInfo from '../models/system-script-info'
@@ -65,6 +64,7 @@ import DataUpdateSubject from '../models/subjects/data-update'
 import CellManagement from './cell-management'
 import { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
 import { CKBLightRunner } from '../services/light-runner'
+import { OutPoint } from '@ckb-lumos/base'
 
 export type Command = 'export-xpubkey' | 'import-xpubkey' | 'delete-wallet' | 'backup-wallet' | 'migrate-acp'
 // Handle channel messages from renderer process and user actions.
@@ -434,7 +434,7 @@ export default class ApiController {
           items: { address: string; capacity: string }[]
           fee: string
           feeRate: string
-          consumeOutPoints?: CKBComponents.OutPoint[]
+          consumeOutPoints?: OutPoint[]
           enableUseSentCell?: boolean
         }
       ) => {
@@ -451,7 +451,7 @@ export default class ApiController {
           items: { address: string; capacity: string }[]
           fee: string
           feeRate: string
-          consumeOutPoints: CKBComponents.OutPoint[]
+          consumeOutPoints: OutPoint[]
           enableUseSentCell?: boolean
         }
       ) => {
@@ -551,6 +551,10 @@ export default class ApiController {
       }
     )
 
+    handle('calculate-unlock-dao-maximum-withdraw', async (_, unlockHash: string) => {
+      return this.#daoController.calculateUnlockDaoMaximumWithdraw(unlockHash)
+    })
+
     // Customized Asset
     handle('get-customized-asset-cells', async (_, params: Controller.Params.GetCustomizedAssetCellsParams) => {
       return this.#customizedAssetsController.getCustomizedAssetCells(params)
@@ -920,7 +924,7 @@ export default class ApiController {
       async (
         _,
         params: {
-          outPoints: CKBComponents.OutPoint[]
+          outPoints: OutPoint[]
           locked: boolean
           password: string
           lockScripts: CKBComponents.Script[]
diff --git a/packages/neuron-wallet/src/controllers/cell-management.ts b/packages/neuron-wallet/src/controllers/cell-management.ts
index 4757e3a929..690de0d4c7 100644
--- a/packages/neuron-wallet/src/controllers/cell-management.ts
+++ b/packages/neuron-wallet/src/controllers/cell-management.ts
@@ -1,4 +1,4 @@
-import type { OutPoint, Script } from '@ckb-lumos/base'
+import type { OutPoint as OutPointSDK, Script } from '@ckb-lumos/base'
 import CellLocalInfo, { UpdateCellLocalInfo } from '../database/chain/entities/cell-local-info'
 import Output from '../models/chain/output'
 import CellsService, { LockScriptCategory, TypeScriptCategory } from '../services/cells'
@@ -17,7 +17,9 @@ export default class CellManagement {
     const liveCells = (await CellsService.getLiveOrSentCellByWalletId(currentWallet.id, { includeCheque: true })).map(
       v => v.toModel()
     )
-    const outPoints = liveCells.filter((v): v is Output & { outPoint: OutPoint } => !!v.outPoint).map(v => v.outPoint)
+    const outPoints = liveCells
+      .filter((v): v is Output & { outPoint: OutPointSDK } => !!v.outPoint)
+      .map(v => v.outPoint)
     const cellLocalInfoMap = await CellLocalInfoService.getCellLocalInfoMap(outPoints)
     return liveCells
       .map<
@@ -56,7 +58,7 @@ export default class CellManagement {
   }
 
   static async updateLiveCellsLockStatus(
-    outPoints: OutPoint[],
+    outPoints: OutPointSDK[],
     locked: boolean,
     lockScripts: Script[],
     password: string
diff --git a/packages/neuron-wallet/src/controllers/dao.ts b/packages/neuron-wallet/src/controllers/dao.ts
index e460b0b13a..2dccf9e798 100644
--- a/packages/neuron-wallet/src/controllers/dao.ts
+++ b/packages/neuron-wallet/src/controllers/dao.ts
@@ -1,3 +1,4 @@
+import { type OutPoint as OutPointSDK } from '@ckb-lumos/base'
 import { ServiceHasNoResponse, IsRequired } from '../exceptions'
 import { ResponseCode } from '../utils/const'
 import CellsService from '../services/cells'
@@ -67,7 +68,7 @@ export default class DaoController {
 
   public async startWithdrawFromDao(params: {
     walletID: string
-    outPoint: OutPoint
+    outPoint: OutPointSDK
     fee: string
     feeRate: string
   }): Promise<Controller.Response<Transaction>> {
@@ -77,7 +78,7 @@ export default class DaoController {
 
     const tx = await new TransactionSender().startWithdrawFromDao(
       params.walletID,
-      new OutPoint(params.outPoint.txHash, params.outPoint.index),
+      OutPoint.fromSDK(params.outPoint),
       params.fee,
       params.feeRate
     )
@@ -89,8 +90,8 @@ export default class DaoController {
 
   public async withdrawFromDao(params: {
     walletID: string
-    depositOutPoint: OutPoint
-    withdrawingOutPoint: OutPoint
+    depositOutPoint: OutPointSDK
+    withdrawingOutPoint: OutPointSDK
     fee: string
     feeRate: string
   }): Promise<Controller.Response<Transaction>> {
@@ -100,8 +101,8 @@ export default class DaoController {
 
     const tx = await new TransactionSender().withdrawFromDao(
       params.walletID,
-      new OutPoint(params.depositOutPoint.txHash, params.depositOutPoint.index),
-      new OutPoint(params.withdrawingOutPoint.txHash, params.withdrawingOutPoint.index),
+      OutPoint.fromSDK(params.depositOutPoint),
+      OutPoint.fromSDK(params.withdrawingOutPoint),
       params.fee,
       params.feeRate
     )
@@ -110,4 +111,21 @@ export default class DaoController {
       result: tx,
     }
   }
+
+  public async calculateUnlockDaoMaximumWithdraw(unlockHash: string): Promise<Controller.Response<string>> {
+    const depositAndWithdrawInfo = await CellsService.getDaoWithdrawAndDeposit(unlockHash)
+    let total = BigInt(0)
+    for (let index = 0; index < depositAndWithdrawInfo.length; index++) {
+      total =
+        total +
+        (await new TransactionSender().calculateDaoMaximumWithdraw(
+          depositAndWithdrawInfo[index].depositOutPoint,
+          depositAndWithdrawInfo[index].withdrawBlockHash
+        ))
+    }
+    return {
+      status: ResponseCode.Success,
+      result: total.toString(),
+    }
+  }
 }
diff --git a/packages/neuron-wallet/src/controllers/transactions.ts b/packages/neuron-wallet/src/controllers/transactions.ts
index 4cf2f38068..eb3a4fabfc 100644
--- a/packages/neuron-wallet/src/controllers/transactions.ts
+++ b/packages/neuron-wallet/src/controllers/transactions.ts
@@ -9,19 +9,18 @@ import { TransactionNotFound, CurrentWalletNotSet } from '../exceptions'
 import Transaction from '../models/chain/transaction'
 
 import { set as setDescription, get as getDescription } from '../services/tx/transaction-description'
-import AddressParser from '../models/address-parser'
 import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
 
 export default class TransactionsController {
   public async getAll(
     params: Controller.Params.TransactionsByKeywords
   ): Promise<Controller.Response<PaginationResult<Transaction> & Controller.Params.TransactionsByKeywords>> {
-    const { pageNo = 1, pageSize = 15, keywords = '', walletID = '' } = params
+    const { pageNo = 1, pageSize = 15, keywords = '', walletID = '', sort, direction } = params
 
     const addresses = (await AddressesService.getAddressesByWalletId(walletID)).map(addr => addr.address)
 
     const transactions = await TransactionsService.getAllByAddresses(
-      { walletID, pageNo, pageSize, addresses },
+      { walletID, pageNo, pageSize, addresses, sort, direction },
       keywords.trim()
     ).catch(() => ({
       totalCount: 0,
@@ -61,17 +60,16 @@ export default class TransactionsController {
       throw new CurrentWalletNotSet()
     }
 
-    const addresses: string[] = (await AddressesService.getAddressesByWalletId(wallet.id)).map(addr => addr.address)
-    const lockHashes: string[] = AddressParser.batchToLockHash(addresses)
+    const lockArgs: string[] = (await AddressesService.getAddressesByWalletId(wallet.id)).map(addr => addr.blake160)
 
     const outputCapacities: bigint = transaction
-      .outputs!.filter(o => lockHashes.includes(o.lockHash!))
+      .outputs!.filter(o => lockArgs.includes(o.lock.args))
       .map(o => BigInt(o.capacity))
       .reduce((result, c) => result + c, BigInt(0))
     const inputCapacities: bigint = transaction
       .inputs!.filter(i => {
-        if (i.lockHash) {
-          return lockHashes.includes(i.lockHash)
+        if (i.lock?.args) {
+          return lockArgs.includes(i.lock?.args)
         }
         return false
       })
diff --git a/packages/neuron-wallet/src/models/chain/transaction-with-status.ts b/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
index 11b14fb521..62899b088b 100644
--- a/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction-with-status.ts
@@ -1,19 +1,23 @@
+import { TransactionWithStatus as APITransactionWithStatus } from '@ckb-lumos/base/lib/api'
 import Transaction from './transaction'
 import TxStatus from './tx-status'
 
 export default class TransactionWithStatus {
   public transaction: Transaction
   public txStatus: TxStatus
+  public cycles: APITransactionWithStatus['cycles']
 
-  constructor(transaction: Transaction, txStatus: TxStatus) {
+  constructor(transaction: Transaction, txStatus: TxStatus, cycles: APITransactionWithStatus['cycles']) {
     this.transaction = transaction
     this.txStatus = txStatus
+    this.cycles = cycles
   }
 
-  public static fromSDK(txWithStatus: CKBComponents.TransactionWithStatus): TransactionWithStatus {
+  public static fromSDK(txWithStatus: APITransactionWithStatus): TransactionWithStatus {
     return new TransactionWithStatus(
       Transaction.fromSDK(txWithStatus.transaction),
-      TxStatus.fromSDK(txWithStatus.txStatus)
+      TxStatus.fromSDK(txWithStatus.txStatus),
+      txWithStatus.cycles
     )
   }
 }
diff --git a/packages/neuron-wallet/src/models/chain/transaction.ts b/packages/neuron-wallet/src/models/chain/transaction.ts
index 2bd405c8bb..1f4a0d1223 100644
--- a/packages/neuron-wallet/src/models/chain/transaction.ts
+++ b/packages/neuron-wallet/src/models/chain/transaction.ts
@@ -61,6 +61,7 @@ export default class Transaction {
   public value?: string
   public fee?: string
   public size?: number
+  public cycles?: string | null
   public interest?: string
 
   public type?: string
diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index ad3b73c57c..82972a2d65 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -1,4 +1,4 @@
-import { Brackets, In, IsNull, type ObjectLiteral } from 'typeorm'
+import { Brackets, In, IsNull, Not, type ObjectLiteral } from 'typeorm'
 import { computeScriptHash as scriptToHash } from '@ckb-lumos/base/lib/utils'
 import { getConnection } from '../database/chain/connection'
 import { scriptToAddress, addressToScript } from '../utils/scriptAndAddress'
@@ -1379,4 +1379,41 @@ export default class CellsService {
       }
     }
   }
+
+  public static async getDaoWithdrawAndDeposit(unlockHash: string) {
+    const inputEntities = await getConnection()
+      .getRepository(InputEntity)
+      .createQueryBuilder('input')
+      .where({
+        transactionHash: unlockHash,
+        data: Not('0x'),
+        typeCodeHash: SystemScriptInfo.DAO_CODE_HASH,
+        typeHashType: SystemScriptInfo.DAO_HASH_TYPE,
+      })
+      .getMany()
+    if (!inputEntities.length) throw new Error(`No unlock transaction use ${unlockHash} as input`)
+    const inputPreviousTxHashes = inputEntities.map(v => v.outPointTxHash)
+    const outputEntities = await getConnection()
+      .getRepository(OutputEntity)
+      .createQueryBuilder('output')
+      .leftJoinAndSelect('output.transaction', 'tx')
+      .where({ outPointTxHash: In(inputPreviousTxHashes), depositTxHash: Not(IsNull()) })
+      .getMany()
+    if (!outputEntities.length) throw new Error(`${unlockHash} is not a DAO transaction`)
+    return inputEntities
+      .map(v => {
+        const withdrawOutput = outputEntities.find(
+          o => o.outPointTxHash === v.outPointTxHash && o.outPointIndex === v.outPointIndex
+        )
+        if (!withdrawOutput) return
+        return {
+          withdrawBlockHash: withdrawOutput.transaction.blockHash,
+          depositOutPoint: OutPoint.fromSDK({
+            txHash: withdrawOutput!.depositTxHash,
+            index: withdrawOutput!.depositIndex,
+          }),
+        }
+      })
+      .filter((v): v is { withdrawBlockHash: string; depositOutPoint: OutPoint } => !!v)
+  }
 }
diff --git a/packages/neuron-wallet/src/services/tx/transaction-service.ts b/packages/neuron-wallet/src/services/tx/transaction-service.ts
index e58a36e84f..eb5cf93dd3 100644
--- a/packages/neuron-wallet/src/services/tx/transaction-service.ts
+++ b/packages/neuron-wallet/src/services/tx/transaction-service.ts
@@ -20,12 +20,16 @@ import NetworksService from '../networks'
 import Script from '../../models/chain/script'
 import Input from '../../models/chain/input'
 import SudtTokenInfoService from '../sudt-token-info'
+import TransactionSize from '../../models/transaction-size'
+import Output from '../../models/chain/output'
 
 export interface TransactionsByAddressesParam {
   pageNo: number
   pageSize: number
   addresses: string[]
   walletID: string
+  sort?: string
+  direction?: string
 }
 
 export interface PaginationResult<T = any> {
@@ -42,6 +46,8 @@ export enum SearchType {
   Unknown = 'unknown',
 }
 
+const DESC = 'decrease'
+
 export class TransactionsService {
   public static filterSearchType(value: string) {
     if (value === '') {
@@ -63,6 +69,30 @@ export class TransactionsService {
     return SearchType.TokenInfo
   }
 
+  public static ComparedTxType(a: Transaction, b: Transaction, direction: string) {
+    const aType = a.type ?? ''
+    const bType = b.type ?? ''
+    if (aType > bType) return direction === DESC ? 1 : -1
+    if (aType < bType) return direction === DESC ? -1 : 1
+    return 0
+  }
+
+  public static ComparedTxTimestamp(a: Transaction, b: Transaction, direction: string) {
+    const aTimestamp = a.timestamp ? +a.timestamp : 0
+    const bTimestamp = b.timestamp ? +b.timestamp : 0
+    if (aTimestamp > bTimestamp) return direction === DESC ? 1 : -1
+    if (aTimestamp < bTimestamp) return direction === DESC ? -1 : 1
+    return 0
+  }
+
+  public static ComparedTxBalance(a: Transaction, b: Transaction, direction: string) {
+    const aBalance = a.value ? BigInt(a.value) : BigInt(0)
+    const bBalance = b.value ? BigInt(b.value) : BigInt(0)
+    if (aBalance > bBalance) return direction === DESC ? 1 : -1
+    if (aBalance < bBalance) return direction === DESC ? -1 : 1
+    return 0
+  }
+
   public static async getAllByAddresses(
     params: TransactionsByAddressesParam,
     searchValue: string = ''
@@ -207,7 +237,10 @@ export class TransactionsService {
     }
 
     const skip = (params.pageNo - 1) * params.pageSize
-    const txHashes = allTxHashes.slice(skip, skip + params.pageSize)
+    const needSort =
+      ['type', 'value', 'timestamp'].includes(params.sort ?? '') &&
+      ['increase', 'decrease'].includes(params.direction ?? '')
+    const txHashes = needSort ? allTxHashes : allTxHashes.slice(skip, skip + params.pageSize)
 
     const transactions = await connection
       .getRepository(TransactionEntity)
@@ -467,7 +500,16 @@ export class TransactionsService {
 
     return {
       totalCount,
-      items: txs,
+      items: needSort
+        ? txs
+            .sort((a, b) => {
+              if (params.sort === 'type') return TransactionsService.ComparedTxType(a, b, params.direction!)
+              if (params.sort === 'value') return TransactionsService.ComparedTxBalance(a, b, params.direction!)
+              if (params.sort === 'timestamp') return TransactionsService.ComparedTxTimestamp(a, b, params.direction!)
+              return 0
+            })
+            .slice(skip, skip + params.pageSize)
+        : txs,
     }
   }
 
@@ -488,7 +530,11 @@ export class TransactionsService {
     }
     const tx = txInDB.toModel()
     tx.inputs = await this.fillInputFields(txWithStatus.transaction.inputs)
-    tx.outputs = txWithStatus.transaction.outputs
+    tx.outputs = txWithStatus.transaction.outputs.map((v, idx) =>
+      Output.fromObject({ ...v, data: txWithStatus.transaction.outputsData[idx] })
+    )
+    tx.size = TransactionSize.tx(tx)
+    tx.cycles = txWithStatus.cycles
     return tx
   }
 
diff --git a/packages/neuron-wallet/src/types/controller.d.ts b/packages/neuron-wallet/src/types/controller.d.ts
index ea54bc7f0f..a59ea9fa0a 100644
--- a/packages/neuron-wallet/src/types/controller.d.ts
+++ b/packages/neuron-wallet/src/types/controller.d.ts
@@ -16,6 +16,8 @@ declare namespace Controller {
       pageSize: number
       keywords: string
       walletID: string
+      sort?: string
+      direction?: string
     }
     interface GenerateTransferNftTxParams {
       walletID: string
diff --git a/packages/neuron-wallet/tests/services/cells.test.ts b/packages/neuron-wallet/tests/services/cells.test.ts
index 085ca35b3c..3bb81943f1 100644
--- a/packages/neuron-wallet/tests/services/cells.test.ts
+++ b/packages/neuron-wallet/tests/services/cells.test.ts
@@ -2,6 +2,7 @@ import type { OutPoint as OutPointSDK } from '@ckb-lumos/base'
 import { scriptToAddress } from '../../src/utils/scriptAndAddress'
 import { bytes } from '@ckb-lumos/codec'
 import OutputEntity from '../../src/database/chain/entities/output'
+import InputEntity from '../../src/database/chain/entities/input'
 import { OutputStatus } from '../../src/models/chain/output'
 import CellsService, {
   CustomizedLock,
@@ -192,6 +193,19 @@ describe('CellsService', () => {
     return multisigCell
   }
 
+  const generateTx = (hash: string, timestamp: string, inputs: InputEntity[] = []) => {
+    const tx = new TransactionEntity()
+    tx.hash = hash
+    tx.version = '0x0'
+    tx.timestamp = timestamp
+    tx.status = TransactionStatus.Success
+    tx.witnesses = []
+    tx.blockNumber = '1'
+    tx.blockHash = '0x' + '10'.repeat(32)
+    tx.inputs = inputs
+    return tx
+  }
+
   const typeScript = new Script(randomHex(), '0x', ScriptHashType.Data)
 
   it('getLiveCell', async () => {
@@ -834,17 +848,6 @@ describe('CellsService', () => {
   describe('#getDaoCells', () => {
     const depositData = '0x0000000000000000'
     const withdrawData = '0x000000000000000a'
-    const generateTx = (hash: string, timestamp: string) => {
-      const tx = new TransactionEntity()
-      tx.hash = hash
-      tx.version = '0x0'
-      tx.timestamp = timestamp
-      tx.status = TransactionStatus.Success
-      tx.witnesses = []
-      tx.blockNumber = '1'
-      tx.blockHash = '0x' + '10'.repeat(32)
-      return tx
-    }
 
     const createCells = async () => {
       const tx1 = generateTx('0x1234', '1572862777481')
@@ -1066,17 +1069,6 @@ describe('CellsService', () => {
   describe('#addUnlockInfo', () => {
     const depositData = '0x0000000000000000'
     const withdrawData = '0x000000000000000a'
-    const generateTx = (hash: string, timestamp: string) => {
-      const tx = new TransactionEntity()
-      tx.hash = hash
-      tx.version = '0x0'
-      tx.timestamp = timestamp
-      tx.status = TransactionStatus.Success
-      tx.witnesses = []
-      tx.blockNumber = '1'
-      tx.blockHash = '0x' + '10'.repeat(32)
-      return tx
-    }
 
     const withdrawTxHash = '0x' + '2'.repeat(64)
 
@@ -1138,17 +1130,6 @@ describe('CellsService', () => {
   describe('#addDepositInfo', () => {
     const depositData = '0x0000000000000000'
     const withdrawData = '0x000000000000000a'
-    const generateTx = (hash: string, timestamp: string) => {
-      const tx = new TransactionEntity()
-      tx.hash = hash
-      tx.version = '0x0'
-      tx.timestamp = timestamp
-      tx.status = TransactionStatus.Success
-      tx.witnesses = []
-      tx.blockNumber = '1'
-      tx.blockHash = '0x' + '10'.repeat(32)
-      return tx
-    }
 
     const depositTxHash = '0x' + '0'.repeat(64)
     const depositTx = Transaction.fromObject({
@@ -1848,4 +1829,102 @@ describe('CellsService', () => {
       expect(CellsService.getCellTypeType(output)).toBe(TypeScriptCategory.Unknown)
     })
   })
+
+  describe('getDaoWithdrawAndDeposit', () => {
+    const generateInput = (
+      params: {
+        capacity?: string
+        typeScript?: Script | null
+        who?: any
+        data?: string
+        transaction?: TransactionEntity | null
+        transactionHash?: string
+      } = {}
+    ) => {
+      const input = new InputEntity()
+      input.transactionHash = params.transaction?.hash ?? params.transactionHash ?? randomHex()
+      input.outPointTxHash = randomHex()
+      input.outPointIndex = '0'
+      input.capacity = params?.capacity ?? toShannon('1000')
+      const who = params.who ?? bob
+      input.lockCodeHash = who.lockScript.codeHash
+      input.lockArgs = who.lockScript.args
+      input.lockHashType = who.lockScript.hashType
+      if (who.lockScript.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) {
+        input.multiSignBlake160 = who.lockScript.args
+      }
+      input.lockHash = who.lockScript.computeHash()
+      input.data = params.data ?? '0x'
+      const typeScript = params.typeScript ?? SystemScriptInfo.generateDaoScript('0x')
+      if (typeScript) {
+        input.typeCodeHash = typeScript.codeHash
+        input.typeArgs = typeScript.args
+        input.typeHashType = typeScript.hashType
+        input.typeHash = typeScript.computeHash()
+      }
+      if (params.transaction) {
+        input.transaction = params.transaction
+      }
+      input.since = '0'
+      return input
+    }
+    const saveTxAndInput = async (
+      params: {
+        capacity?: string
+        typeScript?: Script | null
+        who?: any
+        data?: string
+      } = {}
+    ) => {
+      const tx = generateTx(randomHex(), '1572862777481')
+      const input = await generateInput({ ...params, transactionHash: tx.hash })
+      await getConnection().manager.save([tx, input])
+      return input
+    }
+    it('no input', async () => {
+      const input = await saveTxAndInput()
+      await expect(CellsService.getDaoWithdrawAndDeposit(input.transactionHash)).rejects.toThrow(
+        new Error(`No unlock transaction use ${input.transactionHash} as input`)
+      )
+    })
+    it('can not find output', async () => {
+      const input = await saveTxAndInput({ data: '0x1234' })
+      const output = await generateCell(toShannon('1000'), OutputStatus.Dead, false, null)
+      await getConnection().manager.save(output)
+      await expect(CellsService.getDaoWithdrawAndDeposit(input.transactionHash)).rejects.toThrow(
+        new Error(`${input.transactionHash} is not a DAO transaction`)
+      )
+    })
+    it('output without deposit tx', async () => {
+      const input = await saveTxAndInput({ data: '0x1234' })
+      const output = await generateCell(toShannon('1000'), OutputStatus.Dead, false, null)
+      output.outPointTxHash = input.outPointTxHash!
+      output.outPointIndex = input.outPointIndex!
+      await getConnection().manager.save(output)
+      await expect(CellsService.getDaoWithdrawAndDeposit(input.transactionHash)).rejects.toThrow(
+        new Error(`${input.transactionHash} is not a DAO transaction`)
+      )
+    })
+    it('success', async () => {
+      const input = await saveTxAndInput({ data: '0x1234' })
+      const output = await generateCell(toShannon('1000'), OutputStatus.Dead, false, null)
+      const tx = generateTx(randomHex(), '1572862777481')
+      output.outPointTxHash = input.outPointTxHash!
+      output.outPointIndex = input.outPointIndex!
+      output.depositTxHash = randomHex()
+      output.depositIndex = '0'
+      tx.outputs = [output]
+      await getConnection().manager.save([tx, output])
+      const res = await CellsService.getDaoWithdrawAndDeposit(input.transactionHash)
+      expect(res).toStrictEqual([
+        {
+          withdrawBlockHash: tx.blockHash,
+          depositOutPoint: OutPoint.fromSDK({
+            txHash: output.depositTxHash,
+            index: output.depositIndex,
+          }),
+        },
+      ])
+    })
+  })
 })

From d5cfd42c558c654073df78c80c21ab59658de836 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:32:27 +0900
Subject: [PATCH 52/68] chore(deps): bump undici from 5.28.2 to 5.28.3 in
 /packages/neuron-wallet (#3060)

chore(deps): bump undici in /packages/neuron-wallet

Bumps [undici](https://github.com/nodejs/undici) from 5.28.2 to 5.28.3.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.28.2...v5.28.3)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/neuron-wallet/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 45828839f7..80a35b051d 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -74,7 +74,7 @@
     "subleveldown": "4.1.4",
     "tslib": "2.6.2",
     "typeorm": "0.2.45",
-    "undici": "5.28.2",
+    "undici": "5.28.3",
     "uuid": "8.3.2"
   },
   "devDependencies": {

From 3e54fc9717647d53e924b04e790b79a0b4a6245b Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Tue, 12 Mar 2024 13:49:57 +0900
Subject: [PATCH 53/68] fix: no translation of language options (#3063)

---
 packages/neuron-ui/src/locales/es.json | 6 +++---
 packages/neuron-ui/src/locales/fr.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 5933db645b..2eb59dcae6 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -422,11 +422,11 @@
         "switch-network-type": "Cambiar a {{type}}"
       },
       "locale": {
-        "en": "Inglés",
-        "en-US": "Inglés(Estados Unidos)",
+        "en": "English",
+        "en-US": "English(United States)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
-        "fr": "Francés",
+        "fr": "Français",
         "es": "Español"
       },
       "data": {
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 76affbaa48..f4bdcb9e8d 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -429,8 +429,8 @@
         "switch-network-type": "Basculer vers {{type}}"
       },
       "locale": {
-        "en": "Anglais",
-        "en-US": "Anglais (États-Unis)",
+        "en": "English",
+        "en-US": "English(United States)",
         "zh": "中文(简体)",
         "zh-TW": "中文(繁體)",
         "fr": "Français",

From 9d19decb761ec14b07fc9f52a588a58a2691c93b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Tue, 12 Mar 2024 14:38:39 +0800
Subject: [PATCH 54/68] chore: Only white list can package with comment.
 (#3047)

* chore: Only MEMBER and OWNER can package with comment.

* chore: Add permissions for package test
---
 .github/workflows/package_for_test.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
index d73e821810..7ee9a30a46 100644
--- a/.github/workflows/package_for_test.yml
+++ b/.github/workflows/package_for_test.yml
@@ -2,12 +2,12 @@ name: Package Neuron for Test
 
 on: 
   issue_comment:
-    types: [created, edited]
+    types: [created]
   push:
 
 jobs:
   packaging:
-    if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package')) || github.event_name == 'push' }}
+    if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package') && contains(fromJSON('["MEMBER", "OWNER"]'), (github.event.comment.author_association))) || github.event_name == 'push' }}
 
     strategy:
       matrix:
@@ -20,6 +20,10 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    permissions:
+      contents: read
+      pull-requests: read
+
     name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
 
     env:
@@ -208,6 +212,9 @@ jobs:
     needs: [packaging]
     name: Append links to the Pull Request
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
     steps:
       - name: Comment by push event
         if: ${{ github.event_name == 'push' }}
@@ -230,6 +237,8 @@ jobs:
     if: ${{ always() && needs.packaging.result == 'failure' }}
     name: Append failed comment to the comment
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: Comment by pull request comment event when package failed
         if: ${{ github.event_name == 'issue_comment' }}

From f94bb2aff1b5124ac5bef5c571b8505317447337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Tue, 12 Mar 2024 15:02:18 +0800
Subject: [PATCH 55/68] fix: Add COLLABORATOR to whitelist (#3068)

---
 .github/workflows/package_for_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
index 7ee9a30a46..757811fc6d 100644
--- a/.github/workflows/package_for_test.yml
+++ b/.github/workflows/package_for_test.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   packaging:
-    if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package') && contains(fromJSON('["MEMBER", "OWNER"]'), (github.event.comment.author_association))) || github.event_name == 'push' }}
+    if: ${{ (github.event_name == 'issue_comment' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/package') && contains(fromJSON('["OWNER", "COLLABORATOR"]'), github.event.comment.author_association)) || github.event_name == 'push' }}
 
     strategy:
       matrix:

From 4055ab6817ad29a9caa3756b90b952bd11ad7645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 14 Mar 2024 12:43:50 +0800
Subject: [PATCH 56/68] Fix cell manage with hard wallet (#3069)

* fix: Adapt hard wallet for lock and unlock live cell.

* fix: Add tx hash for cell info dialog
---
 .../CellInfoDialog/cellInfoDialog.module.scss |   6 +
 .../src/components/CellInfoDialog/index.tsx   |  34 ++++-
 .../CellManagement/cellManagement.module.scss |  22 ++-
 .../src/components/CellManagement/hooks.ts    | 142 +++++++++++++++++-
 .../src/components/CellManagement/index.tsx   | 134 ++++++++++++-----
 .../components/HistoryDetailPage/index.tsx    |   2 +-
 packages/neuron-ui/src/locales/en.json        |   4 +-
 packages/neuron-ui/src/locales/es.json        |   4 +-
 packages/neuron-ui/src/locales/fr.json        |   4 +-
 packages/neuron-ui/src/locales/zh-tw.json     |   4 +-
 packages/neuron-ui/src/locales/zh.json        |   4 +-
 .../neuron-ui/src/widgets/Icons/Hardware.png  | Bin 0 -> 14718 bytes
 packages/neuron-wallet/src/controllers/api.ts |   2 +-
 .../src/controllers/cell-management.ts        |   4 +-
 .../tests/controllers/cell-management.test.ts |   2 +-
 15 files changed, 313 insertions(+), 55 deletions(-)
 create mode 100755 packages/neuron-ui/src/widgets/Icons/Hardware.png

diff --git a/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss b/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
index 148d7b4f99..1831f13f93 100644
--- a/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
+++ b/packages/neuron-ui/src/components/CellInfoDialog/cellInfoDialog.module.scss
@@ -1,3 +1,5 @@
+@import '../../styles/mixin.scss';
+
 .cellInfoDialog {
   min-width: 650px;
 }
@@ -270,3 +272,7 @@
   top: 4px;
   cursor: pointer;
 }
+
+.notice {
+  @include dialog-copy-animation;
+}
diff --git a/packages/neuron-ui/src/components/CellInfoDialog/index.tsx b/packages/neuron-ui/src/components/CellInfoDialog/index.tsx
index 20bc08a669..e75da3363a 100644
--- a/packages/neuron-ui/src/components/CellInfoDialog/index.tsx
+++ b/packages/neuron-ui/src/components/CellInfoDialog/index.tsx
@@ -1,11 +1,14 @@
-import React, { useMemo, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import Dialog from 'widgets/Dialog'
-import { calculateUsedCapacity, shannonToCKBFormatter } from 'utils'
+import { calculateUsedCapacity, getExplorerUrl, shannonToCKBFormatter, truncateMiddle, useCopy } from 'utils'
 import { useTranslation } from 'react-i18next'
 import Tabs from 'widgets/Tabs'
 import { type TFunction } from 'i18next'
 import { Script } from '@ckb-lumos/base'
 import Switch from 'widgets/Switch'
+import { Copy, ExplorerIcon } from 'widgets/Icons/icon'
+import Alert from 'widgets/Alert'
+import { openExternal } from 'services/remote'
 import styles from './cellInfoDialog.module.scss'
 
 type ScriptRenderType = 'table' | 'raw'
@@ -108,13 +111,26 @@ const useTabs = ({ t, output }: { t: TFunction; output?: State.DetailedOutput })
   }
 }
 
-const CellInfoDialog = ({ onCancel, output }: { onCancel: () => void; output?: State.DetailedOutput }) => {
+const CellInfoDialog = ({
+  onCancel,
+  output,
+  isMainnet,
+}: {
+  onCancel: () => void
+  output?: State.DetailedOutput
+  isMainnet: boolean
+}) => {
   const [t] = useTranslation()
 
   const { tabs, currentTab, setCurrentTab, scriptRenderType, setScriptRenderType } = useTabs({
     t,
     output,
   })
+  const { copied, copyTimes, onCopy } = useCopy()
+  const onOpenTx = useCallback(() => {
+    const explorerUrl = getExplorerUrl(isMainnet)
+    openExternal(`${explorerUrl}/transaction/${output?.outPoint.txHash}`)
+  }, [isMainnet, output?.outPoint.txHash])
   if (!output) {
     return null
   }
@@ -124,6 +140,13 @@ const CellInfoDialog = ({ onCancel, output }: { onCancel: () => void; output?: S
       title={
         <div className={styles.title}>
           <span>{t('cell-manage.cell-detail-dialog.title')}</span>
+          <div className={styles.outPoint}>
+            {t('cell-manage.cell-detail-dialog.transaction-hash')}
+            :&nbsp;&nbsp;
+            {truncateMiddle(output.outPoint.txHash, 10, 10)}
+            <Copy onClick={() => onCopy(output.outPoint.txHash)} />
+            <ExplorerIcon onClick={onOpenTx} />
+          </div>
         </div>
       }
       onCancel={onCancel}
@@ -149,6 +172,11 @@ const CellInfoDialog = ({ onCancel, output }: { onCancel: () => void; output?: S
           </div>
         ) : null}
       </div>
+      {copied ? (
+        <Alert status="success" className={styles.notice} key={copyTimes.toString()}>
+          {t('common.copied')}
+        </Alert>
+      ) : null}
     </Dialog>
   )
 }
diff --git a/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss b/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
index 14ed375b5a..c286a5007a 100644
--- a/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
+++ b/packages/neuron-ui/src/components/CellManagement/cellManagement.module.scss
@@ -163,9 +163,9 @@
   @include checkbox;
 
   .multiActions {
-    position: absolute;
+    position: fixed;
     bottom: 24px;
-    left: 50%;
+    left: calc(50% + 80px);
     transform: translateX(-50%);
     padding: 12px 40px 12px 40px;
     border-radius: 40px;
@@ -235,4 +235,22 @@
       margin-right: 4px;
     }
   }
+
+  .hardWalletImg {
+    width: 88px;
+    height: 88px;
+    margin: 16px 0 24px 0;
+  }
+
+  .lockActions {
+    margin-top: 24px;
+    display: flex;
+    justify-content: center;
+    gap: 16px;
+  }
+
+  .hardwalletErr {
+    justify-content: center;
+    margin-top: 12px;
+  }
 }
diff --git a/packages/neuron-ui/src/components/CellManagement/hooks.ts b/packages/neuron-ui/src/components/CellManagement/hooks.ts
index 9076750ece..e38c6cec29 100644
--- a/packages/neuron-ui/src/components/CellManagement/hooks.ts
+++ b/packages/neuron-ui/src/components/CellManagement/hooks.ts
@@ -1,12 +1,20 @@
+import { CkbAppNotFoundException, DeviceNotFoundException } from 'exceptions'
+import { TFunction } from 'i18next'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import {
+  connectDevice,
+  getDeviceCkbAppVersion,
+  getDevices,
   getLiveCells,
+  getPlatform,
   updateLiveCellsLocalInfo,
   updateLiveCellsLockStatus as updateLiveCellsLockStatusAPI,
+  updateWallet,
 } from 'services/remote'
+import { ControllerResponse } from 'services/remote/remoteApiWrapper'
 import { AppActions, useDispatch } from 'states'
-import { LockScriptCategory, RoutePath, TypeScriptCategory, isSuccessResponse, outPointToStr } from 'utils'
+import { ErrorCode, LockScriptCategory, RoutePath, TypeScriptCategory, isSuccessResponse, outPointToStr } from 'utils'
 import { SortType } from 'widgets/Table'
 
 const cellTypeOrder: Record<string, number> = {
@@ -204,6 +212,7 @@ export const useAction = ({
   resetPassword,
   setError,
   password,
+  verifyDeviceStatus,
 }: {
   liveCells: State.LiveCellWithLocalInfo[]
   currentPageLiveCells: State.LiveCellWithLocalInfo[]
@@ -212,6 +221,7 @@ export const useAction = ({
   resetPassword: () => void
   setError: (error: string) => void
   password: string
+  verifyDeviceStatus: () => Promise<boolean>
 }) => {
   const dispatch = useDispatch()
   const navigate = useNavigate()
@@ -219,7 +229,7 @@ export const useAction = ({
   const [operateCells, setOperateCells] = useState<State.LiveCellWithLocalInfo[]>([])
   const [loading, setLoading] = useState(false)
   const onOpenActionDialog = useCallback(
-    (e: React.SyntheticEvent<SVGSVGElement, MouseEvent>) => {
+    async (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
@@ -227,24 +237,27 @@ export const useAction = ({
       setOperateCells([operateCell])
       setAction(curAction)
       resetPassword()
+      await verifyDeviceStatus()
     },
     [currentPageLiveCells, setOperateCells, dispatch, navigate]
   )
   const onMultiAction = useCallback(
-    (e: React.SyntheticEvent<HTMLButtonElement, MouseEvent>) => {
+    async (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()
+      await verifyDeviceStatus()
     },
     [liveCells, selectedOutPoints, setOperateCells, dispatch, navigate]
   )
-  const onActionConfirm = useCallback(() => {
+  const onActionConfirm = useCallback(async () => {
     switch (action) {
       case 'lock':
       case 'unlock':
+        if (!(await verifyDeviceStatus())) return
         setLoading(true)
         updateLiveCellsLockStatus({
           outPoints: operateCells.map(v => v.outPoint),
@@ -362,3 +375,124 @@ export const usePassword = () => {
     resetPassword,
   }
 }
+
+export const useHardWallet = ({ wallet, t }: { wallet: State.WalletIdentity; t: TFunction }) => {
+  const isWin32 = useMemo(() => {
+    return getPlatform() === 'win32'
+  }, [])
+  const [error, setError] = useState<ErrorCode | string | undefined>()
+  const isNotAvailable = useMemo(() => {
+    return error === ErrorCode.DeviceNotFound || error === ErrorCode.CkbAppNotFound
+  }, [error])
+
+  const [deviceInfo, setDeviceInfo] = useState(wallet.device)
+  const [isReconnecting, setIsReconnecting] = useState(false)
+
+  const ensureDeviceAvailable = useCallback(
+    async (device: State.DeviceInfo) => {
+      try {
+        const connectionRes = await connectDevice(device)
+        let { descriptor } = device
+        if (!isSuccessResponse(connectionRes)) {
+          // for win32, opening or closing the ckb app changes the HID descriptor(deviceInfo),
+          // so if we can't connect to the device, we need to re-search device automatically.
+          // for unix, the descriptor never changes unless user plugs the device into another USB port,
+          // in that case, mannauly re-search device one time will do.
+          if (isWin32) {
+            setIsReconnecting(true)
+            const devicesRes = await getDevices(device)
+            setIsReconnecting(false)
+            if (isSuccessResponse(devicesRes) && Array.isArray(devicesRes.result) && devicesRes.result.length > 0) {
+              const [updatedDeviceInfo] = devicesRes.result
+              descriptor = updatedDeviceInfo.descriptor
+              setDeviceInfo(updatedDeviceInfo)
+            } else {
+              throw new DeviceNotFoundException()
+            }
+          } else {
+            throw new DeviceNotFoundException()
+          }
+        }
+
+        // getDeviceCkbAppVersion will halt forever while in win32 sleep mode.
+        const ckbVersionRes = await Promise.race([
+          getDeviceCkbAppVersion(descriptor),
+          new Promise<ControllerResponse>((_, reject) => {
+            setTimeout(() => reject(), 1000)
+          }),
+        ]).catch(() => {
+          return { status: ErrorCode.DeviceInSleep }
+        })
+
+        if (!isSuccessResponse(ckbVersionRes)) {
+          if (ckbVersionRes.status !== ErrorCode.DeviceInSleep) {
+            throw new CkbAppNotFoundException()
+          } else {
+            throw new DeviceNotFoundException()
+          }
+        }
+        setError(undefined)
+        return true
+      } catch (err) {
+        if (err instanceof CkbAppNotFoundException || err instanceof DeviceNotFoundException) {
+          setError(err.code)
+        }
+        return false
+      }
+    },
+    [isWin32]
+  )
+
+  const reconnect = useCallback(async () => {
+    if (!deviceInfo) return
+    setError(undefined)
+    setIsReconnecting(true)
+    try {
+      const res = await getDevices(deviceInfo)
+      if (isSuccessResponse(res) && Array.isArray(res.result) && res.result.length > 0) {
+        const [device] = res.result
+        setDeviceInfo(device)
+        if (device.descriptor !== deviceInfo.descriptor) {
+          await updateWallet({
+            id: wallet.id,
+            device,
+          })
+        }
+        await ensureDeviceAvailable(device)
+      } else {
+        setError(ErrorCode.DeviceNotFound)
+      }
+    } catch (err) {
+      setError(ErrorCode.DeviceNotFound)
+    } finally {
+      setIsReconnecting(false)
+    }
+  }, [deviceInfo, ensureDeviceAvailable, wallet.id])
+
+  const verifyDeviceStatus = useCallback(async () => {
+    if (deviceInfo) {
+      return ensureDeviceAvailable(deviceInfo)
+    }
+    return true
+  }, [ensureDeviceAvailable, deviceInfo])
+
+  const errorMessage = useMemo(() => {
+    switch (error) {
+      case ErrorCode.DeviceNotFound:
+        return t('hardware-verify-address.status.disconnect')
+      case ErrorCode.CkbAppNotFound:
+        return t(CkbAppNotFoundException.message)
+      default:
+        return error
+    }
+  }, [error, t])
+  return {
+    deviceInfo,
+    isReconnecting,
+    isNotAvailable,
+    reconnect,
+    verifyDeviceStatus,
+    errorMessage,
+    setError,
+  }
+}
diff --git a/packages/neuron-ui/src/components/CellManagement/index.tsx b/packages/neuron-ui/src/components/CellManagement/index.tsx
index e8752c869c..48f94566e2 100644
--- a/packages/neuron-ui/src/components/CellManagement/index.tsx
+++ b/packages/neuron-ui/src/components/CellManagement/index.tsx
@@ -13,6 +13,7 @@ import {
   outPointToStr,
   LockScriptCategory,
   getLockTimestamp,
+  isMainnet as isMainnetUtil,
 } from 'utils'
 import { HIDE_BALANCE } from 'utils/const'
 import Tooltip from 'widgets/Tooltip'
@@ -23,7 +24,10 @@ import TextField from 'widgets/TextField'
 import { useSearchParams } from 'react-router-dom'
 import CellInfoDialog from 'components/CellInfoDialog'
 import { computeScriptHash } from '@ckb-lumos/base/lib/utils'
-import { Actions, useAction, useLiveCells, usePassword, useSelect } from './hooks'
+import Hardware from 'widgets/Icons/Hardware.png'
+import Button from 'widgets/Button'
+import Alert from 'widgets/Alert'
+import { Actions, useAction, useHardWallet, useLiveCells, usePassword, useSelect } from './hooks'
 import styles from './cellManagement.module.scss'
 
 const getColumns = ({
@@ -214,11 +218,14 @@ const getColumns = ({
 const CellManagement = () => {
   const {
     app: { epoch },
-    wallet: { balance = '' },
+    wallet,
     chain: {
       syncState: { bestKnownBlockTimestamp },
+      networkID,
     },
+    settings: { networks },
   } = useGlobalState()
+  const isMainnet = useMemo(() => isMainnetUtil(networks, networkID), [networks, networkID])
   const [t] = useTranslation()
   const [searchParams] = useSearchParams()
   const breadPages = useMemo(() => [{ label: t('cell-manage.title') }], [t])
@@ -236,6 +243,17 @@ const CellManagement = () => {
     return liveCells.slice(pageSize * (pageNo - 1), pageSize * pageNo)
   }, [pageNo, pageSize, liveCells])
   const { onSelect, onSelectAll, isAllSelected, selectedOutPoints, hasSelectLocked, isAllLocked } = useSelect(liveCells)
+  const {
+    isReconnecting,
+    isNotAvailable,
+    reconnect,
+    verifyDeviceStatus,
+    errorMessage: hardwalletError,
+    setError: setHardwalletError,
+  } = useHardWallet({
+    wallet,
+    t,
+  })
   const { password, error, onPasswordChange, setError, resetPassword } = usePassword()
   const { action, operateCells, onActionCancel, onActionConfirm, onOpenActionDialog, onMultiAction, loading } =
     useAction({
@@ -243,9 +261,10 @@ const CellManagement = () => {
       currentPageLiveCells,
       updateLiveCellsLockStatus,
       selectedOutPoints,
-      setError,
+      setError: wallet.device ? setHardwalletError : setError,
       resetPassword,
       password,
+      verifyDeviceStatus,
     })
   const columns = useMemo(
     () =>
@@ -285,7 +304,7 @@ const CellManagement = () => {
             {showBalance ? <EyesOpen onClick={onChangeShowBalance} /> : <EyesClose onClick={onChangeShowBalance} />}
             <span>{t('cell-manage.wallet-balance')}</span>
             &nbsp;&nbsp;
-            {`${showBalance ? shannonToCKBFormatter(balance) : HIDE_BALANCE} CKB`}
+            {`${showBalance ? shannonToCKBFormatter(wallet.balance) : HIDE_BALANCE} CKB`}
           </div>
         </div>
       }
@@ -329,39 +348,82 @@ const CellManagement = () => {
             : undefined
         }
         onCancel={onActionCancel}
+        isMainnet={isMainnet}
       />
-      <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>
+      {wallet.device ? (
+        <Dialog
+          show={action === Actions.Lock || action === Actions.Unlock}
+          title={t(`cell-manage.cell-${action}-dialog.title`)}
+          onCancel={onActionCancel}
+          showFooter={false}
+          className={styles.lockCell}
+        >
+          <p className={styles.cellsCapacity}>
+            {t(`cell-manage.cell-${action}-dialog.capacity`, { capacity: totalCapacity })}
+          </p>
+          <div>
+            <img src={Hardware} alt="hard-wallet" className={styles.hardWalletImg} />
+          </div>
+          {action === Actions.Lock ? (
+            <span className={styles.canNotUse}>
+              <Attention />
+              {t('cell-manage.cell-lock-dialog.locked-cell-can-not-use')}
+            </span>
+          ) : null}
+          <div className={styles.lockActions}>
+            <Button onClick={onActionCancel} type="cancel">
+              {t('common.cancel')}
+            </Button>
+            <Button
+              onClick={isNotAvailable ? reconnect : onActionConfirm}
+              loading={loading || isReconnecting}
+              type="primary"
+            >
+              {isNotAvailable || isReconnecting
+                ? t('hardware-verify-address.actions.reconnect')
+                : t('cell-manage.verify')}
+            </Button>
+          </div>
+          {hardwalletError ? (
+            <Alert status="error" className={styles.hardwalletErr}>
+              {hardwalletError}
+            </Alert>
+          ) : null}
+        </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')}
diff --git a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
index 7a6b141652..2923653803 100644
--- a/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
+++ b/packages/neuron-ui/src/components/HistoryDetailPage/index.tsx
@@ -422,7 +422,7 @@ const HistoryDetailPage = () => {
         type="failed"
         onCancel={() => navigate(-1)}
       />
-      <CellInfoDialog output={outputCell} onCancel={onCancel} />
+      <CellInfoDialog output={outputCell} onCancel={onCancel} isMainnet={isMainnet} />
     </PageContainer>
   )
 }
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index fb0619c3d2..c42810c3f5 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -1198,6 +1198,7 @@
       },
       "cell-detail-dialog": {
         "title": "Cell Detail",
+        "transaction-hash": "Transaction Hash",
         "capacity-used": "Used Capacity",
         "data": "Data",
         "total": "Total",
@@ -1232,7 +1233,8 @@
       "password-placeholder": "Please input wallet password",
       "lock": "Lock",
       "unlock": "Unlock",
-      "consume": "Consume"
+      "consume": "Consume",
+      "verify": "Verify"
     },
     "send-tx-detail": {
       "page-title": "Transaction Detail",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 2eb59dcae6..8d38510953 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -1177,6 +1177,7 @@
       },
       "cell-detail-dialog": {
         "title": "Detalles de la Cell",
+        "transaction-hash": "Hash de Transacción",
         "capacity-used": "Capacidad utilizada",
         "data": "Datos",
         "total": "Total",
@@ -1211,7 +1212,8 @@
       "password-placeholder": "Ingrese la contraseña de la billetera",
       "lock": "Bloquear",
       "unlock": "Desbloquear",
-      "consume": "Consumir"
+      "consume": "Consumir",
+      "verify": "Verificar"
     },
     "send-tx-detail": {
       "page-title": "Detalles de la transacción",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index f4bdcb9e8d..5cd1baf641 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -1188,6 +1188,7 @@
       },
       "cell-detail-dialog": {
         "title": "Détail de la cellule",
+        "transaction-hash": "Hash de transaction",
         "capacity-used": "Capacité utilisée",
         "data": "Données",
         "total": "Total",
@@ -1222,7 +1223,8 @@
       "password-placeholder": "Veuillez entrer le mot de passe du Wallet",
       "lock": "Verrouiller",
       "unlock": "Déverrouiller",
-      "consume": "Consommer"
+      "consume": "Consommer",
+      "verify": "Vérifier"
     },
     "send-tx-detail": {
       "page-title": "Détail de l'historique",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index e08c32e39a..0208b9e9d4 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -1169,6 +1169,7 @@
       },
       "cell-detail-dialog": {
         "title": "Cell詳情",
+        "transaction-hash": "交易哈希",
         "capacity-used": "容量使用",
         "data": "數據",
         "total": "總量",
@@ -1199,7 +1200,8 @@
       "password-placeholder": "請輸入錢包密碼",
       "lock": "鎖定",
       "unlock": "解鎖",
-      "consume": "消耗"
+      "consume": "消耗",
+      "verify": "驗證"
     },
     "send-tx-detail": {
       "page-title": "交易詳情",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 036ab6d4dd..fbb85cf7af 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -1190,6 +1190,7 @@
       },
       "cell-detail-dialog": {
         "title": "Cell详情",
+        "transaction-hash": "交易哈希",
         "capacity-used": "容量使用",
         "data": "数据",
         "total": "总量",
@@ -1224,7 +1225,8 @@
       "password-placeholder": "请输入钱包密码",
       "lock": "锁定",
       "unlock": "解锁",
-      "consume": "消耗"
+      "consume": "消耗",
+      "verify": "验证"
     },
     "send-tx-detail": {
       "page-title": "交易详情",
diff --git a/packages/neuron-ui/src/widgets/Icons/Hardware.png b/packages/neuron-ui/src/widgets/Icons/Hardware.png
new file mode 100755
index 0000000000000000000000000000000000000000..53939e5f0a9911414a23f47227fa84fc4cbc513d
GIT binary patch
literal 14718
zcmb7LRaab1u$^JB;O-hExVuYm0t9z=cbCE4gG=BeI1Em3cXxMp4Q`iv|G|Ce?sd*X
zclGYQs#ou-id0gNLPj7!0002UGSc6bKga6-ZSb(4ebwJR{m<cxqqLR_0DwdFzYQp(
zOnLSB6X>EWB?f>@5FLMhKwF6Z5Cs5g;t^ksU;qGKOquVZs-D1eKg4QAEv=1@2mc(u
z4Uda<b`Nt;L;@)o2^Hf$5gN{J&7%KMsPOU7N7H5V#Zu4<BD*8LsHMvy$YILMB(PHK
zs(PldNGh|z8o=i}I*J$?;-xR<yzo@LT@3ziP_G*NsJiewKuMo^S$kJJuk-P!(zkJY
z_}g(;86ZfI*RY^%Q~Cet&daz$u>USj!!2AHI*uAHb#{Ofioc9SzuC^MUy$~s58QtJ
zUGb1K{g}JcBlU4T$lP|g6Hg*)^KC$#psVV={Nw3An-1@nIN<%HYt89H^7F0EA13rW
zZs6B4<`E;5g0J~b#jCs{xKF=Y9OwG?Xnyad-N58r>L(Kcuy<{P3f@`p#|Jp*qI_Fs
zPl-wV7@8mRNxipTF9mP>FfGsN?dcJ>G=v{tJ{(V5#`zbGSkA<7`O?ANj3;tzgeQvP
z_?-Uq8nT?7B}q{<2;?PkP2gWR9Qi0Q7<aVFnOI*+#1e_HW_OH*7@5+8s;dyhP^EIl
zFO0m?6{Ga|Hb$;3Z<;qkAN)7{;@_5onKQ&}3~DPW!3OOfi?gun-M=AK$SJl;mbFVW
z2@*)F2dgYBBF6p{FQjj5O{j-(y@TyC(2$UjAT<ALW5a+`q_oJg@vj<@abyJ)YOsSR
zizR?ecMLVO`>4Sge}5yp0*?d|bCnb9f{AJ$%@`xL(;tJaPc3xtj%v6eDbQCoDE=RI
zguQoZ5B0VsGe!G)c1I6aa&CjtKkHyU@8I#MrE0GlN)*n1f_&QJcY3yZ!cEc5M1wL{
z0N<Z+F8G`zpXcfK7Nb;YtU_D}_FHg{wt;3WwAJa9>!y&hXeXfpC*khsWwW+)l)77+
ztn~s_84B4OD+iDTd(iMs$MDfVzBrQSxryzn*SEtMBN*F#!0QNV=ZlR(z}xfS0)H<j
z1Mgqo2ppxtL<`jya4&aiAX1+0l5_n02uc*t3gxIKe@m-%FnA6J4Btg`H1AD@MID2X
zyvfAwDxnx>-MC`_p=sg@dT!3c|6x`6IQMnj{{`_hhx-H8R}KNWAq8|*PU1JIXq&y_
zJIjXxwh$)%v3(<T!Ja3x@G_-C2)M(LUTB%RL?zoi>CRgWztA>-k=Bd>o*5eu>k+8C
zj_Hwn<x?<S64`0HTBZ6~3iO=m%ZsZe>kG}-#)Zz?P5S7Xa0=C3=cKwuOrM6rk$66~
zg|2%3Tm1XM-!iX~2>h{pq!-}Y;&F0$UvpU4v$q5Ey}`Wz_Xoe^UdON+;($W*JK^;1
z^2de#VW(rlm=jR%H$n-bU=P88q&<A98ykSVv2Nf>AZ2ha9U9%4q#|~hkn0>ApAxEU
zmT4(qC}?OHIC#EibbuIKN^A?i^YY|1D9oZitNDfzNMIXi$O#JR*?L#K4*&k;hPRMK
zg()laxd`fgmbp^!gL8`Iv<G2%ocqJRcvdFYS^x!&WHi{}2@I@ats*4093dV?BF~y6
zQ;COW3iPHqLKHzmKPp$Ps6PlYq~U`eo*=Nbw-c>xfNg>RHdJ6tEb=<$cQwG13aExA
zCLr(CQ>6-<tp`=$&n=DLxlDjy2$e-D3QPo_k_#h)OW&XPO%*`3&D3?uG}ce#-I=n1
zGP^)p+nFgaPyUVmq0IY9fZK8KOO@~&aVI=-ZHn<$!1L28<T8i<t}DZ|IDCpV!+=O(
zt3deqROD8mnn1;?qkBLr{@56oW}%5>XbW%t#DZ>e@42Zc1-s0u9B#yOYL`_5p`^18
z<y0pNuxc}f?~2@dm?cQz)l!DGXR%;t;z#_vN|@kKvRjt06~@Ok#~B%wm*r^BcsmA>
zU=u8-jHsz^<?f(N+lDI(J2fFK;?R(9V<8=La&=4>JQV)@0+|#Qw=Kl;bTW6$@wOFQ
z6q(`j-eRRO$2Sa$aXR~gMWpk}8oX(dLW(#@yDV%Pwfbf_We8R-2=wcPACmiWn-$bs
zSwI)$%N5ppOY!qAJg9g7%cNq$<gz4G?>MsN>N3>I1^&GUhRi6{it;AExEiKy=8C8s
zxgI8#bte<UdZ0aOQ<z0bVtwIA>@+7|=~(9kqMN0Q4fizL&bK`BMrDBdgQFBT3y;o0
z*>!5(KNuHDtPQvwfW&0(S{B)kkq(M{oA@rz)E6`mJ(Dy8a#{`_stk{C2T9uGM4~f3
z5pmB>A}Fme0X6lTh&pCIgJX+bUU$WvaJF(x6+-XIY*lD++rOuTtRkX}cqZRx+=F3y
zeRxvO@%5_*HcN0N7C5=rl%F>z!Y?|SB2VNOphf@y2Zcz1$b=G;gl#hsC~^Rq>YE9U
zfF|Sd)YCLBeU#Q(VVJ(5PoioAYr%8@;zgO6+ug4k!V-rW^s>J)6qRY{rUgo&swSTc
zY#I3C;25+aakt;YAz40=x?A1y8e|9Dt}BM2ih>vdv1?7i#r#XaVzGuFOlMxa-Fk8p
z3CEFmzS~4K<rug?6QMtjF`RfN1IV>x>C7BwZG7t}l$~CRq$->0J<!Cby<a1qds~;`
z`%(}V!nYz9LY*%ag+a5oJ_*S?MsyiG8k^6_cD;W^J_!I=)9bB^v?#bqEJVEoX%t^5
zRvTl*dujF&7?I@%3J6_Lc13iHdYce?t~FDMn4%beR3e6BxH*OOFL%v?&|)qTQVrdG
zh+l=C>Px8=e#{}1ygc}mJ2J!IT(}w{5*X9NZ1odCe#obu7bt^Aib?_B^@5{>n{J-i
z{Dug%gosSOLo{e-5@^(l>G2?v4>8d*mxL1uYVB~zB|r1Rj!!utG0YwQsq<9i(g#vD
z`fd&&Djva#casIY<7Q>RMb$RDU&G<6PI9Q>f9WapUzDT_;SCuc{(DSbJLba`(7}vG
zYf_LPxA`ta^M{0#8(E;_<dDy?g~*xl(imltg0Nt%rvWab&jyJ3*Lj_{zgNZJY(ExX
zwnZ5*ao{@PL(YIUbKFB3kB?XG+S?=1MRrhRED?Cd4#7f-(aO5@?0aTV2;WXvtlo4}
zT%4z=NsU7kd0nmX(oGPD`yw1Jbupn5Qp3w2HNl#?pnm2)A^v}epL)0l!>TiJz-+i0
zpk^8~z|PZU)?rvQF41XYFrr1&6{DW@jx-g#{nWgG+Iw=G>Gepz`WlFFbD?7GS_W=I
zSVLP_#Ok}HM~wPX&f#!4$2T;}w5#`ed3HO6rb7#$55IIX!*%egvp{HD_C(2sGr@sP
zh|Q{wKb=NnDvQ@TN=Ii@A)kNr7su91`O0>aF1k)Wz4ad%GhMcfQ*h!a$S?+V`c5N5
zP{?C<#m4q9n&G0@K4{=yUnLUQ;IV$OvQ&K)0*Y<?=ZF*usQ3lwmX+o;zZu)rga_S*
zut(HzzVt@4ijUJxp=l;SSATyd>#Za0N@+4NCvh122SKNyjK2Cd2vgY6zO}0?=pK18
zjo8l`(tNqfMDj^UGr+6cgTM<dF+;dUb1of0F;y>%61q)Dh@{Mx2#Rs%k6Koc5(UeY
z*H>FUHze)ZbcC(s8PNrdI}&I^n6U3aSB<^^ILW)IV!nekf~--j+^UQFOy;aU=2*jf
zpZHhL)d-*exH3!?*_b#M#xoTT!3iva#of~X1@4q-z8^A}mrqq7kP8qxqb;z|tui+9
zM$4&Fp}ygn8nGx?#>nUqvh!GI=rsKd+kM(wBkYR%&k?mTyx{@K!WEsslpeHo;qFXV
z!@epjF3n5|69hBJAbKk6m~XhBE()5;pCLo6NsKpOvvkv>21AF$gldwP$l_ioU>-i&
zn5hZV%Wval2I)3S1_-rkkRdjuDMtmG92@p9RkJ>8td0P9R*Tt*rF&vEP`zB=*|IKF
z=1X*$eFPEq+7aR$eu|(J29cqxchxJ00pyZ_P^I_Ux&(2|<b0%>@1A^2!dtg=0j)gc
z)yXiNScV8zK@6U~DywA6tNN?j*It$hpJ&U@@5omJTGrd8^w~?OVf;>*Z$tqO%kCU0
zmVw$(o8n!<;2)&IuD60e4^(jK{qntpr;UMMt#nr`xfSkAcd!fIt&AIhLq3F&WG2RP
zebqwjBuwMWBpUpArZLGI$*~&^d2`&tzklW6U4ssA))e=Sro%&qY`~)`aQ}+0>~%??
zeDzKJ^Pt!gNlD<GL>9is$>Y>u5RM`<W%;(a$J3Nh_O|N$7vS+Xtmu>{+o7sCJ}qCg
zk*$|D`G;p_DjG@%Y+v0kwYrr*2d+qGu~sGzfOD&@Bm8CYT|>9S=tr$ZXQf{l9NPgU
zH~r|We!2g>Iu;-lXryOoW?%3m<LzXw`9Uue9=o*G9aJq^$o98-RxgFaE|0LV6uMH2
zF5}6fQdfMF<thXGfdkjU!^^Au5mtiTj-^akHT%)!=Ge}Ubl!_P2&K$(>YPLOk6FfF
zid+P+6IK?_ojEdj+bc-?)vk4ZQ?q=7-)-U<dAN6qOa~u!09uh>Bef&{$rR<-lR&Ld
zsD24k6V^tPmZJ>-_4EWwCc_mch;ZMmj-Py9j)Rfl1Qx(y@03rY^9oIG<_s&P<9vOB
zuP~vs^dj*&{6`J$d<R^~U1tB)k6`ZS%h^LRz9L{i8Ayo7jWIJB*D#YW0p`us1P*(G
zlm^f#BMvKC1_%PL82KOca)^t4ytcobjhaZH=MLfr&%pg@*_qI6qA}b(gJiUcqN&y`
z^cCN?7=*ws%K{z`xZ47x0zH!dcHxGru%Bn0N)Fp;da+;;OH8)cT300_k|+%Y6!28-
zpy#3St1VUN-vHRo<MOGmXlnw6h~^G_fBKgxhv~I_#M#g$*9Bfkl7KTP<<2PYb~iNE
zXVdLX?dXA9byWm{f;Hu?Ja3Yzeu6-B6F!qhCJ9Zp2!Shio`VTQ^6V$hxeB3BS<tua
z)A&Uerpe#*-%Sgykoi!I0m9H2c0wf>q@mNc;D+PKx4tS`647w;mVj7exb&VQdrv(I
zY8O78FMxOy91FU-MBHdg!TK4RAoAK~4rMv@^0&N5DkL7oTQM>MB_t6c;v{7D+kUVD
z5;bJHp9&Z$CW-DC*bh{j6lW0q4}~O=wz0DJxL<R`AT-1Yl{7f)6Qrijz+!%(@_pnS
zVRy~acinlti*ogkq`*_grXf6OrSH8x`2cd^frj#O-Vu2<FXi{Iml6q!jUhkm2Iw|o
zG!+us6!qgo=g<p!D<2BV>3XqV`roElJ}t&YY*RnggAhx_pFizFl^n?2>T^F`1>L7m
z)5~j6!QKA@H;A`M9}QZYL}Lo3K@lbF8@;T?(cd$~IseNThE?aq1JY6K>9$=EF1K&-
z33i~`|JHwxTFa>x^dDe%Dw?H14QWgPII>AYj+fMov(4g%8bd6ILq?DgCI+xbVm-k`
znn2xd0iM@mB2DrbW-=^<_+OmRnuA?2ZsQ%6V1doN68NS}z|Je%9Y#yMcz*O{EPqui
zKaxjK&)dlTt)!c=<>xLuqW8*mP5P&QaOuIPZfn=lVbZ0zQbAkrb;8-acA)J67MIt8
zyHxIG^4HKkH)s)rQMf0p)KdFiczqW4F~8!YqdLahKvgSSoVLv7vzSP?)<ygLA3U>w
z-0Y@`7X4r=STPH+_JP=P+rN|FVQT(tfyIS|kwv|Ee8s;|Ms&%=N-HD?NM$Q#BjW35
zsKwFukXQ;0$}@u&SMd<csj{1lv7XNKNMUcTXeIjF?E3sl-RX>6w(A)s_vy*^l;Fy2
zF(tjRs=2buWuJn7t;%yR6v~j5ooSjN2(&oT6vn3e{S;;SGVtyG8$=vZXI7=ri1|k;
z$!mU7Zyy9%Fg{uOIb9Mcu%ZstmA<3JjqyW=FIU{jbkj<#R(5|?ACCP8kz6RiGG+;n
zuG20^)FdsC$Ov(2ND`|StkepQj9nSjYA>StMTAX#qX9beURGoI0@P%*^oAjsLVT+U
zI_<G&os<1^14%;JZjMu_W%hfn9ObAn`D`e~-%q&Al_n!Nk;&2HRf{0n?y;0!B;Ofm
zGd6OVcc8SUbcx!oshmXvV|T?sWUFvNq4|<CkDxt%Hn2hG%I^>RcNoibPLeL>x2nqy
zl$zPy*!2Es=(R0(lQBeq0wok_lepSco@vL(O(|NL0WLKq)i?2h+P=fk56KAXc=hst
z>Aa{PSZJhZCuPsdaYMVBq~$zPaMHgJD_eOPCe6N-{(gG<n_~}r{cd+kWyOoK<eb)A
zWAZXX<jOFlU}y*ts8)h~)ke&1DB)YF5C~O!OIn4A4&7DFI;vg9r@0FPaBadtMTiDn
zNotP$aqi2&#+hz_KTzNH(Gfp7$^S*k%Rjlbb<vttL(TGc0OZ+0GZ8VIeL`Ja*KA?<
zz9g2SkYfGIX5vO5f`G67*EG)~rAE-^WVy9g4*OOeteF;zk}Px?4qhh~R{Y>Q%t0Dk
z_@I$P27p$?b^VObTSr!iQeeRuvGpGf#}onTmIAIKA%LB^Z>I*-?SBy%8U96$@uaai
zM)M%NQnd-MW;3a}!4_Whzle1#FJhKzJ_{cqxe#_I>B(<j5yY?Lhk_zsbNkYor*S>T
zVQAPav*E;ac7bc>R2HLuF+!t!{#iDq<w|_r*<)gkd2c$69*u8Fv0LMw<E*eokjp4e
z;NIB!&$2L478qe2p+rA-WRMH#l+<=+7MWwhDjW{X{@3~w$k3Tg%P|30QF#rRU~7R?
zyidpBDqUnFN?}u1n8@Es&~)LU+?MfKi}e5e=|*aC<GBh95eQ(Dq0oMp|Do|Z@B5uF
z;&cyb#4I@h;es#y0`*vIU!TWnn!j$_WuVtI`4woH_eqyG|3iFVq7eUyC(4w%*gzi;
z!zo`Ee^^w#0lr51=s}sjK~9!*exr8PY?D|fV4=3*iWD@o!4-LU^9|OI2p27_5hM(k
zpN7pfp}F%*Snr%Nu*K<KRkdk^UOvfuJk({u6L9FlhYK(yT{dO9W4=219dzJ=s;D}y
zrgz5RUzh@dfm56}1+hR7jUCfgx2%MjuyQ#P_ZNpzaV(?>tu@yvxX-xJ!-JX`;@=3}
zwd5<l+cjY9$ki%rGSXt(d%1JmwoGO~$5&W4Ux!m^jdOaM76+D;0n=~+QA-TQ+{W_w
za*=uR_~@7+T4d9lEwqwi_aV06N**xtiSod={Ww6!xUz>!Y&Z9x1i^?{?WsPkU0?-C
z&oWC+t}6G9{BaF$1m6s_tKk;}^t_SWHd)ljknyDJYMiD!26zT!5;&32s!{}B{iB_r
z{T(FjrnW|w7YYIn=%k!pw`Ae86k;uS*X$J!fwN~^wlE^J3gJSSE6m0$`}cJrYR{;;
zgbPU~+y<s`r_eK+i1d_UC=06OP*|ie5fUY8lzVrq%agJ!lW=8}M+b6V@!k<T%)a?M
zwo+x%g+hvEJ|Sj4IGMF#v}zgyda|B0qx*M>XTT@Dk+*Q){;k9!bgf@~HQ*?i!Z5f4
zGRzj!ST#IXpwY48n-VD~H$94hP$|OPyW2b5<PSA2z7VWG1%*nYW`vnJ7b?*E3|QE_
z3~(X|$Di(_IV>%#59QeLqXgAdujszsX9eV)4|)E_)nfHJheBnG6xdQ)00Y)ThEocf
zVAW#`zJ?3G2a>CG6LO+}vVuLAzA`zDS%}5?bv;Aj01%av7eaz*U>9UDx58<DW3MYF
zHLR;U_`tXSXsw{5*XWPA2jq8XKO*Q90JB~BibuFzw8aH6P4qjK2t}G=PY9$~ZTiWu
z8?5)cT_ogkyZ7YO7_yAPe{D>G(xv1i!eXK18A?tP^A1L?`i22GilJIH%3Dq9?wPrp
zQMsw8Uu^U><=~k`#4D!(>XcqwF?{r*Y@J*Bwv6RJ0A;{X(~*`ijW%T4Dmk??Gj<x!
zKs1<vhIgxGCgfv`zGn@DjFSi+jd|&2U{I)8{?2iz-9;K#CwGsnDe#<xvldufIc-xw
zdm*^HF?QUyca%7qQu8<4#+b!fX<il)2Q|7#IacG&Qdh9frAef67!kfPgodOd(D9Fz
zOl_H*gVtZ3_}`^Q*9L>z<`f!bC364JIOa0XC9`&s-`gE=>Pt@~?|liMY)lR+XM=&_
zY9ZI%T=1OoacqoV_}oe6*?(v8UEW`N?z~0?1*$y|+z2DEh8&nTu)M5AyPMFcw$EnO
z8uF|LzU1XE*dhza=WgRKX+FK{56TW!rXjw^lw4yqkLl9flAhvc3Y(%>5BfV1sBW{;
zGOw}7`rD6Pp|k;Nu)Yvz=7#qWcE?}$?6Bc@sGN3=yDX-&M;&?Jv}u*sy4W<rGHt2$
z)LN1p%g2|Z#F)=XJfYI5F+%6iW^wrDA(<$OO}6F6;4jdN&=g=EqtDq`Lm6T+1-r);
z2B&?cQIiJP4N-8LUIRxxct~UrveLF>Rgrwp-5K#IgAc|f-4|?OCFc<byUPB$N`(as
zB_6PEqKP0f5vjV>SpNAgB~A{g;%@$aMTWzZ%0}^L4<G^PB2>o+BLCgUa+3*FLan>r
zP(5Hb4&MSkS6X_U_gJ`#M(+KuY~seLPQS9hayhn%k~bEwY{OO{bZ$)Y02z0pV(Tx=
z6d7c}B$kM?2i$MdZCYlLq>r42jPiU#Z>jN8x0AR9Qxe2J8fS{b{3}+ncg&dDT~J{c
zO8;&A26C%a5*HH-1i8Vtaao#k*ESBYT|MZ3<hrG_6Qd};+3&5j=j8VIqaj7UvZ!*f
z><aNpHjP-n=DT=p?}f{SkK!=N7<&O3sFu5sj(tL-m5yomT7>u5Wyf^Wq$d{j+gR$p
z8V!nK?XU96;Gng;ZE6T!X<3$V;&e^Ey8h?Ajpmgi7tJ8xj<l(d-@^BSw~I{1sx8+?
zzYk!h3@X&x@LZ!&M9DKP)!6;A_D$DpD63laG!X#rZwOs71ovSLdjX6js8|VISjH2p
z2y_zLZDsn{Bj=bSK-?M)-zDsg`n57b2QjQ=F{ix73gm2K`6r(u!rXh6;@H;sr^|2%
z@0X{jF{&20Nx4OYsN81ly5d$_oJ~+H=K#{wD_v{dO#0n!hcG(iJ-zW_A?#8TM?Zpz
zOZ~&zh5@`dR&K_BmQP`;>x1xo=zd;hol+I6@e+5ub2s?-%cV*b{}%Q^movs>Nt?wv
zmNq@fFfttCOe`9vw7)_$(*6)CmMc9c4ZW63Zi;yomsnl(w*jXmaXA!gX-%KUE*8cy
zw@2$;o6&-M<5fU<mII*fDttXI(p!6Dt|rWS;4+E%^aPF4T#HVrXHYZYZuG@8nU%{_
z>di}pbK6?iun&R0b|nZ;M}<>=vFRVo=$qX?pf#j0nPc(u#;(zifM{VZRlX^`FLFQ2
zY`*ChE_yp&2mcOn<p}LJ2Il-UC-9tY2X)o6s9YugDL8b>Ks|8~3>xpif@P%X6*ncj
zr~L}DoHH(NVKT59qH_RHbE5?b<CVoob*zPinP<z7P59${sVShmMel?5ymIkc&^wL(
zZ;!!`#$iq;()bg-X#8ARuH@=mD3f2Oox6l%gMxSyVLYQoLRq5zJfTmfuo)|1a_l^O
zJmCKRf}1zz*=GDyt8`zEaNhug0zVl4d71x2b1BOJd2|3`>~cDI%P@zN23l!A1~Xqz
z<=i?zgy^ei`11f3xrvcaAZ7V8UIfGvMjbg;0^%KvUaqU#k-joeOFYfr3In5dn!M-z
zD!{SyNg9PoCQGr`?pio=2B`S==7rGi71*u|>WVsXi{(ZOqXq5RNvuPJR~4A&Yb2bJ
z&FpcksRs*|mNwM7b_&pQC>>Tw_wT|3kD~6*zZTx`m<;%v976LRQh^5FOeN=*8!6y)
z8LWt!jET=~?Fxf*2V;9Gfmorzp50(F-X;=v(4yj7<+rDoEslmby47Gw?wwDQ{z&Iu
za8~!SL`0z(bK_j%NZg|#C8EQx52l&9$;$+zAi)x{@H7AkLxkGvP<XodB`G;D`d`^$
zJdyoX0MsffWE`tDrOA3kz1#bvBklj0#na)br~&49TX4YFJt6cs%^7w(h4CqZ`{7H1
zCHSj`-3+Oi;I8}cd;4;QflHTN13$P4VDGh;S%q<8vm>`FY5+wcxdbFiB}AhR6K#}n
zSG&?38TPBjZBb037dj$sr(6p?sy}cO>oTH-SvsH3AU+8xtd5OooDm?SL^?8?X7)_{
z$bxRgsA)IkJRcI|N7Q>DQ;ZR-fk?g(&o}9mcjkY*bhfOD$dBkb7am*j1a7bDi6kY-
zy?2|px_J5?$YXP)mwi*Imtwmc(cP6bfB}1F9Fs^TAjEcSUJj`!xj>&GfJ?Nme12~1
zXR(h~3gc}sQk!TMRQdh>{IAaBT;ul~<l9nhXzyQafLgJdze#Kbky`9prvcff2@@7&
zN;G}}{?NMx6w=Hjnad0rP~H~W=>rasMu*pXhaii#GYRUPpf;Lo+NyxI2l!9ceA&Vk
zzWo8}CpuljR)+~RHA6=WYIGaZU_>Gpc;LKc(v3)uKE0lba8cuAaSV^z0A-xa6eloA
zR{?Now)WA~2UT6CA06*3XdoGKB-F*$)`0ODZ!`Dfd-lQOhk)b2m;CMpX@KyX-r*}h
zE04<pas;bd^)pE!VpDZ`H_!MO=-9ordikeXOPOTrNJevM4^>Xwi6-4Hau~+Ze?IhQ
z4>6|%+LWT<SoJ0}VopG#2H=vqURU*I+@uE^O@}=i6BjN7k}CRhY41Ak@&`O5IOX=B
zqt)LT1-VfY>hVbaqja%}Gf>dKj3E=3_jSLU#P`S&b>eg&fdpY_7?FP=AjJRBYKC6_
z-mrXD!!8XvOqLl!r3boUr<1SR4FBP#Z(t?uGKK{>lr=dE!{Q`pPDN2S`d4zjAMdFy
z6|Dg!RE|$RC$jc28ZDXgtE>oB;HQsZJ_Ic{-k&`!dFONMRSpcf6_>fq>wOmA(uwmN
z9`*TxS4q79Br0Qs=!h>lX}vlb8TN%<u!lx;s8<B5AYoV4i;{4`Gdf2PZ-lik|FBve
ztTi&A9<<yxv^(Jx@hf^ae4%WtH<dzXjbw2NfVY9mVZ`30KZ}k9;79jiYr_nWXOSx=
z`GrCj;%yjz#UR>81|CtL81&bBIZ#DaCVsA5(_r4n@KRl-9&k>7_5L^fB0TuaNxiMA
zG`EVu);{3yy*d}sZYFwnrV~5Mfp+*N=k)XnA{QTcTXjN91;WlN2X~bF_Sm!wozdKr
zQnn|(sWHx;yBp%RvYff85efD`>-9cHYGN)^tIkxv4f82CT|kB^rt0g9L-Axzj39yI
zX2|@9`P&Qf%zfG3C(N(ZMTm2Yq<Wt4D9*4OgP^0`z_h{cz_H2r_*;{cEqs`XNN1Tu
z6FZ;xHU9y=YzQMxbf&8wJ!>|P>SpG;V(Fz(r|G+qMsO?QX-S4~pb7$5e7~D#ow!Sc
zm|pQ)A~R&Sea>jpTxW8c;)<<@I3u8Ad3|W*lll|ptjTg8tvXQy4qhLwUjwn&joT*A
z1HO_O;55bs{yaVUKAcHQWFt3wnAwEHF~2z?!8IdX+n+RRE3PCcIes*`u@czX-tpyd
zA?)6BZppPywn@I`WsFP~0jZ+0HS$5cw=x4zv`3>c@8Pw(4{rX+7Y@1$+{hzA8x?UT
z^1Mdqi5ehxG)TVSV<(9pl}gSWvYydae>{mJwJ<G2C}Fa{yGtBpe;nEd`o0a|_)eD2
zR!^U=(D=#WJw77*CQIJ!{s!q-OqTSZu(8>59O)l~`#nmZ+$yKDh)mn=REX-8LH<&7
zREHEoR4))=yv11PG}wk~gCA!#e7!~EwKFg|dT^y7mA1`I;)6E;i8b7XJTg=ePI!V#
z(JmzxK5iN8d?_G_fQ=_@PbCmf@l=E}r@rEGPZbFy3pR<hEeJl*&o^ZHFH0F5o`|1!
z8NudH+hV`zl*cr!9Me*hT|WNCfvJcwBZIrX_LrT4E!ZnZFJ-RNAUOpO<D*XHMwq`p
zEZUb%0vk9nx;h)*-qLRBmlVnAISDX&QF{;}0R(4!?Zfz$IJ#&xHdyxfEGDUf3KZq%
zc52nsUVC+|%02>(VN_n_ttfwUn735wz6b~q*6mho57@_$BO)8E5^5~Hy$ClvLUF8R
z@>3N2-l)rSrgHDtONRY-ZwO!IIl$djx}0xJ__8ozhU8wz_awJsAqXb{n_+FaFLQVI
zSMI#2CoukYH3t*>zmZ1c9XQGG`CSHM3T)ZO)J=6sEET-YH%4YZGy?l^7#3{O>{&6I
zZD+3U%Zx4MrhW9ePq9~RqNEGdvSo}#3jw3+4jKtlX@!N1*mR8)jHDPZT!nm!66>Xd
z5<Z1S*Xe#<W#06&)hc{}<7pk8_`LARPY!%sE&av7&bHRukKRmvlJqNP+;mY{e57iJ
zdzeK<E#L*jt}FWYv)h&3EbCf;EAah!r<a8mA)S`=TD3;8ObGE#00Eg{p9=g(CrJLq
znp5Y5gu8vA`rX}jr2D}$mX6_eM&)>4JDDFacsOYIo)yyXM3TG=Z?D@reOB`CYWaNa
z-RdcCl_--Efg<a8wi;?d6L2ZydLsC;NE~+%+<yS@CMyZ^=q|fl-=_9We%F0*byQRY
zS?A+frWUejsQG4EYp6iH6WQ;yx>WrR5In<Ad<3$3LO7OOK<^pAPFSJTJdV7})KI{=
z1DvlK3gnn9MwPGaw0Z2?s{emoZ_Z%IWKR6Hq}z|lC0>v}PNRV&z|X^3w$yAZDO3+R
z_2Td{9J_h|>QUqOo#3qws{O|;?|5fjms`1;64HN><8Ho34sYHo`6u}^qyfIe0$i+0
zL;lB5EXsNd$)y;<vR@fE%5A1jq4I^`j-e%I@yD<dChc?8oLzvyZ{ab*sRFG!QyzT#
z4t2~mA|7C4ugJGi4XB+c2ko~kqV9z=fW7}cVwt@t7pmesVM69dbMwXwC~*JbX?Xn;
zs-uSKlIY7!mFFDoG^%^M9Jj6gg8HENIs%;14gmZ|Nu~B(%+dJ<n!C3+=}0l0FXu2g
z?{NK!0R~#I-leQdP>qc`G!)8b`2Iv^9!e^M4y!KX#7Jf9XOf;=PAK0uwLAB1%}?PV
zH)Hk!pOo>6!a>Zkns#bjO={#3LqO$j;H|)-6Ri=}SKY9Q3v;cu3bxv0s|Q1bE#D{L
zR7Zb$Y5z|XCqdV)&o>XZ4xyi@JdEF@2N2hnD-p=>3Hw(jJt{L<?#AD$Q_~SKr@!jB
zD&oL%j2IVp0{MfHFKzaN$Mgi8!Oc*~L6e$K_6^zi^jj7Pj}-H?iL}FYEVV_Z?}>Cs
zQiykz2qCEg%~1Xt5>7>%;l&O)VO3r?e|wTWCM44&x{5gx?V85Phr-8Db(Oue=r@q*
zjpGl`o}yMqQ5`xzTtDV!-IMKZb%Kh%i+(ZwM#5778y!gfu<C-pBolKUTjrgmtPAf+
zBgEf?V2H1BZo=ZE(?vdyR71&3DAr-KW4s@K#@n)J_n+=BmCV5Ve}9S|v6!x)zWrO<
z<a<-R2>s+vXQ|5iDZj;u`RFn#m2i@u_chNln-TzB_?v&%r^*By6?m)$=5;@CpcF%r
zA0IrrAy2sQY-`dtbMq|HOEj(A4YaPJ%{8YQxObk+;FaQ>!aB_y$hs9xxcfMPVrRP0
z#=f%F2~6|r{cRnmiAMTjvyA+>@`XlJWbGVwN4M+^yX)L2Yz<CwC!JozxCIj~$xMm0
zy*)K_{b`=UKB{n%Dv9UYgigft{8u+8x=W;AE8H3n945K$ZVbgzH;cUppL*IW|6=<;
z!4pY?88tnYiCAY=R3m@ein(fxBF-7`WW0C=HA1mygZ4w7#~HjE@}TEd^X$UUd%b*T
zWbQ*VK*qO{QMfA(Ij=ttj98|)3l9nS9}aj9NhJFYo#%x1Z}1ffpE~BrHVrDapK8PI
z8yM5dHzl(xbN&ei;D*}L2YWbABd<#n;itBa-*s5?wBEOzvv^#KmgwnIVya>KVP;-p
z3#SQA0`W`YQ?NWZ7`=96BqH;M))3O2TZQv=0_e@@0fykSYR_<UL%-gq+LE=AdsRF@
zJg4E#DbPnfm`bg6vmZ<eMp3h)uT=%9{=!tD9l_K#cgMW(lhwC@!!;U$S*ciF2@PsX
z^2%4{L-WXj0pQl{aN7%ej2;^H+fo6tH#Y))8zZmhC|!s=pi#9V5X++PF4t6XQTA%&
zAOT7(&i_tLw27({;?i5HrqDtTuAHf6u8yjhzf;^fmlz1_e$`2*O#0znGSLHGgogte
zle#IOPAn#Wz|&iP#_ae5?x_rvP`Bz@o^N+`M1{mQf1HpCXbl8!RifDvvHyA*h+?C`
z{gtX*xNzI8sa^Xge&{073^oc1T>{|CW5p0YRcJ+6c`<q0GTZSBW-@r?K)DF@(O`qM
zZ6By9`WZH|k$X6b%fQc3?|`NI*CsQ7oCE3}hmIL<JJ~}f>NJTI$RA+>kd>4<rJ-u?
zsBL`&hv&<KZ2qy|IxdyaGF1!xFs%u{bz_;eGV00-WkqFDlzu=hUf&GCZb$(-veF7A
zop99~#q&{=VlD?u!tO;GiqO*fQb=n8q~{TTE&}#mWcrMCykn@SW}TI8F^5ldE<c4J
zNU4|0ltJ>kfj6=2v7ux(E8rW<+d-AVOOj-jh*$P!aDDT=BJC~Lx=(LLe&-sip?+VM
z>jHQ~mmPkn3|R7tH*tL(Ib*uOYg~{*tLL#<a{6(`EH90)aTG!pt0@rlcRAe>S(ksO
zn|mW0`*tT9_qWTFhGD3k8K8nh?kAC1fWTtAvp;%p*=Xb=SJ*tIjp(7S{p%x}ErLTJ
z4`3eiEy+8@@15vdpfPPo1)Zan@}JSlfEK>o-t}l_gY5=~FB?5$|J=Q(rEhm|FIuXW
zZGH>pR-%FD?KTxQisAC`KB#VBv2MRtpRCrE2NYo_T^K#v8wiAH?ZV=ztGdCT7{&o=
zxlxhvc&nQ~R>m<<R^c%o86dI`^`oF?&xSQ^yyX;e0U4Zuf06u(o6kDcJD=%Y7i&3h
zKlT5FF1VsS1veu`X_Sq6A6pM%FFpqEN@8x}z5;&E4l_YVU~A~AJvBk$4(OBFOr?}Y
zCVS~;uPV*dO%_ad{Cc`Z5l~Gv69&<<m>pezrZc^!;&#5OJn?+gU(CV#**Rg;@ydad
z9F*&W2c2~%v-wBk{R<EtU^#nm_X<`Rn&Bg#O397wa0L4p2=x-G@O{%*mxnXuU&Ma;
zUY##??zB5XeNI}z*b2DxNEQs0$}2)#Ji~oX*I0H_bHrzo?=%{ezM-C%#VfgE;u$92
zu{dr<cWYbfBXeWshE^Bpv*ca~EciB3Tn~SS$lHo2k{tgd09GO5Gubk_D(t~ZuQ=yM
zsn@>S7*>3%j%&w1ICBHhF*aw!9<W)8-cq>k)Ep)uQ8y5ZlxDV$1Io=!Xr;W3(d9Ee
zNN&zQDH=Bnjy;O=5cn8;C;FU|1mw{gkczu(;_ph}!R(X^#QKBp1MS)5oD4*I;su5%
zbFbDQc5n{DEyyLedXmWeVvo^Ut#w%no_~`^&BE`u?TRC@O6C3S&>W{7_x5_Y1-(21
zd{poq78NRrxAxF(4inW?gPT$#IAYZ?X@}*y;ElIYuVE&H;A6no@axfQW`9WD8@1r?
zifP&jJo~B~&l~=?3g)JoY&UOd8&yi|TD4zozw_r2ZFB}KsJq@iFp<^S=a;}tq|e1i
zM?^B33wuC5P}=pCvu+$&PvInp+*gArF^UP6yTtm4>3hBeqIG&N_=ruRq%pKI#Mo~2
zQepn*+631L|7}biqwA?~L$54J7te!WNDF_$^IKQ|ZS*(#QD1EGvE2j!b|`SYNe}ny
zOo2OdfTEsZ09GxJr%I~Ucyx!vkDadt&TXK=B16J^i48NP&i5?tiUV-Yt}PYNcd*X?
zs4hxRXn)OW#&$QnC!5zIw=xf66smN1nqnvLPjfHWp-Bh%yY;JE6?~HS`q-i8FJ0`Z
z8hS;9{2NXC1y6W(M(3AIX#OETj<6@@-Y@kj(AAA+(>thRWFBgE#%nZnOe`AvNwWow
z`4lgWctk`CU26Ah<TwbDIlhj-P;-fkle%NF=y}d}r5<#fKk;x}3t$r2drrLp+Z1-(
z?H%@L?v3WV5kyBQJ2Rks)>Es>>Iw=D0k^35NG@Z(73<j6)gdASoUlXa;S<;$37PeH
zS!}w@rK>W=xS&Kmuj?Nfgeeu(EN=u%ylPgl%W&}Ts9pHq6L;5_h7_19ZRVFIW1>@q
z=rCpNSnYBrK}%waU<)hzr1?@DSA857FVPBEczt-BZ@?jv?=dr&tpy}57@?o<Uy%FA
z@wL6(OKlz!#%tQ|$G+3lHdB+kPa9tsRD^4*a_33YE;zIr(qa$`PuZaoFQLp^bv<#U
zVNuDK-!sE-weeIcJj~XzWeSS&;#YgKnqneNzV^1-7fG1omYI9Kj_Le$@S@K))Y1C9
z5e}bTaIx{prDTRAM8$ez<f6**(<S@d!^dTJ6TXut&4RlwDH375b5L|imU=W`O$H0#
zM@z-*W8oIfh?I{^|5a^=tjdCTn!z4s=|x34T7*ee0-|l0PuFFqWP&}ADL49ZCx3-A
zH$xoKMyDI2EF*cJAzX=Aj<4$QGF)r*w$jVb<~uoG(`q|CR~JSvz?k;*$XlxpE&G8C
z!SR!Z=w3*Gy)IxFbs)PCNDGp$1KWQ>n@d$g{r;#MLf7pwERxcGy~=Kq>p?zl=*Ip-
z=mF&Zczs;>&tjXdIt8}6@$2X&_ow?ARy*Kyh`_yIFl0C)@Tr}rydDl9QyM$NV;2<W
zrsFwsm(fU<XL_Vx(*Nk3>#(<)i*dtWJ*9~f_8jDXKZ4t$tDc9uLi$J};Y(i`&V?Yj
zAGARMJAoxA)ZYPE%|!`2VFVT$PdX61%Q%@!7%#z{jz1kG_l=^i0z*ihjm&2E^9;=z
zZv$@k{l}36)h^kU0^rue+IX7thY0(z5XmgARe1I-(USXLHFti%0w=*~o!#~<yNrXB
zEjK^gF&N#9aiUX4Xf6TvGAc2WA?r=&nqH!j{-?E>lA^9c$HQ}j7n2V-2!@UqU^DD*
z+%3`j8e=!z8IOm0q&uo|8AlUdLR;22P7ndEwq`Q&8C$vh<}=jZj%E@S6T9Z5QO56D
zc4}^rJC0Eo${x`rub=Jptt0mG2xw^u>cdfV{{#+58YnpJukqTgS|vJe!~^@<w@8Nw
zpx=+?N6{A&f%dGC%#xnX70*9ZqQPb+zNzlW@Z-&I^i^+ry2pJTve=@l#RP7d`n^wJ
zvGdDOK!qK3??_Jnt=GirGlcx691*#k;RM$U<7cH>F~raMP?1UhUW1(5z?Ro(4M^gW
zPU)*-eV{<t_|XCWtIw#y^_r#+BhyxK#N}O7djy!}XSSNN{lFfNQGU9hffRPmS6;|=
zsBfP(yoy7g^7R++Wqq}NI8x8))OgL$`y&3y*DG<yl;z<BG(*5`xY2pNbNp<DFL|eP
zWKl`te!S?>U6cUgceO@W0fKsvNTmXb!bV9o%kSzmY&S{UCR6p}dL?1fG4@BbCWP}o
zKoeZQ-9!#G?1tf7y2W8gjS!wMoIO|(s}t<A7IB+HPR&+MQue%zmC%%P{Hy9zzO<B;
zW42{GsoAH1+GNu=-v24b;H5V<pziepk)IVXQQZH{nSt8KHB*r6wK>s;&N&BW(~dYn
zGapS-|MI5vUX>k#X)MZJ>hY4VS><9r>hCX<j3c+Y-Qdg4L(;VeoF>^%qaGVw{>G_U
zbhnzjyJk|#qX@0$%@Q>Bj5Vgkrh1YRMKsIB3}apd516c*E676Q+({{sFbkq0vhQ&J
zHSt4K2e}>&6Dr&|4iDC0f(%XY{S6@oo5dua3FwW%U4Kg}n8KD2(UunRNUKq5LE`c+
z+wItZ=_TVd$S=|f(Qce%DE*LZ$bydc9aF>)?4X_zA~#nB(vPdnr#YQ%x<*VG!=85^
zSJe3sb71|-l(l@B#pqNuf(V@xmH>il43;4rc=G+~IqT0y2B`6?oV8>&{#BCCZzmd_
z+tL10i241z`+or6)rAM)B9iNMlT7f%(v~SfT}ffrE)^)bFeNgD#tgiUpMyjWsuqa6
z;jeDFWHS$*Uw=0DpIfhZ+~w~)*}n`aUsFg8QA+izeMEKHzYzZ8#5>d<M}B1!=s6H8
zI^I2mm+?nu3>3lYjrWZ_@I<xZ)_G1#X+&AL726%hz7Ib|g>zI)D&fa=gQxCrlPuD9
zA3oLJ82b;$s#(7a6#HKHTA<!rk<VtF3&`!{mt*@k!>4!p5maf^Fc`r;aiQ+;S&^Kw
zfupguQJzp|#-_1{`{_TPhXKO3wU^-w3M3$UG^~15;mYOH61;AICusJUxaO`1pa_b>
zz3vOWxjF20l$=75LQRE842Sy?GG5ULXf)Ct=A_x*s6`3Ar3@V>{6SvfRW+Z!0duIU
zu-)}_Rk%vz<~es~lar_m@I2Me)Rdo0<%xN35KMQSgTK|=m(wz@qrUCPpEMS{`Jr!b
zPE_?gyEPAEZ{9{*O6qoygXwc+^LNv8v^<Z~M2{!`ew*}ls!HJD-oYP;eAMcC$FG)f
zl+>|?(e(w|L1ZU?<ekO#n=fgoiBac335;+aGhiZM`_+8D+0!ho;g-v?*)V-^{O=aC
z*|eyNr>8%t16}*p-56hUbzI7USLc<pBmc!MM}vApFsy<33}s8KygWg)4MG1)KnYkl
zGC*bdI5DDbwArr3<-cEu&&=GXS!QQy)s1)}Y=OU3RvtFRZ8j7*z&USQ?>hbh#~%Lb
zdS|mI1gdx3`R{me-s$IY6=dH#a~Ntw4jmQq{weIa8!HVI4QRCC;J?OiF8e>BirMr)
z5CAqW7gC!|tYZ_essRyIp`1%72-u*aW);9`9txRMu1xZ@A=OHg^dmNVAuf;X&+`wW
zx8Y!B-+%o9&esi6Q<>G}uw4@!5BJ=^kA;Mvn6wph*ZF&j-6!24;|Klf7GNE%%u8yC
zT9{tb0-_zlWA%#gbhinp53M@<ibgb+BlfvspQl!HZUuuU{l`O}DeZm;AHX27{i5jo
zudwfFbJoV=pVNu>qSkgTht?*@(twmzorj-=kGH>*J<plJZ-;4oJnXEd_2o~uqTs=}
z{4?Rw##%!7J0|EVL#2oFrf2KFgf^;uzop4d*TLATSMI45WgFltw_R1U*W-V^4(<0V
z2JIIE1<|vW4fS;ym+tO9E-S~jRD{to9m|YKvGvJ%tIKi|RNP(2PgowwO!v{haAZg?
zhiCqwav2z``LAaAzamckKdTD=uLN=Q`~%9@E~>_8Vyy48ToNE7q3|6dW*GE83S?V;

literal 0
HcmV?d00001

diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index 1f0bae8933..d442eaefe7 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -926,7 +926,7 @@ export default class ApiController {
         params: {
           outPoints: OutPoint[]
           locked: boolean
-          password: string
+          password?: string
           lockScripts: CKBComponents.Script[]
         }
       ) => {
diff --git a/packages/neuron-wallet/src/controllers/cell-management.ts b/packages/neuron-wallet/src/controllers/cell-management.ts
index 690de0d4c7..4e0ee8ce20 100644
--- a/packages/neuron-wallet/src/controllers/cell-management.ts
+++ b/packages/neuron-wallet/src/controllers/cell-management.ts
@@ -61,7 +61,7 @@ export default class CellManagement {
     outPoints: OutPointSDK[],
     locked: boolean,
     lockScripts: Script[],
-    password: string
+    password: string = ''
   ) {
     // check wallet password
     const currentWallet = WalletService.getInstance().getCurrent()
@@ -69,7 +69,7 @@ export default class CellManagement {
     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')
+    await SignMessage.sign(currentWallet.id, scriptToAddress(lockScripts[0], isMainnet), password, 'verify cell owner')
     return CellLocalInfoService.updateLiveCellLockStatus(outPoints, locked)
   }
 
diff --git a/packages/neuron-wallet/tests/controllers/cell-management.test.ts b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
index e1ad5a0623..eb5a357e29 100644
--- a/packages/neuron-wallet/tests/controllers/cell-management.test.ts
+++ b/packages/neuron-wallet/tests/controllers/cell-management.test.ts
@@ -155,7 +155,7 @@ describe('CellManage', () => {
       getAddressesByWalletIdMock.mockResolvedValueOnce([{ address }])
       const outPoints = [new OutPoint(`0x${'00'.repeat(32)}`, '0')]
       await CellManagement.updateLiveCellsLockStatus(outPoints, true, [lockScript], 'password')
-      expect(signMock).toBeCalledWith('walletId1', address, 'password', 'verify password')
+      expect(signMock).toBeCalledWith('walletId1', address, 'password', 'verify cell owner')
       expect(updateLiveCellLockStatusMock).toBeCalledWith(outPoints, true)
     })
   })

From 57b018e5d0284312bccec4fd0ba1fa65200a1082 Mon Sep 17 00:00:00 2001
From: devchenyan <sgt39007@163.com>
Date: Thu, 14 Mar 2024 14:25:36 +0800
Subject: [PATCH 57/68] Support "amend a pending transaction" (#3045)

Co-authored-by: Chen Yu <keithwhisper@gmail.com>
---
 .../AmendSUDTSend/amendSUDTSend.module.scss   | 160 ++++++++++
 .../src/components/AmendSUDTSend/hooks.ts     | 147 +++++++++
 .../src/components/AmendSUDTSend/index.tsx    | 288 ++++++++++++++++++
 .../AmendSend/amendSend.module.scss           | 201 ++++++++++++
 .../src/components/AmendSend/hooks.ts         | 154 ++++++++++
 .../src/components/AmendSend/index.tsx        | 268 ++++++++++++++++
 .../src/components/History/RowExtend.tsx      |  88 ++++--
 .../components/History/history.module.scss    |  18 ++
 .../neuron-ui/src/components/History/hooks.ts |  19 +-
 .../src/components/PasswordRequest/hooks.ts   |   7 +-
 packages/neuron-ui/src/locales/en.json        |   5 +-
 packages/neuron-ui/src/locales/es.json        | 199 ++++++------
 packages/neuron-ui/src/locales/fr.json        |   5 +-
 packages/neuron-ui/src/locales/zh-tw.json     |   5 +-
 packages/neuron-ui/src/locales/zh.json        |   5 +-
 packages/neuron-ui/src/router.tsx             |  22 ++
 .../neuron-ui/src/services/remote/offline.ts  |   1 +
 .../src/services/remote/remoteApiWrapper.ts   |   1 +
 packages/neuron-ui/src/types/App/index.d.ts   |   1 +
 .../neuron-ui/src/types/Controller/index.d.ts |   2 +
 .../block-sync-renderer/tx-status-listener.ts |   2 +
 .../src/controllers/anyone-can-pay.ts         |   4 +-
 packages/neuron-wallet/src/controllers/api.ts |   5 +
 .../src/controllers/transactions.ts           |   9 +
 .../neuron-wallet/src/controllers/wallets.ts  |   4 +-
 .../chain/entities/amend-transaction.ts       |  31 ++
 .../neuron-wallet/src/database/chain/index.ts |  11 +-
 .../1709008125088-AmendTransaction.ts         |  13 +
 .../src/database/chain/ormconfig.ts           |   4 +
 .../src/services/amend-transaction.ts         |  21 ++
 .../src/services/transaction-sender.ts        |  11 +-
 .../src/services/tx/failed-transaction.ts     |  63 +++-
 32 files changed, 1637 insertions(+), 137 deletions(-)
 create mode 100644 packages/neuron-ui/src/components/AmendSUDTSend/amendSUDTSend.module.scss
 create mode 100644 packages/neuron-ui/src/components/AmendSUDTSend/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
 create mode 100644 packages/neuron-ui/src/components/AmendSend/amendSend.module.scss
 create mode 100644 packages/neuron-ui/src/components/AmendSend/hooks.ts
 create mode 100644 packages/neuron-ui/src/components/AmendSend/index.tsx
 create mode 100644 packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts
 create mode 100644 packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts
 create mode 100644 packages/neuron-wallet/src/services/amend-transaction.ts

diff --git a/packages/neuron-ui/src/components/AmendSUDTSend/amendSUDTSend.module.scss b/packages/neuron-ui/src/components/AmendSUDTSend/amendSUDTSend.module.scss
new file mode 100644
index 0000000000..2ef4fcb512
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSUDTSend/amendSUDTSend.module.scss
@@ -0,0 +1,160 @@
+@import '../../styles/mixin.scss';
+$bottomHeight: 24px;
+$headerHeight: 72px;
+$noticeHeight: 60px;
+
+.layout {
+  display: flex;
+
+  .left {
+    flex: 1;
+    position: relative;
+
+    .addressCell {
+      margin-bottom: 10px;
+      .label {
+        font-size: 14px;
+        line-height: 20px;
+        color: var(--secondary-text-color);
+        margin-bottom: 8px;
+      }
+      .content {
+        font-family: 'JetBrains Mono';
+        display: flex;
+        align-items: center;
+        color: var(--main-text-color);
+        border: 1px solid var(--divide-line-color);
+        background-color: var(--input-disabled-color);
+        border-radius: 8px;
+        padding: 10px 16px;
+        word-break: break-word;
+        white-space: break-spaces;
+      }
+    }
+
+    .inputCell {
+      background: var(--secondary-background-color);
+      padding: 20px 16px 18px;
+      border-radius: 16px;
+      margin-bottom: 16px;
+      .addresstField {
+        font-family: 'JetBrains Mono';
+      }
+      .textFieldClass {
+        margin-bottom: 10px;
+      }
+    }
+
+    .leftFooter {
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      height: 80px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .addButton {
+        min-width: 216px;
+        padding: 20px;
+        box-shadow: 0 0 10px var(--primary-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &_icon {
+          margin-right: 8px;
+        }
+        svg {
+          g,
+          path {
+            fill: var(--primary-text-color);
+          }
+        }
+      }
+    }
+  }
+
+  &.withFullySynced {
+    .right {
+      height: calc(100vh - $headerHeight - $bottomHeight - $noticeHeight);
+    }
+  }
+
+  .right {
+    margin-left: 16px;
+    flex: 1;
+    position: relative;
+    border-radius: 16px;
+    background: var(--secondary-background-color);
+    height: calc(100vh - $headerHeight - $bottomHeight);
+    $actionHeight: 108px;
+
+    .content {
+      $contentPadding: 16px;
+      padding: 16px;
+      /**
+        These styles are for showing the full tips, because of content needs to scroll on the y-axis.
+        Then the overflow property that is set as scroll will truncate the tips overflow of the content.
+        So I need to expand the content's left to show the full tips.
+      */
+      position: relative;
+      left: -48px;
+      padding-left: 64px;
+      width: calc(100% - 32px);
+      overflow-y: scroll;
+      height: calc(100% - $actionHeight - 2 * $contentPadding);
+    }
+
+    .rightFooter {
+      position: absolute;
+      width: 100%;
+      bottom: 16px;
+      left: 0;
+      text-align: center;
+      .actions {
+        display: flex;
+        justify-content: center;
+
+        button {
+          width: 216px;
+          &:last-child {
+            margin-left: 12px;
+          }
+        }
+      }
+    }
+  }
+}
+
+.headerContainer {
+  display: flex;
+  align-items: center;
+
+  .goBack {
+    margin-right: 8px;
+    cursor: pointer;
+    g,
+    path {
+      stroke: var(--main-text-color);
+    }
+  }
+  .btn {
+    margin-left: 12px;
+    min-width: 30px;
+    height: 16px;
+    padding: 0 8px;
+    border-radius: 0;
+    border-left: 1px solid var(--button-cancel-color);
+    svg {
+      g,
+      path {
+        fill: var(--main-text-color);
+      }
+    }
+  }
+
+  .balance {
+    font-size: 14px;
+  }
+}
diff --git a/packages/neuron-ui/src/components/AmendSUDTSend/hooks.ts b/packages/neuron-ui/src/components/AmendSUDTSend/hooks.ts
new file mode 100644
index 0000000000..3b17fe22a6
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSUDTSend/hooks.ts
@@ -0,0 +1,147 @@
+import React, { useState, useCallback, useEffect, useMemo } from 'react'
+import { TFunction } from 'i18next'
+import { AppActions } from 'states/stateProvider/reducer'
+import { getTransaction as getOnChainTransaction } from 'services/chain'
+import { getTransaction as getSentTransaction, getTransactionSize, getTransactionList } from 'services/remote'
+import { isSuccessResponse } from 'utils'
+
+export const useInitialize = ({
+  hash,
+  walletID,
+  dispatch,
+}: {
+  hash: string
+  walletID: string
+  isMainnet: boolean
+  dispatch: React.Dispatch<any>
+  t: TFunction
+}) => {
+  const [transaction, setTransaction] = useState<State.GeneratedTx | null>(null)
+  const [size, setSize] = useState(0)
+  const [minPrice, setMinPrice] = useState('0')
+  const [price, setPrice] = useState('0')
+  const [description, setDescription] = useState('')
+  const [showConfirmedAlert, setShowConfirmedAlert] = useState(false)
+  const [sudtInfo, setSudtInfo] = useState<State.Transaction['sudtInfo'] | null>(null)
+  const [txValue, setTxValue] = useState('0')
+
+  const onDescriptionChange = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.target as HTMLInputElement
+      setDescription(value)
+    },
+    [dispatch]
+  )
+
+  const fee = useMemo(() => {
+    const ratio = BigInt(1000)
+    const base = BigInt(size) * BigInt(price)
+    const curFee = base / ratio
+    if (curFee * ratio < base) {
+      return curFee + BigInt(1)
+    }
+    return curFee
+  }, [price, size])
+
+  const fetchInitData = useCallback(async () => {
+    const {
+      // @ts-expect-error Replace-By-Fee (RBF)
+      min_replace_fee: minFee,
+      transaction: { outputsData },
+    } = await getOnChainTransaction(hash)
+    if (!minFee) {
+      setShowConfirmedAlert(true)
+    }
+
+    const listRes = await getTransactionList({
+      walletID,
+      pageNo: 1,
+      pageSize: 10,
+      keywords: hash,
+    })
+    if (isSuccessResponse(listRes)) {
+      const list = listRes.result.items
+      if (list.length) {
+        const { sudtInfo: info, value } = list[0]
+        setSudtInfo(info)
+        setTxValue(value)
+      }
+    }
+
+    const txRes = await getSentTransaction({ hash, walletID })
+    if (isSuccessResponse(txRes)) {
+      const tx = txRes.result
+
+      setTransaction({ ...tx, outputsData })
+
+      const sizeRes = await getTransactionSize(tx)
+
+      if (isSuccessResponse(sizeRes) && typeof sizeRes.result === 'number') {
+        setSize(sizeRes.result)
+        if (minFee) {
+          const mPrice = ((BigInt(minFee) * BigInt(1000)) / BigInt(sizeRes.result)).toString()
+          setMinPrice(mPrice)
+          setPrice(mPrice)
+        }
+      }
+    }
+  }, [hash, setShowConfirmedAlert, setPrice, setTransaction, setSize, setMinPrice])
+
+  useEffect(() => {
+    fetchInitData()
+  }, [])
+
+  const onSubmit = useCallback(
+    async (e: React.FormEvent) => {
+      const {
+        dataset: { walletId, status },
+      } = e.target as HTMLFormElement
+      e.preventDefault()
+      if (status !== 'ready' || !transaction) {
+        return
+      }
+      try {
+        // @ts-expect-error Replace-By-Fee (RBF)
+        const { min_replace_fee: minFee } = await getOnChainTransaction(hash)
+        if (!minFee) {
+          setShowConfirmedAlert(true)
+          return
+        }
+
+        const actionType =
+          transaction.inputs.length > transaction.witnesses.length ? 'send-sudt' : 'send-acp-sudt-to-new-cell'
+
+        dispatch({
+          type: AppActions.RequestPassword,
+          payload: {
+            walletID: walletId as string,
+            amendHash: hash,
+            actionType,
+          },
+        })
+      } catch {
+        // ignore
+      }
+    },
+    [dispatch, walletID, hash, setShowConfirmedAlert, transaction]
+  )
+
+  return {
+    setPrice,
+    price,
+    description,
+    onDescriptionChange,
+    fee,
+    transaction,
+    setTransaction,
+    minPrice,
+    showConfirmedAlert,
+    onSubmit,
+    sudtInfo,
+    txValue,
+  }
+}
+
+export default {
+  useInitialize,
+}
diff --git a/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
new file mode 100644
index 0000000000..9ed69091e4
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSUDTSend/index.tsx
@@ -0,0 +1,288 @@
+import React, { useEffect, useMemo, useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useParams } from 'react-router-dom'
+import { useState as useGlobalState, useDispatch, AppActions } from 'states'
+import TextField from 'widgets/TextField'
+import PageContainer from 'components/PageContainer'
+import Button from 'widgets/Button'
+import Spinner from 'widgets/Spinner'
+import { GoBack } from 'widgets/Icons/icon'
+import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
+import {
+  isMainnet as isMainnetUtil,
+  localNumberFormatter,
+  useGoBack,
+  shannonToCKBFormatter,
+  sudtValueToAmount,
+  sUDTAmountFormatter,
+} from 'utils'
+import { DEFAULT_SUDT_FIELDS } from 'utils/const'
+import AlertDialog from 'widgets/AlertDialog'
+import styles from './amendSUDTSend.module.scss'
+import { useInitialize } from './hooks'
+
+const AmendSUDTSend = () => {
+  const {
+    app: {
+      loadings: { sending = false },
+      showWaitForFullySynced,
+    },
+    wallet: { id: walletID = '', addresses },
+    chain: { networkID },
+    experimental,
+    settings: { networks = [] },
+    sUDTAccounts,
+  } = useGlobalState()
+  const dispatch = useDispatch()
+  const { t } = useTranslation()
+  const { hash = '' } = useParams()
+
+  const onBack = useGoBack()
+
+  const isMainnet = isMainnetUtil(networks, networkID)
+
+  const {
+    fee,
+    price,
+    setPrice,
+    transaction,
+    onSubmit,
+    minPrice,
+    showConfirmedAlert,
+    sudtInfo,
+    description,
+    onDescriptionChange,
+    txValue,
+  } = useInitialize({
+    hash,
+    walletID,
+    isMainnet,
+    dispatch,
+    t,
+  })
+
+  const priceError = useMemo(() => {
+    return Number(price || '0') < Number(minPrice) ? t('price-switch.errorTip', { minPrice }) : null
+  }, [price, minPrice])
+
+  const inputHint = t('price-switch.hintTip', { suggestFeeRate: minPrice })
+
+  const handlePriceChange = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value: inputValue } = e.currentTarget
+
+      const value = inputValue.split('.')[0].replace(/[^\d]/, '')
+      setPrice(value)
+    },
+    [setPrice]
+  )
+
+  const toAddress = useMemo(() => {
+    if (!transaction?.outputs) return ''
+
+    const list = sUDTAccounts.map(item => item.address)
+
+    const to = transaction?.outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+      if (list.includes(address) || (sudtInfo && !output.type)) {
+        return false
+      }
+      return true
+    })
+    if (to) {
+      return scriptToAddress(to.lock, isMainnet)
+    }
+    return scriptToAddress(transaction?.outputs[0].lock, isMainnet)
+  }, [transaction?.outputs])
+
+  const getLastOutputAddress = (outputs: State.DetailedOutput[]) => {
+    const change = outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+
+      return !!addresses.find(item => item.address === address && item.type === 1)
+    })
+    if (change) {
+      return scriptToAddress(change.lock, isMainnet)
+    }
+
+    const receive = outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+      return !!addresses.find(item => item.address === address && item.type === 0)
+    })
+    if (receive) {
+      return scriptToAddress(receive.lock, isMainnet)
+    }
+
+    const sudt = outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+      return !!sUDTAccounts.find(item => item.address === address)
+    })
+    if (sudt) {
+      return scriptToAddress(sudt.lock, isMainnet)
+    }
+    return ''
+  }
+
+  const items: {
+    address: string
+    amount: string
+    capacity: string
+    isLastOutput: boolean
+    output: State.DetailedOutput
+  }[] = useMemo(() => {
+    if (transaction && transaction.outputs.length) {
+      const lastOutputAddress = getLastOutputAddress(transaction.outputs)
+      return transaction.outputs.map(output => {
+        const address = scriptToAddress(output.lock, isMainnet)
+        return {
+          capacity: output.capacity,
+          address,
+          output,
+          amount: shannonToCKBFormatter(output.capacity || '0'),
+          isLastOutput: address === lastOutputAddress,
+        }
+      })
+    }
+    return []
+  }, [transaction?.outputs])
+
+  const outputsCapacity = useMemo(() => {
+    const outputList = items.filter(item => !item.isLastOutput)
+    return outputList.reduce((total, cur) => {
+      if (Number.isNaN(+(cur.capacity || ''))) {
+        return total
+      }
+      return total + BigInt(cur.capacity || '0')
+    }, BigInt(0))
+  }, [items])
+
+  const lastOutputsCapacity = useMemo(() => {
+    if (transaction) {
+      const inputsCapacity = transaction.inputs.reduce((total, cur) => {
+        if (Number.isNaN(+(cur.capacity || ''))) {
+          return total
+        }
+        return total + BigInt(cur.capacity || '0')
+      }, BigInt(0))
+
+      return inputsCapacity - outputsCapacity - fee
+    }
+    return -1
+  }, [transaction, fee, outputsCapacity])
+
+  useEffect(() => {
+    if (transaction) {
+      const outputs = items.map(item => {
+        const capacity = item.isLastOutput ? lastOutputsCapacity.toString() : item.capacity
+        return {
+          ...item.output,
+          capacity,
+        }
+      })
+      dispatch({
+        type: AppActions.UpdateExperimentalParams,
+        payload: {
+          tx: {
+            ...transaction,
+            description: experimental?.params?.description || description || '',
+            outputs,
+          },
+        },
+      })
+    }
+  }, [lastOutputsCapacity, transaction, items, dispatch, experimental?.params?.description, description])
+
+  const disabled = sending || !experimental?.tx || priceError || lastOutputsCapacity < 0
+
+  return (
+    <PageContainer
+      head={
+        <div className={styles.headerContainer}>
+          <GoBack className={styles.goBack} onClick={onBack} />
+          <p>{t('navbar.send')}</p>
+        </div>
+      }
+    >
+      <form onSubmit={onSubmit} data-wallet-id={walletID} data-status={disabled ? 'not-ready' : 'ready'}>
+        <div className={`${styles.layout} ${showWaitForFullySynced ? styles.withFullySynced : ''}`}>
+          <div className={styles.left}>
+            <div className={styles.content}>
+              <div className={styles.inputCell}>
+                <div className={styles.addressCell}>
+                  <div className={styles.label}>{t('send.address')}</div>
+                  <div className={styles.content}>{toAddress}</div>
+                </div>
+
+                <TextField
+                  className={styles.textFieldClass}
+                  label={`${t('s-udt.send.amount')}(${sudtInfo?.sUDT.tokenName || 'CKB'})`}
+                  field="amount"
+                  value={sUDTAmountFormatter(
+                    sudtValueToAmount(
+                      (sudtInfo?.amount || txValue).replace('-', ''),
+                      sudtInfo?.sUDT.decimal || DEFAULT_SUDT_FIELDS.CKBDecimal
+                    )
+                  )}
+                  disabled
+                  width="100%"
+                />
+              </div>
+            </div>
+          </div>
+
+          <div className={styles.right}>
+            <div className={styles.content}>
+              <TextField
+                placeholder={t('send.description-optional')}
+                className={styles.textFieldClass}
+                field="description"
+                label={t('send.description')}
+                value={description || experimental?.params?.description || ''}
+                disabled={sending}
+                onChange={onDescriptionChange}
+                width="100%"
+              />
+              <TextField
+                label={t('send.fee')}
+                field="fee"
+                value={`${shannonToCKBFormatter(fee.toString())} CKB`}
+                readOnly
+                disabled
+                width="100%"
+              />
+              <TextField
+                label={t('price-switch.customPrice')}
+                field="price"
+                value={localNumberFormatter(price)}
+                onChange={handlePriceChange}
+                suffix="shannons/kB"
+                error={priceError}
+                hint={!priceError && inputHint ? inputHint : null}
+                width="100%"
+              />
+            </div>
+            <div className={styles.rightFooter}>
+              <div className={styles.actions}>
+                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                  {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
+                </Button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+      <AlertDialog
+        show={showConfirmedAlert}
+        title={t('send.transaction-confirmed')}
+        message={t('send.transaction-cannot-amend')}
+        type="warning"
+        onOk={onBack}
+        action="ok"
+      />
+    </PageContainer>
+  )
+}
+
+AmendSUDTSend.displayName = 'AmendSUDTSend'
+
+export default AmendSUDTSend
diff --git a/packages/neuron-ui/src/components/AmendSend/amendSend.module.scss b/packages/neuron-ui/src/components/AmendSend/amendSend.module.scss
new file mode 100644
index 0000000000..58bd47f31f
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSend/amendSend.module.scss
@@ -0,0 +1,201 @@
+@import '../../styles/mixin.scss';
+$bottomHeight: 24px;
+$headerHeight: 72px;
+$noticeHeight: 60px;
+
+.layout {
+  display: flex;
+
+  .left {
+    flex: 1;
+    position: relative;
+
+    .addressCell {
+      margin-bottom: 10px;
+      .label {
+        font-size: 14px;
+        line-height: 20px;
+        color: var(--secondary-text-color);
+        margin-bottom: 8px;
+      }
+      .content {
+        font-family: 'JetBrains Mono';
+        display: flex;
+        align-items: center;
+        color: var(--main-text-color);
+        border: 1px solid var(--divide-line-color);
+        background-color: var(--input-disabled-color);
+        border-radius: 8px;
+        padding: 10px 16px;
+        word-break: break-word;
+        white-space: break-spaces;
+      }
+    }
+
+    .inputCell {
+      background: var(--secondary-background-color);
+      padding: 20px 16px 18px;
+      border-radius: 16px;
+      margin-bottom: 16px;
+      .addresstField {
+        font-family: 'JetBrains Mono';
+      }
+      .textFieldClass {
+        margin-bottom: 10px;
+      }
+    }
+
+    .leftFooter {
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      height: 80px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .addButton {
+        min-width: 216px;
+        padding: 20px;
+        box-shadow: 0 0 10px var(--primary-color);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &_icon {
+          margin-right: 8px;
+        }
+        svg {
+          g,
+          path {
+            fill: var(--primary-text-color);
+          }
+        }
+      }
+    }
+  }
+
+  &.withFullySynced {
+    .right {
+      height: calc(100vh - $headerHeight - $bottomHeight - $noticeHeight);
+    }
+  }
+
+  .right {
+    margin-left: 16px;
+    flex: 1;
+    position: relative;
+    border-radius: 16px;
+    background: var(--secondary-background-color);
+    height: calc(100vh - $headerHeight - $bottomHeight);
+    $actionHeight: 108px;
+
+    .content {
+      $contentPadding: 16px;
+      padding: 16px;
+      /**
+        These styles are for showing the full tips, because of content needs to scroll on the y-axis.
+        Then the overflow property that is set as scroll will truncate the tips overflow of the content.
+        So I need to expand the content's left to show the full tips.
+      */
+      position: relative;
+      left: -48px;
+      padding-left: 64px;
+      width: calc(100% - 32px);
+      overflow-y: scroll;
+      height: calc(100% - $actionHeight - 2 * $contentPadding);
+    }
+
+    .totalAmountField {
+      padding-bottom: 34px;
+      p {
+        margin: 0;
+      }
+      .title {
+        color: var(--secondary-text-color);
+        font-size: 14px;
+      }
+      .value {
+        margin-top: 22px;
+        color: var(--main-text-color);
+        font-size: 32px;
+        font-weight: 500;
+        letter-spacing: 0.5px;
+        font-family: 'D-DIN-PRO';
+      }
+      .errorMessage {
+        margin-top: 8px;
+        color: var(--error-color);
+      }
+    }
+
+    .rightFooter {
+      position: absolute;
+      width: 100%;
+      bottom: 16px;
+      left: 0;
+      text-align: center;
+      .actions {
+        display: flex;
+        justify-content: center;
+
+        button {
+          width: 216px;
+          &:last-child {
+            margin-left: 12px;
+          }
+        }
+      }
+      .allowUseSent {
+        display: inline-block;
+        margin-bottom: 16px;
+        color: var(--secondary-text-color);
+        input[type='checkbox'] {
+          display: none;
+          margin-right: 8px;
+        }
+        input[type='checkbox'] + span {
+          display: inline-block;
+          padding-left: 26px;
+          background: url('../../widgets/Icons/Radio.svg') no-repeat left top;
+          user-select: none;
+        }
+        input[type='checkbox']:checked + span {
+          background: url('../../widgets/Icons/RadioSelected.svg') no-repeat left top;
+        }
+      }
+    }
+  }
+}
+
+.headerContainer {
+  display: flex;
+  align-items: center;
+
+  .goBack {
+    margin-right: 8px;
+    cursor: pointer;
+    g,
+    path {
+      stroke: var(--main-text-color);
+    }
+  }
+  .btn {
+    margin-left: 12px;
+    min-width: 30px;
+    height: 16px;
+    padding: 0 8px;
+    border-radius: 0;
+    border-left: 1px solid var(--button-cancel-color);
+    svg {
+      g,
+      path {
+        fill: var(--main-text-color);
+      }
+    }
+  }
+
+  .balance {
+    font-size: 14px;
+  }
+}
diff --git a/packages/neuron-ui/src/components/AmendSend/hooks.ts b/packages/neuron-ui/src/components/AmendSend/hooks.ts
new file mode 100644
index 0000000000..e22e716097
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSend/hooks.ts
@@ -0,0 +1,154 @@
+import React, { useState, useCallback, useEffect, useMemo } from 'react'
+import { TFunction } from 'i18next'
+import { AppActions, StateAction, StateDispatch } from 'states/stateProvider/reducer'
+import { getTransaction as getOnChainTransaction } from 'services/chain'
+import { getTransaction as getSentTransaction, getTransactionSize } from 'services/remote'
+import { isSuccessResponse } from 'utils'
+
+const clear = (dispatch: StateDispatch) => {
+  dispatch({
+    type: AppActions.ClearSendState,
+  })
+}
+
+const useUpdateTransactionPrice = (dispatch: StateDispatch) =>
+  useCallback(
+    (value: string) => {
+      const price = value.split('.')[0].replace(/[^\d]/, '')
+      dispatch({
+        type: AppActions.UpdateSendPrice,
+        payload: price,
+      })
+    },
+    [dispatch]
+  )
+
+const useSendDescriptionChange = (dispatch: StateDispatch) =>
+  useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value } = e.target as HTMLInputElement
+      dispatch({
+        type: AppActions.UpdateSendDescription,
+        payload: value,
+      })
+    },
+    [dispatch]
+  )
+
+export const useInitialize = ({
+  hash,
+  walletID,
+  price,
+  dispatch,
+}: {
+  hash: string
+  walletID: string
+  price: string
+  isMainnet: boolean
+  dispatch: React.Dispatch<StateAction>
+  t: TFunction
+}) => {
+  const [transaction, setTransaction] = useState<State.GeneratedTx | null>(null)
+  const [size, setSize] = useState(0)
+  const [minPrice, setMinPrice] = useState('0')
+  const [showConfirmedAlert, setShowConfirmedAlert] = useState(false)
+
+  const updateTransactionPrice = useUpdateTransactionPrice(dispatch)
+  const onDescriptionChange = useSendDescriptionChange(dispatch)
+
+  const fee = useMemo(() => {
+    const ratio = BigInt(1000)
+    const base = BigInt(size) * BigInt(price)
+    const curFee = base / ratio
+    if (curFee * ratio < base) {
+      return curFee + BigInt(1)
+    }
+    return curFee
+  }, [price, size])
+
+  const fetchInitData = useCallback(async () => {
+    const res = await getOnChainTransaction(hash)
+    const {
+      // @ts-expect-error Replace-By-Fee (RBF)
+      min_replace_fee: minFee,
+      transaction: { outputsData },
+    } = res
+    if (!minFee) {
+      setShowConfirmedAlert(true)
+    }
+
+    const txRes = await getSentTransaction({ hash, walletID })
+    if (isSuccessResponse(txRes)) {
+      const tx = txRes.result
+      setTransaction({
+        ...tx,
+        outputsData,
+      })
+
+      const sizeRes = await getTransactionSize(tx)
+
+      if (isSuccessResponse(sizeRes) && typeof sizeRes.result === 'number') {
+        setSize(sizeRes.result)
+        if (minFee) {
+          const mPrice = ((BigInt(minFee) * BigInt(1000)) / BigInt(sizeRes.result)).toString()
+          setMinPrice(mPrice)
+          updateTransactionPrice(mPrice)
+        }
+      }
+    }
+  }, [hash, setShowConfirmedAlert, updateTransactionPrice, setTransaction, setSize, setMinPrice])
+
+  useEffect(() => {
+    fetchInitData()
+  }, [])
+
+  useEffect(() => {
+    clear(dispatch)
+  }, [walletID, dispatch])
+
+  const onSubmit = useCallback(
+    async (e: React.FormEvent) => {
+      const {
+        dataset: { walletId, status },
+      } = e.target as HTMLFormElement
+      e.preventDefault()
+      if (status !== 'ready') {
+        return
+      }
+      try {
+        // @ts-expect-error Replace-By-Fee (RBF)
+        const { min_replace_fee: minFee } = await getOnChainTransaction(hash)
+        if (!minFee) {
+          setShowConfirmedAlert(true)
+          return
+        }
+        dispatch({
+          type: AppActions.RequestPassword,
+          payload: {
+            walletID: walletId as string,
+            amendHash: hash,
+            actionType: 'send',
+          },
+        })
+      } catch {
+        // ignore
+      }
+    },
+    [dispatch, walletID, hash, setShowConfirmedAlert]
+  )
+
+  return {
+    updateTransactionPrice,
+    onDescriptionChange,
+    fee,
+    transaction,
+    setTransaction,
+    minPrice,
+    showConfirmedAlert,
+    onSubmit,
+  }
+}
+
+export default {
+  useInitialize,
+}
diff --git a/packages/neuron-ui/src/components/AmendSend/index.tsx b/packages/neuron-ui/src/components/AmendSend/index.tsx
new file mode 100644
index 0000000000..543ff7c464
--- /dev/null
+++ b/packages/neuron-ui/src/components/AmendSend/index.tsx
@@ -0,0 +1,268 @@
+import React, { useEffect, useMemo, useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useParams, useNavigate } from 'react-router-dom'
+import { useState as useGlobalState, useDispatch, appState, AppActions } from 'states'
+import TextField from 'widgets/TextField'
+import PageContainer from 'components/PageContainer'
+import Button from 'widgets/Button'
+import Spinner from 'widgets/Spinner'
+import { GoBack } from 'widgets/Icons/icon'
+import { MIN_AMOUNT } from 'utils/const'
+import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils'
+import {
+  isMainnet as isMainnetUtil,
+  localNumberFormatter,
+  useGoBack,
+  shannonToCKBFormatter,
+  RoutePath,
+  isSecp256k1Address,
+} from 'utils'
+import AlertDialog from 'widgets/AlertDialog'
+import styles from './amendSend.module.scss'
+import { useInitialize } from './hooks'
+
+const AmendSend = () => {
+  const {
+    app: {
+      send = appState.send,
+      loadings: { sending = false },
+      showWaitForFullySynced,
+    },
+    wallet: { id: walletID = '', addresses },
+    chain: { networkID },
+    settings: { networks = [] },
+  } = useGlobalState()
+  const dispatch = useDispatch()
+  const navigate = useNavigate()
+  const { t } = useTranslation()
+  const { hash = '' } = useParams()
+
+  const onBack = useGoBack()
+
+  const isMainnet = isMainnetUtil(networks, networkID)
+
+  const { fee, updateTransactionPrice, onDescriptionChange, transaction, onSubmit, minPrice, showConfirmedAlert } =
+    useInitialize({
+      hash,
+      walletID,
+      price: send.price,
+      isMainnet,
+      dispatch,
+      t,
+    })
+
+  const priceError = useMemo(() => {
+    return Number(send.price) < Number(minPrice) ? t('price-switch.errorTip', { minPrice }) : null
+  }, [send.price, minPrice])
+
+  const inputHint = t('price-switch.hintTip', { suggestFeeRate: minPrice })
+
+  const handlePriceChange = useCallback(
+    (e: React.SyntheticEvent<HTMLInputElement>) => {
+      const { value: inputValue } = e.currentTarget
+
+      updateTransactionPrice(inputValue.replace(/,/g, ''))
+    },
+    [updateTransactionPrice]
+  )
+
+  const getLastOutputAddress = (outputs: State.DetailedOutput[]) => {
+    if (outputs.length === 1) {
+      return scriptToAddress(outputs[0].lock, isMainnet)
+    }
+
+    const change = outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+      if (!isSecp256k1Address(address)) {
+        navigate(`${RoutePath.History}/amendSUDTSend/${hash}`, {
+          replace: true,
+        })
+      }
+
+      return !!addresses.find(item => item.address === address && item.type === 1)
+    })
+    if (change) {
+      return scriptToAddress(change.lock, isMainnet)
+    }
+
+    const receive = outputs.find(output => {
+      const address = scriptToAddress(output.lock, isMainnet)
+      return !!addresses.find(item => item.address === address && item.type === 0)
+    })
+    if (receive) {
+      return scriptToAddress(receive.lock, isMainnet)
+    }
+
+    return ''
+  }
+
+  const items: {
+    address: string
+    amount: string
+    capacity: string
+    isLastOutput: boolean
+    output: State.DetailedOutput
+  }[] = useMemo(() => {
+    if (transaction && transaction.outputs.length) {
+      const lastOutputAddress = getLastOutputAddress(transaction.outputs)
+      return transaction.outputs.map(output => {
+        const address = scriptToAddress(output.lock, isMainnet)
+        return {
+          capacity: output.capacity,
+          address,
+          output,
+          amount: shannonToCKBFormatter(output.capacity || '0'),
+          isLastOutput: address === lastOutputAddress,
+        }
+      })
+    }
+    return []
+  }, [transaction?.outputs])
+
+  const outputsCapacity = useMemo(() => {
+    const outputList = items.filter(item => !item.isLastOutput)
+    return outputList.reduce((total, cur) => {
+      if (Number.isNaN(+(cur.capacity || ''))) {
+        return total
+      }
+      return total + BigInt(cur.capacity || '0')
+    }, BigInt(0))
+  }, [items])
+
+  const totalAmount = shannonToCKBFormatter(outputsCapacity.toString())
+
+  const lastOutputsCapacity = useMemo(() => {
+    if (transaction) {
+      const inputsCapacity = transaction.inputs.reduce((total, cur) => {
+        if (Number.isNaN(+(cur.capacity || ''))) {
+          return total
+        }
+        return total + BigInt(cur.capacity || '0')
+      }, BigInt(0))
+
+      return inputsCapacity - outputsCapacity - fee
+    }
+    return -1
+  }, [transaction, fee, outputsCapacity])
+
+  useEffect(() => {
+    if (transaction) {
+      const outputs = items.map(item => {
+        const capacity = item.isLastOutput ? lastOutputsCapacity.toString() : item.capacity
+        return {
+          ...item.output,
+          capacity,
+        }
+      })
+      dispatch({
+        type: AppActions.UpdateGeneratedTx,
+        payload: {
+          ...transaction,
+          outputs,
+        },
+      })
+    }
+  }, [lastOutputsCapacity, transaction, items, dispatch])
+
+  const disabled = sending || !send.generatedTx || priceError || lastOutputsCapacity < MIN_AMOUNT
+
+  return (
+    <PageContainer
+      head={
+        <div className={styles.headerContainer}>
+          <GoBack className={styles.goBack} onClick={onBack} />
+          <p>{t('navbar.send')}</p>
+        </div>
+      }
+    >
+      <form onSubmit={onSubmit} data-wallet-id={walletID} data-status={disabled ? 'not-ready' : 'ready'}>
+        <div className={`${styles.layout} ${showWaitForFullySynced ? styles.withFullySynced : ''}`}>
+          <div className={styles.left}>
+            <div className={styles.content}>
+              {items
+                .filter(item => items.length === 1 || !item.isLastOutput)
+                .map(item => (
+                  <div className={styles.inputCell}>
+                    <div className={styles.addressCell}>
+                      <div className={styles.label}>{t('send.address')}</div>
+                      <div className={styles.content}>{item.address}</div>
+                    </div>
+
+                    <TextField
+                      className={styles.textFieldClass}
+                      label={t('send.amount')}
+                      field="amount"
+                      value={item.amount ? localNumberFormatter(item.amount) : ''}
+                      disabled
+                      width="100%"
+                    />
+                  </div>
+                ))}
+            </div>
+          </div>
+
+          <div className={styles.right}>
+            <div className={styles.content}>
+              <div className={styles.totalAmountField}>
+                <p className={styles.title}>{t('send.total-amount')}</p>
+                <p className={styles.value}>{totalAmount}</p>
+              </div>
+              <TextField
+                placeholder={t('send.description-optional')}
+                className={styles.textFieldClass}
+                field="description"
+                label={t('send.description')}
+                value={send.description}
+                disabled={sending}
+                onChange={onDescriptionChange}
+                width="100%"
+              />
+              <TextField
+                label={t('send.fee')}
+                field="fee"
+                value={`${shannonToCKBFormatter(fee.toString())} CKB`}
+                readOnly
+                disabled
+                width="100%"
+              />
+              <TextField
+                label={t('price-switch.customPrice')}
+                field="price"
+                value={localNumberFormatter(send.price)}
+                onChange={handlePriceChange}
+                suffix="shannons/kB"
+                error={priceError}
+                hint={!priceError && inputHint ? inputHint : null}
+                width="100%"
+              />
+            </div>
+            <div className={styles.rightFooter}>
+              <label htmlFor="send-with-sent-cell" className={styles.allowUseSent}>
+                <input type="checkbox" id="send-with-sent-cell" checked />
+                <span>{t('send.allow-use-sent-cell')}</span>
+              </label>
+              <div className={styles.actions}>
+                <Button type="submit" disabled={disabled} label={t('send.send')}>
+                  {sending ? <Spinner /> : (t('send.submit-transaction') as string)}
+                </Button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </form>
+
+      <AlertDialog
+        show={showConfirmedAlert}
+        title={t('send.transaction-confirmed')}
+        message={t('send.transaction-cannot-amend')}
+        type="warning"
+        onOk={onBack}
+        action="ok"
+      />
+    </PageContainer>
+  )
+}
+
+AmendSend.displayName = 'AmendSend'
+
+export default AmendSend
diff --git a/packages/neuron-ui/src/components/History/RowExtend.tsx b/packages/neuron-ui/src/components/History/RowExtend.tsx
index 800557d238..980fb87b28 100644
--- a/packages/neuron-ui/src/components/History/RowExtend.tsx
+++ b/packages/neuron-ui/src/components/History/RowExtend.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import { showPageNotice, useDispatch } from 'states'
 import { openExternal } from 'services/remote'
 
@@ -9,6 +9,9 @@ import { ExplorerIcon, Copy, DetailIcon } from 'widgets/Icons/icon'
 import { useTranslation } from 'react-i18next'
 import ShowOrEditDesc from 'widgets/ShowOrEditDesc'
 import Tooltip from 'widgets/Tooltip'
+import { getTransaction as getOnChainTransaction } from 'services/chain'
+
+import Button from 'widgets/Button'
 import styles from './history.module.scss'
 
 type RowExtendProps = {
@@ -23,6 +26,7 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   const dispatch = useDispatch()
   const navigate = useNavigate()
   const [t] = useTranslation()
+  const [amendabled, setAmendabled] = useState(false)
 
   const { onChangeEditStatus, onSubmitDescription } = useLocalDescription('transaction', id, dispatch)
 
@@ -39,6 +43,14 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
             navigate(`${RoutePath.History}/${btn.dataset.hash}`)
             break
           }
+          case 'amend': {
+            if (column?.sudtInfo) {
+              navigate(`${RoutePath.History}/amendSUDTSend/${btn.dataset.hash}`)
+              return
+            }
+            navigate(`${RoutePath.History}/amend/${btn.dataset.hash}`)
+            break
+          }
           default: {
             // ignore
           }
@@ -48,7 +60,7 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
     [isMainnet]
   )
 
-  const { blockNumber, hash, description } = column
+  const { blockNumber, hash, description, status } = column
   const confirmations = blockNumber ? 1 + bestBlockNumber - +blockNumber : 0
   const confirmationsLabel = confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
   const onCopy = useCallback(() => {
@@ -56,6 +68,21 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
     showPageNotice('common.copied')(dispatch)
   }, [hash, dispatch])
 
+  useEffect(() => {
+    if (status !== 'success') {
+      if (column.type === 'send' && !column.nftInfo && !column.nervosDao) {
+        getOnChainTransaction(hash).then(tx => {
+          // @ts-expect-error Replace-By-Fee (RBF)
+          const { min_replace_fee: minReplaceFee } = tx
+          if (minReplaceFee) {
+            setAmendabled(true)
+          }
+        })
+      }
+    }
+    setAmendabled(false)
+  }, [status, hash, setAmendabled])
+
   return (
     <tr>
       <td colSpan={columns.length} className={styles.extendWrapper} style={{ paddingLeft: `${columns?.[0]?.width}` }}>
@@ -83,7 +110,6 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
               </Tooltip>
             </div>
           </div>
-
           <div className={styles.infoBlock}>
             <div className={styles.infoBlockTitle}>{t('history.transaction-hash')}</div>
             <div className={styles.txHash}>
@@ -92,28 +118,40 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
             </div>
           </div>
           <div className={styles.infoOperationBox}>
-            <button
-              type="button"
-              className={styles.explorerNavButton}
-              title={t('history.view-in-explorer-button-title')}
-              onClick={onActionBtnClick}
-              data-hash={hash}
-              data-action="explorer"
-            >
-              <ExplorerIcon />
-              <span>{t('history.view-in-explorer')}</span>
-            </button>
-            <button
-              type="button"
-              className={styles.detailNavButton}
-              title={t('history.view-detail-button-title')}
-              onClick={onActionBtnClick}
-              data-hash={hash}
-              data-action="detail"
-            >
-              <DetailIcon />
-              <span>{t('history.view-detail')}</span>
-            </button>
+            <div>
+              <button
+                type="button"
+                className={styles.explorerNavButton}
+                onClick={onActionBtnClick}
+                data-hash={hash}
+                data-action="explorer"
+              >
+                <ExplorerIcon />
+                <span>{t('history.view-in-explorer')}</span>
+              </button>
+              <button
+                type="button"
+                className={styles.detailNavButton}
+                onClick={onActionBtnClick}
+                data-hash={hash}
+                data-action="detail"
+              >
+                <DetailIcon />
+                <span>{t('history.view-detail')}</span>
+              </button>
+            </div>
+
+            {amendabled ? (
+              <Button
+                type="reset"
+                className={styles.amendButton}
+                onClick={onActionBtnClick}
+                data-hash={hash}
+                data-action="amend"
+              >
+                <span>{t('history.amend')}</span>
+              </Button>
+            ) : null}
           </div>
         </div>
       </td>
diff --git a/packages/neuron-ui/src/components/History/history.module.scss b/packages/neuron-ui/src/components/History/history.module.scss
index c749dc8d9e..2c68bdcd19 100644
--- a/packages/neuron-ui/src/components/History/history.module.scss
+++ b/packages/neuron-ui/src/components/History/history.module.scss
@@ -135,6 +135,14 @@ body {
 
     .infoOperationBox {
       display: flex;
+      justify-content: space-between;
+      margin-top: 20px;
+
+      div {
+        display: flex;
+        gap: 20px;
+        flex: 1;
+      }
       gap: 20px;
 
       .explorerNavButton,
@@ -156,6 +164,16 @@ body {
           }
         }
       }
+
+      .amendButton {
+        float: rights;
+        padding: 4px 16px;
+        font-size: 14px;
+        height: auto;
+        width: auto;
+        min-width: 0;
+        border-radius: 4px;
+      }
     }
   }
 }
diff --git a/packages/neuron-ui/src/components/History/hooks.ts b/packages/neuron-ui/src/components/History/hooks.ts
index 19a40d836f..326b8ab8b5 100644
--- a/packages/neuron-ui/src/components/History/hooks.ts
+++ b/packages/neuron-ui/src/components/History/hooks.ts
@@ -1,6 +1,8 @@
 import { useState, useEffect } from 'react'
 import { updateTransactionList } from 'states/stateProvider/actionCreators/transactions'
-import { listParams, backToTop } from 'utils'
+import { NeuronWalletActions } from 'states/stateProvider/reducer'
+import { listParams, backToTop, isSuccessResponse } from 'utils'
+import { getSUDTAccountList } from 'services/remote'
 
 export const useSearch = (search: string, walletID: string, dispatch: React.Dispatch<any>) => {
   const [keywords, setKeywords] = useState('')
@@ -18,6 +20,21 @@ export const useSearch = (search: string, walletID: string, dispatch: React.Disp
     setKeywords(params.keywords)
     setSortInfo({ sort: params.sort, direction: params.direction })
     updateTransactionList({ ...params, keywords: params.keywords, walletID })(dispatch)
+
+    getSUDTAccountList({ walletID })
+      .then(res => {
+        if (isSuccessResponse(res)) {
+          return res.result
+        }
+        throw new Error(res.message.toString())
+      })
+      .then((list: Controller.GetSUDTAccountList.Response) => {
+        dispatch({
+          type: NeuronWalletActions.GetSUDTAccountList,
+          payload: list,
+        })
+      })
+      .catch((err: Error) => console.error(err))
   }, [search, walletID, dispatch])
   return { keywords, onKeywordsChange, setKeywords, sortInfo }
 }
diff --git a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
index 6f8991b5d6..9e335c9e4e 100644
--- a/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
+++ b/packages/neuron-ui/src/components/PasswordRequest/hooks.ts
@@ -45,7 +45,7 @@ export default ({
 
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
-  const { walletID = '', actionType = null, multisigConfig, onSuccess } = passwordRequest
+  const { walletID = '', actionType = null, amendHash, multisigConfig, onSuccess } = passwordRequest
 
   useEffect(() => {
     setPassword('')
@@ -139,7 +139,9 @@ export default ({
             if (isSending) {
               break
             }
-            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(handleSendTxRes)
+            await sendTransaction({ walletID, tx: generatedTx, description, password, amendHash })(dispatch).then(
+              handleSendTxRes
+            )
             break
           }
           case 'send-from-multisig-need-one': {
@@ -231,6 +233,7 @@ export default ({
               tx: experimental?.tx,
               password,
               skipLastInputs,
+              amendHash,
             }
             await sendSUDTTransaction(params)(dispatch).then(handleSendTxRes)
             break
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index c42810c3f5..4204d777e0 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -253,7 +253,9 @@
       "release-on": "Release on",
       "locktime-warning": "Please ensure that receiver's wallet can support expiration unlocking. (Note: 1.Exchanges generally do not support expiration unlocking {{extraNote}})",
       "allow-use-sent-cell": "Unconfirmed Outputs are allowed in this transaction.",
-      "submit-transaction": "Submit the transaction"
+      "submit-transaction": "Submit the transaction",
+      "transaction-confirmed": "Transaction Confirmed",
+      "transaction-cannot-amend": "The current transaction is confirmed and cannot be amended."
     },
     "receive": {
       "title": "Receive",
@@ -323,6 +325,7 @@
       "view-in-explorer-button-title": "View on explorer",
       "view-detail": "Detail",
       "view-detail-button-title": "View Detail",
+      "amend": "Amend",
       "opening": "Opening",
       "copy-tx-hash": "Copy Transaction Hash",
       "copy-balance": "Copy Balance",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
index 8d38510953..dc163b043b 100644
--- a/packages/neuron-ui/src/locales/es.json
+++ b/packages/neuron-ui/src/locales/es.json
@@ -245,7 +245,9 @@
       "release-on": "Liberar en",
       "locktime-warning": "Asegúrese de que la billetera del receptor pueda soportar el desbloqueo por vencimiento. (Nota: 1. Generalmente, las casas de cambio no admiten el desbloqueo por vencimiento {{extraNote}})",
       "allow-use-sent-cell": "Se permite el uso de salidas no confirmadas en esta transacción.",
-      "submit-transaction": "Enviar la transacción"
+      "submit-transaction": "Enviar la transacción",
+      "transaction-confirmed": "Transacción confirmada",
+      "transaction-cannot-amend": "La transacción actual está confirmada y no puede modificarse."
     },
     "receive": {
       "title": "Recibir",
@@ -315,6 +317,7 @@
       "view-in-explorer-button-title": "Ver en el explorador",
       "view-detail": "Detalle",
       "view-detail-button-title": "Ver Detalle",
+      "amend": "Enmendar",
       "opening": "Abriendo",
       "copy-tx-hash": "Copiar Hash de Transacción",
       "copy-balance": "Copiar Saldo",
@@ -514,94 +517,94 @@
         "title": "Enviar CKB desde dirección multifirma"
       },
       "xpub-notice": "Para billetera de solo lectura, sólo es posible exportar transacciones"
+    },
+    "qrcode": {
+      "copy": "Copiar imagen",
+      "save": "Guardar imagen"
+    },
+    "common": {
+      "or": "o",
+      "ok": "Ok",
+      "dismiss": "Descartar",
+      "confirm": "Confirmar",
+      "open": "Abrir",
+      "cancel": "Cancelar",
+      "save": "Guardar",
+      "toggle": {
+        "on": "Encendido",
+        "off": "Apagado"
       },
-      "qrcode": {
-        "copy": "Copiar imagen",
-        "save": "Guardar imagen"
+      "copy-tx-hash": "Copiar Hash de Transacción",
+      "copy-address": "Copiar Dirección",
+      "select": "Seleccionar",
+      "backup": "Respaldar",
+      "edit": "Editar",
+      "delete": "Borrar",
+      "click-to-edit": "Hacer clic para editar",
+      "notice": "Nota",
+      "experimental": "Experimental",
+      "close": "Cerrar",
+      "copy": "Copiar",
+      "copied": "Copiado",
+      "verification-failure": "Falló la Verificación",
+      "back": "Atrás",
+      "switch-to-light": "Cambiar a modo claro",
+      "switch-to-dark": "Cambiar a modo oscuro",
+      "ckb-node-data-path": "CKB Ruta de los datos del nodo"
+    },
+    "notification-panel": {
+      "title": "Notificaciones"
+    },
+    "message-types": {
+      "warning": "advertencia",
+      "alert": "alerta",
+      "success": "éxito"
+    },
+    "messages": {
+      "error": "Error",
+      "unknown-error": "Error desconocido",
+      "update-wallet-successfully": "La billetera fue actualizada",
+      "delete-wallet-successfully": "La billetera fue eliminada",
+      "create-network-successfully": "La red fue creada",
+      "update-network-successfully": "La red fue actualizada",
+      "clear-cache-successfully": "El caché fue borrado",
+      "addr-copied": "La dirección ha sido copiada en el portapapeles",
+      "qrcode-copied": "El Código QR ha sido copiado en el portapapeles",
+      "view-the-run-node-doc": "Ver la guía en el navegador",
+      "remain-ckb-for-withdraw": "Es recomendable reservar algunos CKBytes para operaciones de retiro",
+      "no-valid-addresses-found": "No se encontraron direcciones válidas",
+      "decimal-range": "El decimal debe ser un número entero de {{range}}(incluido)",
+      "experimental-message-hardware": "Esta es una función experimental. Preste atención al riesgo y use con precaución.",
+      "experimental-message": "Esta es una función experimental, puede cambiar en cualquier momento. Por favor, use con precaución.",
+      "rebuild-sync": "Para una mejor experiencia de usuario, Neuron ha adoptado un nuevo almacenamiento, lo que requiere una migración de datos (estimado de 20 a 60 minutos).\nLo sentimos por la inconveniencia.",
+      "migrate-warning": "Advertencia: el proceso de migración puede fallar por razones desconocidas, lo que resulta en resincronización, ¡haga una copia de seguridad manualmente y comience la migración!",
+      "migrate-ckb-data": "Migrar",
+      "migrate": "Migrar",
+      "secp256k1/blake160-address-required": "Se requiere la dirección Secp256k1/Blake160",
+      "light-client-locktime-warning": "2. El modo de cliente ligero no admite mostrar CKBytes en tiempo de bloqueo.",
+      "light-client-cheque-warning": "Advertencia: el modo de cliente ligero no admite mostrar activos de Cheque.",
+      "fields": {
+        "wallet": "Billetera",
+        "name": "Nombre",
+        "password": "Contraseña",
+        "remote": "URL de RPC",
+        "network": "Red",
+        "address": "Dirección",
+        "amount": "Cantidad",
+        "transaction": "Transacción",
+        "default-address": "Dirección predeterminada",
+        "mnemonic": "Mnemónico",
+        "keystore-path": "Archivo Keystore",
+        "keystore-name": "Nombre de la billetera",
+        "keystore-password": "Contraseña",
+        "deposit": "Depósito",
+        "account-name": "Nombre de la cuenta",
+        "token-name": "Nombre del token",
+        "token-id": "ID del token",
+        "symbol": "Símbolo",
+        "decimal": "Decimal"
       },
-      "common": {
-        "or": "o",
-        "ok": "Ok",
-        "dismiss": "Descartar",
-        "confirm": "Confirmar",
-        "open": "Abrir",
-        "cancel": "Cancelar",
-        "save": "Guardar",
-        "toggle": {
-          "on": "Encendido",
-          "off": "Apagado"
-        },
-        "copy-tx-hash": "Copiar Hash de Transacción",
-        "copy-address": "Copiar Dirección",
-        "select": "Seleccionar",
-        "backup": "Respaldar",
-        "edit": "Editar",
-        "delete": "Borrar",
-        "click-to-edit": "Hacer clic para editar",
-        "notice": "Nota",
-        "experimental": "Experimental",
-        "close": "Cerrar",
-        "copy": "Copiar",
-        "copied": "Copiado",
-        "verification-failure": "Falló la Verificación",
-        "back": "Atrás",
-        "switch-to-light": "Cambiar a modo claro",
-        "switch-to-dark": "Cambiar a modo oscuro",
-        "ckb-node-data-path": "CKB Ruta de los datos del nodo"
-      },
-      "notification-panel": {
-        "title": "Notificaciones"
-      },
-      "message-types": {
-        "warning": "advertencia",
-        "alert": "alerta",
-        "success": "éxito"
-      },
-      "messages": {
-        "error": "Error",
-        "unknown-error": "Error desconocido",
-        "update-wallet-successfully": "La billetera fue actualizada",
-        "delete-wallet-successfully": "La billetera fue eliminada",
-        "create-network-successfully": "La red fue creada",
-        "update-network-successfully": "La red fue actualizada",
-        "clear-cache-successfully": "El caché fue borrado",
-        "addr-copied": "La dirección ha sido copiada en el portapapeles",
-        "qrcode-copied": "El Código QR ha sido copiado en el portapapeles",
-        "view-the-run-node-doc": "Ver la guía en el navegador",
-        "remain-ckb-for-withdraw": "Es recomendable reservar algunos CKBytes para operaciones de retiro",
-        "no-valid-addresses-found": "No se encontraron direcciones válidas",
-        "decimal-range": "El decimal debe ser un número entero de {{range}}(incluido)",
-        "experimental-message-hardware": "Esta es una función experimental. Preste atención al riesgo y use con precaución.",
-        "experimental-message": "Esta es una función experimental, puede cambiar en cualquier momento. Por favor, use con precaución.",
-        "rebuild-sync": "Para una mejor experiencia de usuario, Neuron ha adoptado un nuevo almacenamiento, lo que requiere una migración de datos (estimado de 20 a 60 minutos).\nLo sentimos por la inconveniencia.",
-        "migrate-warning": "Advertencia: el proceso de migración puede fallar por razones desconocidas, lo que resulta en resincronización, ¡haga una copia de seguridad manualmente y comience la migración!",
-        "migrate-ckb-data": "Migrar",
-        "migrate": "Migrar",
-        "secp256k1/blake160-address-required": "Se requiere la dirección Secp256k1/Blake160",
-        "light-client-locktime-warning": "2. El modo de cliente ligero no admite mostrar CKBytes en tiempo de bloqueo.",
-        "light-client-cheque-warning": "Advertencia: el modo de cliente ligero no admite mostrar activos de Cheque.",
-        "fields": {
-          "wallet": "Billetera",
-          "name": "Nombre",
-          "password": "Contraseña",
-          "remote": "URL de RPC",
-          "network": "Red",
-          "address": "Dirección",
-          "amount": "Cantidad",
-          "transaction": "Transacción",
-          "default-address": "Dirección predeterminada",
-          "mnemonic": "Mnemónico",
-          "keystore-path": "Archivo Keystore",
-          "keystore-name": "Nombre de la billetera",
-          "keystore-password": "Contraseña",
-          "deposit": "Depósito",
-          "account-name": "Nombre de la cuenta",
-          "token-name": "Nombre del token",
-          "token-id": "ID del token",
-          "symbol": "Símbolo",
-          "decimal": "Decimal"
-        },
-        "codes": {
+      "codes": {
         "-3": "",
         "100": "La cantidad no es suficiente.",
         "101": "La cantidad {{amount}} CKB es demasiado pequeña, por favor ingrese una cantidad no menor a {{required}} CKB.",
@@ -706,18 +709,18 @@
         "days-hours": "{{days}} días {{hours}} horas",
         "no-deposit": "Sin Depósito",
         "no-completed": "Sin Completar"
-    },
-    "compensation-period": {
-      "tooltip": {
-        "compensated-period": "Período de Compensación",
-        "days-hours": "{{days}} días {{hours}} horas",
-        "immature-for-withdraw": "Se tarda al menos 16 horas (4epochs) para realizar la siguiente acción",
-        "normal": "La cantidad de compensación es baja, no se recomienda la acción de retiro",
-        "suggested": "Período de retiro sugerido para una compensación maximizada",
-        "ending": "Es posible que el retiro solicitado se posponga y se bloquee durante un ciclo adicional de 30 días",
-        "withdrawn": "Retirado"
       },
-      "stage-messages": {
+      "compensation-period": {
+        "tooltip": {
+          "compensated-period": "Período de Compensación",
+          "days-hours": "{{days}} días {{hours}} horas",
+          "immature-for-withdraw": "Se tarda al menos 16 horas (4epochs) para realizar la siguiente acción",
+          "normal": "La cantidad de compensación es baja, no se recomienda la acción de retiro",
+          "suggested": "Período de retiro sugerido para una compensación maximizada",
+          "ending": "Es posible que el retiro solicitado se posponga y se bloquee durante un ciclo adicional de 30 días",
+          "withdrawn": "Retirado"
+        },
+        "stage-messages": {
           "pending": "Pendiente...",
           "immature-for-withdraw": "No se puede retirar CKB durante las próximas {{ horas }} horas",
           "immature-for-unlock": "No se puede desbloquear CKB durante las próximas {{ horas }} horas",
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
index 5cd1baf641..6a76f0d5e4 100644
--- a/packages/neuron-ui/src/locales/fr.json
+++ b/packages/neuron-ui/src/locales/fr.json
@@ -252,7 +252,9 @@
       "release-on": "Libération le",
       "locktime-warning": "Veuillez vous assurer que le Wallet du destinataire peut prendre en charge le déverrouillage par expiration. (Remarque : 1. Les échanges ne prennent généralement pas en charge le déverrouillage par expiration {{extraNote}})",
       "allow-use-sent-cell": "Les sorties non confirmées sont autorisées dans cette transaction.",
-      "submit-transaction": "Soumettre la transaction"
+      "submit-transaction": "Soumettre la transaction",
+      "transaction-confirmed": "Transaction confirmée",
+      "transaction-cannot-amend": "La transaction en cours est confirmée et ne peut être modifiée."
     },
     "receive": {
       "title": "Recevoir",
@@ -322,6 +324,7 @@
       "view-in-explorer-button-title": "Voir sur l'explorateur",
       "view-detail": "Détail",
       "view-detail-button-title": "Voir les détails",
+      "amend": "Modifier",
       "opening": "Ouverture",
       "copy-tx-hash": "Copier le hash de la transaction",
       "copy-balance": "Copier le solde",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
index 0208b9e9d4..32130fbf4e 100644
--- a/packages/neuron-ui/src/locales/zh-tw.json
+++ b/packages/neuron-ui/src/locales/zh-tw.json
@@ -247,7 +247,9 @@
       "release-on": "鎖定至",
       "locktime-warning": "請確保對方錢包支持到期解鎖功能。（註：1.交易所壹般不支持到期解鎖功能 {{extraNote}}）",
       "allow-use-sent-cell": "允許使用待確認的 Outputs 構建交易",
-      "submit-transaction": "發起交易"
+      "submit-transaction": "發起交易",
+      "transaction-confirmed": "交易已確認",
+      "transaction-cannot-amend": "目前交易已確認，無法修改。"
     },
     "receive": {
       "title": "收款",
@@ -316,6 +318,7 @@
       "no-txs": "沒有交易記錄",
       "view-in-explorer": "瀏覽器打開",
       "view-in-explorer-button-title": "瀏覽器中查看詳情",
+      "amend": "修改",
       "view-detail": "詳情",
       "view-detail-button-title": "查看詳情",
       "opening": "正在打開",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index fbb85cf7af..bef868f0b4 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -246,7 +246,9 @@
       "release-on": "锁定至",
       "locktime-warning": "请确保对方钱包支持到期解锁功能。（注：1.交易所一般不支持到期解锁功能 {{extraNote}}）",
       "allow-use-sent-cell": "允许使用待确认的 Outputs 构建交易",
-      "submit-transaction": "发起交易"
+      "submit-transaction": "发起交易",
+      "transaction-confirmed": "交易已确认",
+      "transaction-cannot-amend": "当前交易已确认，无法修改。"
     },
     "receive": {
       "title": "收款",
@@ -316,6 +318,7 @@
       "view-in-explorer-button-title": "浏览器中查看详情",
       "view-detail": "详情",
       "view-detail-button-title": "查看详情",
+      "amend": "修改",
       "opening": "正在打开",
       "copy-tx-hash": "复制交易哈希",
       "copy-balance": "复制余额",
diff --git a/packages/neuron-ui/src/router.tsx b/packages/neuron-ui/src/router.tsx
index 8e197d8bfa..319ebc3274 100644
--- a/packages/neuron-ui/src/router.tsx
+++ b/packages/neuron-ui/src/router.tsx
@@ -9,6 +9,8 @@ import ImportKeystore from 'components/ImportKeystore'
 import Send from 'components/Send'
 import History from 'components/History'
 import HistoryDetailPage from 'components/HistoryDetailPage'
+import AmendSend from 'components/AmendSend'
+import AmendSUDTSend from 'components/AmendSUDTSend'
 import LaunchScreen from 'components/LaunchScreen'
 import PasswordRequest from 'components/PasswordRequest'
 import NervosDAO from 'components/NervosDAO'
@@ -142,6 +144,26 @@ const mainRouterConfig: RouteObject[] = [
             ),
             children: [...toolsRouters],
           },
+          {
+            path: 'amend/:hash',
+            element: (
+              <>
+                <AmendSend />
+                <Outlet />
+              </>
+            ),
+            children: [...toolsRouters],
+          },
+          {
+            path: 'amendSUDTSend/:hash',
+            element: (
+              <>
+                <AmendSUDTSend />
+                <Outlet />
+              </>
+            ),
+            children: [...toolsRouters],
+          },
           {
             path: ':hash',
             element: (
diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts
index 1743cd2a46..f2ed6f88e3 100644
--- a/packages/neuron-ui/src/services/remote/offline.ts
+++ b/packages/neuron-ui/src/services/remote/offline.ts
@@ -44,6 +44,7 @@ export const exportTransactionAsJSON = remoteApi<OfflineSignJSON, void>('export-
 export const signTransactionOnly = remoteApi<OfflineSignJSON, void>('sign-transaction-only')
 export const broadcastTransaction = remoteApi<BroadcastProps, void>('broadcast-transaction-only')
 export const broadcastSignedTransaction = remoteApi<SignedTransaction, string>('broadcast-signed-transaction')
+export const getTransactionSize = remoteApi<State.DetailedTransaction, string>('get-transaction-size')
 export const signAndExportTransaction = remoteApi<SignProps, { filePath: string; json: OfflineSignJSON }>(
   'sign-and-export-transaction'
 )
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index a1f270ce63..5be98553fc 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -139,6 +139,7 @@ type Action =
   | 'sign-transaction-only'
   | 'broadcast-transaction-only'
   | 'broadcast-signed-transaction'
+  | 'get-transaction-size'
   | 'sign-and-export-transaction'
   | 'sign-and-broadcast-transaction'
   // nft
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index b8559efbb0..4ba289b716 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -127,6 +127,7 @@ declare namespace State {
     }
     onSuccess?: () => void
     showType?: 'Global' | ''
+    amendHash?: string
   }
 
   interface SUDTAccount {
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 5be3667b02..c308f2b88b 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -69,6 +69,7 @@ declare namespace Controller {
     tx: any
     password?: string
     description?: string
+    amendHash?: string
     multisigConfig?: {
       id: number
       walletId: string
@@ -289,6 +290,7 @@ declare namespace Controller {
       tx: any
       password?: string
       skipLastInputs?: boolean
+      amendHash?: string
     }
     type Response = Hash
   }
diff --git a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
index 1fbba05c50..1a2532559b 100644
--- a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
+++ b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
@@ -42,6 +42,8 @@ const getTransactionStatus = async (hash: string) => {
 
 const trackingStatus = async () => {
   const pendingTransactions = await FailedTransaction.pendings()
+  await FailedTransaction.processAmendFailedTxs()
+
   if (!pendingTransactions.length) {
     return
   }
diff --git a/packages/neuron-wallet/src/controllers/anyone-can-pay.ts b/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
index b74267ea19..df092470bf 100644
--- a/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
+++ b/packages/neuron-wallet/src/controllers/anyone-can-pay.ts
@@ -22,6 +22,7 @@ export interface SendAnyoneCanPayTxParams {
   tx: Transaction
   password: string
   skipLastInputs?: boolean
+  amendHash?: string
 }
 
 export default class AnyoneCanPayController {
@@ -65,7 +66,8 @@ export default class AnyoneCanPayController {
       txModel,
       params.password,
       params?.skipLastInputs ?? true,
-      skipSign
+      skipSign,
+      params?.amendHash
     )
 
     if (!txHash) {
diff --git a/packages/neuron-wallet/src/controllers/api.ts b/packages/neuron-wallet/src/controllers/api.ts
index d442eaefe7..bca1118731 100644
--- a/packages/neuron-wallet/src/controllers/api.ts
+++ b/packages/neuron-wallet/src/controllers/api.ts
@@ -416,6 +416,7 @@ export default class ApiController {
           password: string
           description?: string
           multisigConfig?: MultisigConfigModel
+          amendHash?: string
         }
       ) => {
         return this.#walletsController.sendTx({
@@ -840,6 +841,10 @@ export default class ApiController {
       return this.#offlineSignController.broadcastTransaction({ ...params, walletID: '' })
     })
 
+    handle('get-transaction-size', async (_, params) => {
+      return this.#transactionsController.getTransactionSize(params)
+    })
+
     handle('sign-and-export-transaction', async (_, params) => {
       return this.#offlineSignController.signAndExportTransaction({
         ...params,
diff --git a/packages/neuron-wallet/src/controllers/transactions.ts b/packages/neuron-wallet/src/controllers/transactions.ts
index eb3a4fabfc..193d7c7565 100644
--- a/packages/neuron-wallet/src/controllers/transactions.ts
+++ b/packages/neuron-wallet/src/controllers/transactions.ts
@@ -10,6 +10,7 @@ import Transaction from '../models/chain/transaction'
 
 import { set as setDescription, get as getDescription } from '../services/tx/transaction-description'
 import ShowGlobalDialogSubject from '../models/subjects/show-global-dialog'
+import TransactionSize from '../models/transaction-size'
 
 export default class TransactionsController {
   public async getAll(
@@ -146,4 +147,12 @@ export default class TransactionsController {
       throw err
     }
   }
+
+  public async getTransactionSize(tx: Transaction) {
+    const size = TransactionSize.tx(Transaction.fromObject(tx))
+    return {
+      status: ResponseCode.Success,
+      result: size,
+    }
+  }
 }
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index 61b972a0b4..08203144c7 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -416,6 +416,7 @@ export default class WalletsController {
       password: string
       description?: string
       multisigConfig?: MultisigConfigModel
+      amendHash?: string
     },
     skipSign = false
   ) {
@@ -438,7 +439,8 @@ export default class WalletsController {
         Transaction.fromObject(params.tx),
         params.password,
         false,
-        skipSign
+        skipSign,
+        params.amendHash
       )
     }
     const description = params.description || params.tx.description || ''
diff --git a/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts b/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts
new file mode 100644
index 0000000000..8bca7a08db
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/entities/amend-transaction.ts
@@ -0,0 +1,31 @@
+import { Column, PrimaryGeneratedColumn, Entity } from 'typeorm'
+
+@Entity()
+export default class AmendTransaction {
+  @PrimaryGeneratedColumn()
+  id!: number
+
+  @Column({
+    type: 'varchar',
+  })
+  hash!: string
+
+  @Column({
+    type: 'varchar',
+  })
+  amendHash!: string
+
+  static fromObject(params: { hash: string; amendHash: string }) {
+    const res = new AmendTransaction()
+    res.hash = params.hash
+    res.amendHash = params.amendHash
+    return res
+  }
+
+  public toModel() {
+    return {
+      hash: this.hash,
+      amendHash: this.amendHash,
+    }
+  }
+}
diff --git a/packages/neuron-wallet/src/database/chain/index.ts b/packages/neuron-wallet/src/database/chain/index.ts
index fcb13996e9..95a2a7a298 100644
--- a/packages/neuron-wallet/src/database/chain/index.ts
+++ b/packages/neuron-wallet/src/database/chain/index.ts
@@ -8,6 +8,7 @@ import IndexerTxHashCache from './entities/indexer-tx-hash-cache'
 import MultisigOutput from './entities/multisig-output'
 import SyncProgress from './entities/sync-progress'
 import TxLock from './entities/tx-lock'
+import AmendTransactionEntity from './entities/amend-transaction'
 import { getConnection } from '../../database/chain/connection'
 
 /*
@@ -15,7 +16,15 @@ import { getConnection } from '../../database/chain/connection'
  */
 export const clean = async (clearAllLightClientData?: boolean) => {
   await Promise.all([
-    ...[InputEntity, OutputEntity, TransactionEntity, IndexerTxHashCache, MultisigOutput, TxLock].map(entity => {
+    ...[
+      InputEntity,
+      OutputEntity,
+      TransactionEntity,
+      IndexerTxHashCache,
+      MultisigOutput,
+      TxLock,
+      AmendTransactionEntity,
+    ].map(entity => {
       return getConnection().getRepository(entity).clear()
     }),
     clearAllLightClientData
diff --git a/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts b/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts
new file mode 100644
index 0000000000..d6578a0dac
--- /dev/null
+++ b/packages/neuron-wallet/src/database/chain/migrations/1709008125088-AmendTransaction.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AmendTransaction1709008125088 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.query(`CREATE TABLE "amend_transaction" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "hash" varchar NOT NULL, "amendHash" varchar NOT NULL)`)
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+      await queryRunner.query(`DROP TABLE "amend_transaction"`)
+    }
+
+}
diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index a4c6c134d7..ac120deeca 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -21,6 +21,7 @@ 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 AmendTransaction from './entities/amend-transaction'
 
 import { InitMigration1566959757554 } from './migrations/1566959757554-InitMigration'
 import { AddTypeAndHasData1567144517514 } from './migrations/1567144517514-AddTypeAndHasData'
@@ -61,6 +62,7 @@ import { IndexerTxHashCacheRemoveField1701234043431 } from './migrations/1701234
 import { CreateCellLocalInfo1701234043432 } from './migrations/1701234043432-CreateCellLocalInfo'
 import { RenameSyncProgress1702781527414 } from './migrations/1702781527414-RenameSyncProgress'
 import { RemoveAddressInIndexerCache1704357651876 } from './migrations/1704357651876-RemoveAddressInIndexerCache'
+import { AmendTransaction1709008125088 } from './migrations/1709008125088-AmendTransaction'
 import { ConnectionName } from './connection'
 import AddressSubscribe from './subscriber/address-subscriber'
 import MultisigConfigSubscribe from './subscriber/multisig-config-subscriber'
@@ -106,6 +108,7 @@ const connectOptions = async (
       SyncProgress,
       TxLock,
       CellLocalInfo,
+      AmendTransaction,
     ],
     migrations: [
       InitMigration1566959757554,
@@ -147,6 +150,7 @@ const connectOptions = async (
       CreateCellLocalInfo1701234043432,
       RenameSyncProgress1702781527414,
       RemoveAddressInIndexerCache1704357651876,
+      AmendTransaction1709008125088,
     ],
     subscribers: [
       AddressSubscribe,
diff --git a/packages/neuron-wallet/src/services/amend-transaction.ts b/packages/neuron-wallet/src/services/amend-transaction.ts
new file mode 100644
index 0000000000..9933787483
--- /dev/null
+++ b/packages/neuron-wallet/src/services/amend-transaction.ts
@@ -0,0 +1,21 @@
+import { getConnection } from '../database/chain/connection'
+import AmendTransactionEntity from '../database/chain/entities/amend-transaction'
+
+export default class AmendTransactionService {
+  static async save(hash: string, amendHash: string) {
+    const exist = await getConnection().getRepository(AmendTransactionEntity).findOne({
+      hash,
+      amendHash,
+    })
+    if (exist) {
+      return
+    }
+
+    const amendTransactionEntity = AmendTransactionEntity.fromObject({
+      hash,
+      amendHash,
+    })
+
+    return await getConnection().manager.save(amendTransactionEntity)
+  }
+}
diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
index b8bc3f5962..d91b4e7b74 100644
--- a/packages/neuron-wallet/src/services/transaction-sender.ts
+++ b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -37,6 +37,7 @@ import AssetAccountInfo from '../models/asset-account-info'
 import MultisigConfigModel from '../models/multisig-config'
 import { Hardware } from './hardware/hardware'
 import MultisigService from './multisig'
+import AmendTransactionService from './amend-transaction'
 import { getMultisigStatus } from '../utils/multisig'
 import { SignStatus } from '../models/offline-sign'
 import NetworksService from './networks'
@@ -68,13 +69,14 @@ export default class TransactionSender {
     transaction: Transaction,
     password: string = '',
     skipLastInputs: boolean = true,
-    skipSign = false
+    skipSign = false,
+    amendHash = ''
   ) {
     const tx = skipSign
       ? Transaction.fromObject(transaction)
       : await this.sign(walletID, transaction, password, skipLastInputs)
 
-    return this.broadcastTx(walletID, tx)
+    return this.broadcastTx(walletID, tx, amendHash)
   }
 
   public async sendMultisigTx(
@@ -91,7 +93,7 @@ export default class TransactionSender {
     return this.broadcastTx(walletID, tx)
   }
 
-  public async broadcastTx(walletID: string = '', tx: Transaction) {
+  public async broadcastTx(walletID: string = '', tx: Transaction, amendHash = '') {
     const currentNetwork = NetworksService.getInstance().getCurrent()
     const rpc = generateRPC(currentNetwork.remote, currentNetwork.type)
     await rpc.sendTransaction(tx.toSDKRawTransaction(), 'passthrough')
@@ -99,6 +101,9 @@ export default class TransactionSender {
 
     await TransactionPersistor.saveSentTx(tx, txHash)
     await MultisigService.saveSentMultisigOutput(tx)
+    if (amendHash) {
+      await AmendTransactionService.save(txHash, amendHash)
+    }
 
     if (walletID) {
       const wallet = WalletService.getInstance().get(walletID)
diff --git a/packages/neuron-wallet/src/services/tx/failed-transaction.ts b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
index 6841cedca1..996c53d336 100644
--- a/packages/neuron-wallet/src/services/tx/failed-transaction.ts
+++ b/packages/neuron-wallet/src/services/tx/failed-transaction.ts
@@ -1,10 +1,12 @@
-import { In } from 'typeorm'
+import { In, Not } from 'typeorm'
 import { getConnection } from '../../database/chain/connection'
 import OutputEntity from '../../database/chain/entities/output'
+import InputEntity from '../../database/chain/entities/input'
 import TransactionEntity from '../../database/chain/entities/transaction'
 import { OutputStatus } from '../../models/chain/output'
 import TransactionsService from './transaction-service'
 import { TransactionStatus } from '../../models/chain/transaction'
+import AmendTransactionEntity from '../../database/chain/entities/amend-transaction'
 
 export class FailedTransaction {
   public static pendings = async (): Promise<TransactionEntity[]> => {
@@ -19,6 +21,65 @@ export class FailedTransaction {
     return pendingTransactions
   }
 
+  public static processAmendFailedTxs = async () => {
+    const failedTransactions = await getConnection()
+      .getRepository(TransactionEntity)
+      .createQueryBuilder('tx')
+      .where({
+        status: TransactionStatus.Failed,
+      })
+      .select('tx.hash', 'hash')
+      .getRawMany()
+
+    if (!failedTransactions.length) return
+
+    const failedHashes = failedTransactions.map(item => item.hash)
+
+    const amendTxs = await getConnection()
+      .getRepository(AmendTransactionEntity)
+      .createQueryBuilder('amend')
+      .where([
+        { amendHash: In(failedHashes), hash: Not(In(failedHashes)) },
+        { hash: In(failedHashes), amendHash: Not(In(failedHashes)) },
+      ])
+      .getMany()
+
+    if (!amendTxs) return
+
+    const removeTxs: string[] = []
+    amendTxs.forEach(({ hash, amendHash }) => {
+      if (failedHashes.includes(hash)) {
+        removeTxs.push(hash)
+      }
+      if (failedHashes.includes(amendHash)) {
+        removeTxs.push(amendHash)
+      }
+    })
+
+    await getConnection().manager.transaction(async transactionalEntityManager => {
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(TransactionEntity)
+        .where({ hash: In(removeTxs) })
+        .execute()
+
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(OutputEntity)
+        .where({ outPointTxHash: In(removeTxs) })
+        .execute()
+
+      await transactionalEntityManager
+        .createQueryBuilder()
+        .delete()
+        .from(InputEntity)
+        .where({ outPointTxHash: In(removeTxs) })
+        .execute()
+    })
+  }
+
   // update tx status to TransactionStatus.Failed
   // update outputs status to OutputStatus.Failed
   // update previous outputs (inputs) to OutputStatus.Live

From 0fd9de0ab9361769d02ae2d6ff444819884e709a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Thu, 14 Mar 2024 14:40:56 +0800
Subject: [PATCH 58/68] fix: If node is connecting, show '--' for confirmation
 (#3071)

---
 packages/neuron-ui/src/components/History/RowExtend.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/components/History/RowExtend.tsx b/packages/neuron-ui/src/components/History/RowExtend.tsx
index 980fb87b28..8a0a6e5ad8 100644
--- a/packages/neuron-ui/src/components/History/RowExtend.tsx
+++ b/packages/neuron-ui/src/components/History/RowExtend.tsx
@@ -61,8 +61,10 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   )
 
   const { blockNumber, hash, description, status } = column
-  const confirmations = blockNumber ? 1 + bestBlockNumber - +blockNumber : 0
-  const confirmationsLabel = confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
+  const confirmations = bestBlockNumber && blockNumber ? 1 + bestBlockNumber - +blockNumber : null
+  const confirmationsLabel =
+    // eslint-disable-next-line no-nested-ternary
+    confirmations === null ? '--' : confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
   const onCopy = useCallback(() => {
     window.navigator.clipboard.writeText(hash)
     showPageNotice('common.copied')(dispatch)

From ec15a784fe6b9db9e4b99f2f885b1671da4edf6f Mon Sep 17 00:00:00 2001
From: yanguoyu <841185308@qq.com>
Date: Thu, 14 Mar 2024 16:13:13 +0800
Subject: [PATCH 59/68] Delete connector.test.ts

---
 .../block-sync-renderer/connector.test.ts     | 411 ------------------
 1 file changed, 411 deletions(-)
 delete mode 100644 packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts

diff --git a/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
deleted file mode 100644
index acc7b37354..0000000000
--- a/packages/neuron-wallet/tests/block-sync-renderer/connector.test.ts
+++ /dev/null
@@ -1,411 +0,0 @@
-import { scriptToAddress } from '../../src/utils/scriptAndAddress'
-import { AddressType } from '../../src/models/keys/address'
-import { Address, AddressVersion } from '../../src/models/address'
-import SystemScriptInfo from '../../src/models/system-script-info'
-import { Connector, type LumosCell, type LumosCellQuery } from '../../src/block-sync-renderer/sync/connector'
-import AddressMeta from '../../src/database/address/meta'
-import IndexerTxHashCache from '../../src/database/chain/entities/indexer-tx-hash-cache'
-import { ScriptHashType } from '../../src/models/chain/script'
-
-const stubbedNextUnprocessedBlockFn = jest.fn()
-const stubbedNextUnprocessedTxsGroupedByBlockNumberFn = jest.fn()
-const stubbedProcessTxsInNextBlockNumberFn = jest.fn()
-const stubbedIndexerConstructor = jest.fn()
-const stubbedCellCollectorConstructor = jest.fn()
-const stubbedBlockTipsSubscribe = jest.fn()
-const stubbedCellCellectFn = jest.fn()
-
-class TestConnector extends Connector {
-  async connect() {}
-  async processTxsInNextBlockNumber(): Promise<void> {
-    return stubbedProcessTxsInNextBlockNumberFn()
-  }
-
-  async upsertTxHashes(): Promise<void> {}
-
-  async notifyCurrentBlockNumberProcessed() {}
-
-  getAddressesByWalletId() {
-    return this.addressesByWalletId
-  }
-}
-
-const script = SystemScriptInfo.generateSecpScript('0x36c329ed630d6ce750712a477543672adab57f4c')
-const address = scriptToAddress(script, false)
-const walletId1 = 'walletid1'
-const walletId2 = 'walletid2'
-const addressObj1: Address = {
-  address,
-  blake160: '0x',
-  walletId: walletId1,
-  path: '',
-  addressType: AddressType.Receiving,
-  addressIndex: 0,
-  txCount: 0,
-  liveBalance: '',
-  sentBalance: '',
-  pendingBalance: '',
-  balance: '',
-  version: AddressVersion.Testnet,
-}
-const addressObj2: Address = {
-  address,
-  blake160: '0x',
-  walletId: walletId2,
-  path: '',
-  addressType: AddressType.Receiving,
-  addressIndex: 0,
-  txCount: 0,
-  liveBalance: '',
-  sentBalance: '',
-  pendingBalance: '',
-  balance: '',
-  version: AddressVersion.Testnet,
-}
-
-const resetMocks = () => {
-  stubbedNextUnprocessedBlockFn.mockReset()
-  stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockReset()
-  stubbedProcessTxsInNextBlockNumberFn.mockReset()
-  stubbedIndexerConstructor.mockReset()
-  stubbedCellCollectorConstructor.mockReset()
-  stubbedBlockTipsSubscribe.mockReset()
-  stubbedCellCellectFn.mockReset()
-}
-
-jest.mock('@ckb-lumos/ckb-indexer', () => {
-  return {
-    Indexer: class {
-      constructor(...params: unknown[]) {
-        stubbedIndexerConstructor(...params)
-      }
-    },
-    CellCollector: class {
-      constructor(...params: unknown[]) {
-        return stubbedCellCollectorConstructor(...params)
-      }
-
-      collect(...params: unknown[]) {
-        return stubbedCellCellectFn(...params)
-      }
-    },
-  }
-})
-
-jest.mock('../../src/block-sync-renderer/sync/indexer-cache-service', () => ({
-  nextUnprocessedBlock: () => stubbedNextUnprocessedBlockFn(),
-  nextUnprocessedTxsGroupedByBlockNumber: (walletId: string) =>
-    stubbedNextUnprocessedTxsGroupedByBlockNumberFn(walletId),
-}))
-
-describe('unit tests for IndexerConnector', () => {
-  const nodeUrl = 'http://nodeurl:8114'
-
-  beforeEach(() => {
-    resetMocks()
-    jest.useFakeTimers('legacy')
-  })
-  afterEach(() => {
-    jest.clearAllTimers()
-  })
-
-  describe('#constructor', () => {
-    const STUB_URI = 'stub_uri'
-
-    it('inits lumos indexer with a node url and indexer folder path', () => {
-      new TestConnector({
-        addresses: [],
-        nodeUrl,
-        indexerUrl: STUB_URI,
-      })
-      expect(stubbedIndexerConstructor).toHaveBeenCalledWith(nodeUrl, STUB_URI)
-    })
-
-    it('init with addresses', () => {
-      const connector = new TestConnector({
-        addresses: [addressObj1, addressObj2],
-        nodeUrl,
-        indexerUrl: STUB_URI,
-      })
-      expect(connector.getAddressesByWalletId().get(walletId1)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj1))
-      expect(connector.getAddressesByWalletId().get(walletId2)?.[0]).toStrictEqual(AddressMeta.fromObject(addressObj2))
-    })
-  })
-
-  describe('#getTxHashesWithNextUnprocessedBlockNumber', () => {
-    const connector = new TestConnector({
-      addresses: [addressObj1, addressObj2],
-      nodeUrl,
-      indexerUrl: '',
-    })
-    it('no cached tx', async () => {
-      stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockResolvedValue([])
-      // @ts-ignore private method
-      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
-      expect(result).toStrictEqual([undefined, []])
-    })
-    it('get cached tx and sort by block number', async () => {
-      stubbedNextUnprocessedTxsGroupedByBlockNumberFn.mockImplementation(walletId =>
-        walletId === walletId1
-          ? [
-              IndexerTxHashCache.fromObject({
-                txHash: 'hash1',
-                blockNumber: 10,
-                lockHash: script.computeHash(),
-                address,
-                walletId,
-              }),
-            ]
-          : [
-              IndexerTxHashCache.fromObject({
-                txHash: 'hash2',
-                blockNumber: 2,
-                lockHash: script.computeHash(),
-                address,
-                walletId,
-              }),
-            ]
-      )
-      // @ts-ignore private method
-      const result = await connector.getTxHashesWithNextUnprocessedBlockNumber()
-      expect(result).toStrictEqual(['2', ['hash2']])
-    })
-  })
-
-  describe('#notifyAndSyncNext', () => {
-    const connector = new TestConnector({
-      addresses: [addressObj1, addressObj2],
-      nodeUrl,
-      indexerUrl: '',
-    })
-    connector.blockTipsSubject.subscribe(stubbedBlockTipsSubscribe)
-
-    it('exist unprocessed block and no current process block', async () => {
-      //@ts-ignore private property
-      connector.processingBlockNumber = undefined
-      stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
-      //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
-      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
-        cacheTipNumber: 10,
-        indexerTipNumber: 100,
-      })
-      expect(stubbedProcessTxsInNextBlockNumberFn).toHaveBeenCalled()
-    })
-    it('exist unprocessed block and has current process block', async () => {
-      //@ts-ignore private property
-      connector.processingBlockNumber = '5'
-      stubbedNextUnprocessedBlockFn.mockResolvedValue('10')
-      //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
-      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
-        cacheTipNumber: 10,
-        indexerTipNumber: 100,
-      })
-      expect(stubbedProcessTxsInNextBlockNumberFn).toHaveBeenCalledTimes(0)
-    })
-    it('no unprocessed block', async () => {
-      //@ts-ignore private property
-      connector.processingBlockNumber = '5'
-      stubbedNextUnprocessedBlockFn.mockResolvedValue(undefined)
-      //@ts-ignore private method
-      await connector.notifyAndSyncNext(100)
-      expect(stubbedBlockTipsSubscribe).toHaveBeenCalledWith({
-        cacheTipNumber: 100,
-        indexerTipNumber: 100,
-      })
-    })
-  })
-
-  describe('#getLiveCellsByScript', () => {
-    let fakeCell1: LumosCell, fakeCell2: LumosCell
-    let cells: LumosCell[]
-
-    fakeCell1 = {
-      blockHash: '0x',
-      outPoint: {
-        txHash: '0x',
-        index: '0x0',
-      },
-      cellOutput: {
-        capacity: '0x0',
-        lock: {
-          hashType: 'type',
-          codeHash: '0xcode',
-          args: '0x1',
-        },
-        type: {
-          hashType: 'data',
-          codeHash: '0xcode',
-          args: '0x1',
-        },
-      },
-    }
-    fakeCell2 = {
-      blockHash: '0x',
-      outPoint: {
-        txHash: '0x',
-        index: '0x0',
-      },
-      cellOutput: {
-        capacity: '0x0',
-        lock: {
-          hashType: 'type',
-          codeHash: '0xcode',
-          args: '0x2',
-        },
-        type: {
-          hashType: 'lock',
-          codeHash: '0xcode',
-          args: '0x2',
-        },
-      },
-    }
-    const fakeCells = [fakeCell1, fakeCell2]
-
-    const connector = new TestConnector({
-      addresses: [addressObj1, addressObj2],
-      nodeUrl,
-      indexerUrl: '',
-    })
-
-    describe('when success', () => {
-      const query: LumosCellQuery = {
-        lock: {
-          hashType: ScriptHashType.Data,
-          codeHash: '0xcode',
-          args: '0x',
-        },
-        type: {
-          hashType: ScriptHashType.Data,
-          codeHash: '0xcode',
-          args: '0x',
-        },
-        data: null,
-      }
-
-      beforeEach(async () => {
-        stubbedCellCellectFn.mockReturnValueOnce([
-          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[0])))),
-          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
-        ])
-
-        //@ts-ignore
-        cells = await connector.getLiveCellsByScript(query)
-      })
-      it('transform the query parameter', () => {
-        expect(stubbedCellCollectorConstructor.mock.calls[0][1]).toEqual({
-          lock: {
-            hashType: query.lock!.hashType,
-            codeHash: query.lock!.codeHash,
-            args: query.lock!.args,
-          },
-          type: {
-            hashType: query.type!.hashType,
-            codeHash: query.type!.codeHash,
-            args: query.type!.args,
-          },
-          data: 'any',
-        })
-      })
-      it('returns live cells with property value fix', async () => {
-        fakeCell2.cellOutput.type!.hashType = 'data'
-        expect(cells).toEqual([fakeCell1, fakeCell2])
-      })
-    })
-    describe('when handling concurrent requests', () => {
-      const query1: LumosCellQuery = {
-        lock: {
-          hashType: ScriptHashType.Data,
-          codeHash: '0xcode',
-          args: '0x1',
-        },
-        type: {
-          hashType: ScriptHashType.Data,
-          codeHash: '0xcode',
-          args: '0x1',
-        },
-        data: null,
-      }
-      const query2: LumosCellQuery = {
-        lock: {
-          hashType: ScriptHashType.Type,
-          codeHash: '0xcode',
-          args: '0x2',
-        },
-        type: {
-          hashType: ScriptHashType.Type,
-          codeHash: '0xcode',
-          args: '0x2',
-        },
-        data: null,
-      }
-
-      const results: unknown[] = []
-      beforeEach(async () => {
-        const stubbedCellCellect1 = jest.fn()
-        stubbedCellCellect1.mockReturnValueOnce([
-          new Promise(resolve => {
-            //fake the waiting, the other concurrent requests should wait until this is finished
-            setTimeout(() => {
-              resolve(JSON.parse(JSON.stringify(fakeCells[0])))
-            }, 500)
-          }),
-        ])
-
-        const stubbedCellCellect2 = jest.fn()
-        stubbedCellCellect2.mockReturnValueOnce([
-          new Promise(resolve => resolve(JSON.parse(JSON.stringify(fakeCells[1])))),
-        ])
-
-        stubbedCellCollectorConstructor.mockImplementation((_indexer: any, query: any) => {
-          if (query.lock.args === '0x1') {
-            return {
-              collect: stubbedCellCellect1,
-            }
-          }
-          if (query.lock.args === '0x2') {
-            return {
-              collect: stubbedCellCellect2,
-            }
-          }
-        })
-
-        const promises = Promise.all([
-          new Promise<void>(resolve => {
-            connector.getLiveCellsByScript(query1).then(cells => {
-              results.push(cells)
-              resolve()
-            })
-          }),
-          new Promise<void>(resolve => {
-            connector.getLiveCellsByScript(query2).then(cells => {
-              results.push(cells)
-              resolve()
-            })
-          }),
-        ])
-
-        jest.advanceTimersByTime(500)
-        await promises
-      })
-      it('process one by one in order', () => {
-        expect(results.length).toEqual(2)
-        expect(results[0]).toEqual([fakeCells[0]])
-      })
-    })
-    describe('when fails', () => {
-      describe('when both type and lock parameter is not specified', () => {
-        it('throws error', async () => {
-          let err
-          try {
-            await connector.getLiveCellsByScript({ lock: null, type: null, data: null })
-          } catch (error) {
-            err = error
-          }
-          expect(err).toEqual(new Error('at least one parameter is required'))
-        })
-      })
-    })
-  })
-})

From e78447653ed9b5604b616303124a6b9f0efdf4cd Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 00:39:54 +0900
Subject: [PATCH 60/68] ci: set action permission to update env

---
 .github/workflows/update_wallet_env.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/update_wallet_env.yml b/.github/workflows/update_wallet_env.yml
index bda340a1ba..f02a69b70b 100644
--- a/.github/workflows/update_wallet_env.yml
+++ b/.github/workflows/update_wallet_env.yml
@@ -7,6 +7,10 @@ jobs:
   ready-for-release:
     name: Update ckb node assume valid target
     runs-on: ubuntu-latest
+    environment: neuron-bot
+    permissions:
+      pull-requests: write # open PR
+      contents: write # update version files
     if: ${{ startsWith(github.ref_name, 'rc/') }}
     steps:
       - name: Create Branch

From 41a5718e44e1d1676f1c1c87cafe3219eb59b21f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 15:44:04 +0000
Subject: [PATCH 61/68] chore: Update ckb node assume valid target for
 rc/v0.114.0.

---
 packages/neuron-wallet/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-wallet/.env b/packages/neuron-wallet/.env
index b86de40909..ea6ce9081c 100644
--- a/packages/neuron-wallet/.env
+++ b/packages/neuron-wallet/.env
@@ -117,5 +117,5 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
 MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
 
 # CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0xe88730476c6ef0508f4767b233c82a0f20c6365fb1572bf020cb1dce2a0e704b'
-CKB_NODE_DATA_SIZE=49
+CKB_NODE_ASSUME_VALID_TARGET='0x397d7d41167051cab2bf1610e334ad3aa5cf612e2cd442f71b91422e0361141e'
+CKB_NODE_DATA_SIZE=51

From 2e7fa471fed3cecd91403b6c1b8937a6a2cff783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com>
Date: Fri, 15 Mar 2024 00:04:27 +0800
Subject: [PATCH 62/68] fix: When the tx is confirming also show -- (#3075)

---
 packages/neuron-ui/src/components/History/RowExtend.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/components/History/RowExtend.tsx b/packages/neuron-ui/src/components/History/RowExtend.tsx
index 8a0a6e5ad8..be6f9aa5fb 100644
--- a/packages/neuron-ui/src/components/History/RowExtend.tsx
+++ b/packages/neuron-ui/src/components/History/RowExtend.tsx
@@ -64,7 +64,11 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   const confirmations = bestBlockNumber && blockNumber ? 1 + bestBlockNumber - +blockNumber : null
   const confirmationsLabel =
     // eslint-disable-next-line no-nested-ternary
-    confirmations === null ? '--' : confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
+    confirmations === null || confirmations < 0
+      ? '--'
+      : confirmations > 1000
+      ? '1,000+'
+      : localNumberFormatter(confirmations)
   const onCopy = useCallback(() => {
     window.navigator.clipboard.writeText(hash)
     showPageNotice('common.copied')(dispatch)

From 5c776c7926d4bb78df0e8542c70b09b52b7cad1b Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 01:47:08 +0900
Subject: [PATCH 63/68] chore: update versions and changelogs

---
 CHANGELOG.md                        | 56 +++++++++++++++++++++++++++++
 lerna.json                          |  2 +-
 package.json                        |  2 +-
 packages/neuron-ui/package.json     |  2 +-
 packages/neuron-wallet/package.json |  4 +--
 5 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd475928af..24d51f8e7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,59 @@
+# 0.114.0 (2024-03-15)
+
+### CKB Node & Light Client
+
+- [CKB@v0.114.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.114.0) was released on Feb. 29st, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.3.6](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.6) was released on Feb. 8th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x397d7d41167051cab2bf1610e334ad3aa5cf612e2cd442f71b91422e0361141e`(at height `12,450,084`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3077)
+
+---
+
+Good day, good Neuron, packed with exciting new features and enhancements to elevate your transaction experience!
+
+With support for Cell Management, Chained Transactions, and detailed viewing options, managing your transactions has never been easier.
+
+We're also thrilled to announce multilingual support, with French and Spanish interfaces now available, thanks to the contributions of our dedicated community members.
+
+Plus, enjoy enhanced guidance features like remaining time estimation and the ability to amend pending transactions for added flexibility.
+
+With optimizations to settings and transaction overviews, Neuron continues to prioritize efficiency and user satisfaction.
+
+Upgrade now and experience seamless transaction management with Neuron.
+
+[![Neuron@v0.114.0](https://github.com/nervosnetwork/neuron/assets/7271329/883aba6e-ceb0-402d-9de0-d46609c528b7)](https://youtu.be/WjEzMS2T9F0)
+
+---
+
+## New features
+
+- #2859: Support Cell Management.(@yanguoyu)
+- #2963: Support chained transactions.(@yanguoyu)
+- #2986: Support viewing chained transaction detail.(@yanguoyu)
+- #3012: Support French in User Interface.(Special thanks to @Natixe)
+- #3024: Support Spanish in User Interface.(Special thanks to @Natixe)
+- #3014: Support remaining time estimation.(@yanguoyu)
+- #3045: Support "amend a pending transaction".(@devchenyan)
+- #3005: Show tip for first sync and show warning when disk is not enough for full-node mode.(@yanguoyu)
+- #2994: Optimize setting of light client.(@yanguoyu)
+- #3040: Optimize transaction overview.(@yanguoyu)
+
+## Bug fixes
+
+- #2951: Fix error on creating multisig address.(@devchenyan)
+- #2992: Fix transaction lost in light client mode.(@yanguoyu)
+- #3010: Fix storage of multisig configuration.(@yanguoyu)
+- #3020: Disable nervos dao unlock button when balance is not enough as transaction fee.(@yanguoyu)
+
+## New Contributors
+
+- @Natixe made their first contribution in https://github.com/nervosnetwork/neuron/pull/3012
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.112.0...v0.114.0
+
+
 # 0.112.0 (2023-12-07)
 
 ### CKB Node & Light Client
diff --git a/lerna.json b/lerna.json
index 8fd1da0d48..e54ad8d2e1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.112.0",
+  "version": "0.114.0",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/package.json b/package.json
index 1318cbb1a7..d3a1d54f1a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.112.0",
+  "version": "0.114.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 512984e473..ea55615543 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.112.0",
+  "version": "0.114.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 80a35b051d..6fb2eb31d0 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.112.0",
+  "version": "0.114.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -98,7 +98,7 @@
     "electron-builder": "24.9.1",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.6.0",
-    "neuron-ui": "0.112.0",
+    "neuron-ui": "0.114.0",
     "typescript": "5.3.3"
   }
 }

From 9056a90fa8d29d12eb0707982872eff6bc028981 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 02:16:41 +0900
Subject: [PATCH 64/68] Update Neuron compatibility table (#3078)

Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
---
 compatible.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/compatible.json b/compatible.json
index 5e1b154e38..c2c41af8a5 100644
--- a/compatible.json
+++ b/compatible.json
@@ -75,6 +75,20 @@
         "0.3",
         "0.2"
       ]
+    },
+    "0.114": {
+      "full": [
+        "0.114",
+        "0.113",
+        "0.112",
+        "0.111",
+        "0.110",
+        "0.109"
+      ],
+      "light": [
+        "0.3",
+        "0.2"
+      ]
     }
   }
-}
+}

From a4e89aa27818626f7aedcbda4639d63ec392148b Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 02:53:53 +0900
Subject: [PATCH 65/68] ci: upload mac artifacts with distinct name

Ref: https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md#overwriting-an-artifact
---
 .github/workflows/package.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 8243b58b3a..f41f8406f2 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -136,28 +136,28 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Mac
+          name: Neuron-Mac-x64
           path: release/Neuron-*-mac-x64.zip
 
       - name: Upload Neuron App Zip(arm64)
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Mac
+          name: Neuron-Mac-arm64
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Dmg
+          name: Neuron-Dmg-x64
           path: release/Neuron-*-x64.dmg
 
       - name: Upload Neuron Dmg(arm64)
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Dmg
+          name: Neuron-Dmg-arm64
           path: release/Neuron-*-arm64.dmg
 
       - name: Upload Neuron Win

From 7f205982574fe9aee8056f7a82c46858a2e63aed Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 03:02:24 +0900
Subject: [PATCH 66/68] ci: grant package.yml to upload artifacts to release
 note

---
 .github/workflows/package.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index f41f8406f2..e4a0171d42 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -21,6 +21,8 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     environment: Release
+    permissions:
+      contents: write
 
     name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
 

From ef733706cc88a6135099ea9842dcd50181a80de8 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 03:25:22 +0900
Subject: [PATCH 67/68] ci: grant checksums-of-release-draft.yml to load
 artifacts from release note

---
 .github/workflows/checksums-of-release-draft.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checksums-of-release-draft.yml b/.github/workflows/checksums-of-release-draft.yml
index e0881a8db9..de95e0a90d 100644
--- a/.github/workflows/checksums-of-release-draft.yml
+++ b/.github/workflows/checksums-of-release-draft.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   checksums:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     if: github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Checkout

From dcf2232842e83bb5319b9d7caa2365e5b6ada580 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Fri, 15 Mar 2024 13:29:07 +0900
Subject: [PATCH 68/68] docs: update introduction video of v0.114.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d51f8e7c..e79308d215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ With optimizations to settings and transaction overviews, Neuron continues to pr
 
 Upgrade now and experience seamless transaction management with Neuron.
 
-[![Neuron@v0.114.0](https://github.com/nervosnetwork/neuron/assets/7271329/883aba6e-ceb0-402d-9de0-d46609c528b7)](https://youtu.be/WjEzMS2T9F0)
+[![Neuron@v0.114.0](https://github.com/nervosnetwork/neuron/assets/7271329/883aba6e-ceb0-402d-9de0-d46609c528b7)](https://youtu.be/df29-EUZG0Y)
 
 ---