Merge branch 'develop' into fix-460

devchenyan · devchenyan · commit dd5c6a6c7b0e · 2025-05-13T23:25:04.000+08:00
diff --git a/.ckb-version b/.ckb-version
@@ -1 +1 @@
-v0.200.0
+v0.201.0
diff --git a/.github/workflows/check_storybook.yml b/.github/workflows/check_storybook.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         node:
-          - 20.15.1
+          - lts/*
         os:
           - macos-latest
-          - ubuntu-20.04
+          - ubuntu-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
@@ -42,11 +42,11 @@ jobs:
             */*/node_modules
           key: 2022-10-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
-      - name: Install libudev
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Install Linux Dependencies
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libudev-dev
+          sudo apt-get install -y libudev-dev libusb-1.0-0-dev
 
       - name: Install Lerna
         run: yarn global add lerna
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         node:
-          - 20.15.1
+          - lts/*
         os:
           - macos-latest
-          - ubuntu-20.04
-          - windows-2019
+          - ubuntu-latest
+          - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -88,11 +88,11 @@ jobs:
           smctl windows certsync
         shell: cmd
 
-      - name: Install libudev
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Install Linux Dependencies
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libudev-dev
+          sudo apt-get install -y libudev-dev libusb-1.0-0-dev
 
       - name: Install Lerna
         run: yarn global add lerna
diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         node:
-          - 20.15.1
+          - lts/*
         os:
           - macos-latest
-          - ubuntu-20.04
-          - windows-2019
+          - ubuntu-latest
+          - windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -130,11 +130,11 @@ jobs:
           smctl windows certsync
         shell: cmd
 
-      - name: Install libudev
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Install Linux Dependencies
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libudev-dev
+          sudo apt-get install -y libudev-dev libusb-1.0-0-dev
 
       - name: Install Lerna
         run: yarn global add lerna
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         node:
-          - 20.15.1
+          - lts/*
         os:
           - macos-latest
-          - ubuntu-20.04
+          - ubuntu-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
@@ -42,11 +42,11 @@ jobs:
             */*/node_modules
           key: 2022-10-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
-      - name: Install libudev
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Install Linux Dependencies
+        if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libudev-dev
+          sudo apt-get install -y libudev-dev libusb-1.0-0-dev
 
       - name: Install Lerna
         run: yarn global add lerna
diff --git a/.github/workflows/update_ckb_client_versions.yml b/.github/workflows/update_ckb_client_versions.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.15.1
+          node-version: lts/*
 
       - name: Update versions
         id: update_versions
diff --git a/.github/workflows/update_neuron_compatible.yml b/.github/workflows/update_neuron_compatible.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.15.1
+          node-version: lts/*
 
       - name: Update versions
         id: update_versions
diff --git a/.github/workflows/update_wallet_env.yml b/.github/workflows/update_wallet_env.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.15.1
+          node-version: lts/*
 
       - name: Write env file
         run: |
diff --git a/compatible.json b/compatible.json
@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.201",
     "0.200",
     "0.121",
     "0.120",
@@ -29,6 +30,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -52,6 +54,7 @@
     },
     "0.110": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -91,6 +94,7 @@
     },
     "0.112": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -114,6 +118,7 @@
     },
     "0.114": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -137,6 +142,7 @@
     },
     "0.116": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -160,6 +166,7 @@
     },
     "0.117": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -183,6 +190,7 @@
     },
     "0.119": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -206,6 +214,7 @@
     },
     "0.120": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
@@ -229,6 +238,7 @@
     },
     "0.121": {
       "full": [
+        "0.201",
         "0.200",
         "0.121",
         "0.120",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -56,7 +56,7 @@
     "@ckb-lumos/helpers": "0.23.0",
     "@ckb-lumos/lumos": "0.23.0",
     "@ckb-lumos/rpc": "0.23.0",
-    "canvg": "2.0.0",
+    "canvg": "3.0.11",
     "i18next": "23.7.11",
     "immer": "9.0.21",
     "jsqr": "1.4.0",
@@ -108,7 +108,7 @@
     "storybook": "8.6.4",
     "storybook-addon-react-router-v6": "2.0.10",
     "terser": "5.39.0",
-    "vite": "6.2.4",
+    "vite": "6.2.6",
     "vite-plugin-commonjs": "0.10.4",
     "vite-plugin-eslint": "1.8.1",
     "vite-plugin-node-polyfills": "0.23.0",
diff --git a/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx b/packages/neuron-ui/src/components/SetStartBlockNumberDialog/index.tsx
@@ -81,10 +81,6 @@ const SetStartBlockNumberDialog = ({
     const explorerUrl = getExplorerUrl(isMainnet)
     openExternal(`${explorerUrl}/address/${address}?sort=time`)
   }, [address, isMainnet])
-  const onViewBlock = useCallback(() => {
-    const explorerUrl = getExplorerUrl(isMainnet)
-    openExternal(`${explorerUrl}/block/${startBlockNumber}`)
-  }, [startBlockNumber, isMainnet])
   const onConfirm = useCallback(() => {
     if (startBlockNumber !== undefined) {
       onUpdateStartBlockNumber(startBlockNumber).catch(res => {
@@ -95,14 +91,16 @@ const SetStartBlockNumberDialog = ({
   useEffect(() => {
     if (show) {
       setStartBlockNumber(initStartBlockNumber)
+      resetCountDown()
     }
-  }, [show, initStartBlockNumber, setStartBlockNumber])
+  }, [show, initStartBlockNumber, setStartBlockNumber, resetCountDown])
   return (
     <Dialog
       title={t('set-start-block-number.title')}
-      confirmText={countdown ? `${t('common.confirm')}(${countdown})` : t('common.confirm')}
+      confirmText={countdown ? `${t('common.confirm')} (${countdown})` : t('common.confirm')}
       show={show}
       onCancel={onCancel}
+      showCancel={false}
       onConfirm={onConfirm}
       disabled={!startBlockNumber || !!countdown}
       contentClassName={styles.setBlockContent}
@@ -120,17 +118,10 @@ const SetStartBlockNumberDialog = ({
           value={startBlockNumber === undefined ? '' : localNumberFormatter(startBlockNumber)}
           error={blockNumberErr}
           suffix={
-            startBlockNumber !== undefined ? (
-              <button type="button" className={styles.viewAction} onClick={onViewBlock}>
-                {t('set-start-block-number.view-block')}
-                <NewTab />
-              </button>
-            ) : (
-              <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
-                {t('set-start-block-number.locate-first-tx')}
-                <NewTab />
-              </button>
-            )
+            <button type="button" className={styles.viewAction} onClick={onOpenAddressInExplorer}>
+              {t('set-start-block-number.locate-first-tx')}
+              <NewTab />
+            </button>
           }
         />
         {isSetLessThanBefore ? (
diff --git a/packages/neuron-ui/src/locales/ar.json b/packages/neuron-ui/src/locales/ar.json
@@ -1260,8 +1260,8 @@
       "switchToPrice": "التبديل إلى السعر"
     },
     "set-start-block-number": {
-      "title": "تعيين رقم كتلة البداية",
-      "warn": "تحذير: لن تتم مزامنة المعاملات قبل كتلة البداية للمزامنة",
+      "title": "تعيين كتلة بدء المزامنة",
+      "warn": "لضمان دقة مزامنة البيانات، يُرجى إدخال رقم الكتلة لأول معاملة في محفظتك",
       "tip": "رقم كتلة المزامنة البدء هو تكوين عند استخدام عقدة ckb خفيفة العميل، ثم يمكنك تعيينه وتسريع المزامنة",
       "input-place-holder": "يرجى إدخال رقم كتلة المزامنة البدء، مثل: 10,100,101",
       "locate-first-tx": "تحديد المعاملة الأولى",
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
@@ -1260,8 +1260,8 @@
       "switchToPrice": "Switch to price"
     },
     "set-start-block-number": {
-      "title": "Set the start block number",
-      "warn": "Warning: Transactions before the start block of synchronization will not be synchronized",
+      "title": "Set synchronization start block",
+      "warn": "To ensure accurate data synchronization, please enter the block number of your wallet's first transaction",
       "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",
diff --git a/packages/neuron-ui/src/locales/es.json b/packages/neuron-ui/src/locales/es.json
@@ -1243,8 +1243,8 @@
       "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",
+      "title": "Establecer bloque de inicio de sincronización",
+      "warn": "Para garantizar una sincronización precisa de datos, ingrese el número de bloque de la primera transacción de su billetera",
       "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"
diff --git a/packages/neuron-ui/src/locales/fr.json b/packages/neuron-ui/src/locales/fr.json
@@ -1250,8 +1250,8 @@
       "switchToPrice": "Basculer vers le prix"
     },
     "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 !",
+      "title": "Définir le bloc de début de synchronisation",
+      "warn": "Pour garantir une synchronisation précise des données, veuillez saisir le numéro de bloc de la première transaction de votre portefeuille",
       "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",
diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json
@@ -1253,8 +1253,8 @@
       "switchToPrice": "切換到單價"
     },
     "set-start-block-number": {
-      "title": "設置同步起始區塊",
-      "warn": "請註意，同步起始區塊之前的交易不會被同步！",
+      "title": "設定同步起始區塊",
+      "warn": "為確保數據同步準確性，請輸入您錢包第一筆交易的區塊高度",
       "tip": "輕客戶端模式下的訂閱起始點是可配置的，因此您可以設置同步起始區塊以加快同步速度。",
       "input-place-holder": "輸入同步起始區塊高度，例如：10,100,101",
       "locate-first-tx": "定位第一筆交易",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
@@ -1253,7 +1253,7 @@
     },
     "set-start-block-number": {
       "title": "设置同步起始区块",
-      "warn": "请注意，同步起始区块之前的交易不会被同步！",
+      "warn": "为确保数据同步准确性，请输入您钱包第一笔交易的区块高度",
       "tip": "轻客户端模式下的订阅起始点是可配置的，因此您可以设置同步起始区块以加快同步速度。",
       "input-place-holder": "输入同步起始区块高度，例如：10,100,101",
       "locate-first-tx": "定位第一笔交易",
diff --git a/packages/neuron-ui/src/widgets/QRCode/index.tsx b/packages/neuron-ui/src/widgets/QRCode/index.tsx
diff --git a/yarn.lock b/yarn.lock
