Merge branch 'develop' into dependabot/npm_and_yarn/packages/neuron-w…

…allet/undici-5.28.4
nervosnetwork · Apr 10, 2024 · e1b2287 · e1b2287 · github-actions · Apr 10, 2024
2 parents a2d02d4 + 129aa3c
commit e1b2287
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.ckb-version b/.ckb-version
@@ -1 +1 @@
-v0.114.0
+v0.115.0
diff --git a/compatible.json b/compatible.json
@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.115",
     "0.114",
     "0.113",
     "0.112",
@@ -20,6 +21,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -34,6 +36,7 @@
     },
     "0.110": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -64,6 +67,7 @@
     },
     "0.112": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -78,6 +82,7 @@
     },
     "0.114": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",

diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
@@ -16,9 +16,11 @@ if (singleInstanceLock) {
     appController.start()
   })
 
-  app.on('before-quit', async () => {
+  app.on('before-quit', async e => {
     logger.info('App:\tNeuron will exit')
+    e.preventDefault()
     await appController.end()
+    app.exit()
   })
 
   app.on('activate', appController.openWindow)