chore: Feature flag cleanup for Arbitrum native USDC (#6743)

remove feature flag stuff

src/components/FeatureFlagModal/FeatureFlagModal.tsx

 import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'featureFlags'
-import { useNativeUSDCArbitrumFlag } from 'featureFlags/flags/nativeUsdcArbitrum'
 import { DetailsV2Variant, useDetailsV2Flag } from 'featureFlags/flags/nftDetails'
 import { useRoutingAPIForPriceFlag } from 'featureFlags/flags/priceRoutingApi'
 import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/traceJsonRpc'
@@ -216,12 +215,6 @@ export default function FeatureFlagModal() {
         featureFlag={FeatureFlag.uraEnabled}
         label="Enable the Unified Routing API"
       />
-      <FeatureFlagOption
-        variant={BaseVariant}
-        value={useNativeUSDCArbitrumFlag()}
-        featureFlag={FeatureFlag.nativeUsdcArbitrum}
-        label="Enable Circle native USDC on Arbitrum"
-      />
       <FeatureFlagOption
         variant={BaseVariant}
         value={useRoutingAPIForPriceFlag()}

src/components/SearchModal/CommonBases.tsx

@@ -4,8 +4,7 @@ import { Currency } from '@uniswap/sdk-core'
 import { AutoColumn } from 'components/Column'
 import CurrencyLogo from 'components/Logo/CurrencyLogo'
 import { AutoRow } from 'components/Row'
-import { COMMON_BASES, COMMON_BASES_V2 } from 'constants/routing'
-import { useNativeUSDCArbitrumEnabled } from 'featureFlags/flags/nativeUsdcArbitrum'
+import { COMMON_BASES } from 'constants/routing'
 import { useTokenInfoFromActiveList } from 'hooks/useTokenInfoFromActiveList'
 import { getTokenAddress } from 'lib/utils/analytics'
 import { Text } from 'rebass'
@@ -60,9 +59,7 @@ export default function CommonBases({
   searchQuery: string
   isAddressSearch: string | false
 }) {
-  const nativeUsdcArbitrumEnabled = useNativeUSDCArbitrumEnabled()
-  const commonBases = nativeUsdcArbitrumEnabled ? COMMON_BASES_V2 : COMMON_BASES
-  const bases = chainId !== undefined ? commonBases[chainId] ?? [] : []
+  const bases = chainId !== undefined ? COMMON_BASES[chainId] ?? [] : []
 
   return bases.length > 0 ? (
     <MobileWrapper gap="md">

src/constants/routing.ts

@@ -4,7 +4,6 @@ import { SupportedChainId } from 'constants/chains'
 
 import {
   AMPL,
-  BRIDGED_USDC_ARBITRUM,
   BTC_BSC,
   BUSD_BSC,
   CAKE_BSC,
@@ -154,7 +153,7 @@ export const COMMON_BASES: ChainCurrencyList = {
   [SupportedChainId.ARBITRUM_ONE]: [
     nativeOnChain(SupportedChainId.ARBITRUM_ONE),
     DAI_ARBITRUM_ONE,
-    BRIDGED_USDC_ARBITRUM,
+    USDC_ARBITRUM,
     USDT_ARBITRUM_ONE,
     WBTC_ARBITRUM_ONE,
     WRAPPED_NATIVE_CURRENCY[SupportedChainId.ARBITRUM_ONE] as Token,
@@ -211,19 +210,6 @@ export const COMMON_BASES: ChainCurrencyList = {
   ],
 }
 
-// This is the same as COMMON_BASES except it swaps out Bridged USDC on arbitrum for native USDC.
-export const COMMON_BASES_V2: ChainCurrencyList = {
-  ...COMMON_BASES,
-  [SupportedChainId.ARBITRUM_ONE]: [
-    nativeOnChain(SupportedChainId.ARBITRUM_ONE),
-    DAI_ARBITRUM_ONE,
-    USDC_ARBITRUM,
-    USDT_ARBITRUM_ONE,
-    WBTC_ARBITRUM_ONE,
-    WRAPPED_NATIVE_CURRENCY[SupportedChainId.ARBITRUM_ONE] as Token,
-  ],
-}
-
 // used to construct the list of all pairs we consider by default in the frontend
 export const BASES_TO_TRACK_LIQUIDITY_FOR: ChainTokenList = {
   ...WRAPPED_NATIVE_CURRENCIES_ONLY,

src/featureFlags/flags/nativeUsdcArbitrum.ts

-import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
-
-export function useNativeUSDCArbitrumFlag(): BaseVariant {
-  return useBaseFlag(FeatureFlag.nativeUsdcArbitrum)
-}
-
-export function useNativeUSDCArbitrumEnabled(): boolean {
-  return useNativeUSDCArbitrumFlag() === BaseVariant.Enabled
-}