Merge branch 'master' into hotfix/app-crashes-via-link

.github/workflows/release.yml

@@ -43,9 +43,8 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 10.16
-      - run: yarn install --network-concurrency 1
-
+          node-version: 12
+      - run: yarn install --frozen-lockfile --network-concurrency 1
       - name: Build/Release Desktop App
         env:
           # macOS notarization API key
@@ -70,21 +69,21 @@ jobs:
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
       - name: 'Upload Artifacts OSX'
-        if: contains(github.ref, 'development') && startsWith(matrix.os, 'macos')
+        if: contains(github.ref, 'master') && startsWith(matrix.os, 'macos')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop OSX
           path: ./dist/Safe[ ]Multisig*.dmg
 
       - name: 'Upload Artifacts Linux'
-        if: contains(github.ref, 'development') && startsWith(matrix.os, 'ubuntu')
+        if: contains(github.ref, 'master') && startsWith(matrix.os, 'ubuntu')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop Linux
           path: ./dist/Safe[ ]Multisig*.AppImage
 
       - name: 'Upload Artifacts Windows'
-        if: contains(github.ref, 'development') && startsWith(matrix.os, 'windows')
+        if: contains(github.ref, 'master') && startsWith(matrix.os, 'windows')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop Windows

package.json

@@ -27,7 +27,7 @@
     "electron-dev": "concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electron .\"",
     "format:staged": "lint-staged",
     "generate-types": "yarn generate-types:contracts",
-    "generate-types:contracts": "typechain --target=web3-v1 --outDir './src/types/contracts' './node_modules/@gnosis.pm/safe-contracts/build/contracts/*.json'",
+    "generate-types:contracts": "cross-env typechain --target=web3-v1 --outDir './src/types/contracts' './node_modules/@gnosis.pm/safe-contracts/build/contracts/*.json'",
     "lint:check": "eslint './src/**/*.{js,jsx,ts,tsx}'",
     "lint:fix": "yarn lint:check --fix",
     "postinstall": "electron-builder install-app-deps && yarn generate-types",
@@ -180,9 +180,9 @@
     "currency-flags": "2.1.2",
     "date-fns": "2.15.0",
     "electron-is-dev": "^1.2.0",
-    "electron-log": "4.2.2",
+    "electron-log": "4.2.4",
     "electron-settings": "^4.0.2",
-    "electron-updater": "4.3.1",
+    "electron-updater": "4.3.4",
     "eth-sig-util": "^2.5.3",
     "ethereum-blockies-base64": "^1.0.2",
     "ethereumjs-abi": "0.6.8",
@@ -247,7 +247,7 @@
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
     "electron": "7.2.4",
-    "electron-builder": "22.7.0",
+    "electron-builder": "22.8.0",
     "electron-notarize": "0.3.0",
     "eslint": "6.8.0",
     "eslint-config-prettier": "6.11.0",