Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,29 @@
+# 0.110.2 (2023-07-07)
+
+### CKB Node & Light Client
+
+- [CKB@v0.110.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.110.0) was released on May. 17th, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light Client@v0.2.4](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.2.4) was released on May. 28th, 2023. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+#### Caveat
+
+◆ **CKB Light Client** is only activated on testnet, thus only `light testnet` is enabled in Neuron. **CKB Light Client on Mainnet** requires a hardfork on the mainnet in the future.
+◆ **CKB@v0.110** requires data migration, which is irreversible. Be cautious to start the migration without a backup. [How to back up data of ckb node](https://github.com/nervosnetwork/neuron/issues/2557#issue-1512510978)
+
+> On the other hand, we strongly recommend you to back up the old data before migrating, the **ckb node data path** can be found by clicking **preference -> Data -> CKB Node Config & Storage**. Because once the migration starts, the data will be no longer compatible with all older versions of CKB.
+
+### Assumed valid target
+
+Block before `0xc0c532e10c708852d9586be46a5ed8317b2aa0835c721aa691abffb9bf4a26cd`(at height `10,004,892`) will be skipped in validation.(#2689)
+
+## Bug fixes
+
+- #2760: Avoid generating deposit DAO when the dialog is not visible.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.1...v0.110.2
+
+
 # 0.110.1 (2023-05-31)
 
 ### CKB Node & Light Client

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.110.1",
+  "version": "0.110.2",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.110.0",
+  "version": "0.110.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.110.1",
+  "version": "0.110.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/src/components/NervosDAO/hooks.ts

@@ -138,6 +138,7 @@ export const useGenerateDaoDepositTx = ({
   t,
   depositValue,
   suggestFeeRate,
+  showDepositDialog,
 }: {
   setErrorMessage: React.Dispatch<React.SetStateAction<string>>
   clearGeneratedTx: () => void
@@ -150,10 +151,14 @@ export const useGenerateDaoDepositTx = ({
   t: TFunction
   depositValue: string
   suggestFeeRate: string | number
+  showDepositDialog: boolean
 }) => {
   const timer = useRef<ReturnType<typeof setTimeout>>()
   useEffect(() => {
     clearTimeout(timer.current)
+    if (!showDepositDialog) {
+      return
+    }
     timer.current = setTimeout(() => {
       setErrorMessage('')
       clearGeneratedTx()
@@ -222,6 +227,7 @@ export const useGenerateDaoDepositTx = ({
     isBalanceReserved,
     depositValue,
     suggestFeeRate,
+    showDepositDialog,
   ])
 }
 

packages/neuron-ui/src/components/NervosDAO/index.tsx

@@ -86,6 +86,7 @@ const NervosDAO = () => {
     t,
     depositValue,
     suggestFeeRate,
+    showDepositDialog,
   })
   const updateDepositValue = hooks.useUpdateDepositValue({ setDepositValue })
 

packages/neuron-wallet/package.json

@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.110.1",
+  "version": "0.110.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -88,7 +88,7 @@
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.5.2",
-    "neuron-ui": "0.110.1",
+    "neuron-ui": "0.110.2",
     "typescript": "5.0.4"
   }
 }