fix: Avoid generate deposit DAO when the dialog is not visible. (#2760)

.github/workflows/package.yml

@@ -62,7 +62,7 @@ jobs:
 
       - name: Boostrap
         run: |
-          yarn bootstrap
+          yarn
         env:
           CI: false
 

.github/workflows/package_for_test.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Boostrap
         run: |
-          yarn bootstrap
+          yarn
         env:
           CI: false
 

.github/workflows/unit_tests.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Boostrap
         run: |
-          yarn bootstrap
+          yarn
           yarn build
         env:
           CI: false

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-lerna run --no-bail --stream precommit
+npx lerna run --no-bail --stream precommit

README.md

@@ -30,7 +30,7 @@ $ yarn global add lerna # install lerna globally
 After lerna has been installed, run this to install and link dependencies:
 
 ```shell
-$ yarn bootstrap
+$ yarn
 $ lerna run rebuild:nativemodules
 ```
 

lerna.json

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

package.json

@@ -22,7 +22,6 @@
     "packages/*"
   ],
   "scripts": {
-    "bootstrap": "npx cross-env lerna bootstrap && lerna link",
     "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\"",
@@ -32,7 +31,7 @@
     "build:main": "lerna run build --scope=neuron-wallet",
     "release": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/release.sh",
     "package:test": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/package-for-test.sh",
-    "test": "cross-env NODE_OPTIONS=--openssl-legacy-provider lerna run --parallel test",
+    "test": "cross-env NODE_OPTIONS=--openssl-legacy-provider lerna run --parallel --load-env-files=false test",
     "test:ci": "yarn build:main && yarn test",
     "lint": "lerna run --stream lint",
     "postinstall": "husky install && lerna run build --scope=@nervina-labs/ckb-indexer",
@@ -50,7 +49,7 @@
     "eslint": "8.38.0",
     "eslint-config-prettier": "8.8.0",
     "husky": "8.0.3",
-    "lerna": "5.6.2",
+    "lerna": "7.0.0",
     "lint-staged": "13.2.1",
     "ncp": "2.0.0",
     "prettier": "2.8.7",

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

@@ -137,6 +137,7 @@ export const useGenerateDaoDepositTx = ({
   t,
   depositValue,
   suggestFeeRate,
+  showDepositDialog,
 }: {
   setErrorMessage: React.Dispatch<React.SetStateAction<string>>
   clearGeneratedTx: () => void
@@ -149,10 +150,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()
@@ -221,6 +226,7 @@ export const useGenerateDaoDepositTx = ({
     isBalanceReserved,
     depositValue,
     suggestFeeRate,
+    showDepositDialog,
   ])
 }
 

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

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