chore: remove FoR feature flag (#5985)

remove feature flag

src/components/FeatureFlagModal/FeatureFlagModal.tsx

 import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags'
-import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
 import { GqlRoutingVariant, useGqlRoutingFlag } from 'featureFlags/flags/gqlRouting'
 import { NftListV2Variant, useNftListV2Flag } from 'featureFlags/flags/nftListV2'
 import { PayWithAnyTokenVariant, usePayWithAnyTokenFlag } from 'featureFlags/flags/payWithAnyToken'
@@ -213,12 +212,6 @@ export default function FeatureFlagModal() {
         featureFlag={FeatureFlag.permit2}
         label="Permit 2 / Universal Router"
       />
-      <FeatureFlagOption
-        variant={BaseVariant}
-        value={useFiatOnrampFlag()}
-        featureFlag={FeatureFlag.fiatOnramp}
-        label="Fiat on-ramp"
-      />
       <FeatureFlagOption
         variant={NftListV2Variant}
         value={useNftListV2Flag()}

src/components/FiatOnrampAnnouncement/index.tsx

@@ -3,8 +3,6 @@ import { sendAnalyticsEvent } from '@uniswap/analytics'
 import { InterfaceEventName } from '@uniswap/analytics-events'
 import { useWeb3React } from '@web3-react/core'
 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 { X } from 'react-feather'
 import { useToggleWalletDropdown } from 'state/application/hooks'
@@ -120,13 +118,11 @@ export function FiatOnrampAnnouncement() {
     acknowledge({ user: true })
   }, [acknowledge, toggleWalletDropdown])
 
-  const fiatOnrampFlag = useFiatOnrampFlag()
   const openModal = useAppSelector((state) => state.application.openModal)
 
   if (
     !account ||
     acks?.user ||
-    fiatOnrampFlag === BaseVariant.Control ||
     localStorage.getItem(ANNOUNCEMENT_DISMISSED) ||
     acks?.renderCount >= MAX_RENDER_COUNT ||
     isMobile ||

src/components/TopLevelModals/index.tsx

@@ -2,8 +2,6 @@ import { useWeb3React } from '@web3-react/core'
 import AddressClaimModal from 'components/claim/AddressClaimModal'
 import ConnectedAccountBlocked from 'components/ConnectedAccountBlocked'
 import FiatOnrampModal from 'components/FiatOnrampModal'
-import { BaseVariant } from 'featureFlags'
-import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
 import useAccountRiskCheck from 'hooks/useAccountRiskCheck'
 import { lazy } from 'react'
 import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
@@ -20,7 +18,6 @@ export default function TopLevelModals() {
   const { account } = useWeb3React()
   useAccountRiskCheck(account)
   const accountBlocked = Boolean(blockedAccountModalOpen && account)
-  const fiatOnrampFlagEnabled = useFiatOnrampFlag() === BaseVariant.Enabled
 
   return (
     <>
@@ -29,7 +26,7 @@ export default function TopLevelModals() {
       <Bag />
       <TransactionCompleteModal />
       <AirdropModal />
-      {fiatOnrampFlagEnabled && <FiatOnrampModal />}
+      <FiatOnrampModal />
     </>
   )
 }

src/components/WalletDropdown/AuthenticatedHeader.tsx

@@ -9,8 +9,6 @@ import Tooltip from 'components/Tooltip'
 import { getConnection } from 'connection/utils'
 import { getChainInfoOrDefault } from 'constants/chainInfo'
 import { SupportedChainId } from 'constants/chains'
-import { BaseVariant } from 'featureFlags'
-import { useFiatOnrampFlag } from 'featureFlags/flags/fiatOnramp'
 import useCopyClipboard from 'hooks/useCopyClipboard'
 import useStablecoinPrice from 'hooks/useStablecoinPrice'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
@@ -225,7 +223,6 @@ const AuthenticatedHeader = () => {
     closeModal()
   }, [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
   // can be removed when components/FiatOnrampAnnouncment.tsx is no longer used
   const [acknowledgements, acknowledge] = useFiatOnrampAck()
@@ -316,47 +313,43 @@ const AuthenticatedHeader = () => {
         >
           <Trans>View and sell NFTs</Trans>
         </ProfileButton>
-        {fiatOnrampFlag === BaseVariant.Enabled && (
-          <>
-            <BuyCryptoButton
-              $animateBorder={animateBuyCryptoButtonBorder}
-              size={ButtonSize.medium}
-              emphasis={ButtonEmphasis.medium}
-              onClick={handleBuyCryptoClick}
-              disabled={disableBuyCryptoButton}
-            >
-              {error ? (
-                <ThemedText.BodyPrimary>{error}</ThemedText.BodyPrimary>
+        <BuyCryptoButton
+          $animateBorder={animateBuyCryptoButtonBorder}
+          size={ButtonSize.medium}
+          emphasis={ButtonEmphasis.medium}
+          onClick={handleBuyCryptoClick}
+          disabled={disableBuyCryptoButton}
+        >
+          {error ? (
+            <ThemedText.BodyPrimary>{error}</ThemedText.BodyPrimary>
+          ) : (
+            <>
+              {fiatOnrampAvailabilityLoading ? (
+                <StyledLoadingButtonSpinner />
               ) : (
-                <>
-                  {fiatOnrampAvailabilityLoading ? (
-                    <StyledLoadingButtonSpinner />
-                  ) : (
-                    <CreditCard height="20px" width="20px" />
-                  )}{' '}
-                  <Trans>Buy crypto</Trans>
-                </>
-              )}
-            </BuyCryptoButton>
-            {Boolean(!fiatOnrampAvailable && fiatOnrampAvailabilityChecked) && (
-              <FiatOnrampNotAvailableText marginTop="8px">
-                <Trans>Not available in your region</Trans>
-                <Tooltip
-                  show={showFiatOnrampUnavailableTooltip}
-                  text={<Trans>Moonpay is not available in some regions. Click to learn more.</Trans>}
-                >
-                  <FiatOnrampAvailabilityExternalLink
-                    onMouseEnter={openFiatOnrampUnavailableTooltip}
-                    onMouseLeave={closeFiatOnrampUnavailableTooltip}
-                    style={{ color: 'inherit' }}
-                    href="https://support.uniswap.org/hc/en-us/articles/11306664890381-Why-isn-t-MoonPay-available-in-my-region-"
-                  >
-                    <StyledInfoIcon />
-                  </FiatOnrampAvailabilityExternalLink>
-                </Tooltip>
-              </FiatOnrampNotAvailableText>
-            )}
-          </>
+                <CreditCard height="20px" width="20px" />
+              )}{' '}
+              <Trans>Buy crypto</Trans>
+            </>
+          )}
+        </BuyCryptoButton>
+        {Boolean(!fiatOnrampAvailable && fiatOnrampAvailabilityChecked) && (
+          <FiatOnrampNotAvailableText marginTop="8px">
+            <Trans>Not available in your region</Trans>
+            <Tooltip
+              show={showFiatOnrampUnavailableTooltip}
+              text={<Trans>Moonpay is not available in some regions. Click to learn more.</Trans>}
+            >
+              <FiatOnrampAvailabilityExternalLink
+                onMouseEnter={openFiatOnrampUnavailableTooltip}
+                onMouseLeave={closeFiatOnrampUnavailableTooltip}
+                style={{ color: 'inherit' }}
+                href="https://support.uniswap.org/hc/en-us/articles/11306664890381-Why-isn-t-MoonPay-available-in-my-region-"
+              >
+                <StyledInfoIcon />
+              </FiatOnrampAvailabilityExternalLink>
+            </Tooltip>
+          </FiatOnrampNotAvailableText>
         )}
         {isUnclaimed && (
           <UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}>

src/featureFlags/flags/featureFlags.ts

 export enum FeatureFlag {
-  fiatOnramp = 'fiatOnramp',
   traceJsonRpc = 'traceJsonRpc',
   permit2 = 'permit2',
   nftListV2 = 'nftListV2',

src/featureFlags/flags/fiatOnramp.ts

-import { BaseVariant } from '../index'
-
-export function useFiatOnrampFlag(): BaseVariant {
-  return BaseVariant.Enabled
-  // return useBaseFlag(FeatureFlag.fiatOnramp)
-}