update unsupported list (#1346 )

fix(google analytics): anonymize IP in hits sent to google analytics
https://developers.google.com/analytics/devguides/collection/analyticsjs/ip-anonymization
2021-03-28 16:11:18 -04:00 · 2021-03-26 16:40:16 -05:00 · 2021-03-26 16:32:13 -05:00 · 2021-03-26 10:03:25 -05:00 · 2021-03-26 10:02:07 -05:00
5 changed files with 31 additions and 7 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -54,6 +54,14 @@ jobs:
          pinata-api-key: ${{ secrets.PINATA_API_KEY }}
          pinata-secret-api-key: ${{ secrets.PINATA_API_SECRET_KEY }}

+      - name: Pin to Crust
+        uses: crustio/ipfs-crust-action@v1.0.8
+        continue-on-error: true
+        timeout-minutes: 2
+        with:
+          cid: ${{ steps.upload.outputs.hash }}
+          seeds: ${{ secrets.CRUST_SEEDS }}
+
      - name: Convert CIDv0 to CIDv1
        id: convert_cidv0
        uses: uniswap/convert-cidv0-cidv1@v1.0.0
--- a/src/components/Settings/index.tsx
+++ b/src/components/Settings/index.tsx
@@ -1,5 +1,6 @@
 import React, { useContext, useRef, useState } from 'react'
 import { Settings, X } from 'react-feather'
+import ReactGA from 'react-ga'
 import { Text } from 'rebass'
 import styled, { ThemeContext } from 'styled-components'
 import { useOnClickOutside } from '../../hooks/useOnClickOutside'
@@ -236,7 +237,13 @@ export default function SettingsTab() {
              <Toggle
                id="toggle-disable-multihop-button"
                isActive={singleHopOnly}
-                toggle={() => (singleHopOnly ? setSingleHopOnly(false) : setSingleHopOnly(true))}
+                toggle={() => {
+                  ReactGA.event({
+                    category: 'Routing',
+                    action: singleHopOnly ? 'disable single hop' : 'enable single hop'
+                  })
+                  setSingleHopOnly(!singleHopOnly)
+                }}
              />
            </RowBetween>
          </AutoColumn>
--- a/src/constants/tokenLists/uniswap-v2-unsupported.tokenlist.json
+++ b/src/constants/tokenLists/uniswap-v2-unsupported.tokenlist.json
@@ -17,6 +17,14 @@
      "decimals": 6,
      "chainId": 1,
      "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x4922a015c4407F87432B179bb209e125432E4a2A/logo.png"
+    },
+    {
+      "name": "Grump Cat",
+      "address": "0x93B2FfF814FCaEFFB01406e80B4Ecd89Ca6A021b",
+      "symbol": "GRUMPY",
+      "decimals": 9,
+      "chainId": 1,
+      "logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x4922a015c4407F87432B179bb209e125432E4a2A/logo.png"
    }
  ]
 }
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -28,8 +28,14 @@ if (!!window.ethereum) {

 const GOOGLE_ANALYTICS_ID: string | undefined = process.env.REACT_APP_GOOGLE_ANALYTICS_ID
 if (typeof GOOGLE_ANALYTICS_ID === 'string') {
-  ReactGA.initialize(GOOGLE_ANALYTICS_ID)
+  ReactGA.initialize(GOOGLE_ANALYTICS_ID, {
+    gaOptions: {
+      storage: 'none',
+      storeGac: false
+    }
+  })
  ReactGA.set({
+    anonymizeIp: true,
    customBrowserType: !isMobile ? 'desktop' : 'web3' in window || 'ethereum' in window ? 'mobileWeb3' : 'mobileRegular'
  })
 } else {
--- a/src/state/user/hooks.tsx
+++ b/src/state/user/hooks.tsx
@@ -1,6 +1,5 @@
 import { ChainId, Pair, Token } from '@uniswap/sdk'
 import flatMap from 'lodash.flatmap'
-import ReactGA from 'react-ga'
 import { useCallback, useMemo } from 'react'
 import { shallowEqual, useDispatch, useSelector } from 'react-redux'
 import { BASES_TO_TRACK_LIQUIDITY_FOR, PINNED_PAIRS } from '../../constants'
@@ -92,10 +91,6 @@ export function useUserSingleHopOnly(): [boolean, (newSingleHopOnly: boolean) =>

  const setSingleHopOnly = useCallback(
    (newSingleHopOnly: boolean) => {
-      ReactGA.event({
-        category: 'Routing',
-        action: newSingleHopOnly ? 'enable single hop' : 'disable single hop'
-      })
      dispatch(updateUserSingleHopOnly({ userSingleHopOnly: newSingleHopOnly }))
    },
    [dispatch]
Author	SHA1	Message	Date
Ian Lapham	6347e63a15	update unsupported list (#1346 )	2021-03-28 16:11:18 -04:00
Moody Salem	bdcb9a8a0a	fix(google analytics): anonymize IP in hits sent to google analytics https://developers.google.com/analytics/devguides/collection/analyticsjs/ip-anonymization	2021-03-26 16:40:16 -05:00
Moody Salem	8d90bb7a39	fix(google analytics): don't set user cookies	2021-03-26 16:32:13 -05:00
Kun	d70b456855	Add Pin to Crust workflow (#1342 )	2021-03-26 10:03:25 -05:00
Luke Donato	fbb797fa54	Move single hop toggle GA event (#1344 ) * Move single hop toggle GA event Move GA event from setSingleHopOnly hook to toggle function * Fix code style issues with ESLint * refactor ternary operator out Co-authored-by: Lint Action <lint-action@samuelmeuli.com>	2021-03-26 10:02:07 -05:00