status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1496 from gnosis/release/v2.13.0 

Backmerge Release v2.13.0
This commit is contained in:
Daniel Sanchez 2020-10-20 10:55:41 +02:00 committed by GitHub
parent c6d54b3eb5 b4faa3b617
commit 0eef6932b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -1,4 +1,4 @@
if: (branch = development) OR (branch = master) OR (feature/#1353-xDai-compatibility) OR (type = pull_request) OR (tag IS present) if: (branch = development) OR (branch = master) OR (release/v2.13.0) OR (type = pull_request) OR (tag IS present)
sudo: required sudo: required
dist: bionic dist: bionic
language: node_js language: node_js
@ -10,16 +10,19 @@ matrix:
include: include:
- env: - env:
- REACT_APP_NETWORK='mainnet' - REACT_APP_NETWORK='mainnet'
- REACT_APP_GOOGLE_ANALYTICS=${REACT_APP_GOOGLE_ANALYTICS_ID_MAINNET}
- STAGING_BUCKET_NAME=${STAGING_MAINNET_BUCKET_NAME} - STAGING_BUCKET_NAME=${STAGING_MAINNET_BUCKET_NAME}
- REACT_APP_GNOSIS_APPS_URL=${REACT_APP_GNOSIS_APPS_URL_PROD} - REACT_APP_GNOSIS_APPS_URL=${REACT_APP_GNOSIS_APPS_URL_PROD}
if: (branch = master AND NOT type = pull_request) OR tag IS present if: (branch = master AND NOT type = pull_request) OR tag IS present
- env: - env:
- REACT_APP_NETWORK='rinkeby' - REACT_APP_NETWORK='rinkeby'
- REACT_APP_GOOGLE_ANALYTICS=${REACT_APP_GOOGLE_ANALYTICS_ID_RINKEBY}
- REACT_APP_GNOSIS_APPS_URL=${REACT_APP_GNOSIS_APPS_URL_STAGING} - REACT_APP_GNOSIS_APPS_URL=${REACT_APP_GNOSIS_APPS_URL_STAGING}
- env: - env:
- REACT_APP_NETWORK='xdai' - REACT_APP_NETWORK='xdai'
- REACT_APP_GOOGLE_ANALYTICS=${REACT_APP_GOOGLE_ANALYTICS_ID_XDAI}
- STAGING_BUCKET_NAME=${STAGING_XDAI_BUCKET_NAME} - STAGING_BUCKET_NAME=${STAGING_XDAI_BUCKET_NAME}
if: ((branch = master OR branch = feature/#1353-xDai-compatibility) AND NOT type = pull_request) OR tag IS present if: ((branch = master OR branch = release/v2.13.0) AND NOT type = pull_request) OR tag IS present
cache: cache:
yarn: true yarn: true
before_script: before_script:
@ -78,7 +81,7 @@ deploy:
upload_dir: current/app upload_dir: current/app
region: $AWS_DEFAULT_REGION region: $AWS_DEFAULT_REGION
on: on:
branch: feature/#1353-xDai-compatibility branch: release/v2.13.0
condition: $REACT_APP_NETWORK = xdai condition: $REACT_APP_NETWORK = xdai
# Prepare production deployment # Prepare production deployment

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "safe-react", "name": "safe-react",
"version": "2.12.2", "version": "2.13.0",
"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": {

2
src/config/index.ts
View File

@ -89,7 +89,7 @@ export const getAllTransactionsUriFrom = (safeAddress: string) => `/safes/${safe
export const getSafeCreationTxUri = (safeAddress: string) => `/safes/${safeAddress}/creation/` export const getSafeCreationTxUri = (safeAddress: string) => `/safes/${safeAddress}/creation/`
export const getGoogleAnalyticsTrackingID = (): string => GOOGLE_ANALYTICS_ID[getNetworkId()] export const getGoogleAnalyticsTrackingID = (): string => GOOGLE_ANALYTICS_ID
const fetchContractABI = memoize( const fetchContractABI = memoize(
async (url: string, contractAddress: string, apiKey?: string) => { async (url: string, contractAddress: string, apiKey?: string) => {