Commit 366f4d98 authored by eddie's avatar eddie Committed by GitHub

fix: remove unused feature flags (#7234)

* fix: remove unused feature flags

* fix: remove flag from tests

* fix: tests

* fix: remove useUniswapX param
parent 4eda18a4
import { FeatureFlag } from '../../src/featureFlags'
import { getTestSelector } from '../utils' import { getTestSelector } from '../utils'
describe('Buy Crypto Modal', () => { describe('Buy Crypto Modal', () => {
it('should open and close', () => { it('should open and close', () => {
cy.visit('/', { featureFlags: [FeatureFlag.fiatOnRampButtonOnSwap] }) cy.visit('/')
// Open the fiat onramp modal // Open the fiat onramp modal
cy.get(getTestSelector('buy-fiat-button')).click() cy.get(getTestSelector('buy-fiat-button')).click()
...@@ -16,7 +15,7 @@ describe('Buy Crypto Modal', () => { ...@@ -16,7 +15,7 @@ describe('Buy Crypto Modal', () => {
it('should open and close, mobile viewport', () => { it('should open and close, mobile viewport', () => {
cy.viewport('iphone-6') cy.viewport('iphone-6')
cy.visit('/', { featureFlags: [FeatureFlag.fiatOnRampButtonOnSwap] }) cy.visit('/')
// Open the fiat onramp modal // Open the fiat onramp modal
cy.get(getTestSelector('buy-fiat-button')).click() cy.get(getTestSelector('buy-fiat-button')).click()
......
...@@ -24,6 +24,6 @@ describe('Swap settings', () => { ...@@ -24,6 +24,6 @@ describe('Swap settings', () => {
cy.contains('Transaction deadline').should('exist') cy.contains('Transaction deadline').should('exist')
cy.contains('UniswapX').should('exist') cy.contains('UniswapX').should('exist')
cy.contains('Local routing').should('exist') cy.contains('Local routing').should('exist')
cy.get(getTestSelector('mobile-settings-scrim')).click() cy.get(getTestSelector('mobile-settings-scrim')).click({ force: true })
}) })
}) })
import Column from 'components/Column' import Column from 'components/Column'
import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags' import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags'
import { useCurrencyConversionFlag } from 'featureFlags/flags/currencyConversion' import { useCurrencyConversionFlag } from 'featureFlags/flags/currencyConversion'
import { useForceUniswapXOnFlag } from 'featureFlags/flags/forceUniswapXOn'
import { useFotAdjustmentsFlag } from 'featureFlags/flags/fotAdjustments' import { useFotAdjustmentsFlag } from 'featureFlags/flags/fotAdjustments'
import { useInfoExploreFlag } from 'featureFlags/flags/infoExplore' import { useInfoExploreFlag } from 'featureFlags/flags/infoExplore'
import { useInfoLiveViewsFlag } from 'featureFlags/flags/infoLiveViews' import { useInfoLiveViewsFlag } from 'featureFlags/flags/infoLiveViews'
...@@ -236,12 +235,6 @@ export default function FeatureFlagModal() { ...@@ -236,12 +235,6 @@ export default function FeatureFlagModal() {
featureFlag={FeatureFlag.uniswapXEnabled} featureFlag={FeatureFlag.uniswapXEnabled}
label="Enable UniswapX on interface" label="Enable UniswapX on interface"
/> />
<FeatureFlagOption
variant={BaseVariant}
value={useForceUniswapXOnFlag()}
featureFlag={FeatureFlag.forceUniswapXOn}
label="Force routing api to enable UniswapX"
/>
<FeatureFlagOption <FeatureFlagOption
variant={BaseVariant} variant={BaseVariant}
value={useUniswapXSyntheticQuoteFlag()} value={useUniswapXSyntheticQuoteFlag()}
......
import { Trans } from '@lingui/macro' import { Trans } from '@lingui/macro'
import { Percent } from '@uniswap/sdk-core' import { Percent } from '@uniswap/sdk-core'
import { useFiatOnRampButtonEnabled } from 'featureFlags/flags/fiatOnRampButton'
import { InterfaceTrade } from 'state/routing/types' import { InterfaceTrade } from 'state/routing/types'
import styled from 'styled-components' import styled from 'styled-components'
import { ThemedText } from 'theme' import { ThemedText } from 'theme'
...@@ -28,15 +27,13 @@ export default function SwapHeader({ ...@@ -28,15 +27,13 @@ export default function SwapHeader({
chainId?: number chainId?: number
trade?: InterfaceTrade trade?: InterfaceTrade
}) { }) {
const fiatOnRampButtonEnabled = useFiatOnRampButtonEnabled()
return ( return (
<StyledSwapHeader> <StyledSwapHeader>
<HeaderButtonContainer> <HeaderButtonContainer>
<ThemedText.SubHeader> <ThemedText.SubHeader>
<Trans>Swap</Trans> <Trans>Swap</Trans>
</ThemedText.SubHeader> </ThemedText.SubHeader>
{fiatOnRampButtonEnabled && <SwapBuyFiatButton />} <SwapBuyFiatButton />
</HeaderButtonContainer> </HeaderButtonContainer>
<RowFixed> <RowFixed>
<SettingsTab autoSlippage={autoSlippage} chainId={chainId} trade={trade} /> <SettingsTab autoSlippage={autoSlippage} chainId={chainId} trade={trade} />
......
import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
function useFiatOnRampButtonFlag(): BaseVariant {
return useBaseFlag(FeatureFlag.fiatOnRampButtonOnSwap)
}
export function useFiatOnRampButtonEnabled(): boolean {
return useFiatOnRampButtonFlag() === BaseVariant.Enabled
}
import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
export function useForceUniswapXOnFlag(): BaseVariant {
return useBaseFlag(FeatureFlag.forceUniswapXOn)
}
export function useForceUniswapXOn(): boolean {
return useForceUniswapXOnFlag() === BaseVariant.Enabled
}
...@@ -7,12 +7,9 @@ import { useGate } from 'statsig-react' ...@@ -7,12 +7,9 @@ import { useGate } from 'statsig-react'
*/ */
export enum FeatureFlag { export enum FeatureFlag {
traceJsonRpc = 'traceJsonRpc', traceJsonRpc = 'traceJsonRpc',
permit2 = 'permit2',
fiatOnRampButtonOnSwap = 'fiat_on_ramp_button_on_swap_page',
debounceSwapQuote = 'debounce_swap_quote', debounceSwapQuote = 'debounce_swap_quote',
uniswapXEnabled = 'uniswapx_enabled', // enables sending dutch_limit config to routing-api uniswapXEnabled = 'uniswapx_enabled', // enables sending dutch_limit config to routing-api
uniswapXSyntheticQuote = 'uniswapx_synthetic_quote', uniswapXSyntheticQuote = 'uniswapx_synthetic_quote',
forceUniswapXOn = 'uniswapx_force_on', // forces routing-api's feature flag for uniswapx to turn on as well
uniswapXEthOutputEnabled = 'uniswapx_eth_output_enabled', uniswapXEthOutputEnabled = 'uniswapx_eth_output_enabled',
uniswapXExactOutputEnabled = 'uniswapx_exact_output_enabled', uniswapXExactOutputEnabled = 'uniswapx_exact_output_enabled',
multichainUX = 'multichain_ux', multichainUX = 'multichain_ux',
......
import { SkipToken, skipToken } from '@reduxjs/toolkit/query/react' import { SkipToken, skipToken } from '@reduxjs/toolkit/query/react'
import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core' import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
import { useForceUniswapXOn } from 'featureFlags/flags/forceUniswapXOn'
import { useFotAdjustmentsEnabled } from 'featureFlags/flags/fotAdjustments' import { useFotAdjustmentsEnabled } from 'featureFlags/flags/fotAdjustments'
import { useUniswapXEnabled } from 'featureFlags/flags/uniswapx' import { useUniswapXEnabled } from 'featureFlags/flags/uniswapx'
import { useUniswapXEthOutputEnabled } from 'featureFlags/flags/uniswapXEthOutput' import { useUniswapXEthOutputEnabled } from 'featureFlags/flags/uniswapXEthOutput'
...@@ -33,7 +32,6 @@ export function useRoutingAPIArguments({ ...@@ -33,7 +32,6 @@ export function useRoutingAPIArguments({
}): GetQuoteArgs | SkipToken { }): GetQuoteArgs | SkipToken {
const uniswapXEnabled = useUniswapXEnabled() const uniswapXEnabled = useUniswapXEnabled()
const uniswapXForceSyntheticQuotes = useUniswapXSyntheticQuoteEnabled() const uniswapXForceSyntheticQuotes = useUniswapXSyntheticQuoteEnabled()
const forceUniswapXOn = useForceUniswapXOn()
const userDisabledUniswapX = useUserDisabledUniswapX() const userDisabledUniswapX = useUserDisabledUniswapX()
const uniswapXEthOutputEnabled = useUniswapXEthOutputEnabled() const uniswapXEthOutputEnabled = useUniswapXEthOutputEnabled()
const uniswapXExactOutputEnabled = useUniswapXExactOutputEnabled() const uniswapXExactOutputEnabled = useUniswapXExactOutputEnabled()
...@@ -59,7 +57,6 @@ export function useRoutingAPIArguments({ ...@@ -59,7 +57,6 @@ export function useRoutingAPIArguments({
needsWrapIfUniswapX: tokenIn.isNative, needsWrapIfUniswapX: tokenIn.isNative,
uniswapXEnabled, uniswapXEnabled,
uniswapXForceSyntheticQuotes, uniswapXForceSyntheticQuotes,
forceUniswapXOn,
userDisabledUniswapX, userDisabledUniswapX,
uniswapXEthOutputEnabled, uniswapXEthOutputEnabled,
uniswapXExactOutputEnabled, uniswapXExactOutputEnabled,
...@@ -75,7 +72,6 @@ export function useRoutingAPIArguments({ ...@@ -75,7 +72,6 @@ export function useRoutingAPIArguments({
uniswapXEnabled, uniswapXEnabled,
uniswapXExactOutputEnabled, uniswapXExactOutputEnabled,
uniswapXForceSyntheticQuotes, uniswapXForceSyntheticQuotes,
forceUniswapXOn,
userDisabledUniswapX, userDisabledUniswapX,
uniswapXEthOutputEnabled, uniswapXEthOutputEnabled,
fotAdjustmentsEnabled, fotAdjustmentsEnabled,
......
...@@ -128,15 +128,7 @@ export const routingApi = createApi({ ...@@ -128,15 +128,7 @@ export const routingApi = createApi({
if (shouldUseAPIRouter(args)) { if (shouldUseAPIRouter(args)) {
fellBack = true fellBack = true
try { try {
const { const { tokenInAddress, tokenInChainId, tokenOutAddress, tokenOutChainId, amount, tradeType } = args
tokenInAddress,
tokenInChainId,
tokenOutAddress,
tokenOutChainId,
amount,
tradeType,
forceUniswapXOn,
} = args
const type = isExactInput(tradeType) ? 'EXACT_INPUT' : 'EXACT_OUTPUT' const type = isExactInput(tradeType) ? 'EXACT_INPUT' : 'EXACT_OUTPUT'
const requestBody = { const requestBody = {
...@@ -146,8 +138,6 @@ export const routingApi = createApi({ ...@@ -146,8 +138,6 @@ export const routingApi = createApi({
tokenOut: tokenOutAddress, tokenOut: tokenOutAddress,
amount, amount,
type, type,
// if forceUniswapXOn is not ON, then use the backend's default value
useUniswapX: forceUniswapXOn || undefined,
configs: getRoutingAPIConfig(args), configs: getRoutingAPIConfig(args),
} }
......
...@@ -46,7 +46,6 @@ export interface GetQuoteArgs { ...@@ -46,7 +46,6 @@ export interface GetQuoteArgs {
uniswapXForceSyntheticQuotes: boolean uniswapXForceSyntheticQuotes: boolean
uniswapXEthOutputEnabled: boolean uniswapXEthOutputEnabled: boolean
uniswapXExactOutputEnabled: boolean uniswapXExactOutputEnabled: boolean
forceUniswapXOn: boolean
userDisabledUniswapX: boolean userDisabledUniswapX: boolean
fotAdjustmentsEnabled: boolean fotAdjustmentsEnabled: boolean
} }
......
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