Commit f9aadbbb authored by vignesh mohankumar's avatar vignesh mohankumar Committed by GitHub

chore: remove tokenSafety flag (#4944)

parent f8c05255
...@@ -6,7 +6,6 @@ import { TraceEvent } from 'analytics/TraceEvent' ...@@ -6,7 +6,6 @@ import { TraceEvent } from 'analytics/TraceEvent'
import TokenSafetyIcon from 'components/TokenSafety/TokenSafetyIcon' import TokenSafetyIcon from 'components/TokenSafety/TokenSafetyIcon'
import { checkWarning } from 'constants/tokenSafety' import { checkWarning } from 'constants/tokenSafety'
import { RedesignVariant, useRedesignFlag } from 'featureFlags/flags/redesign' import { RedesignVariant, useRedesignFlag } from 'featureFlags/flags/redesign'
import { TokenSafetyVariant, useTokenSafetyFlag } from 'featureFlags/flags/tokenSafety'
import { CSSProperties, MutableRefObject, useCallback, useMemo } from 'react' import { CSSProperties, MutableRefObject, useCallback, useMemo } from 'react'
import { XOctagon } from 'react-feather' import { XOctagon } from 'react-feather'
import { Check } from 'react-feather' import { Check } from 'react-feather'
...@@ -135,7 +134,6 @@ export function CurrencyRow({ ...@@ -135,7 +134,6 @@ export function CurrencyRow({
const balance = useCurrencyBalance(account ?? undefined, currency) const balance = useCurrencyBalance(account ?? undefined, currency)
const warning = currency.isNative ? null : checkWarning(currency.address) const warning = currency.isNative ? null : checkWarning(currency.address)
const redesignFlagEnabled = useRedesignFlag() === RedesignVariant.Enabled const redesignFlagEnabled = useRedesignFlag() === RedesignVariant.Enabled
const tokenSafetyFlagEnabled = useTokenSafetyFlag() === TokenSafetyVariant.Enabled
const isBlockedToken = !!warning && !warning.canProceed const isBlockedToken = !!warning && !warning.canProceed
const blockedTokenOpacity = '0.6' const blockedTokenOpacity = '0.6'
...@@ -168,7 +166,7 @@ export function CurrencyRow({ ...@@ -168,7 +166,7 @@ export function CurrencyRow({
<AutoColumn style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}> <AutoColumn style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}>
<Row> <Row>
<CurrencyName title={currency.name}>{currency.name}</CurrencyName> <CurrencyName title={currency.name}>{currency.name}</CurrencyName>
{tokenSafetyFlagEnabled && <TokenSafetyIcon warning={warning} />} <TokenSafetyIcon warning={warning} />
{isBlockedToken && <BlockedTokenIcon />} {isBlockedToken && <BlockedTokenIcon />}
</Row> </Row>
<ThemedText.DeprecatedDarkGray ml="0px" fontSize={'12px'} fontWeight={300}> <ThemedText.DeprecatedDarkGray ml="0px" fontSize={'12px'} fontWeight={300}>
......
import { Currency, Token } from '@uniswap/sdk-core' import { Currency, Token } from '@uniswap/sdk-core'
import { TokenList } from '@uniswap/token-lists' import { TokenList } from '@uniswap/token-lists'
import TokenSafety from 'components/TokenSafety' import TokenSafety from 'components/TokenSafety'
import { TokenSafetyVariant, useTokenSafetyFlag } from 'featureFlags/flags/tokenSafety'
import usePrevious from 'hooks/usePrevious' import usePrevious from 'hooks/usePrevious'
import { memo, useCallback, useEffect, useState } from 'react' import { memo, useCallback, useEffect, useState } from 'react'
import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo'
...@@ -59,23 +58,16 @@ export default memo(function CurrencySearchModal({ ...@@ -59,23 +58,16 @@ export default memo(function CurrencySearchModal({
setModalView(CurrencyModalView.tokenSafety) setModalView(CurrencyModalView.tokenSafety)
} }
const tokenSafetyFlag = useTokenSafetyFlag()
const handleCurrencySelect = useCallback( const handleCurrencySelect = useCallback(
(currency: Currency, hasWarning?: boolean) => { (currency: Currency, hasWarning?: boolean) => {
if ( if (hasWarning && currency.isToken && !userAddedTokens.find((token) => token.equals(currency))) {
tokenSafetyFlag === TokenSafetyVariant.Enabled &&
hasWarning &&
currency.isToken &&
!userAddedTokens.find((token) => token.equals(currency))
) {
showTokenSafetySpeedbump(currency) showTokenSafetySpeedbump(currency)
} else { } else {
onCurrencySelect(currency) onCurrencySelect(currency)
onDismiss() onDismiss()
} }
}, },
[onDismiss, onCurrencySelect, tokenSafetyFlag, userAddedTokens] [onDismiss, onCurrencySelect, userAddedTokens]
) )
// for token import view // for token import view
...@@ -121,7 +113,7 @@ export default memo(function CurrencySearchModal({ ...@@ -121,7 +113,7 @@ export default memo(function CurrencySearchModal({
break break
case CurrencyModalView.tokenSafety: case CurrencyModalView.tokenSafety:
modalHeight = undefined modalHeight = undefined
if (tokenSafetyFlag === TokenSafetyVariant.Enabled && warningToken) { if (warningToken) {
content = ( content = (
<TokenSafety <TokenSafety
tokenAddress={warningToken.address} tokenAddress={warningToken.address}
...@@ -135,9 +127,7 @@ export default memo(function CurrencySearchModal({ ...@@ -135,9 +127,7 @@ export default memo(function CurrencySearchModal({
case CurrencyModalView.importToken: case CurrencyModalView.importToken:
if (importToken) { if (importToken) {
modalHeight = undefined modalHeight = undefined
if (tokenSafetyFlag === TokenSafetyVariant.Enabled) { showTokenSafetySpeedbump(importToken)
showTokenSafetySpeedbump(importToken)
}
content = ( content = (
<ImportToken <ImportToken
tokens={[importToken]} tokens={[importToken]}
......
import { BaseVariant } from '../index'
export function useTokenSafetyFlag(): BaseVariant {
return BaseVariant.Enabled
}
export { BaseVariant as TokenSafetyVariant }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment