Merge pull request crypto-com#988 from crypto-com/dev

Internal Release v0.6.9
crypto-matto · Feb 16, 2022 · 68adb35 · 68adb35
2 parents 125a7c7 + ae5d0c4
commit 68adb35
Show file tree

Hide file tree

Showing 10 changed files with 343 additions and 209 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
 
       - name: Refresh
         run: |

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
 
       - name: Install deps with big timeout
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
 
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/integration_test_zemu.yml b/.github/workflows/integration_test_zemu.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
 
       - name: Setup dependencies
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
 
       - name: Install deps with big timeout
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 *Unreleased*
 
 *Released*
+## [v0.6.9] - 2022-02-16
+### Bug fixes
+- Ledger connectivity on Windows
 ## [v0.6.8] - 2022-02-11
 ### Additions
 - Wrapped ETH NFT support on Crypto.org chain

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chain-desktop-wallet",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "Crypto.com Chain Desktop Wallet App",
   "repository": "github:crypto-com/chain-desktop-wallet",
   "author": "Crypto.org <[email protected]>",
@@ -86,7 +86,7 @@
     "postinstall": "electron-builder install-app-deps",
     "electron:dev": "export NODE_ENV=development && yarn electron:devcore",
     "electron:devcore": "concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && tsc -p electron -w\" \"wait-on http://localhost:3000 && tsc -p electron && electron .\"",
-    "electron:windev": "concurrently \"SET BROWSER=none && yarn start\" \"wait-on http://localhost:3000 && tsc -p electron -w\" \"wait-on http://localhost:3000 && tsc -p electron && electron .\"",
+    "electron:windev": "concurrently \"SET NODE_ENV=none && SET BROWSER=none && yarn start\" \"wait-on http://localhost:3000 && tsc -p electron -w\" \"wait-on http://localhost:3000 && tsc -p electron && electron .\"",
     "electron:pre-build": "yarn build && yarn copy-macos-manifest && tsc -p electron",
     "copy-macos-manifest": "copyfiles entitlements* ./build/",
     "clean-builds": "rimraf build && rimraf dist",
@@ -215,7 +215,7 @@
     "dotenv": "8.2.0",
     "dotenv-expand": "5.1.0",
     "electron": "11.5.0",
-    "electron-builder": "22.10.5",
+    "electron-builder": "22.14.13",
     "electron-builder-notarize": "1.2.0",
     "eslint": "7.23.0",
     "eslint-config-react-app": "6.0.0",

diff --git a/src/storage/SecretStoreService.ts b/src/storage/SecretStoreService.ts
@@ -12,7 +12,7 @@ export class SecretStoreService {
   }
 
   public async savePassword(credential: EncryptedCredential) {
-    return this.db.credentialStore.update<EncryptedCredential>(
+    await this.db.credentialStore.update<EncryptedCredential>(
       { _id: this.CREDENTIAL_STORED_ID },
       { $set: credential },
       { upsert: true },

diff --git a/tests/yarn.lock b/tests/yarn.lock
@@ -2971,9 +2971,9 @@ flatted@^2.0.0:
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 follow-redirects@^1.10.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-each@^0.3.3:
   version "0.3.3"