From c6d54b3eb57f8c04b691458656a8b9106ffb7c0a Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Mon, 19 Oct 2020 18:11:21 +0200 Subject: [PATCH 1/4] Fix etherscan links (#1497) --- src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/index.ts b/src/config/index.ts index b57869a9d5..6240ce8807 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -157,7 +157,7 @@ export const getExplorerInfo = (hash: string): BlockScanInfo => { default: { const type = hash.length > 42 ? 'tx' : 'address' return () => ({ - url: `${url}${type}/${hash}`, + url: `${url}/${type}/${hash}`, alt: name || '', }) } From 24c917d8215fa361a641960bc44f755b10f16c35 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Tue, 20 Oct 2020 17:46:09 +0200 Subject: [PATCH 2/4] Set warn level to batch request catch --- src/logic/contracts/generateBatchRequests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/contracts/generateBatchRequests.ts b/src/logic/contracts/generateBatchRequests.ts index 0ed3c09c48..adf327b84f 100644 --- a/src/logic/contracts/generateBatchRequests.ts +++ b/src/logic/contracts/generateBatchRequests.ts @@ -55,7 +55,7 @@ const generateBatchRequests = ({ abi, address, batch, context, met // If batch was provided add to external batch batch ? batch.add(request) : localBatch.add(request) } catch (e) { - console.error('There was an error trying to batch request from web3.', e) + console.warn('There was an error trying to batch request from web3.', e) resolve() } }) From f46c4f72ad679e4978c071ff8bc1635bbd2d5024 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Tue, 20 Oct 2020 17:47:25 +0200 Subject: [PATCH 3/4] Set v2.13.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da4bd9acfd..0923492e67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "safe-react", - "version": "2.13.0", + "version": "2.13.1", "description": "Allowing crypto users manage funds in a safer way", "website": "https://github.com/gnosis/safe-react#readme", "bugs": { From bc5878b5d4d2c481e6cc43a6c67904b533126df2 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Tue, 20 Oct 2020 17:53:47 +0200 Subject: [PATCH 4/4] Remove release/v2.13.0 branch from travis file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8de4514522..33f236b9f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -if: (branch = development) OR (branch = master) OR (release/v2.13.0) OR (type = pull_request) OR (tag IS present) +if: (branch = development) OR (branch = master) OR (type = pull_request) OR (tag IS present) sudo: required dist: bionic language: node_js @@ -22,7 +22,7 @@ matrix: - REACT_APP_NETWORK='xdai' - REACT_APP_GOOGLE_ANALYTICS=${REACT_APP_GOOGLE_ANALYTICS_ID_XDAI} - STAGING_BUCKET_NAME=${STAGING_XDAI_BUCKET_NAME} - if: ((branch = master OR branch = release/v2.13.0) AND NOT type = pull_request) OR tag IS present + if: (branch = master AND NOT type = pull_request) OR tag IS present cache: yarn: true before_script: