Merge pull request #2080 from nervosnetwork/master

Merge master into develop

Author: kellyshang

CHANGELOG.md

@@ -1,4 +1,21 @@
-# 0.36.0-rc1 (2021-08-10)
+# 0.36.0-rc2 (2021-08-23)
+
+This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
+
+[CKB v0.35.2](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.2) was released on Feb. 23rd, 2021. This version of CKB node is now bundled and preconfigured in Neuron. 
+
+### New feature
+* Support sending and receiving NFT in the `Customized Assets`.
+
+### Bug fixes
+
+* Upgrade the bundled CKB node to v0.35.2.
+* Add hint for `Token ID` field when creating a new sUDT account.
+
+
+# 0.36.0-rc1 (2021-08-13)
+
+⚠️ **Yanked because of CI exception** ⚠️
 
 This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
 

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.36.0-rc1",
+  "version": "0.36.0-rc2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

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

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.36.0-rc1",
+  "version": "0.36.0-rc2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-wallet/package.json

@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.36.0-rc1",
+  "version": "0.36.0-rc2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -84,7 +84,7 @@
     "electron-notarize": "0.2.1",
     "jest-when": "2.7.2",
     "lint-staged": "9.2.5",
-    "neuron-ui": "0.36.0-rc1",
+    "neuron-ui": "0.36.0-rc2",
     "rimraf": "3.0.0",
     "ttypescript": "1.5.10"
   }