Skip to content

Commit 68cc21e

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/packages/neuron-wallet/bn.js-5.2.3
2 parents d965e83 + c920666 commit 68cc21e

6 files changed

Lines changed: 266 additions & 189 deletions

File tree

compatible.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,62 @@
355355
"0.3",
356356
"0.2"
357357
]
358+
},
359+
"0.203": {
360+
"full": [
361+
"0.204",
362+
"0.203",
363+
"0.202",
364+
"0.201",
365+
"0.200",
366+
"0.121",
367+
"0.120",
368+
"0.119",
369+
"0.118",
370+
"0.117",
371+
"0.116",
372+
"0.115",
373+
"0.114",
374+
"0.113",
375+
"0.112",
376+
"0.111",
377+
"0.110",
378+
"0.109"
379+
],
380+
"light": [
381+
"0.5",
382+
"0.4",
383+
"0.3",
384+
"0.2"
385+
]
386+
},
387+
"0.204": {
388+
"full": [
389+
"0.204",
390+
"0.203",
391+
"0.202",
392+
"0.201",
393+
"0.200",
394+
"0.121",
395+
"0.120",
396+
"0.119",
397+
"0.118",
398+
"0.117",
399+
"0.116",
400+
"0.115",
401+
"0.114",
402+
"0.113",
403+
"0.112",
404+
"0.111",
405+
"0.110",
406+
"0.109"
407+
],
408+
"light": [
409+
"0.5",
410+
"0.4",
411+
"0.3",
412+
"0.2"
413+
]
358414
}
359415
}
360416
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"dependencies": {},
6767
"resolutions": {
6868
"@types/react": "18.3.22",
69-
"react-i18next": ">=11.16.4",
69+
"react-i18next": "14.1.3",
7070
"react-refresh": "0.17.0",
7171
"node-fetch": "2.6.13",
7272
"@ckb-lumos/ckb-indexer": "0.23.0",

packages/neuron-ui/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"qr.js": "0.0.0",
6565
"react": "18.3.1",
6666
"react-dom": "18.3.1",
67-
"react-i18next": "13.5.0",
67+
"react-i18next": "14.1.3",
6868
"react-router-dom": "6.21.1",
6969
"react-transition-group": "4.4.5",
7070
"sass": "1.69.5",
@@ -105,7 +105,7 @@
105105
"jest-styled-components": "7.2.0",
106106
"jsdom": "26.0.0",
107107
"postcss-preset-env": "10.1.6",
108-
"storybook": "8.6.14",
108+
"storybook": "8.6.17",
109109
"storybook-addon-react-router-v6": "2.0.10",
110110
"terser": "5.39.2",
111111
"vite": "6.3.6",
@@ -114,8 +114,5 @@
114114
"vite-plugin-node-polyfills": "0.23.0",
115115
"vite-plugin-svgr": "4.3.0",
116116
"vitest": "3.0.8"
117-
},
118-
"resolutions": {
119-
"react-i18next": "14.1.3"
120117
}
121118
}

packages/neuron-ui/src/containers/Navbar/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const Navbar = () => {
111111
}
112112
}, [network?.readonly])
113113

114-
const gotoCompatile = useCallback(() => {
114+
const gotoCompatible = useCallback(() => {
115115
openExternal(`https://neuron.magickbase.com${i18n.language.startsWith('zh') ? '/zh' : ''}/download`)
116116
}, [i18n.language])
117117

@@ -133,7 +133,7 @@ const Navbar = () => {
133133
i18nKey="navbar.ckb-node-compatible"
134134
values={{ version: getVersion(), btnText: t('navbar.learn-more') }}
135135
components={[
136-
<button type="button" className={styles.learnMore} onClick={gotoCompatile}>
136+
<button type="button" className={styles.learnMore} onClick={gotoCompatible}>
137137
{t('navbar.learn-more')}
138138
</button>,
139139
]}

packages/neuron-wallet/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"electron-updater": "6.3.0",
6161
"electron-window-state": "5.0.3",
6262
"elliptic": "6.6.1",
63-
"i18next": "21.10.0",
63+
"i18next": "23.7.11",
6464
"leveldown": "6.1.1",
6565
"levelup": "4.4.0",
6666
"reflect-metadata": "0.1.13",
@@ -94,5 +94,12 @@
9494
"jest-when": "3.6.0",
9595
"neuron-ui": "^0.204.0",
9696
"typescript": "5.3.3"
97+
},
98+
"resolutions": {
99+
"@ckb-lumos/base": "0.23.0",
100+
"@ckb-lumos/ckb-indexer": "0.23.0",
101+
"@ckb-lumos/helpers": "0.23.0",
102+
"@ckb-lumos/lumos": "0.23.0",
103+
"@ckb-lumos/rpc": "0.23.0"
97104
}
98105
}

0 commit comments

Comments
 (0)