Try w/o prebuilt dist

5afe · Jul 14, 2021 · 46940b5 · 46940b5
1 parent b1bd716
commit 46940b5
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 46 deletions.
diff --git a/.github/workflows/deploy-bsc.yml b/.github/workflows/deploy-bsc.yml
@@ -58,6 +58,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -70,11 +75,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build
         env:

diff --git a/.github/workflows/deploy-ewc.yml b/.github/workflows/deploy-ewc.yml
@@ -56,6 +56,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -68,11 +73,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build
         env:

diff --git a/.github/workflows/deploy-mainnet.yml b/.github/workflows/deploy-mainnet.yml
@@ -56,6 +56,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -68,11 +73,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build
         env:

diff --git a/.github/workflows/deploy-polygon.yml b/.github/workflows/deploy-polygon.yml
@@ -55,6 +55,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -66,10 +71,6 @@ jobs:
           yarn install --cache-folder ./.yarncache --frozen-lockfile
           rm -rf .yarncache
           yarn cache clean
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
 
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build

diff --git a/.github/workflows/deploy-rinkeby.yml b/.github/workflows/deploy-rinkeby.yml
@@ -58,6 +58,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -70,11 +75,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-        # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app ${{ env.REACT_APP_ENV }}
         run: yarn build
         env:

diff --git a/.github/workflows/deploy-volta.yml b/.github/workflows/deploy-volta.yml
@@ -56,6 +56,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -68,11 +73,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build
         env:

diff --git a/.github/workflows/deploy-xdai.yml b/.github/workflows/deploy-xdai.yml
@@ -56,6 +56,11 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      # Set production flag
+      - name: Set production flag for release PR or tagged build
+        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
+        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
+
       - run: |
           sudo apt-get update
           sudo apt-get -y install python3-pip python3-dev libusb-1.0-0-dev libudev-dev
@@ -68,11 +73,6 @@ jobs:
           rm -rf .yarncache
           yarn cache clean
 
-      # Set production flag
-      - name: Set production flag for release PR or tagged build
-        run: echo "REACT_APP_ENV=production" >> $GITHUB_ENV
-        if: startsWith(github.ref, 'refs/tags/v') || github.base_ref == 'main'
-
       - name: Build ${{ env.REACT_APP_NETWORK }} app
         run: yarn build
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,8 +33,6 @@ jobs:
         run: |
           mkdir .yarncache
           yarn install --cache-folder ./.yarncache --frozen-lockfile
-          rm -rf .yarncache
-          yarn cache clean
 
       - run: yarn test:coverage
 

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "lint:check": "eslint './src/**/*.{js,jsx,ts,tsx}'",
     "lint:fix": "yarn lint:check --fix",
     "postinstall": "patch-package && electron-builder install-app-deps && yarn generate-types && yarn copy-gateway-types",
+    "preinstall": "if [ $GITHUB_ACTIONS ]; then yarn config set network-concurrency 2; fi",
     "preelectron-pack": "yarn build",
     "prettier:check": "yarn prettier --check",
     "prettier:fix": "yarn prettier --write",
@@ -167,7 +168,7 @@
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
     "@gnosis.pm/safe-deployments": "^1.0.0",
     "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#17058d4",
-    "@gnosis.pm/safe-react-gateway-sdk": "https://github.com/gnosis/safe-react-gateway-sdk.git#1550ebd",
+    "@gnosis.pm/safe-react-gateway-sdk": "https://github.com/gnosis/safe-react-gateway-sdk.git#0db9370",
     "@ledgerhq/hw-transport-node-hid-singleton": "5.51.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.11.0",
@@ -271,7 +272,7 @@
     "electron": "^9.4.0",
     "electron-builder": "22.10.5",
     "electron-notarize": "1.0.0",
-    "eslint": "^7.29.0",
+    "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsx-a11y": "^6.3.1",
@@ -286,7 +287,7 @@
     "redux-mock-store": "^1.5.4",
     "sass": "^1.32.0",
     "typechain": "^5.0.0",
-    "typescript": "4.3.4",
+    "typescript": "^4.3.5",
     "wait-on": "^5.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1869,9 +1869,9 @@
     classnames "^2.2.6"
     react-media "^1.10.0"
 
-"@gnosis.pm/safe-react-gateway-sdk@https://github.com/gnosis/safe-react-gateway-sdk.git#1550ebd":
+"@gnosis.pm/safe-react-gateway-sdk@https://github.com/gnosis/safe-react-gateway-sdk.git#950dbeb":
   version "1.0.0"
-  resolved "https://github.com/gnosis/safe-react-gateway-sdk.git#1550ebd81076b4e6b0e413179804198c1bb8b832"
+  resolved "https://github.com/gnosis/safe-react-gateway-sdk.git#950dbebb89ec12d0c429f6e8e49c7ec518d61319"
   dependencies:
     unfetch "^4.2.0"
 
@@ -1919,6 +1919,20 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -9306,7 +9320,7 @@ eslint-webpack-plugin@^2.5.2:
     micromatch "^4.0.2"
     schema-utils "^3.0.0"
 
-eslint@^7.11.0, eslint@^7.29.0:
+eslint@^7.11.0:
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"
   integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==
@@ -9351,6 +9365,52 @@ eslint@^7.11.0, eslint@^7.29.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
+eslint@^7.30.0:
+  version "7.30.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
+  integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
+  dependencies:
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.2"
+    "@humanwhocodes/config-array" "^0.5.0"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    enquirer "^2.3.5"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.1.2"
+    globals "^13.6.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.9"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
@@ -20773,10 +20833,10 @@ typescript-tuple@^2.2.1:
   dependencies:
     typescript-compare "^0.0.2"
 
-typescript@4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc"
-  integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==
+typescript@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
 
 typical@^2.6.0, typical@^2.6.1:
   version "2.6.1"