Commit 4a72d883 authored by Jordan Frankfurt's avatar Jordan Frankfurt Committed by GitHub

chore: remove FoR feature flag (#5985)

remove feature flag
parent 19c60236
import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags' import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags'
import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
import { GqlRoutingVariant, useGqlRoutingFlag } from 'featureFlags/flags/gqlRouting' import { GqlRoutingVariant, useGqlRoutingFlag } from 'featureFlags/flags/gqlRouting'
import { NftListV2Variant, useNftListV2Flag } from 'featureFlags/flags/nftListV2' import { NftListV2Variant, useNftListV2Flag } from 'featureFlags/flags/nftListV2'
import { PayWithAnyTokenVariant, usePayWithAnyTokenFlag } from 'featureFlags/flags/payWithAnyToken' import { PayWithAnyTokenVariant, usePayWithAnyTokenFlag } from 'featureFlags/flags/payWithAnyToken'
...@@ -213,12 +212,6 @@ export default function FeatureFlagModal() { ...@@ -213,12 +212,6 @@ export default function FeatureFlagModal() {
featureFlag={FeatureFlag.permit2} featureFlag={FeatureFlag.permit2}
label="Permit 2 / Universal Router" label="Permit 2 / Universal Router"
/> />
<FeatureFlagOption
variant={BaseVariant}
value={useFiatOnrampFlag()}
featureFlag={FeatureFlag.fiatOnramp}
label="Fiat on-ramp"
/>
<FeatureFlagOption <FeatureFlagOption
variant={NftListV2Variant} variant={NftListV2Variant}
value={useNftListV2Flag()} value={useNftListV2Flag()}
......
...@@ -3,8 +3,6 @@ import { sendAnalyticsEvent } from '@uniswap/analytics' ...@@ -3,8 +3,6 @@ import { sendAnalyticsEvent } from '@uniswap/analytics'
import { InterfaceEventName } from '@uniswap/analytics-events' import { InterfaceEventName } from '@uniswap/analytics-events'
import { useWeb3React } from '@web3-react/core' import { useWeb3React } from '@web3-react/core'
import fiatMaskUrl from 'assets/svg/fiat_mask.svg' import fiatMaskUrl from 'assets/svg/fiat_mask.svg'
import { BaseVariant } from 'featureFlags'
import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
import { useCallback, useEffect, useState } from 'react' import { useCallback, useEffect, useState } from 'react'
import { X } from 'react-feather' import { X } from 'react-feather'
import { useToggleWalletDropdown } from 'state/application/hooks' import { useToggleWalletDropdown } from 'state/application/hooks'
...@@ -120,13 +118,11 @@ export function FiatOnrampAnnouncement() { ...@@ -120,13 +118,11 @@ export function FiatOnrampAnnouncement() {
acknowledge({ user: true }) acknowledge({ user: true })
}, [acknowledge, toggleWalletDropdown]) }, [acknowledge, toggleWalletDropdown])
const fiatOnrampFlag = useFiatOnrampFlag()
const openModal = useAppSelector((state) => state.application.openModal) const openModal = useAppSelector((state) => state.application.openModal)
if ( if (
!account || !account ||
acks?.user || acks?.user ||
fiatOnrampFlag === BaseVariant.Control ||
localStorage.getItem(ANNOUNCEMENT_DISMISSED) || localStorage.getItem(ANNOUNCEMENT_DISMISSED) ||
acks?.renderCount >= MAX_RENDER_COUNT || acks?.renderCount >= MAX_RENDER_COUNT ||
isMobile || isMobile ||
......
...@@ -2,8 +2,6 @@ import { useWeb3React } from '@web3-react/core' ...@@ -2,8 +2,6 @@ import { useWeb3React } from '@web3-react/core'
import AddressClaimModal from 'components/claim/AddressClaimModal' import AddressClaimModal from 'components/claim/AddressClaimModal'
import ConnectedAccountBlocked from 'components/ConnectedAccountBlocked' import ConnectedAccountBlocked from 'components/ConnectedAccountBlocked'
import FiatOnrampModal from 'components/FiatOnrampModal' import FiatOnrampModal from 'components/FiatOnrampModal'
import { BaseVariant } from 'featureFlags'
import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
import useAccountRiskCheck from 'hooks/useAccountRiskCheck' import useAccountRiskCheck from 'hooks/useAccountRiskCheck'
import { lazy } from 'react' import { lazy } from 'react'
import { useModalIsOpen, useToggleModal } from 'state/application/hooks' import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
...@@ -20,7 +18,6 @@ export default function TopLevelModals() { ...@@ -20,7 +18,6 @@ export default function TopLevelModals() {
const { account } = useWeb3React() const { account } = useWeb3React()
useAccountRiskCheck(account) useAccountRiskCheck(account)
const accountBlocked = Boolean(blockedAccountModalOpen && account) const accountBlocked = Boolean(blockedAccountModalOpen && account)
const fiatOnrampFlagEnabled = useFiatOnrampFlag() === BaseVariant.Enabled
return ( return (
<> <>
...@@ -29,7 +26,7 @@ export default function TopLevelModals() { ...@@ -29,7 +26,7 @@ export default function TopLevelModals() {
<Bag /> <Bag />
<TransactionCompleteModal /> <TransactionCompleteModal />
<AirdropModal /> <AirdropModal />
{fiatOnrampFlagEnabled && <FiatOnrampModal />} <FiatOnrampModal />
</> </>
) )
} }
...@@ -9,8 +9,6 @@ import Tooltip from 'components/Tooltip' ...@@ -9,8 +9,6 @@ import Tooltip from 'components/Tooltip'
import { getConnection } from 'connection/utils' import { getConnection } from 'connection/utils'
import { getChainInfoOrDefault } from 'constants/chainInfo' import { getChainInfoOrDefault } from 'constants/chainInfo'
import { SupportedChainId } from 'constants/chains' import { SupportedChainId } from 'constants/chains'
import { BaseVariant } from 'featureFlags'
import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
import useCopyClipboard from 'hooks/useCopyClipboard' import useCopyClipboard from 'hooks/useCopyClipboard'
import useStablecoinPrice from 'hooks/useStablecoinPrice' import useStablecoinPrice from 'hooks/useStablecoinPrice'
import useNativeCurrency from 'lib/hooks/useNativeCurrency' import useNativeCurrency from 'lib/hooks/useNativeCurrency'
...@@ -225,7 +223,6 @@ const AuthenticatedHeader = () => { ...@@ -225,7 +223,6 @@ const AuthenticatedHeader = () => {
closeModal() closeModal()
}, [clearCollectionFilters, closeModal, navigate, resetSellAssets, setSellPageState]) }, [clearCollectionFilters, closeModal, navigate, resetSellAssets, setSellPageState])
const fiatOnrampFlag = useFiatOnrampFlag()
// animate the border of the buy crypto button when a user navigates here from the feature announcement // animate the border of the buy crypto button when a user navigates here from the feature announcement
// can be removed when components/FiatOnrampAnnouncment.tsx is no longer used // can be removed when components/FiatOnrampAnnouncment.tsx is no longer used
const [acknowledgements, acknowledge] = useFiatOnrampAck() const [acknowledgements, acknowledge] = useFiatOnrampAck()
...@@ -316,8 +313,6 @@ const AuthenticatedHeader = () => { ...@@ -316,8 +313,6 @@ const AuthenticatedHeader = () => {
> >
<Trans>View and sell NFTs</Trans> <Trans>View and sell NFTs</Trans>
</ProfileButton> </ProfileButton>
{fiatOnrampFlag === BaseVariant.Enabled && (
<>
<BuyCryptoButton <BuyCryptoButton
$animateBorder={animateBuyCryptoButtonBorder} $animateBorder={animateBuyCryptoButtonBorder}
size={ButtonSize.medium} size={ButtonSize.medium}
...@@ -356,8 +351,6 @@ const AuthenticatedHeader = () => { ...@@ -356,8 +351,6 @@ const AuthenticatedHeader = () => {
</Tooltip> </Tooltip>
</FiatOnrampNotAvailableText> </FiatOnrampNotAvailableText>
)} )}
</>
)}
{isUnclaimed && ( {isUnclaimed && (
<UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}> <UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}>
<Trans>Claim</Trans> {unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} <Trans>reward</Trans> <Trans>Claim</Trans> {unclaimedAmount?.toFixed(0, { groupSeparator: ',' } ?? '-')} <Trans>reward</Trans>
......
export enum FeatureFlag { export enum FeatureFlag {
fiatOnramp = 'fiatOnramp',
traceJsonRpc = 'traceJsonRpc', traceJsonRpc = 'traceJsonRpc',
permit2 = 'permit2', permit2 = 'permit2',
nftListV2 = 'nftListV2', nftListV2 = 'nftListV2',
......
import { BaseVariant } from '../index'
export function useFiatOnrampFlag(): BaseVariant {
return BaseVariant.Enabled
// return useBaseFlag(FeatureFlag.fiatOnramp)
}
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