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

Backmerge Release v2.13.0

.travis.yml

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

package.json

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

src/config/index.ts

@@ -89,7 +89,7 @@ export const getAllTransactionsUriFrom = (safeAddress: string) => `/safes/${safe
 
 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(
   async (url: string, contractAddress: string, apiKey?: string) => {