Merge pull request #1278 from gnosis/v2.10.2-backmerge

V2.10.2 backmerge
This commit is contained in:
Mikhail Mikheev 2020-08-26 15:22:49 +04:00 committed by GitHub
commit 54d5b81069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 875 deletions

View File

@ -44,20 +44,7 @@ jobs:
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 12 node-version: 12
- run: | - run: yarn install --frozen-lockfile --network-concurrency 1
mkdir .yarncache
yarn install --frozen-lockfile --cache-folder ./.yarncache
- name: Remove and cache clean (Windows Only)
if: startsWith(matrix.os, 'windows')
shell: powershell
run: |
rm -Recurse -Force .yarncache
yarn cache clean
- name: Remove and cache clean
if: "!startsWith(matrix.os, 'windows')"
run: |
rm -rf .yarncache
yarn cache clean
- name: Build/Release Desktop App - name: Build/Release Desktop App
env: env:
# macOS notarization API key # macOS notarization API key

View File

@ -1,6 +1,6 @@
{ {
"name": "safe-react", "name": "safe-react",
"version": "2.10.0", "version": "2.10.2",
"description": "Allowing crypto users manage funds in a safer way", "description": "Allowing crypto users manage funds in a safer way",
"website": "https://github.com/gnosis/safe-react#readme", "website": "https://github.com/gnosis/safe-react#readme",
"bugs": { "bugs": {

View File

@ -23,7 +23,7 @@ export const staticAppsList: Array<{ url: string; disabled: boolean }> = [
//Balancer Exchange //Balancer Exchange
{ url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmfPLXne1UrY399RQAcjD1dmBhQrPGZWgp311CDLLW3VTn`, disabled: false }, { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmfPLXne1UrY399RQAcjD1dmBhQrPGZWgp311CDLLW3VTn`, disabled: false },
//Balancer Pool //Balancer Pool
{ url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmSiUgsYQE6y4ADZQtKuVCwszvUeeHnaRc7kmQMZRiF4ZH`, disabled: false }, { url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmaTucdZYLKTqaewwJduVMM8qfCDhyaEqjd8tBNae26K1J`, disabled: false },
// Compound // Compound
{ url: `${gnosisAppsUrl}/compound`, disabled: false }, { url: `${gnosisAppsUrl}/compound`, disabled: false },
// Idle // Idle

886
yarn.lock

File diff suppressed because it is too large Load Diff