Merge remote-tracking branch 'origin/develop' into spore

# Conflicts:
#	packages/neuron-wallet/package.json
#	yarn.lock

.ckb-version

@@ -1 +1 @@
-v0.110.2
+v0.111.0

.github/workflows/update_valid_target.yml

@@ -1,28 +1,26 @@
 name: Update ckb node assume valid target
 
 on:
-  pull_request:
-    types: [ready_for_review]
-    branches:
-      - master
+  create:
 
 jobs:
   ready-for-release:
     name: Update ckb node assume valid target
     runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref_name, 'rc/') }}
     steps:
       - name: Create Branch
         uses: peterjgrainger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: 'chore-update-valid-target/${{github.head_ref}}'
-          sha: '${{ github.event.pull_request.head.sha }}'
+          branch: 'chore-update-valid-target/${{github.ref_name}}'
+          sha: '${{ github.event.create.head.sha }}'
 
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ref: 'chore-update-valid-target/${{github.head_ref}}'
+          ref: 'chore-update-valid-target/${{github.ref_name}}'
 
       - name: Setup Node
         uses: actions/setup-node@v3
@@ -37,7 +35,7 @@ jobs:
         uses: actions/github-script@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BASE: ${{ github.head_ref }}
+          BASE: ${{ github.ref_name }}
         with:
           script: |
             const fs = require('node:fs')
@@ -64,8 +62,8 @@ jobs:
         uses: actions/github-script@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BASE: ${{github.head_ref}}
-          HEAD: chore-update-valid-target/${{github.head_ref}}
+          BASE: ${{github.ref}}
+          HEAD: chore-update-valid-target/${{github.ref_name}}
           REPO: ${{github.repository}}
         with:
           script: |
@@ -83,5 +81,5 @@ jobs:
               head: HEAD,
               base: BASE,
               title: 'chore: Update ckb node assume valid target',
-              body: `This PR uses to update ckb node assume valid target for PR https://github.com/${REPO}/pull/${context.issue.number}`,
+              body: `This PR uses to update ckb node assume valid target for ${BASE} branch`,
             })

CHANGELOG.md

@@ -1,3 +1,81 @@
+# 0.111.0 (2023-10-19)
+
+### CKB Node & Light Client
+
+- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.111.0) was released on Sep. 14nd, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light [email protected]](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 an activation on the mainnet, the timetable can be found at https://github.com/nervosnetwork/ckb/releases/tag/v0.110.1.
+
+### Assumed valid target
+
+Block before `0xd5e25ad24400f237aa5f72f3738a9ae77fe082a89937e75143fcc8ef5b009383`(at height `11,204,855`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/2881)
+
+---
+
+## Bug fixes
+
+* #2869: Add a dialog for migration.(@yanguoyu)
+* #2870: Fix width of navbar.(@yanguoyu)
+* #2873: Fix fallback font on Linux.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.3...v0.111.0
+
+
+# 0.110.3 (2023-10-11)
+
+### CKB Node & Light Client
+
+- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.110.2) was released on Sep. 12nd, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
+- [CKB Light [email protected]](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 an activation on the mainnet, the timetable can be found at https://github.com/nervosnetwork/ckb/releases/tag/v0.110.1.
+◆ **default node** has been renamed to **Internal Node** for clarity.
+
+### Assumed valid target
+
+Block before `0x6b6db6bb23e6e98f63b88e6cd38fa49f46980e5b816f620c71c6c9c74633ee54`(at height `10,985,048`) will be skipped in validation.(257c06eb95062e8ef3bf53179668965fc743b10f)
+
+---
+
+We are so excited to announce this new release of Neuron that has been completely revamped with modernizaed user interface and also enhanced your overall user experience.
+
+Say goodbye to clunky interface and hello to a smoother, more intuitive user experience. Neuron's new version is designed to make managing your assets on CKB effortless.
+
+Curious to see the magic of the new Neuron in action? Checkout our demo video on YouTube: https://youtu.be/MRuXmTLcXFo
+
+[![Brand-new Neuron](https://github.com/nervosnetwork/neuron/assets/7271329/77618118-4524-46c8-bf56-789b3e9d3206)](https://youtu.be/MRuXmTLcXFo)
+
+---
+
+## New features
+
+- Adopt brand new User Interface.(@yanguoyu, @devchenyan, @WhiteMinds, @jeffreyma597, @zhangyouxin, @homura)
+- #2672: Optimize storage of transactions to boost searching and reduce disk usage.(@yanguoyu)
+- #2783: Check new versions actively.(@yanguoyu)
+- #2786: Support synchronization from a specified block number in light client mode.(@yanguoyu)
+- #2808: Optimize compatibility checking of CKB NODE.(@yanguoyu)
+- #2813: Rename `default node` to `Internal node` for clarity.(@yanguoyu)
+- #2839: Update Ckb client versions(@github-actions)
+
+## Bug fixes
+
+- #2711: Fix exit of synchronization with exception and multisig balance.(@yanguoyu)
+- #2722: Automatically pad decimal places when the deposit dialog automatically provides a maximum value with decimals by(@WhiteMinds)
+- #2772: Fix generating transaction when deposit all without balance.(@yanguoyu)
+
+## New Contributors
+
+- @zhangyouxin made their first contribution in https://github.com/nervosnetwork/neuron/pull/2775
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.2...v0.110.3
+
+
 # 0.110.2 (2023-07-07)
 
 ### CKB Node & Light Client

_typos.toml

@@ -1,11 +1,9 @@
 [default.extend-words]
 thur = "thur"
+numer = "numer"
 
 # defined in database schema
 lastest = "lastest"
 
 [files]
 extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts"]
-
-
-

compatible.csv

@@ -1,5 +1,6 @@
-CKB,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
-Neuron,,,,,,,,
-0.110,yes,yes,no,no,no,no,no,no
-0.106,no,no,yes,yes,yes,yes,no,no
-0.103,no,no,no,no,no,no,yes,yes
+CKB,0.111,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
+Neuron,,,,,,,,,
+0.111,yes,yes,yes,no,no,no,no,no,no
+0.110,yes,yes,yes,no,no,no,no,no,no
+0.106,no,no,no,yes,yes,yes,yes,no,no
+0.103,no,no,no,no,no,no,no,yes,yes

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.110.2",
+  "version": "0.111.0",
   "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.2",
+  "version": "0.111.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/.storybook/.babelrc

@@ -1,6 +1,3 @@
 {
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript"
-  ]
+  "presets": ["@babel/preset-env", "@babel/preset-typescript"]
 }

packages/neuron-ui/.storybook/electron.js

@@ -1,6 +1,6 @@
 const sendSyncValues = {
   'get-locale': 'zh',
-  'get-version': '0.103.1'
+  'get-version': '0.103.1',
 }
 
 module.exports = {
@@ -12,10 +12,10 @@ module.exports = {
       return Promise.resolve({})
     },
     on() {},
-    removeAllListeners() {}
+    removeAllListeners() {},
   },
   clipboard() {},
   nativeImage() {},
   shell() {},
-  desktopCapturer() {}
+  desktopCapturer() {},
 }

packages/neuron-ui/.storybook/preview.tsx

@@ -9,31 +9,38 @@ import { action } from '@storybook/addon-actions'
 import { NeuronWalletContext, initStates } from '../src/states'
 
 export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
+  actions: { argTypesRegex: '^on[A-Z].*' },
   controls: {
     matchers: {
       color: /(background|color)$/i,
       date: /Date$/,
     },
-  }
+  },
 }
 
 const dispatch = action('Dispatch')
 
-BigInt.prototype['toJSON'] = function() { return this.toString() }
+BigInt.prototype['toJSON'] = function () {
+  return this.toString()
+}
 
 export const decorators = [
   (Story, { argTypes, args }) => {
     const globalArgTypes = Object.keys(argTypes).filter(v => argTypes[v]?.isGlobal)
-    const globalStates = globalArgTypes.reduce((pre, cur) => args[cur] ? ({
-      ...pre,
-      [cur]: args[cur]
-    }) : pre, initStates)
+    const globalStates = globalArgTypes.reduce(
+      (pre, cur) =>
+        args[cur]
+          ? {
+              ...pre,
+              [cur]: args[cur],
+            }
+          : pre,
+      initStates
+    )
     return (
       <NeuronWalletContext.Provider value={{ state: globalStates, dispatch }}>
         <Story />
       </NeuronWalletContext.Provider>
     )
   },
-];
-
+]

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.110.2",
+  "version": "0.111.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -88,7 +88,7 @@
     "@types/styled-components": "5.1.26",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "24.7.1",
+    "electron": "24.8.5",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",

packages/neuron-ui/public/css/fonts.css

@@ -11,29 +11,39 @@
 @font-face {
   font-family: 'ProximaNova-Regular';
   src: url('../fonts/ProximaNova-Regular.otf') format('opentype'),
-      url('../fonts//Proximanova-Regular.ttf') format('opentype');
+    url('../fonts//Proximanova-Regular.ttf') format('opentype');
 }
 
 @font-face {
   font-family: 'ProximaNova-Semibold';
   src: url('../fonts/ProximaNova-Semibold.otf') format('opentype'),
-      url('../fonts/ProximaNova-Semibold.ttf') format('opentype');
+    url('../fonts/ProximaNova-Semibold.ttf') format('opentype');
 }
 
 @font-face {
   font-family: 'D-DIN-PRO';
   src: url('../fonts/D-DIN-PRO-500-Medium.otf') format('opentype'),
-      url('../fonts/D-DIN-PRO-500-Medium.ttf') format('opentype');
+    url('../fonts/D-DIN-PRO-500-Medium.ttf') format('opentype');
 }
 
 @font-face {
   font-family: 'JetBrains Mono Medium';
   src: url('../fonts/JetBrainsMonoNL-Medium.otf') format('opentype'),
-      url('../fonts/JetBrainsMonoNL-Medium.ttf') format('opentype');
+    url('../fonts/JetBrainsMonoNL-Medium.ttf') format('opentype');
 }
 
 @font-face {
   font-family: 'JetBrains Mono';
   src: url('../fonts/JetBrainsMonoNL-Regular.otf') format('opentype'),
-      url('../fonts/JetBrainsMonoNL-Regular.ttf') format('opentype');
+    url('../fonts/JetBrainsMonoNL-Regular.ttf') format('opentype');
+}
+
+@font-face {
+  font-family: 'Inter-Regular';
+  src: url('../fonts/Inter-Regular.otf') format('opentype'), url('../fonts/Inter-Regular.ttf') format('opentype');
+}
+
+@font-face {
+  font-family: 'Inter-Medium';
+  src: url('../fonts/Inter-Medium.otf') format('opentype'), url('../fonts/Inter-Medium.ttf') format('opentype');
 }

packages/neuron-ui/public/index.html

@@ -1,13 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
-  <link rel="stylesheet" href="%PUBLIC_URL%/css/fonts.css" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-  <meta name="theme-color" content="#000000" />
-  <!--
+  <head>
+    <meta charset="utf-8" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="stylesheet" href="%PUBLIC_URL%/css/fonts.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <meta name="theme-color" content="#000000" />
+    <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -16,14 +15,13 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>Neuron</title>
-</head>
-
-<body>
-  <navbar class="navbar"></navbar>
-  <div id="notification" class="notification"></div>
-  <main id="root" class="main-content"></main>
-  <div id="dialog" class="dialog"></div>
-</body>
+    <title>Neuron</title>
+  </head>
 
+  <body>
+    <navbar class="navbar"></navbar>
+    <div id="notification" class="notification"></div>
+    <main id="root" class="main-content"></main>
+    <div id="dialog" class="dialog"></div>
+  </body>
 </html>

packages/neuron-ui/src/components/BalanceSyncingIcon/balanceSyncIcon.module.scss

@@ -5,6 +5,6 @@
   margin-left: 4px;
 
   path {
-    fill: #FFFFFF;
+    fill: #ffffff;
   }
 }