Merge branch 'develop' into fix-light-bugs

.github/workflows/package.yml

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

.github/workflows/package_for_test.yml

@@ -19,7 +19,7 @@ jobs:
 
     name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
     env:
-      APPLE_ID: ${{ secrets.APPLE_ID }}
+      MAC_SHOULD_CODE_SIGN: ${{ github.event_name != 'pull_request' && secrets.APPLE_ID != '' }}
       WIN_CERTIFICATE_BASE64: ${{ secrets.WIN_CERTIFICATE_BASE64 }}
 
     steps:
@@ -62,12 +62,12 @@ jobs:
 
       - name: Boostrap
         run: |
-          yarn bootstrap
+          yarn
         env:
           CI: false
 
       - name: Package for MacOS
-        if: ${{ matrix.os == 'macos-latest' && env.APPLE_ID != '' }}
+        if: ${{ matrix.os == 'macos-latest' && env.MAC_SHOULD_CODE_SIGN == 'true' }}
         run: |
           ./scripts/download-ckb.sh mac
           yarn package:test mac
@@ -79,10 +79,9 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
 
       - name: Package for MacOS for skip code sign
-        if: ${{ matrix.os == 'macos-latest' && env.APPLE_ID == '' }}
+        if: ${{ matrix.os == 'macos-latest' && env.MAC_SHOULD_CODE_SIGN == 'false' }}
         run: |
           export CSC_IDENTITY_AUTO_DISCOVERY=false
-          unset APPLE_ID
           ./scripts/download-ckb.sh mac
           yarn package:test mac
         env:

.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/package.json

@@ -28,9 +28,14 @@
     "registry": "https://registry.npmjs.org/"
   },
   "lint-staged": {
-    "src/**/*.{ts,tsx}": [
+    "src/**/*.{js,cjs,mjs,jsx,ts,tsx}": [
+      "prettier --write",
       "eslint --fix",
       "git add"
+    ],
+    "src/**/*.{css,scss}": [
+      "prettier --write",
+      "git add"
     ]
   },
   "jest": {
@@ -77,7 +82,7 @@
     "@types/styled-components": "5.1.26",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "24.1.1",
+    "electron": "24.5.1",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",

packages/neuron-wallet/package.json

@@ -30,7 +30,8 @@
     "rebuild:nativemodules": "electron-builder install-app-deps"
   },
   "lint-staged": {
-    "src/**/*.ts": [
+    "src/**/*.{js,cjs,mjs,jsx,ts,tsx}": [
+      "prettier --write",
       "eslint --fix",
       "git add"
     ]
@@ -82,7 +83,7 @@
     "@types/sqlite3": "3.1.8",
     "@types/uuid": "8.3.4",
     "devtron": "1.4.0",
-    "electron": "24.1.1",
+    "electron": "24.5.1",
     "electron-build-env": "0.2.0",
     "electron-builder": "23.6.0",
     "electron-devtools-installer": "3.2.0",

packages/neuron-wallet/src/controllers/app/menu.ts

@@ -66,15 +66,14 @@ const showAbout = () => {
   const isWin = process.platform === 'win32'
 
   if (isWin) {
-    const options = {
+    dialog.showMessageBox({
       type: 'info',
       title: app.name,
       message: app.name,
       detail: applicationVersion,
       buttons: ['OK'],
       cancelId: 0,
-    }
-    dialog.showMessageBox(options)
+    })
     return
   }
 
@@ -330,7 +329,7 @@ const updateApplicationMenu = (mainWindow: BrowserWindow | null) => {
               width: 1000,
               maxWidth: 1000,
               minWidth: 1000,
-              resizable: true
+              resizable: true,
             },
             ['multisig-output-update']
           )