Merge branch 'develop' into fix-dao

Author: devchenyan

package.json

@@ -41,20 +41,20 @@
     "update:client-versions": "node ./scripts/update-ckb-client-versions.js"
   },
   "devDependencies": {
-    "@babel/core": "7.23.6",
+    "@babel/core": "7.27.1",
     "@types/jest": "27.5.2",
     "@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": "8.57.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
     "jest": "27.5.1",
-    "lerna": "8.1.5",
+    "lerna": "8.2.2",
     "lint-staged": "15.2.7",
     "ncp": "2.0.0",
     "prettier": "2.8.8",
@@ -65,9 +65,9 @@
   },
   "dependencies": {},
   "resolutions": {
-    "@types/react": "18.2.45",
+    "@types/react": "18.3.21",
     "react-i18next": ">=11.16.4",
-    "react-refresh": "0.14.0",
+    "react-refresh": "0.17.0",
     "node-fetch": "2.6.13",
     "@ckb-lumos/ckb-indexer": "0.23.0",
     "@ckb-lumos/base": "0.23.0",

packages/neuron-ui/package.json

@@ -62,8 +62,8 @@
     "jsqr": "1.4.0",
     "office-ui-fabric-react": "7.204.0",
     "qr.js": "0.0.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-i18next": "13.5.0",
     "react-router-dom": "6.21.1",
     "react-transition-group": "4.4.5",
@@ -72,24 +72,24 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
-    "@babel/preset-env": "7.26.9",
-    "@babel/preset-typescript": "7.23.3",
-    "@storybook/addon-actions": "8.6.4",
-    "@storybook/addon-essentials": "8.6.4",
-    "@storybook/addon-interactions": "8.6.4",
-    "@storybook/addon-links": "8.6.4",
-    "@storybook/builder-vite": "8.6.4",
-    "@storybook/node-logger": "7.6.6",
-    "@storybook/react": "8.6.4",
-    "@storybook/react-vite": "8.6.4",
+    "@babel/preset-env": "7.27.2",
+    "@babel/preset-typescript": "7.27.1",
+    "@storybook/addon-actions": "8.6.14",
+    "@storybook/addon-essentials": "8.6.14",
+    "@storybook/addon-interactions": "8.6.14",
+    "@storybook/addon-links": "8.6.14",
+    "@storybook/builder-vite": "8.6.14",
+    "@storybook/node-logger": "7.6.20",
+    "@storybook/react": "8.6.14",
+    "@storybook/react-vite": "8.6.14",
     "@storybook/testing-library": "0.2.2",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
-    "@types/enzyme": "3.10.18",
+    "@types/enzyme": "3.10.19",
     "@types/enzyme-adapter-react-16": "1.0.9",
     "@types/node": "20.10.5",
-    "@types/react": "18.2.45",
-    "@types/react-dom": "18.2.18",
+    "@types/react": "18.3.21",
+    "@types/react-dom": "18.3.7",
     "@types/react-router-dom": "5.3.3",
     "@types/styled-components": "5.1.34",
     "@vitejs/plugin-react": "4.3.4",
@@ -104,10 +104,10 @@
     "eslint-plugin-react": "7.32.2",
     "jest-styled-components": "7.2.0",
     "jsdom": "26.0.0",
-    "postcss-preset-env": "10.1.5",
-    "storybook": "8.6.4",
+    "postcss-preset-env": "10.1.6",
+    "storybook": "8.6.14",
     "storybook-addon-react-router-v6": "2.0.10",
-    "terser": "5.39.0",
+    "terser": "5.39.2",
     "vite": "6.2.7",
     "vite-plugin-commonjs": "0.10.4",
     "vite-plugin-eslint": "1.8.1",
@@ -116,6 +116,6 @@
     "vitest": "3.0.8"
   },
   "resolutions": {
-    "react-i18next": "14.0.0"
+    "react-i18next": "14.1.3"
   }
 }

packages/neuron-ui/src/widgets/TextField/index.tsx

@@ -4,7 +4,33 @@ import Edit from 'widgets/Icons/Edit.svg?react'
 import { EyesClose, EyesOpen } from 'widgets/Icons/icon'
 import styles from './textField.module.scss'
 
-const TextField = React.forwardRef(
+const TextField = React.forwardRef<
+  HTMLDivElement,
+  {
+    field: string
+    label?: string | React.ReactNode
+    value?: string
+    hint?: string
+    error?: string
+    type?: 'text' | 'password' | 'file'
+    onChange?: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void
+    onClick?: (e: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>) => void
+    className?: string
+    prefix?: string | React.ReactNode | undefined
+    suffix?: string | React.ReactNode | undefined
+    stack?: boolean
+    required?: boolean
+    readOnly?: boolean
+    placeholder?: string
+    disabled?: boolean
+    selected?: boolean
+    width?: string
+    rows?: number
+    errorWithIcon?: boolean
+    tabIndex?: number
+    [key: string]: any
+  }
+>(
   (
     {
       label,
@@ -28,31 +54,8 @@ const TextField = React.forwardRef(
       rows = 1,
       errorWithIcon = false,
       ...rest
-    }: {
-      field: string
-      label?: string | React.ReactNode
-      value?: string
-      hint?: string
-      error?: string
-      type?: 'text' | 'password' | 'file'
-      onChange?: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void
-      onClick?: (e: React.SyntheticEvent<HTMLInputElement | HTMLTextAreaElement>) => void
-      className?: string
-      prefix?: string | React.ReactNode | undefined
-      suffix?: string | React.ReactNode | undefined
-      stack?: boolean
-      required?: boolean
-      readOnly?: boolean
-      placeholder?: string
-      disabled?: boolean
-      selected?: boolean
-      [key: string]: any
-      width?: string
-      rows?: number
-      errorWithIcon?: boolean
-      tabIndex?: number
     },
-    ref: React.LegacyRef<HTMLDivElement>
+    ref
   ) => {
     const [isPasswordHidden, setIsPasswordHidden] = useState(true)
     const inputRef = useRef<(HTMLTextAreaElement & HTMLInputElement) | null>(null)

packages/neuron-wallet/package.json

@@ -75,7 +75,7 @@
   "devDependencies": {
     "@electron/notarize": "2.3.2",
     "@nervosnetwork/ckb-types": "0.109.1",
-    "@types/archiver": "6.0.2",
+    "@types/archiver": "6.0.3",
     "@types/async": "3.2.24",
     "@types/electron-devtools-installer": "2.2.5",
     "@types/elliptic": "6.4.18",
@@ -89,8 +89,8 @@
     "@types/uuid": "8.3.4",
     "devtron": "1.4.0",
     "electron": "30.0.0",
-    "electron-builder": "24.9.1",
-    "electron-devtools-installer": "3.2.0",
+    "electron-builder": "24.13.3",
+    "electron-devtools-installer": "3.2.1",
     "jest-when": "3.6.0",
     "neuron-ui": "0.121.1",
     "typescript": "5.3.3"