From 69af536ebbb7ff24aa93a496db2149dfa4ad75c5 Mon Sep 17 00:00:00 2001
From: Tom McGuire <Mcgtom10@gmail.com>
Date: Wed, 14 Feb 2024 15:42:17 -0800
Subject: [PATCH] chore: remove show receive amount in select provider feature
 gate (#4859)

### Description

The `show_receive_amount_in_select_provider` feature gate has been
rolled out to 100% since v1.62.0. This is to remove the code path for
when that gate returned false.

### Test plan

- Tested locally on iOS
- Unit Tests updated
- E2E tests updated

### Related issues

- Fixes ACT-1076

### Backwards compatibility

Yes
---
 e2e/src/usecases/OnRamps.js                   |  10 -
 src/fiatExchanges/FiatExchangeAmount.test.tsx |  29 +--
 src/fiatExchanges/FiatExchangeAmount.tsx      |  46 -----
 .../PaymentMethodSection.test.tsx             | 118 +-----------
 src/fiatExchanges/PaymentMethodSection.tsx    |  78 ++------
 src/fiatExchanges/SelectProvider.test.tsx     |   4 +-
 src/fiatExchanges/SelectProvider.tsx          |   8 +-
 .../FiatExchangeAmount.test.tsx.snap          | 172 ------------------
 .../quotes/normalizeQuotes.test.ts            |  59 +-----
 src/fiatExchanges/quotes/normalizeQuotes.ts   |  24 +--
 src/statsig/constants.ts                      |   1 -
 src/statsig/types.ts                          |   1 -
 12 files changed, 37 insertions(+), 513 deletions(-)

diff --git a/e2e/src/usecases/OnRamps.js b/e2e/src/usecases/OnRamps.js
index 8b5fd696bdb..62ce658618b 100644
--- a/e2e/src/usecases/OnRamps.js
+++ b/e2e/src/usecases/OnRamps.js
@@ -42,11 +42,6 @@ export default onRamps = () => {
           device.getPlatform() === 'ios'
             ? cardProviders.label.split(' ')[0]
             : cardProviders.text.split(' ')[0]
-        await element(by.id('Card/section')).tap()
-        // Check that best rate is displayed first
-        await expect(
-          element(by.id('Card/provider-0').withDescendant(by.id('Card/bestRate')))
-        ).toExist()
         // Check that the expected number of providers show
         for (let i = 0; i < numCardProviders; i++) {
           await expect(element(by.id(`Card/provider-${i}`))).toExist()
@@ -64,11 +59,6 @@ export default onRamps = () => {
           device.getPlatform() === 'ios'
             ? bankProviders.label.split(' ')[0]
             : bankProviders.text.split(' ')[0]
-        await element(by.id('Bank/section')).tap()
-        // Check that best rate is displayed first
-        await expect(
-          element(by.id('Bank/provider-0').withDescendant(by.id('Bank/bestRate')))
-        ).toExist()
         // Check that the expected number of providers show
         for (let i = 0; i < numBankProviders; i++) {
           await expect(element(by.id(`Bank/provider-${i}`))).toExist()
diff --git a/src/fiatExchanges/FiatExchangeAmount.test.tsx b/src/fiatExchanges/FiatExchangeAmount.test.tsx
index 82ae9595dd7..5a0de1c0bdb 100644
--- a/src/fiatExchanges/FiatExchangeAmount.test.tsx
+++ b/src/fiatExchanges/FiatExchangeAmount.test.tsx
@@ -12,7 +12,7 @@ import { Screens } from 'src/navigator/Screens'
 import { getFeatureGate } from 'src/statsig'
 import { NetworkId } from 'src/transactions/types'
 import { CiCoCurrency } from 'src/utils/currencies'
-import { createMockStore, getElementText, getMockStackScreenProps } from 'test/utils'
+import { createMockStore, getMockStackScreenProps } from 'test/utils'
 import {
   mockCeloAddress,
   mockCeloTokenId,
@@ -243,51 +243,30 @@ describe('FiatExchangeAmount cashOut', () => {
   })
 
   it('displays correctly for cUSD when local currency is USD', () => {
-    const { getByText, getByTestId } = render(
+    const { getByText } = render(
       <Provider store={storeWithUSD}>
         <FiatExchangeAmount {...mockScreenProps} />
       </Provider>
     )
     expect(getByText('amount (cUSD)')).toBeTruthy()
-    expect(getElementText(getByTestId('LineItemRowTitle/subtotal'))).toBe('cUSD @ $1.00')
-    expect(getElementText(getByTestId('LineItemRow/subtotal'))).toBe('$0.00')
-    expect(getByText('disclaimerFiat, {"currency":"cUSD"}')).toBeTruthy()
   })
 
   it('displays correctly for cEUR when local currency is USD', () => {
-    const { getByText, getByTestId } = render(
+    const { getByText } = render(
       <Provider store={storeWithUSD}>
         <FiatExchangeAmount {...mockScreenPropsEuro} />
       </Provider>
     )
     expect(getByText('amount (cEUR)')).toBeTruthy()
-    expect(getElementText(getByTestId('LineItemRowTitle/subtotal'))).toBe('cEUR @ $1.20')
-    expect(getElementText(getByTestId('LineItemRow/subtotal'))).toBe('$0.00')
-    expect(getByText('disclaimerFiat, {"currency":"cEUR"}')).toBeTruthy()
   })
 
   it('displays correctly for CELO when local currency is USD', () => {
-    const { getByText, getByTestId } = render(
+    const { getByText } = render(
       <Provider store={storeWithUSD}>
         <FiatExchangeAmount {...mockScreenPropsCelo} />
       </Provider>
     )
     expect(getByText('amount (CELO)')).toBeTruthy()
-    expect(getElementText(getByTestId('LineItemRowTitle/subtotal'))).toBe('CELO @ $5.00')
-    expect(getElementText(getByTestId('LineItemRow/subtotal'))).toBe('$0.00')
-  })
-
-  it('displays correctly when the SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER feature flag is on', () => {
-    jest.mocked(getFeatureGate).mockReturnValue(true)
-    const { getByText, queryByTestId, queryByText } = render(
-      <Provider store={storeWithUSD}>
-        <FiatExchangeAmount {...mockScreenProps} />
-      </Provider>
-    )
-    expect(getByText('amount (cUSD)')).toBeTruthy()
-    expect(queryByTestId('LineItemRowTitle/subtotal')).toBeFalsy()
-    expect(queryByTestId('LineItemRow/subtotal')).toBeFalsy()
-    expect(queryByText('disclaimerFiat, {"currency":"cUSD"}')).toBeFalsy()
   })
 
   it('disables the next button if the cUSD amount is 0', () => {
diff --git a/src/fiatExchanges/FiatExchangeAmount.tsx b/src/fiatExchanges/FiatExchangeAmount.tsx
index f49efce9c95..3525d9ca024 100644
--- a/src/fiatExchanges/FiatExchangeAmount.tsx
+++ b/src/fiatExchanges/FiatExchangeAmount.tsx
@@ -17,8 +17,6 @@ import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
 import Dialog from 'src/components/Dialog'
 import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
 import KeyboardSpacer from 'src/components/KeyboardSpacer'
-import LineItemRow from 'src/components/LineItemRow'
-import TokenDisplay from 'src/components/TokenDisplay'
 import { ALERT_BANNER_DURATION, DOLLAR_ADD_FUNDS_MAX_AMOUNT } from 'src/config'
 import { useMaxSendAmount } from 'src/fees/hooks'
 import { FeeType } from 'src/fees/reducer'
@@ -37,8 +35,6 @@ import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import DisconnectBanner from 'src/shared/DisconnectBanner'
-import { getFeatureGate } from 'src/statsig'
-import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import fontStyles from 'src/styles/fonts'
 import variables from 'src/styles/variables'
@@ -94,10 +90,6 @@ function FiatExchangeAmount({ route }: Props) {
     overLocalLimitDisplayString = ` (${localCurrencySymbol}${roundUp(localCurrencyMaxAmount)})`
   }
 
-  const showExchangeRate = !getFeatureGate(
-    StatsigFeatureGates.SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER
-  )
-
   const dispatch = useDispatch()
 
   function isNextButtonValid() {
@@ -213,37 +205,7 @@ function FiatExchangeAmount({ route }: Props) {
             testID="FiatExchangeInput"
           />
         </View>
-        {showExchangeRate && (
-          <LineItemRow
-            testID="subtotal"
-            textStyle={styles.subtotalBodyText}
-            title={
-              <>
-                {`${tokenSymbol} @ `}
-                {
-                  <TokenDisplay
-                    amount={BigNumber(1)}
-                    tokenId={tokenId}
-                    showLocalAmount={true}
-                    hideSign={false}
-                  />
-                }
-              </>
-            }
-            amount={
-              <TokenDisplay
-                amount={inputCryptoAmount}
-                tokenId={tokenId}
-                showLocalAmount={inputIsCrypto}
-                hideSign={false}
-              />
-            }
-          />
-        )}
       </KeyboardAwareScrollView>
-      {showExchangeRate && (
-        <Text style={styles.disclaimerFiat}>{t('disclaimerFiat', { currency: tokenSymbol })}</Text>
-      )}
       <Button
         onPress={onPressContinue}
         showLoading={usdToLocalRate === null || attemptReturnUserFlowLoading}
@@ -326,9 +288,6 @@ const styles = StyleSheet.create({
   exchangeBodyText: {
     ...fontStyles.regular500,
   },
-  subtotalBodyText: {
-    ...fontStyles.small,
-  },
   currencyInput: {
     ...fontStyles.regular,
     marginLeft: 10,
@@ -344,9 +303,4 @@ const styles = StyleSheet.create({
   reviewBtn: {
     padding: variables.contentPadding,
   },
-  disclaimerFiat: {
-    ...fontStyles.small,
-    color: colors.gray4,
-    textAlign: 'center',
-  },
 })
diff --git a/src/fiatExchanges/PaymentMethodSection.test.tsx b/src/fiatExchanges/PaymentMethodSection.test.tsx
index 18e4f917f62..d3e08772d92 100644
--- a/src/fiatExchanges/PaymentMethodSection.test.tsx
+++ b/src/fiatExchanges/PaymentMethodSection.test.tsx
@@ -16,7 +16,6 @@ import {
   mockCusdAddress,
   mockCusdTokenId,
   mockFiatConnectQuotes,
-  mockFiatConnectQuotesWithUnknownFees,
   mockProviderSelectionAnalyticsData,
   mockProviders,
 } from 'test/values'
@@ -89,30 +88,7 @@ describe('PaymentMethodSection', () => {
     expect(queryByTestId('newDialog')).toBeFalsy()
   })
 
-  it('shows a non-expandable view with fees if there is one provider available and feature gate is false', async () => {
-    props.normalizedQuotes = normalizeQuotes(
-      CICOFlow.CashIn,
-      [],
-      [mockProviders[2]],
-      mockCusdTokenId,
-      'cUSD'
-    )
-    const { queryByText, queryByTestId } = render(
-      <Provider store={mockStore}>
-        <PaymentMethodSection {...props} />
-      </Provider>
-    )
-    expect(queryByText('selectProviderScreen.card')).toBeTruthy()
-    expect(queryByTestId('image-Ramp')).toBeTruthy()
-    expect(queryByTestId('newLabel-Ramp')).toBeFalsy()
-    // NOTE: this ideally should show fees, but because of mock store, tokenInfo
-    // and exchange rate isn't available, no fees are shown. This isn't too
-    // important to test now since that we're going to roll out received amount
-    // and this will be cleaned up
-    expect(queryByTestId('Card/provider-0')).toHaveTextContent('selectProviderScreen.feesVary')
-  })
-
-  it('shows a non-expandable view with receive amount if there is one provider available and feature gate is true', async () => {
+  it('shows a non-expandable view with receive amount if there is one provider available', async () => {
     jest.mocked(getFeatureGate).mockReturnValue(true)
     props.normalizedQuotes = normalizeQuotes(
       CICOFlow.CashIn,
@@ -160,69 +136,6 @@ describe('PaymentMethodSection', () => {
     await waitFor(() => expect(getByTestId('newDialog')).not.toBeVisible())
   })
 
-  it('shows an expandable view with fees if there is more than one provider available and feature gate is false', async () => {
-    const { queryByText, queryByTestId, getByText } = render(
-      <Provider store={mockStore}>
-        <PaymentMethodSection {...props} />
-      </Provider>
-    )
-
-    expect(queryByText('selectProviderScreen.card')).toBeTruthy()
-    expect(queryByText('selectProviderScreen.numProviders, {"count":3}')).toBeTruthy()
-    expect(queryByTestId('Card/minFee')).toBeTruthy()
-    expect(queryByTestId('image-Ramp')).toBeFalsy()
-    expect(queryByTestId('image-Simplex')).toBeFalsy()
-    expect(queryByTestId('image-Moonpay')).toBeFalsy()
-
-    // Expand works
-    fireEvent.press(getByText('selectProviderScreen.numProviders, {"count":3}'))
-    expect(queryByTestId('image-Ramp')).toBeTruthy()
-    expect(queryByTestId('image-Simplex')).toBeTruthy()
-    expect(queryByTestId('image-Moonpay')).toBeTruthy()
-    expect(queryByTestId('newLabel-Ramp')).toBeFalsy()
-    expect(queryByTestId('newLabel-Simplex')).toBeFalsy()
-    expect(queryByTestId('newLabel-Moonpay')).toBeFalsy()
-    expect(queryByTestId('Card/amount-0')).toHaveTextContent('selectProviderScreen.feesVary')
-    expect(queryByTestId('Card/amount-1')).toHaveTextContent('selectProviderScreen.feesVary')
-    expect(queryByTestId('Card/amount-2')).toHaveTextContent('selectProviderScreen.feesVary')
-  })
-
-  it('shows an expanded view with receive amount if there is more than one provider available and feature gate is false', async () => {
-    jest.mocked(getFeatureGate).mockReturnValue(true)
-    const { queryByText, queryByTestId, getByText, debug } = render(
-      <Provider store={mockStore}>
-        <PaymentMethodSection {...props} />
-      </Provider>
-    )
-
-    debug()
-
-    expect(queryByText('selectProviderScreen.card')).toBeTruthy()
-    expect(queryByText('selectProviderScreen.numProviders, {"count":3}')).toBeTruthy()
-    expect(queryByTestId('Card/minFee')).toBeFalsy()
-    expect(queryByTestId('image-Ramp')).toBeTruthy()
-    expect(queryByTestId('image-Simplex')).toBeTruthy()
-    expect(queryByTestId('image-Moonpay')).toBeTruthy()
-    expect(queryByTestId('newLabel-Ramp')).toBeFalsy()
-    expect(queryByTestId('newLabel-Simplex')).toBeFalsy()
-    expect(queryByTestId('newLabel-Moonpay')).toBeFalsy()
-    expect(queryByTestId('Card/amount-0')).toHaveTextContent(
-      'selectProviderScreen.receiveAmount100.00 cUSD'
-    )
-    expect(queryByTestId('Card/amount-1')).toHaveTextContent(
-      'selectProviderScreen.receiveAmount25.00 cUSD'
-    )
-    expect(queryByTestId('Card/amount-2')).toHaveTextContent(
-      'selectProviderScreen.receiveAmount90.00 cUSD'
-    )
-
-    // Collapse works
-    fireEvent.press(getByText('selectProviderScreen.numProviders, {"count":3}'))
-    expect(queryByTestId('image-Ramp')).toBeFalsy()
-    expect(queryByTestId('image-Simplex')).toBeFalsy()
-    expect(queryByTestId('image-Moonpay')).toBeFalsy()
-  })
-
   it('shows new label for multiple providers in expanded view', async () => {
     // make simplex and moonpay card quotes new
     jest.spyOn(props.normalizedQuotes[3], 'isProviderNew').mockReturnValue(true)
@@ -236,12 +149,7 @@ describe('PaymentMethodSection', () => {
 
     expect(queryByText('selectProviderScreen.card')).toBeTruthy()
     expect(queryByText('selectProviderScreen.numProviders, {"count":3}')).toBeTruthy()
-    expect(queryByTestId('image-Ramp')).toBeFalsy()
-    expect(queryByTestId('image-Simplex')).toBeFalsy()
-    expect(queryByTestId('image-Moonpay')).toBeFalsy()
 
-    // Expand works
-    fireEvent.press(getByText('selectProviderScreen.numProviders, {"count":3}'))
     expect(queryByTestId('image-Ramp')).toBeTruthy()
     expect(queryByTestId('image-Simplex')).toBeTruthy()
     expect(queryByTestId('image-Moonpay')).toBeTruthy()
@@ -256,26 +164,12 @@ describe('PaymentMethodSection', () => {
     await waitFor(() => expect(getByTestId('newDialog')).not.toBeVisible())
     fireEvent.press(getByTestId('newLabel-Moonpay'))
     expect(getByTestId('newDialog')).toBeVisible()
-  })
 
-  it('shows "Fees Vary" when a provider does not return fees in its quote', async () => {
-    props.normalizedQuotes = normalizeQuotes(
-      CICOFlow.CashIn,
-      mockFiatConnectQuotesWithUnknownFees,
-      [],
-      mockCusdTokenId,
-      'cUSD'
-    )
-    props.paymentMethod = PaymentMethod.Bank
-    const { queryByText, queryByTestId } = render(
-      <Provider store={mockStore}>
-        <PaymentMethodSection {...props} />
-      </Provider>
-    )
-    const expandElement = queryByText('selectProviderScreen.numProviders, {"count":2}')
-    expect(expandElement).toBeTruthy()
-    fireEvent.press(expandElement!)
-    expect(queryByTestId('Bank/amount-1')).toHaveTextContent('selectProviderScreen.feesVary')
+    // Collapse works
+    fireEvent.press(getByText('selectProviderScreen.numProviders, {"count":3}'))
+    expect(queryByTestId('image-Ramp')).toBeFalsy()
+    expect(queryByTestId('image-Simplex')).toBeFalsy()
+    expect(queryByTestId('image-Moonpay')).toBeFalsy()
   })
 
   it('shows "ID required" when KYC is required', async () => {
diff --git a/src/fiatExchanges/PaymentMethodSection.tsx b/src/fiatExchanges/PaymentMethodSection.tsx
index d52ba7f713e..6587e0ee25e 100644
--- a/src/fiatExchanges/PaymentMethodSection.tsx
+++ b/src/fiatExchanges/PaymentMethodSection.tsx
@@ -6,7 +6,6 @@ import { FiatExchangeEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import Dialog from 'src/components/Dialog'
 import Expandable from 'src/components/Expandable'
-import TokenDisplay from 'src/components/TokenDisplay'
 import Touchable from 'src/components/Touchable'
 import { CryptoAmount, FiatAmount } from 'src/fiatExchanges/amount'
 import { SettlementEstimation, SettlementTime } from 'src/fiatExchanges/quotes/constants'
@@ -16,8 +15,6 @@ import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import InfoIcon from 'src/icons/InfoIcon'
 import { getLocalCurrencyCode, usdToLocalCurrencyRateSelector } from 'src/localCurrency/selectors'
-import { getFeatureGate } from 'src/statsig'
-import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import fontStyles from 'src/styles/fonts'
 import { useTokenInfo } from 'src/tokens/hooks'
@@ -60,13 +57,8 @@ export function PaymentMethodSection({
   const tokenInfo = useTokenInfo(tokenId)
   const localCurrency = useSelector(getLocalCurrencyCode)
 
-  const showReceiveAmountFeatureGate = getFeatureGate(
-    StatsigFeatureGates.SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER
-  )
-
   const isExpandable = sectionQuotes.length > 1
-  // default to true if feature gate is true and the section is expandable
-  const [expanded, setExpanded] = useState(showReceiveAmountFeatureGate && isExpandable)
+  const [expanded, setExpanded] = useState(isExpandable)
   const [newDialogVisible, setNewDialogVisible] = useState(false)
 
   useEffect(() => {
@@ -120,16 +112,7 @@ export function PaymentMethodSection({
     <>
       <View testID={`${paymentMethod}/section`} style={styles.left}>
         <Text style={styles.category}>{getCategoryTitle()}</Text>
-        {!expanded && !showReceiveAmountFeatureGate && (
-          <Text testID={`${paymentMethod}/minFee`} style={styles.fee}>
-            {
-              // quotes assumed to be sorted ascending by fee
-              renderAmount(sectionQuotes[0], t('selectProviderScreen.minFee'))
-            }
-          </Text>
-        )}
       </View>
-
       <View style={styles.right}>
         <Text testID={`${paymentMethod}/numProviders`} style={styles.providerDropdown}>
           {t('selectProviderScreen.numProviders', { count: sectionQuotes.length })}
@@ -176,7 +159,7 @@ export function PaymentMethodSection({
       <View testID={`${paymentMethod}/singleProvider`} style={styles.left}>
         <Text style={styles.category}>{getCategoryTitle()}</Text>
         <Text testID={`${paymentMethod}/provider-0`} style={styles.fee}>
-          {renderAmount(sectionQuotes[0], t('selectProviderScreen.fee'))}
+          {renderAmount(sectionQuotes[0])}
         </Text>
         <Text testID={`${paymentMethod}/provider-0/info`} style={styles.topInfo}>
           {renderInfoText(sectionQuotes[0])}
@@ -205,48 +188,27 @@ export function PaymentMethodSection({
     return `${reqsSubtitleString}${getPaymentMethodSettlementTimeString(quote.getTimeEstimation())}`
   }
 
-  const renderAmount = (normalizedQuote: NormalizedQuote, feePostFix: string) => {
+  const renderAmount = (normalizedQuote: NormalizedQuote) => {
     const defaultText = <Text>{t('selectProviderScreen.feesVary')}</Text>
+    const receiveAmount = normalizedQuote.getReceiveAmount()
 
-    if (showReceiveAmountFeatureGate) {
-      const receiveAmount = normalizedQuote.getReceiveAmount()
-      if (receiveAmount) {
-        return (
-          <Text>
-            <Trans i18nKey="selectProviderScreen.receiveAmount">
-              {flow === CICOFlow.CashIn ? (
-                <CryptoAmount amount={receiveAmount} tokenId={tokenId} />
-              ) : (
-                <FiatAmount amount={receiveAmount} currency={localCurrency} />
-              )}
-            </Trans>
-          </Text>
-        )
-      } else {
-        return defaultText
-      }
+    if (receiveAmount) {
+      return (
+        <Text>
+          <Trans i18nKey="selectProviderScreen.receiveAmount">
+            {flow === CICOFlow.CashIn ? (
+              <CryptoAmount amount={receiveAmount} tokenId={tokenId} />
+            ) : (
+              <FiatAmount amount={receiveAmount} currency={localCurrency} />
+            )}
+          </Trans>
+        </Text>
+      )
+    } else {
+      return defaultText
     }
-
-    const feeAmount = !!tokenInfo && normalizedQuote.getFeeInCrypto(usdToLocalRate, tokenInfo)
-
-    return (
-      <>
-        {feeAmount ? (
-          <Text>
-            <TokenDisplay
-              amount={feeAmount}
-              tokenId={tokenInfo?.tokenId}
-              showLocalAmount={flow === CICOFlow.CashIn}
-              hideSign={false}
-            />{' '}
-            {feePostFix}
-          </Text>
-        ) : (
-          defaultText
-        )}
-      </>
-    )
   }
+
   return (
     <View style={styles.container}>
       <Touchable
@@ -291,7 +253,7 @@ export function PaymentMethodSection({
               <View style={styles.expandedContainer}>
                 <View style={styles.left}>
                   <Text style={styles.expandedFee} testID={`${paymentMethod}/amount-${index}`}>
-                    {renderAmount(normalizedQuote, t('selectProviderScreen.fee'))}
+                    {renderAmount(normalizedQuote)}
                   </Text>
                   <Text style={styles.expandedInfo}>{renderInfoText(normalizedQuote)}</Text>
                   {index === 0 &&
diff --git a/src/fiatExchanges/SelectProvider.test.tsx b/src/fiatExchanges/SelectProvider.test.tsx
index c0be4243534..bafaa8539fd 100644
--- a/src/fiatExchanges/SelectProvider.test.tsx
+++ b/src/fiatExchanges/SelectProvider.test.tsx
@@ -232,7 +232,7 @@ describe(SelectProviderScreen, () => {
         quotes: [mockFiatConnectQuotes[4]],
       },
     })
-    const { queryByTestId, queryByText, getByTestId, getByText } = render(
+    const { queryByText, getByTestId, getByText } = render(
       <Provider store={mockStore}>
         <SelectProviderScreen {...mockScreenProps()} />
       </Provider>
@@ -248,8 +248,8 @@ describe(SelectProviderScreen, () => {
 
     expect(queryByText('selectProviderScreen.somePaymentsUnavailable')).toBeFalsy()
     expect(getByText('selectProviderScreen.disclaimer')).toBeTruthy()
-    expect(queryByTestId('AmountSpentInfo')).toBeFalsy()
   })
+
   it('shows you will pay fiat amount for cash ins if feature flag is true', async () => {
     jest.mocked(fetchProviders).mockResolvedValue(mockProviders)
     jest.mocked(fetchLegacyMobileMoneyProviders).mockResolvedValue(mockLegacyProviders)
diff --git a/src/fiatExchanges/SelectProvider.tsx b/src/fiatExchanges/SelectProvider.tsx
index 5af4c078580..c02713734d1 100644
--- a/src/fiatExchanges/SelectProvider.tsx
+++ b/src/fiatExchanges/SelectProvider.tsx
@@ -48,8 +48,6 @@ import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { userLocationDataSelector } from 'src/networkInfo/selectors'
-import { getFeatureGate } from 'src/statsig'
-import { StatsigFeatureGates } from 'src/statsig/types'
 import colors from 'src/styles/colors'
 import fontStyles from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -286,13 +284,9 @@ export default function SelectProviderScreen({ route, navigation }: Props) {
     )
   }
 
-  const showReceiveAmount = getFeatureGate(
-    StatsigFeatureGates.SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER
-  )
-
   return (
     <ScrollView>
-      {showReceiveAmount && <AmountSpentInfo {...route.params} />}
+      <AmountSpentInfo {...route.params} />
       {paymentMethodSections.map((paymentMethod) => (
         <PaymentMethodSection
           key={paymentMethod}
diff --git a/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap b/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
index 660a2aaea8a..d432118199b 100644
--- a/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
+++ b/src/fiatExchanges/__snapshots__/FiatExchangeAmount.test.tsx.snap
@@ -107,94 +107,8 @@ exports[`FiatExchangeAmount cashIn renders correctly with EUR as app currency 1`
           testID="FiatExchangeInput"
         />
       </View>
-      <View
-        style={
-          [
-            {
-              "flexDirection": "row",
-              "flexWrap": "wrap",
-              "justifyContent": "space-between",
-              "marginVertical": 5,
-            },
-            undefined,
-          ]
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "marginRight": 5,
-            }
-          }
-        >
-          <Text
-            style={
-              [
-                {
-                  "color": "#2E3338",
-                  "fontFamily": "Inter-Regular",
-                  "fontSize": 16,
-                  "lineHeight": 22,
-                },
-                {
-                  "color": "#2E3338",
-                  "fontFamily": "Inter-Regular",
-                  "fontSize": 14,
-                  "lineHeight": 18,
-                },
-              ]
-            }
-            testID="LineItemRowTitle/subtotal"
-          >
-            cUSD @ 
-            <Text>
-              €
-              0.86
-            </Text>
-          </Text>
-        </View>
-        <Text
-          style={
-            [
-              {
-                "color": "#2E3338",
-                "fontFamily": "Inter-Regular",
-                "fontSize": 16,
-                "lineHeight": 22,
-              },
-              {
-                "color": "#2E3338",
-                "fontFamily": "Inter-Regular",
-                "fontSize": 14,
-                "lineHeight": 18,
-              },
-            ]
-          }
-          testID="LineItemRow/subtotal"
-        >
-          <Text>
-            0.00
-             cUSD
-          </Text>
-        </Text>
-      </View>
     </View>
   </RCTScrollView>
-  <Text
-    style={
-      {
-        "color": "#666666",
-        "fontFamily": "Inter-Regular",
-        "fontSize": 14,
-        "lineHeight": 18,
-        "textAlign": "center",
-      }
-    }
-  >
-    disclaimerFiat, {"currency":"cUSD"}
-  </Text>
   <View
     style={
       [
@@ -416,94 +330,8 @@ exports[`FiatExchangeAmount cashIn renders correctly with USD as app currency 1`
           testID="FiatExchangeInput"
         />
       </View>
-      <View
-        style={
-          [
-            {
-              "flexDirection": "row",
-              "flexWrap": "wrap",
-              "justifyContent": "space-between",
-              "marginVertical": 5,
-            },
-            undefined,
-          ]
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "marginRight": 5,
-            }
-          }
-        >
-          <Text
-            style={
-              [
-                {
-                  "color": "#2E3338",
-                  "fontFamily": "Inter-Regular",
-                  "fontSize": 16,
-                  "lineHeight": 22,
-                },
-                {
-                  "color": "#2E3338",
-                  "fontFamily": "Inter-Regular",
-                  "fontSize": 14,
-                  "lineHeight": 18,
-                },
-              ]
-            }
-            testID="LineItemRowTitle/subtotal"
-          >
-            cUSD @ 
-            <Text>
-              $
-              1.00
-            </Text>
-          </Text>
-        </View>
-        <Text
-          style={
-            [
-              {
-                "color": "#2E3338",
-                "fontFamily": "Inter-Regular",
-                "fontSize": 16,
-                "lineHeight": 22,
-              },
-              {
-                "color": "#2E3338",
-                "fontFamily": "Inter-Regular",
-                "fontSize": 14,
-                "lineHeight": 18,
-              },
-            ]
-          }
-          testID="LineItemRow/subtotal"
-        >
-          <Text>
-            0.00
-             cUSD
-          </Text>
-        </Text>
-      </View>
     </View>
   </RCTScrollView>
-  <Text
-    style={
-      {
-        "color": "#666666",
-        "fontFamily": "Inter-Regular",
-        "fontSize": 14,
-        "lineHeight": 18,
-        "textAlign": "center",
-      }
-    }
-  >
-    disclaimerFiat, {"currency":"cUSD"}
-  </Text>
   <View
     style={
       [
diff --git a/src/fiatExchanges/quotes/normalizeQuotes.test.ts b/src/fiatExchanges/quotes/normalizeQuotes.test.ts
index dd07de596a7..f240b075bf7 100644
--- a/src/fiatExchanges/quotes/normalizeQuotes.test.ts
+++ b/src/fiatExchanges/quotes/normalizeQuotes.test.ts
@@ -1,4 +1,3 @@
-import BigNumber from 'bignumber.js'
 import {
   normalizeExternalProviders,
   normalizeFiatConnectQuotes,
@@ -6,14 +5,8 @@ import {
 } from 'src/fiatExchanges/quotes/normalizeQuotes'
 import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { getFeatureGate } from 'src/statsig'
-import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
-import {
-  mockCusdTokenId,
-  mockFiatConnectQuotes,
-  mockFiatConnectQuotesWithUnknownFees,
-  mockProviders,
-} from 'test/values'
+import { mockCusdTokenId, mockFiatConnectQuotes, mockProviders } from 'test/values'
 
 jest.mock('src/utils/Logger', () => ({
   __esModule: true,
@@ -26,33 +19,7 @@ jest.mock('src/utils/Logger', () => ({
 jest.mock('src/statsig')
 
 describe('normalizeQuotes', () => {
-  it('returns both fiatconnect and external quotes sorted by fee if feature gate is false', () => {
-    jest.mocked(getFeatureGate).mockReturnValue(false)
-    const normalizedQuotes = normalizeQuotes(
-      CICOFlow.CashIn,
-      mockFiatConnectQuotes,
-      mockProviders,
-      mockCusdTokenId,
-      'cUSD'
-    )
-    expect(
-      normalizedQuotes.map((quote) => [
-        quote.getProviderId(),
-        quote.getFeeInCrypto('1', { priceUsd: BigNumber('1') } as TokenBalance)?.toNumber(),
-      ])
-    ).toEqual([
-      ['Ramp', 0],
-      ['provider-two', 0.53],
-      ['provider-three', 4.22], //provider-three supports Mobile Money and Bank Account
-      ['provider-three', 4.22],
-      ['Moonpay', 5],
-      ['Simplex', 6],
-      ['Fonbnk', 7],
-      ['Moonpay', 10],
-    ])
-  })
-
-  it('returns both fiatconnect and external quotes sorted by receive amount if feature gate is true', () => {
+  it('returns both fiatconnect and external quotes sorted by receive amount', () => {
     jest.mocked(getFeatureGate).mockReturnValue(true)
     const normalizedQuotes = normalizeQuotes(
       CICOFlow.CashIn,
@@ -75,27 +42,7 @@ describe('normalizeQuotes', () => {
     ])
   })
 
-  it('sorts FiatConnect quotes with no fee returned at the end of quotes if feature gate is false', () => {
-    jest.mocked(getFeatureGate).mockReturnValue(false)
-    const normalizedQuotes = normalizeQuotes(
-      CICOFlow.CashIn,
-      mockFiatConnectQuotesWithUnknownFees,
-      [],
-      mockCusdTokenId,
-      'cUSD'
-    )
-    expect(
-      normalizedQuotes.map((quote) => [
-        quote.getProviderId(),
-        quote.getFeeInCrypto('1', { priceUsd: BigNumber('1') } as TokenBalance)?.toNumber(),
-      ])
-    ).toEqual([
-      ['provider-one', 0.97],
-      ['provider-two', undefined],
-    ])
-  })
-
-  it('sorts quotes with no receive amount at the end of quotes if feature gate is true', () => {
+  it('sorts quotes with no receive amount at the end of quotes', () => {
     jest.mocked(getFeatureGate).mockReturnValue(true)
     const normalizedQuotes = normalizeQuotes(
       CICOFlow.CashIn,
diff --git a/src/fiatExchanges/quotes/normalizeQuotes.ts b/src/fiatExchanges/quotes/normalizeQuotes.ts
index ec5ee4e1f51..6200b0407f4 100644
--- a/src/fiatExchanges/quotes/normalizeQuotes.ts
+++ b/src/fiatExchanges/quotes/normalizeQuotes.ts
@@ -10,9 +10,6 @@ import {
   RawProviderQuote,
   SimplexQuote,
 } from 'src/fiatExchanges/utils'
-import { getFeatureGate } from 'src/statsig'
-import { StatsigFeatureGates } from 'src/statsig/types'
-import { TokenBalance } from 'src/tokens/slice'
 import Logger from 'src/utils/Logger'
 
 const TAG = 'NormalizeQuotes'
@@ -28,26 +25,7 @@ export function normalizeQuotes(
   return [
     ...normalizeFiatConnectQuotes(flow, fiatConnectQuotes, tokenId),
     ...normalizeExternalProviders({ flow, input: externalProviders, tokenId, tokenSymbol }),
-  ].sort(
-    getFeatureGate(StatsigFeatureGates.SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER)
-      ? quotesByReceiveAmountComparator
-      : quotesByFeeComparator
-  )
-}
-
-export const quotesByFeeComparator = (quote1: NormalizedQuote, quote2: NormalizedQuote) => {
-  // We can use a dummy exchange rate value here since its just a comparator
-  const usdToLocalRate = '1'
-  // also dummy token info. all we need is the priceUsd
-  const dummyTokenInfo = {
-    priceUsd: new BigNumber('1'),
-  }
-  const providerFee1 =
-    quote1.getFeeInFiat(usdToLocalRate, dummyTokenInfo as TokenBalance) ?? new BigNumber(Infinity)
-  const providerFee2 =
-    quote2.getFeeInFiat(usdToLocalRate, dummyTokenInfo as TokenBalance) ?? new BigNumber(Infinity)
-
-  return providerFee1.isGreaterThan(providerFee2) ? 1 : -1
+  ].sort(quotesByReceiveAmountComparator)
 }
 
 export const quotesByReceiveAmountComparator = (
diff --git a/src/statsig/constants.ts b/src/statsig/constants.ts
index 4a19f0c2af8..8ffdba051b5 100644
--- a/src/statsig/constants.ts
+++ b/src/statsig/constants.ts
@@ -8,7 +8,6 @@ export const FeatureGates = {
   [StatsigFeatureGates.ALLOW_HOOKS_PREVIEW]: true,
   [StatsigFeatureGates.APP_REVIEW]: false,
   [StatsigFeatureGates.SHOW_IN_APP_NFT_VIEWER]: false,
-  [StatsigFeatureGates.SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER]: false,
   [StatsigFeatureGates.SHOW_IN_APP_NFT_GALLERY]: false,
   [StatsigFeatureGates.SHOW_NOTIFICATION_CENTER]: false,
   [StatsigFeatureGates.SHOW_CLOUD_ACCOUNT_BACKUP_SETUP]: false,
diff --git a/src/statsig/types.ts b/src/statsig/types.ts
index e0490bd2a99..c6407939a44 100644
--- a/src/statsig/types.ts
+++ b/src/statsig/types.ts
@@ -15,7 +15,6 @@ export enum StatsigFeatureGates {
   ALLOW_HOOKS_PREVIEW = 'allow_hooks_preview',
   APP_REVIEW = 'app_review',
   SHOW_IN_APP_NFT_VIEWER = 'show_in_app_nft_viewer',
-  SHOW_RECEIVE_AMOUNT_IN_SELECT_PROVIDER = 'show_receive_amount_in_select_provider',
   SHOW_IN_APP_NFT_GALLERY = 'show_in_app_nft_gallery',
   SHOW_NOTIFICATION_CENTER = 'show_notification_center',
   SHOW_CLOUD_ACCOUNT_BACKUP_SETUP = 'show_cloud_account_backup_setup',