Release v2.12.0

.github/workflows/release.yml

@@ -1,10 +1,8 @@
 name: Build/Release Desktop app
 
 # this will help you specify where to run
-on:
-  push:
-    branches:
-      - master
+on: 
+  workflow_dispatch
 
 env:
   REACT_APP_BLOCKNATIVE_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_KEY }}
@@ -29,6 +27,19 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
 
+      # Add cache for yarn directory
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
       - name: Patch node gyp on windows to support Visual Studio 2019
         if: startsWith(matrix.os, 'windows')
         shell: powershell
@@ -69,21 +80,21 @@ jobs:
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
       - name: 'Upload Artifacts OSX'
-        if: contains(github.ref, 'master') && startsWith(matrix.os, 'macos')
+        if: contains(github.ref, 'development') && 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, 'master') && startsWith(matrix.os, 'ubuntu')
+        if: contains(github.ref, 'development') && 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, 'master') && startsWith(matrix.os, 'windows')
+        if: contains(github.ref, 'development') && startsWith(matrix.os, 'windows')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop Windows

.travis.yml

@@ -1,18 +1,16 @@
 if: (branch = development) OR (branch = master) OR (type = pull_request) OR (tag IS present)
 sudo: required
-dist: xenial
-services:
-  - docker
+dist: bionic
 language: node_js
 node_js:
   - '12'
 os:
   - linux
-env:
-  global:
-    - DOCKER_COMPOSE_VERSION=1.22.0
 matrix:
   include:
+    - env:
+        - REACT_APP_ENV='production'
+      if: tag IS present
     - env:
         - REACT_APP_NETWORK='mainnet'
         - STAGING_BUCKET_NAME=${STAGING_MAINNET_BUCKET_NAME}
@@ -28,10 +26,12 @@ before_install:
   - sudo apt-get update
   - sudo apt-get -y install python-pip python-dev libusb-1.0-0-dev
   - pip install awscli --upgrade --user
-  # Install truffle
-  - yarn global add truffle
 script:
-  - bash ./config/travis/build.sh
+  - yarn lint:check
+  - yarn prettier:check
+  - yarn test:coverage
+  - yarn build
+  #- bash ./config/travis/build.sh
 after_success:
   # Pull Request - Deploy it to a review environment
   # Travis doesn't do deploy step with pull requests builds

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-react",
-  "version": "2.11.1",
+  "version": "2.12.0",
   "description": "Allowing crypto users manage funds in a safer way",
   "website": "https://github.com/gnosis/safe-react#readme",
   "bugs": {
@@ -38,7 +38,7 @@
     "release": "electron-builder --mac --linux --windows -p always",
     "start-mainnet": "REACT_APP_NETWORK=mainnet yarn start",
     "start": "react-app-rewired start",
-    "test": "NODE_ENV=test && react-app-rewired test --env=jsdom",
+    "test": "react-app-rewired test --env=jsdom",
     "test:coverage": "yarn test --coverage --watchAll=false",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "storybook": "start-storybook -p 9009 -s public",
@@ -164,21 +164,21 @@
     ]
   },
   "dependencies": {
-    "@gnosis.pm/safe-apps-sdk": "https://github.com/gnosis/safe-apps-sdk.git#development",
+    "@gnosis.pm/safe-apps-sdk": "0.4.0",
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
     "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#1bf397f",
     "@gnosis.pm/util-contracts": "2.0.6",
-    "@ledgerhq/hw-transport-node-hid": "5.19.1",
+    "@ledgerhq/hw-transport-node-hid": "5.22.0",
     "@material-ui/core": "4.11.0",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "4.0.0-alpha.56",
     "@openzeppelin/contracts": "3.1.0",
     "async-sema": "^3.1.0",
-    "axios": "0.19.2",
+    "axios": "0.20.0",
     "bignumber.js": "9.0.0",
-    "bnc-onboard": "1.11.1",
+    "bnc-onboard": "1.13.1",
     "classnames": "^2.2.6",
-    "concurrently": "^5.2.0",
+    "concurrently": "^5.3.0",
     "connected-react-router": "6.8.0",
     "coveralls": "^3.1.0",
     "currency-flags": "2.1.2",
@@ -190,20 +190,20 @@
     "eth-sig-util": "^2.5.3",
     "ethereum-blockies-base64": "^1.0.2",
     "ethereumjs-abi": "0.6.8",
-    "exponential-backoff": "^3.0.1",
+    "exponential-backoff": "^3.1.0",
     "express": "^4.17.1",
     "final-form": "^4.20.1",
     "final-form-calculate": "^1.3.1",
     "history": "4.10.1",
-    "immortal-db": "^1.0.3",
+    "immortal-db": "^1.1.0",
     "immutable": "^4.0.0-rc.12",
     "js-cookie": "^2.2.1",
     "lodash.debounce": "^4.0.8",
     "lodash.memoize": "^4.1.2",
-    "material-ui-search-bar": "^1.0.0-beta.13",
+    "material-ui-search-bar": "^1.0.0",
     "notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
-    "open": "^7.1.0",
-    "polished": "3.6.5",
+    "open": "^7.2.0",
+    "polished": "3.6.7",
     "qrcode.react": "1.0.0",
     "query-string": "6.13.1",
     "react": "16.13.1",
@@ -215,15 +215,15 @@
     "react-qr-reader": "^2.2.1",
     "react-redux": "7.2.1",
     "react-router-dom": "5.2.0",
-    "react-scripts": "^3.4.1",
+    "react-scripts": "^3.4.3",
     "react-window": "^1.8.5",
     "recompose": "^0.30.0",
     "redux": "4.0.5",
     "redux-actions": "^2.6.5",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "semver": "7.3.2",
-    "styled-components": "^5.1.1",
+    "styled-components": "^5.2.0",
     "truffle-contract": "4.0.31",
     "web3": "1.2.9",
     "web3-core": "^1.2.11",
@@ -236,45 +236,43 @@
     "@storybook/addons": "^5.3.19",
     "@storybook/preset-create-react-app": "^3.1.4",
     "@storybook/react": "^5.3.19",
-    "@testing-library/jest-dom": "5.11.2",
-    "@testing-library/react": "10.4.8",
-    "@testing-library/user-event": "12.1.0",
+    "@testing-library/jest-dom": "5.11.4",
+    "@testing-library/react": "10.4.9",
     "@typechain/web3-v1": "^1.0.0",
     "@types/history": "4.6.2",
-    "@types/jest": "^26.0.9",
+    "@types/jest": "^26.0.14",
     "@types/lodash.memoize": "^4.1.6",
-    "@types/node": "14.6.0",
-    "@types/react": "^16.9.47",
+    "@types/node": "14.11.2",
+    "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.6",
     "@types/react-redux": "^7.1.9",
     "@types/react-router-dom": "^5.1.5",
-    "@types/styled-components": "^5.1.2",
+    "@types/styled-components": "^5.1.3",
     "@typescript-eslint/eslint-plugin": "3.9.1",
     "@typescript-eslint/parser": "3.9.1",
     "autoprefixer": "9.8.6",
     "cross-env": "^7.0.2",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
-    "electron": "7.2.4",
+    "electron": "9.3.0",
     "electron-builder": "22.8.0",
-    "electron-notarize": "0.3.0",
+    "electron-notarize": "1.0.0",
     "eslint": "6.8.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-import": "2.22.0",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.20.5",
+    "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-sort-destructure-keys": "1.3.5",
     "ethereumjs-abi": "0.6.8",
     "husky": "^4.2.5",
-    "lint-staged": "10.2.11",
+    "lint-staged": "10.4.0",
     "node-sass": "^4.14.1",
-    "prettier": "2.0.5",
+    "prettier": "2.1.2",
     "react-app-rewired": "^2.1.6",
     "react-docgen-typescript-loader": "^3.7.2",
-    "truffle": "5.1.36",
     "typechain": "^2.0.0",
     "typescript": "3.9.7",
-    "wait-on": "5.1.0"
+    "wait-on": "5.2.0"
   }
 }

public/electron.js

@@ -142,6 +142,10 @@ process.on('uncaughtException',function(error){
 
 app.userAgentFallback = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36';
 
+// We have one non-context-aware module in node_modules/usb. This is used by @ledgerhq/hw-transport-node-hid
+// This type of modules will be impossible to use after electron 10
+app.allowRendererProcessReuse = false;
+
 app.commandLine.appendSwitch('ignore-certificate-errors');
 app.on("ready", () =>{
   // Hide the menu