Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6347e63a15 | ||
|
|
bdcb9a8a0a | ||
|
|
8d90bb7a39 | ||
|
|
d70b456855 | ||
|
|
fbb797fa54 | ||
|
|
8ace518311 | ||
|
|
67c776c995 | ||
|
|
719754c46c |
8
.github/workflows/release.yaml
vendored
8
.github/workflows/release.yaml
vendored
@@ -54,6 +54,14 @@ jobs:
|
|||||||
pinata-api-key: ${{ secrets.PINATA_API_KEY }}
|
pinata-api-key: ${{ secrets.PINATA_API_KEY }}
|
||||||
pinata-secret-api-key: ${{ secrets.PINATA_API_SECRET_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
|
- name: Convert CIDv0 to CIDv1
|
||||||
id: convert_cidv0
|
id: convert_cidv0
|
||||||
uses: uniswap/convert-cidv0-cidv1@v1.0.0
|
uses: uniswap/convert-cidv0-cidv1@v1.0.0
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import React, { useContext, useRef, useState } from 'react'
|
import React, { useContext, useRef, useState } from 'react'
|
||||||
import { Settings, X } from 'react-feather'
|
import { Settings, X } from 'react-feather'
|
||||||
|
import ReactGA from 'react-ga'
|
||||||
import { Text } from 'rebass'
|
import { Text } from 'rebass'
|
||||||
import styled, { ThemeContext } from 'styled-components'
|
import styled, { ThemeContext } from 'styled-components'
|
||||||
import { useOnClickOutside } from '../../hooks/useOnClickOutside'
|
import { useOnClickOutside } from '../../hooks/useOnClickOutside'
|
||||||
@@ -236,7 +237,13 @@ export default function SettingsTab() {
|
|||||||
<Toggle
|
<Toggle
|
||||||
id="toggle-disable-multihop-button"
|
id="toggle-disable-multihop-button"
|
||||||
isActive={singleHopOnly}
|
isActive={singleHopOnly}
|
||||||
toggle={() => (singleHopOnly ? setSingleHopOnly(false) : setSingleHopOnly(true))}
|
toggle={() => {
|
||||||
|
ReactGA.event({
|
||||||
|
category: 'Routing',
|
||||||
|
action: singleHopOnly ? 'disable single hop' : 'enable single hop'
|
||||||
|
})
|
||||||
|
setSingleHopOnly(!singleHopOnly)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</RowBetween>
|
</RowBetween>
|
||||||
</AutoColumn>
|
</AutoColumn>
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ export function AdvancedSwapDetails({ trade }: AdvancedSwapDetailsProps) {
|
|||||||
{!showRoute && (
|
{!showRoute && (
|
||||||
<AutoColumn style={{ padding: '12px 16px 0 16px' }}>
|
<AutoColumn style={{ padding: '12px 16px 0 16px' }}>
|
||||||
<InfoLink
|
<InfoLink
|
||||||
href={'https://uniswap.info/pair/' + trade.route.pairs[0].liquidityToken.address}
|
href={'https://info.uniswap.org/pair/' + trade.route.pairs[0].liquidityToken.address}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
>
|
>
|
||||||
View pair analytics ↗
|
View pair analytics ↗
|
||||||
|
|||||||
@@ -17,6 +17,14 @@
|
|||||||
"decimals": 6,
|
"decimals": 6,
|
||||||
"chainId": 1,
|
"chainId": 1,
|
||||||
"logoURI": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0x4922a015c4407F87432B179bb209e125432E4a2A/logo.png"
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,8 +28,14 @@ if (!!window.ethereum) {
|
|||||||
|
|
||||||
const GOOGLE_ANALYTICS_ID: string | undefined = process.env.REACT_APP_GOOGLE_ANALYTICS_ID
|
const GOOGLE_ANALYTICS_ID: string | undefined = process.env.REACT_APP_GOOGLE_ANALYTICS_ID
|
||||||
if (typeof GOOGLE_ANALYTICS_ID === 'string') {
|
if (typeof GOOGLE_ANALYTICS_ID === 'string') {
|
||||||
ReactGA.initialize(GOOGLE_ANALYTICS_ID)
|
ReactGA.initialize(GOOGLE_ANALYTICS_ID, {
|
||||||
|
gaOptions: {
|
||||||
|
storage: 'none',
|
||||||
|
storeGac: false
|
||||||
|
}
|
||||||
|
})
|
||||||
ReactGA.set({
|
ReactGA.set({
|
||||||
|
anonymizeIp: true,
|
||||||
customBrowserType: !isMobile ? 'desktop' : 'web3' in window || 'ethereum' in window ? 'mobileWeb3' : 'mobileRegular'
|
customBrowserType: !isMobile ? 'desktop' : 'web3' in window || 'ethereum' in window ? 'mobileWeb3' : 'mobileRegular'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -29,18 +29,16 @@ function fetchClaim(account: string, chainId: ChainId): Promise<UserClaimData |
|
|||||||
|
|
||||||
return (CLAIM_PROMISES[key] =
|
return (CLAIM_PROMISES[key] =
|
||||||
CLAIM_PROMISES[key] ??
|
CLAIM_PROMISES[key] ??
|
||||||
fetch(`https://gentle-frost-9e74.uniswap.workers.dev/${chainId}/${formatted}`)
|
fetch('https://merkle-drop-1.uniswap.workers.dev/', {
|
||||||
.then(res => {
|
body: JSON.stringify({ chainId, address: formatted }),
|
||||||
if (res.status === 200) {
|
headers: {
|
||||||
return res.json()
|
'Content-Type': 'application/json',
|
||||||
} else {
|
'Referrer-Policy': 'no-referrer'
|
||||||
console.debug(`No claim for account ${formatted} on chain ID ${chainId}`)
|
},
|
||||||
return null
|
method: 'POST'
|
||||||
}
|
})
|
||||||
})
|
.then(res => (res.ok ? res.json() : console.log(`No claim for account ${formatted} on chain ID ${chainId}`)))
|
||||||
.catch(error => {
|
.catch(error => console.error('Failed to get claim data', error)))
|
||||||
console.error('Failed to get claim data', error)
|
|
||||||
}))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// parse distributorContract blob and detect if user has claim data
|
// parse distributorContract blob and detect if user has claim data
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { ChainId, Pair, Token } from '@uniswap/sdk'
|
import { ChainId, Pair, Token } from '@uniswap/sdk'
|
||||||
import flatMap from 'lodash.flatmap'
|
import flatMap from 'lodash.flatmap'
|
||||||
import ReactGA from 'react-ga'
|
|
||||||
import { useCallback, useMemo } from 'react'
|
import { useCallback, useMemo } from 'react'
|
||||||
import { shallowEqual, useDispatch, useSelector } from 'react-redux'
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux'
|
||||||
import { BASES_TO_TRACK_LIQUIDITY_FOR, PINNED_PAIRS } from '../../constants'
|
import { BASES_TO_TRACK_LIQUIDITY_FOR, PINNED_PAIRS } from '../../constants'
|
||||||
@@ -92,10 +91,6 @@ export function useUserSingleHopOnly(): [boolean, (newSingleHopOnly: boolean) =>
|
|||||||
|
|
||||||
const setSingleHopOnly = useCallback(
|
const setSingleHopOnly = useCallback(
|
||||||
(newSingleHopOnly: boolean) => {
|
(newSingleHopOnly: boolean) => {
|
||||||
ReactGA.event({
|
|
||||||
category: 'Routing',
|
|
||||||
action: newSingleHopOnly ? 'enable single hop' : 'disable single hop'
|
|
||||||
})
|
|
||||||
dispatch(updateUserSingleHopOnly({ userSingleHopOnly: newSingleHopOnly }))
|
dispatch(updateUserSingleHopOnly({ userSingleHopOnly: newSingleHopOnly }))
|
||||||
},
|
},
|
||||||
[dispatch]
|
[dispatch]
|
||||||
|
|||||||
Reference in New Issue
Block a user