refactor(fiatExchanges): cleanup types (#6293)

### Description

Moved types from fiatExchanges/utils to fiatExchanges/types and removed
unused types. Left some legacy types that will be removed soon in utils

### Test plan

CI

### Related issues

- Part of ACT-1421

### Backwards compatibility

Yes

### Network scalability

N/A

src/analytics/Properties.tsx

@@ -55,8 +55,12 @@ import { AddAssetsActionType } from 'src/components/AddAssetsBottomSheet'
 import { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { DappSection } from 'src/dapps/types'
 import { BeforeDepositActionName, EarnActiveMode, SerializableRewardsInfo } from 'src/earn/types'
-import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
-import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
+import {
+  CICOFlow,
+  FiatExchangeFlow,
+  PaymentMethod,
+  ProviderSelectionAnalyticsData,
+} from 'src/fiatExchanges/types'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
 import {
   KeylessBackupFlow,

src/app/saga.test.ts

@@ -31,7 +31,7 @@ import {
 } from 'src/app/selectors'
 import { DEEP_LINK_URL_SCHEME } from 'src/config'
 import { activeDappSelector } from 'src/dapps/selectors'
-import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
+import { FiatExchangeFlow } from 'src/fiatExchanges/types'
 import { initI18n } from 'src/i18n'
 import {
   allowOtaTranslationsSelector,

src/app/saga.ts

@@ -32,7 +32,7 @@ import {
 } from 'src/app/selectors'
 import { CeloNewsConfig } from 'src/celoNews/types'
 import { DEFAULT_APP_LANGUAGE, FETCH_TIMEOUT_DURATION, isE2EEnv } from 'src/config'
-import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
+import { FiatExchangeFlow } from 'src/fiatExchanges/types'
 import { FiatAccountSchemaCountryOverrides } from 'src/fiatconnect/types'
 import { fetchRemoteConfigValues } from 'src/firebase/firebase'
 import { initI18n } from 'src/i18n'

src/earn/EarnConfirmationScreen.tsx

@@ -15,7 +15,7 @@ import { withdrawStatusSelector } from 'src/earn/selectors'
 import { withdrawStart } from 'src/earn/slice'
 import { EarnActiveMode } from 'src/earn/types'
 import { getEarnPositionBalanceValues, isGasSubsidizedForNetwork } from 'src/earn/utils'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'

src/earn/EarnEnterAmount.test.tsx

@@ -8,7 +8,7 @@ import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnEnterAmount from 'src/earn/EarnEnterAmount'
 import { usePrepareEnterAmountTransactionsCallback } from 'src/earn/hooks'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { getFeatureGate } from 'src/statsig'

src/earn/EarnEnterAmount.tsx

@@ -22,7 +22,7 @@ import CustomHeader from 'src/components/header/CustomHeader'
 import EarnDepositBottomSheet from 'src/earn/EarnDepositBottomSheet'
 import { usePrepareEnterAmountTransactionsCallback } from 'src/earn/hooks'
 import { getSwapToAmountInDecimals } from 'src/earn/utils'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import ArrowRightThick from 'src/icons/ArrowRightThick'
 import DownArrowIcon from 'src/icons/DownArrowIcon'
 import { LocalCurrencySymbol } from 'src/localCurrency/consts'

src/earn/poolInfoScreen/BeforeDepositBottomSheet.tsx

@@ -8,7 +8,7 @@ import BottomSheet, { BottomSheetModalRefType } from 'src/components/BottomSheet
 import { ActionCard } from 'src/earn/ActionCard'
 import { BeforeDepositAction } from 'src/earn/types'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import QuickActionsAdd from 'src/icons/quick-actions/Add'
 import QuickActionsSend from 'src/icons/quick-actions/Send'
 import SwapAndDeposit from 'src/icons/SwapAndDeposit'

src/earn/poolInfoScreen/EarnPoolInfoScreen.test.tsx

@@ -4,7 +4,7 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { EarnEvents } from 'src/analytics/Events'
 import EarnPoolInfoScreen from 'src/earn/poolInfoScreen/EarnPoolInfoScreen'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { EarnPosition } from 'src/positions/types'

src/fiatExchanges/CoinbasePaymentSection.test.tsx

@@ -3,13 +3,13 @@ import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { MockStoreEnhanced } from 'redux-mock-store'
-import { CoinbasePayEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { CoinbasePayEvents } from 'src/analytics/Events'
 import {
   CoinbasePaymentSection,
   CoinbasePaymentSectionProps,
 } from 'src/fiatExchanges/CoinbasePaymentSection'
-import { PaymentMethod } from 'src/fiatExchanges/utils'
+import { PaymentMethod } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { createMockStore } from 'test/utils'
 import {

src/fiatExchanges/ExchangeQR.test.tsx

@@ -2,11 +2,11 @@ import Clipboard from '@react-native-clipboard/clipboard'
 import { fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
 import { Provider } from 'react-redux'
-import { FiatExchangeEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { FiatExchangeEvents } from 'src/analytics/Events'
 import ExchangeQR from 'src/fiatExchanges/ExchangeQR'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
-import { CICOFlow } from 'src/fiatExchanges/utils'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { createMockStore, getMockStackScreenProps } from 'test/utils'

src/fiatExchanges/ExchangeQR.tsx

@@ -1,10 +1,11 @@
 import { RouteProp } from '@react-navigation/native'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { useLayoutEffect, useRef } from 'react'
-import { FiatExchangeEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { FiatExchangeEvents } from 'src/analytics/Events'
 import BackButton from 'src/components/BackButton'
 import { ExternalExchangeProvider } from 'src/fiatExchanges/ExternalExchanges'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import i18n from 'src/i18n'
 import Share from 'src/icons/Share'
 import { emptyHeader } from 'src/navigator/Headers'
@@ -14,7 +15,6 @@ import { StackParamList } from 'src/navigator/types'
 import QRCode from 'src/qrcode/QRCode'
 import { useDispatch } from 'src/redux/hooks'
 import { SVG, shareQRCode } from 'src/send/actions'
-import { CICOFlow } from './utils'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.ExchangeQR>
 

src/fiatExchanges/FiatExchangeAmount.test.tsx

@@ -5,6 +5,7 @@ import { Provider } from 'react-redux'
 import { showError } from 'src/alert/actions'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import FiatExchangeAmount from 'src/fiatExchanges/FiatExchangeAmount'
+import { CICOFlow } from 'src/fiatExchanges/types'
 import { attemptReturnUserFlow } from 'src/fiatconnect/slice'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { navigate } from 'src/navigator/NavigationService'
@@ -22,7 +23,6 @@ import {
   mockCusdTokenId,
   mockEthTokenId,
 } from 'test/values'
-import { CICOFlow } from './utils'
 
 jest.mock('src/statsig', () => ({
   getFeatureGate: jest.fn(),

src/fiatExchanges/FiatExchangeAmount.tsx

@@ -22,6 +22,8 @@ import {
   cachedFiatAccountUsesSelector,
 } from 'src/fiatconnect/selectors'
 import { attemptReturnUserFlow } from 'src/fiatconnect/slice'
+import { CICOFlow } from 'src/fiatExchanges/types'
+import { isUserInputCrypto } from 'src/fiatExchanges/utils'
 import i18n from 'src/i18n'
 import { LocalCurrencyCode, LocalCurrencySymbol } from 'src/localCurrency/consts'
 import { useLocalCurrencyCode } from 'src/localCurrency/hooks'
@@ -40,7 +42,6 @@ import { tokenSymbolToAnalyticsCurrency } from 'src/utils/currencies'
 import { roundUp } from 'src/utils/formatting'
 import { parseInputAmount } from 'src/utils/parsing'
 import networkConfig from 'src/web3/networkConfig'
-import { CICOFlow, isUserInputCrypto } from './utils'
 
 const { decimalSeparator } = getNumberFormatSettings()
 

src/fiatExchanges/FiatExchangeCurrencyBottomSheet.test.tsx

@@ -2,7 +2,7 @@ import { fireEvent, render, within } from '@testing-library/react-native'
 import React from 'react'
 import { Provider } from 'react-redux'
 import FiatExchangeCurrencyBottomSheet from 'src/fiatExchanges/FiatExchangeCurrencyBottomSheet'
-import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
+import { FiatExchangeFlow } from 'src/fiatExchanges/types'
 import { getDynamicConfigParams, getFeatureGate, getMultichainFeatures } from 'src/statsig'
 import { DynamicConfigs } from 'src/statsig/constants'
 import {

src/fiatExchanges/FiatExchangeCurrencyBottomSheet.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { FilterChip } from 'src/components/FilterChipsCarousel'
 import TokenBottomSheet, { TokenPickerOrigin } from 'src/components/TokenBottomSheet'
 import { fetchFiatConnectProviders } from 'src/fiatconnect/slice'
+import { CICOFlow, FiatExchangeFlow } from 'src/fiatExchanges/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
@@ -17,7 +18,6 @@ import { TokenBalance } from 'src/tokens/slice'
 import { sortCicoTokens } from 'src/tokens/utils'
 import { NetworkId } from 'src/transactions/types'
 import { resolveCurrency } from 'src/utils/currencies'
-import { CICOFlow, FiatExchangeFlow } from './utils'
 
 type Props = BottomSheetScreenProps<StackParamList, Screens.FiatExchangeCurrencyBottomSheet>
 

src/fiatExchanges/PaymentMethodSection.test.tsx

@@ -1,13 +1,13 @@
 import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import * as React from 'react'
 import { Provider } from 'react-redux'
+import { FiatConnectQuoteSuccess } from 'src/fiatconnect'
 import {
   PaymentMethodSection,
   PaymentMethodSectionProps,
 } from 'src/fiatExchanges/PaymentMethodSection'
 import { normalizeQuotes } from 'src/fiatExchanges/quotes/normalizeQuotes'
-import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
-import { FiatConnectQuoteSuccess } from 'src/fiatconnect'
+import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/types'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { getFeatureGate } from 'src/statsig'
 import { NetworkId } from 'src/transactions/types'

src/fiatExchanges/PaymentMethodSection.tsx

@@ -10,8 +10,7 @@ import { CryptoAmount, FiatAmount } from 'src/fiatExchanges/amount'
 import NormalizedQuote from 'src/fiatExchanges/quotes/NormalizedQuote'
 import { SettlementEstimation, SettlementTime } from 'src/fiatExchanges/quotes/constants'
 import { getSettlementTimeString } from 'src/fiatExchanges/quotes/utils'
-import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
-import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod, ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import InfoIcon from 'src/icons/InfoIcon'
 import { getLocalCurrencyCode, usdToLocalCurrencyRateSelector } from 'src/localCurrency/selectors'
 import { useDispatch, useSelector } from 'src/redux/hooks'

src/fiatExchanges/SelectProvider.test.tsx

@@ -6,7 +6,19 @@ import { MockStoreEnhanced } from 'redux-mock-store'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { FiatExchangeEvents } from 'src/analytics/Events'
 import SelectProviderScreen from 'src/fiatExchanges/SelectProvider'
-import { SelectProviderExchangesLink, SelectProviderExchangesText } from 'src/fiatExchanges/types'
+import {
+  CICOFlow,
+  PaymentMethod,
+  SelectProviderExchangesLink,
+  SelectProviderExchangesText,
+} from 'src/fiatExchanges/types'
+import {
+  LegacyMobileMoneyProvider,
+  fetchExchanges,
+  fetchLegacyMobileMoneyProviders,
+  fetchProviders,
+  getProviderSelectionAnalyticsData,
+} from 'src/fiatExchanges/utils'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -24,15 +36,6 @@ import {
   mockFiatConnectQuotes,
   mockProviders,
 } from 'test/values'
-import {
-  CICOFlow,
-  LegacyMobileMoneyProvider,
-  PaymentMethod,
-  fetchExchanges,
-  fetchLegacyMobileMoneyProviders,
-  fetchProviders,
-  getProviderSelectionAnalyticsData,
-} from './utils'
 import mocked = jest.mocked
 
 const AMOUNT_TO_CASH_IN = 100

src/fiatExchanges/SelectProvider.tsx

@@ -25,10 +25,22 @@ import {
 import { CryptoAmount, FiatAmount } from 'src/fiatExchanges/amount'
 import { normalizeQuotes } from 'src/fiatExchanges/quotes/normalizeQuotes'
 import {
+  CICOFlow,
+  FiatExchangeFlow,
+  PaymentMethod,
   ProviderSelectionAnalyticsData,
   SelectProviderExchangesLink,
   SelectProviderExchangesText,
 } from 'src/fiatExchanges/types'
+import {
+  LegacyMobileMoneyProvider,
+  fetchExchanges,
+  fetchLegacyMobileMoneyProviders,
+  fetchProviders,
+  filterLegacyMobileMoneyProviders,
+  filterProvidersByPaymentMethod,
+  getProviderSelectionAnalyticsData,
+} from 'src/fiatExchanges/utils'
 import {
   fiatConnectQuotesErrorSelector,
   fiatConnectQuotesLoadingSelector,
@@ -61,18 +73,6 @@ import Logger from 'src/utils/Logger'
 import { navigateToURI } from 'src/utils/linking'
 import networkConfig from 'src/web3/networkConfig'
 import { currentAccountSelector } from 'src/web3/selectors'
-import {
-  CICOFlow,
-  FiatExchangeFlow,
-  LegacyMobileMoneyProvider,
-  PaymentMethod,
-  fetchExchanges,
-  fetchLegacyMobileMoneyProviders,
-  fetchProviders,
-  filterLegacyMobileMoneyProviders,
-  filterProvidersByPaymentMethod,
-  getProviderSelectionAnalyticsData,
-} from './utils'
 
 const TAG = 'SelectProviderScreen'
 

src/fiatExchanges/SimplexScreen.test.tsx

@@ -5,13 +5,13 @@ import { Provider } from 'react-redux'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { FiatExchangeEvents } from 'src/analytics/Events'
 import SimplexScreen from 'src/fiatExchanges/SimplexScreen'
+import { SimplexQuote } from 'src/fiatExchanges/types'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { Screens } from 'src/navigator/Screens'
 import { CiCoCurrency } from 'src/utils/currencies'
 import { createMockStore, getMockStackScreenProps } from 'test/utils'
 import { mockAccount, mockCusdTokenId, mockE164Number } from 'test/values'
 import { v4 as uuidv4 } from 'uuid'
-import { SimplexQuote } from './utils'
 
 const mockUserIpAddress = '1.1.1.1.1.1.0'
 

src/fiatExchanges/WithdrawSpend.tsx

@@ -7,7 +7,7 @@ import { FiatExchangeEvents } from 'src/analytics/Events'
 import { AppState } from 'src/app/actions'
 import ListItem from 'src/components/ListItem'
 import { FiatExchangeTokenBalance } from 'src/components/TokenBalance'
-import { FiatExchangeFlow } from 'src/fiatExchanges/utils'
+import { FiatExchangeFlow } from 'src/fiatExchanges/types'
 import { fiatExchange } from 'src/images/Images'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'

src/fiatExchanges/quotes/ExternalQuote.test.ts

@@ -2,7 +2,8 @@ import BigNumber from 'bignumber.js'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import ExternalQuote from 'src/fiatExchanges/quotes/ExternalQuote'
 import { SettlementTime } from 'src/fiatExchanges/quotes/constants'
-import { CICOFlow, PaymentMethod, RawProviderQuote, SimplexQuote } from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod, SimplexQuote } from 'src/fiatExchanges/types'
+import { RawProviderQuote } from 'src/fiatExchanges/utils'
 import { navigate } from 'src/navigator/NavigationService'
 import { NetworkId } from 'src/transactions/types'
 import { navigateToURI } from 'src/utils/linking'

src/fiatExchanges/quotes/ExternalQuote.ts

@@ -7,13 +7,8 @@ import {
   SettlementEstimation,
 } from 'src/fiatExchanges/quotes/constants'
 import NormalizedQuote from 'src/fiatExchanges/quotes/NormalizedQuote'
-import {
-  CICOFlow,
-  FetchProvidersOutput,
-  PaymentMethod,
-  RawProviderQuote,
-  SimplexQuote,
-} from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod, SimplexQuote } from 'src/fiatExchanges/types'
+import { FetchProvidersOutput, RawProviderQuote } from 'src/fiatExchanges/utils'
 import i18n from 'src/i18n'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'

src/fiatExchanges/quotes/FiatConnectQuote.test.ts

@@ -6,15 +6,15 @@ import {
 } from '@fiatconnect/fiatconnect-types'
 import BigNumber from 'bignumber.js'
 import _ from 'lodash'
-import { FiatExchangeEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { FiatExchangeEvents } from 'src/analytics/Events'
 import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import {
   DEFAULT_BANK_SETTLEMENT_ESTIMATION,
   DEFAULT_MOBILE_MONEY_SETTLEMENT_ESTIMATION,
   SettlementTime,
 } from 'src/fiatExchanges/quotes/constants'
-import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/types'
 import { FiatConnectQuoteSuccess } from 'src/fiatconnect'
 import { selectFiatConnectQuote } from 'src/fiatconnect/slice'
 import { NetworkId } from 'src/transactions/types'

src/fiatExchanges/quotes/FiatConnectQuote.ts

@@ -6,8 +6,8 @@ import {
   QuoteResponseFiatAccountSchema,
   QuoteResponseKycSchema,
 } from '@fiatconnect/fiatconnect-types'
-import BigNumber from 'bignumber.js'
 import { Dispatch } from '@reduxjs/toolkit'
+import BigNumber from 'bignumber.js'
 import { FiatConnectProviderInfo, FiatConnectQuoteSuccess } from 'src/fiatconnect'
 import { selectFiatConnectQuote } from 'src/fiatconnect/slice'
 import {
@@ -18,7 +18,7 @@ import {
   SettlementTime,
 } from 'src/fiatExchanges/quotes/constants'
 import NormalizedQuote from 'src/fiatExchanges/quotes/NormalizedQuote'
-import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/types'
 import i18n from 'src/i18n'
 import { TokenBalance } from 'src/tokens/slice'
 import { convertLocalToTokenAmount, convertTokenToLocalAmount } from 'src/tokens/utils'

src/fiatExchanges/quotes/NormalizedQuote.ts

@@ -1,10 +1,9 @@
-import BigNumber from 'bignumber.js'
 import { Dispatch } from '@reduxjs/toolkit'
-import { FiatExchangeEvents } from 'src/analytics/Events'
+import BigNumber from 'bignumber.js'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { FiatExchangeEvents } from 'src/analytics/Events'
 import { SettlementEstimation } from 'src/fiatExchanges/quotes/constants'
-import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
-import { CICOFlow, PaymentMethod } from 'src/fiatExchanges/utils'
+import { CICOFlow, PaymentMethod, ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { TokenBalance } from 'src/tokens/slice'
 
 export default abstract class NormalizedQuote {