Send all swaps requests to api2, remove useNewSwapsApi boolean (#12792)

* Send all swaps requests to api2, remove useNewSwapsApi boolean * Switch token bucket priority * Fix tests * Trigger Build * Trigger Build
2024-12-22 17:33:23 +01:00 · 2021-11-30 11:56:28 -07:00 · 2021-11-30 11:56:28 -07:00 · 8e6a0ff879
commit 8e6a0ff879
parent d0c1fd713d
13 changed files with 61 additions and 158 deletions
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@ -79,7 +79,6 @@ const initialState = {
    topAggId: null,
    routeState: '',
    swapsFeatureIsLive: true,
-    useNewSwapsApi: false,
    saveFetchedQuotes: false,
    swapsQuoteRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
    swapsQuotePrefetchingRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
@ -123,9 +122,9 @@ export default class SwapsController {
    });
  }

-  async fetchSwapsRefreshRates(chainId, useNewSwapsApi) {
+  async fetchSwapsRefreshRates(chainId) {
    const response = await fetchWithCache(
-      getBaseApi('network', chainId, useNewSwapsApi),
+      getBaseApi('network', chainId),
      { method: 'GET' },
      { cacheRefreshTime: 600000 },
    );
@ -149,13 +148,9 @@ export default class SwapsController {
  // Sets the refresh rate for quote updates from the MetaSwap API
  async _setSwapsRefreshRates() {
    const chainId = this._getCurrentChainId();
-    const { swapsState } = this.store.getState();
    let swapsRefreshRates;
    try {
-      swapsRefreshRates = await this.fetchSwapsRefreshRates(
-        chainId,
-        swapsState.useNewSwapsApi,
-      );
+      swapsRefreshRates = await this.fetchSwapsRefreshRates(chainId);
    } catch (e) {
      console.error('Request for swaps quote refresh time failed: ', e);
    }
@ -210,11 +205,7 @@ export default class SwapsController {
  ) {
    const { chainId } = fetchParamsMetaData;
    const {
-      swapsState: {
-        useNewSwapsApi,
-        quotesPollingLimitEnabled,
-        saveFetchedQuotes,
-      },
+      swapsState: { quotesPollingLimitEnabled, saveFetchedQuotes },
    } = this.store.getState();

    if (!fetchParams) {
@ -242,7 +233,6 @@ export default class SwapsController {
    let [newQuotes] = await Promise.all([
      this._fetchTradesInfo(fetchParams, {
        ...fetchParamsMetaData,
-        useNewSwapsApi,
      }),
      this._setSwapsRefreshRates(),
    ]);
@ -574,9 +564,9 @@ export default class SwapsController {

  setSwapsLiveness(swapsLiveness) {
    const { swapsState } = this.store.getState();
-    const { swapsFeatureIsLive, useNewSwapsApi } = swapsLiveness;
+    const { swapsFeatureIsLive } = swapsLiveness;
    this.store.updateState({
-      swapsState: { ...swapsState, swapsFeatureIsLive, useNewSwapsApi },
+      swapsState: { ...swapsState, swapsFeatureIsLive },
    });
  }

@ -588,7 +578,6 @@ export default class SwapsController {
        tokens: swapsState.tokens,
        fetchParams: swapsState.fetchParams,
        swapsFeatureIsLive: swapsState.swapsFeatureIsLive,
-        useNewSwapsApi: swapsState.useNewSwapsApi,
        swapsQuoteRefreshTime: swapsState.swapsQuoteRefreshTime,
        swapsQuotePrefetchingRefreshTime:
          swapsState.swapsQuotePrefetchingRefreshTime,
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@ -131,7 +131,6 @@ const EMPTY_INIT_STATE = {
    topAggId: null,
    routeState: '',
    swapsFeatureIsLive: true,
-    useNewSwapsApi: false,
    swapsQuoteRefreshTime: 60000,
    swapsQuotePrefetchingRefreshTime: 60000,
    swapsUserFeeLevel: '',
@ -707,7 +706,6 @@ describe('SwapsController', function () {
        assert.strictEqual(
          fetchTradesInfoStub.calledOnceWithExactly(MOCK_FETCH_PARAMS, {
            ...MOCK_FETCH_METADATA,
-            useNewSwapsApi: false,
          }),
          true,
        );
@ -885,7 +883,6 @@ describe('SwapsController', function () {
        const tokens = 'test';
        const fetchParams = 'test';
        const swapsFeatureIsLive = false;
-        const useNewSwapsApi = false;
        const swapsQuoteRefreshTime = 0;
        const swapsQuotePrefetchingRefreshTime = 0;
        swapsController.store.updateState({
@ -893,7 +890,6 @@ describe('SwapsController', function () {
            tokens,
            fetchParams,
            swapsFeatureIsLive,
-            useNewSwapsApi,
            swapsQuoteRefreshTime,
            swapsQuotePrefetchingRefreshTime,
          },
--- a/shared/constants/swaps.js
+++ b/shared/constants/swaps.js
@ -84,12 +84,7 @@ export const WBNB_CONTRACT_ADDRESS =
 export const WMATIC_CONTRACT_ADDRESS =
  '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270';

-const METASWAP_ETH_API_HOST = 'https://api.metaswap.codefi.network';
-
-const METASWAP_BSC_API_HOST = 'https://bsc-api.metaswap.codefi.network';
-
 const SWAPS_TESTNET_CHAIN_ID = '0x539';
-const SWAPS_TESTNET_HOST = 'https://metaswap-api.airswap-dev.codefi.network';

 export const SWAPS_API_V2_BASE_URL = 'https://api2.metaswap.codefi.network';
 export const SWAPS_DEV_API_V2_BASE_URL =
@ -111,14 +106,6 @@ export const ALLOWED_SWAPS_CHAIN_IDS = {
  [RINKEBY_CHAIN_ID]: true,
 };

-// This is mapping for v1 URLs and will be removed once we migrate to v2.
-export const METASWAP_CHAINID_API_HOST_MAP = {
-  [MAINNET_CHAIN_ID]: METASWAP_ETH_API_HOST,
-  [SWAPS_TESTNET_CHAIN_ID]: `${SWAPS_API_V2_BASE_URL}/networks/1`,
-  [BSC_CHAIN_ID]: METASWAP_BSC_API_HOST,
-  [RINKEBY_CHAIN_ID]: SWAPS_TESTNET_HOST,
-};
-
 export const SWAPS_CHAINID_CONTRACT_ADDRESS_MAP = {
  [MAINNET_CHAIN_ID]: MAINNET_CONTRACT_ADDRESS,
  [SWAPS_TESTNET_CHAIN_ID]: TESTNET_CONTRACT_ADDRESS,
--- a/test/jest/constants.js
+++ b/test/jest/constants.js
@ -1,2 +1,2 @@
-export const METASWAP_BASE_URL = 'https://api.metaswap.codefi.network';
-export const METASWAP_API_V2_BASE_URL = 'https://api2.metaswap.codefi.network';
+export const METASWAP_BASE_URL = 'https://api2.metaswap.codefi.network';
+export const GAS_API_URL = 'https://gas-api.metaswap.codefi.network';
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@ -221,7 +221,6 @@ export const createSwapsMockStore = () => {
        topAggId: 'TEST_AGG_BEST',
        routeState: '',
        swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
      },
      useTokenDetection: true,
      tokenList: {
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@ -237,9 +237,6 @@ const getSwapsState = (state) => state.metamask.swapsState;
 export const getSwapsFeatureIsLive = (state) =>
  state.metamask.swapsState.swapsFeatureIsLive;

-export const getUseNewSwapsApi = (state) =>
-  state.metamask.swapsState.useNewSwapsApi;
-
 export const getSwapsQuoteRefreshTime = (state) =>
  state.metamask.swapsState.swapsQuoteRefreshTime;

@ -403,7 +400,6 @@ export const fetchSwapsLiveness = () => {
  return async (dispatch, getState) => {
    let swapsLivenessForNetwork = {
      swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
    };
    try {
      const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@ -431,7 +427,6 @@ export const fetchQuotesAndSetQuoteState = (
    const chainId = getCurrentChainId(state);
    let swapsLivenessForNetwork = {
      swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
    };
    try {
      const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@ -655,7 +650,6 @@ export const signAndSendTransactions = (history, metaMetricsEvent) => {
    );
    let swapsLivenessForNetwork = {
      swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
    };
    try {
      const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@ -913,13 +907,12 @@ export function fetchMetaSwapsGasPriceEstimates() {
  return async (dispatch, getState) => {
    const state = getState();
    const chainId = getCurrentChainId(state);
-    const useNewSwapsApi = getUseNewSwapsApi(state);

    dispatch(swapGasPriceEstimatesFetchStarted());

    let priceEstimates;
    try {
-      priceEstimates = await fetchSwapsGasPrices(chainId, useNewSwapsApi);
+      priceEstimates = await fetchSwapsGasPrices(chainId);
    } catch (e) {
      log.warn('Fetching swaps gas prices failed:', e);

--- a/ui/ducks/swaps/swaps.test.js
+++ b/ui/ducks/swaps/swaps.test.js
@ -61,7 +61,6 @@ describe('Ducks - Swaps', () => {
      const mockDispatch = jest.fn();
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
      };
      const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
      const featureFlagApiNock = mockFeatureFlagsApiResponse({
@ -81,7 +80,6 @@ describe('Ducks - Swaps', () => {
      const mockDispatch = jest.fn();
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
      };
      const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
      featureFlagsResponse.ethereum.extension_active = false;
@ -102,7 +100,6 @@ describe('Ducks - Swaps', () => {
      const mockDispatch = jest.fn();
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
      };
      const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
      featureFlagsResponse.ethereum.extension_active = false;
@ -124,7 +121,6 @@ describe('Ducks - Swaps', () => {
      const mockDispatch = jest.fn();
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
      };
      const featureFlagApiNock = mockFeatureFlagsApiResponse({
        replyWithError: true,
@ -143,7 +139,6 @@ describe('Ducks - Swaps', () => {
      const mockDispatch = jest.fn();
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
      };
      const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
      const featureFlagApiNock = mockFeatureFlagsApiResponse({
@ -210,22 +205,6 @@ describe('Ducks - Swaps', () => {
    });
  });

-  describe('getUseNewSwapsApi', () => {
-    it('returns true for "useNewSwapsApi"', () => {
-      const state = createSwapsMockStore();
-      const useNewSwapsApi = true;
-      state.metamask.swapsState.useNewSwapsApi = useNewSwapsApi;
-      expect(swaps.getUseNewSwapsApi(state)).toBe(useNewSwapsApi);
-    });
-
-    it('returns false for "useNewSwapsApi"', () => {
-      const state = createSwapsMockStore();
-      const useNewSwapsApi = false;
-      state.metamask.swapsState.useNewSwapsApi = useNewSwapsApi;
-      expect(swaps.getUseNewSwapsApi(state)).toBe(useNewSwapsApi);
-    });
-  });
-
  describe('getUsedQuote', () => {
    it('returns selected quote', () => {
      const state = createSwapsMockStore();
--- a/ui/hooks/useTokensToSearch.js
+++ b/ui/hooks/useTokensToSearch.js
@ -154,15 +154,15 @@ export function useTokensToSearch({
        tokenList,
        useTokenDetection,
      );
-      if (
+      if (memoizedTopTokens[token.address.toLowerCase()]) {
+        tokensToSearchBuckets.top[
+          memoizedTopTokens[token.address.toLowerCase()].index
+        ] = renderableDataToken;
+      } else if (
        isSwapsDefaultTokenSymbol(renderableDataToken.symbol, chainId) ||
        usersTokensAddressMap[token.address.toLowerCase()]
      ) {
        tokensToSearchBuckets.owned.push(renderableDataToken);
-      } else if (memoizedTopTokens[token.address.toLowerCase()]) {
-        tokensToSearchBuckets.top[
-          memoizedTopTokens[token.address.toLowerCase()].index
-        ] = renderableDataToken;
      } else {
        tokensToSearchBuckets.others.push(renderableDataToken);
      }
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@ -35,7 +35,6 @@ import {
  prepareToLeaveSwaps,
  fetchAndSetSwapsGasPriceInfo,
  fetchSwapsLiveness,
-  getUseNewSwapsApi,
  getFromToken,
  getReviewSwapClickedTimestamp,
 } from '../../ducks/swaps/swaps';
@ -117,8 +116,6 @@ export default function Swap() {
  const swapsEnabled = useSelector(getSwapsFeatureIsLive);
  const chainId = useSelector(getCurrentChainId);
  const isSwapsChain = useSelector(getIsSwapsChain);
-  const useNewSwapsApi = useSelector(getUseNewSwapsApi);
-  const prevUseNewSwapsApi = useRef(useNewSwapsApi);
  const networkAndAccountSupports1559 = useSelector(
    checkNetworkAndAccountSupports1559,
  );
@ -194,35 +191,24 @@ export default function Swap() {

  // eslint-disable-next-line
  useEffect(() => {
-    if (isFeatureFlagLoaded && prevUseNewSwapsApi.current === useNewSwapsApi) {
-      fetchTokens(chainId, useNewSwapsApi)
-        .then((tokens) => {
-          dispatch(setSwapsTokens(tokens));
-        })
-        .catch((error) => console.error(error));
-      fetchTopAssets(chainId, useNewSwapsApi).then((topAssets) => {
-        dispatch(setTopAssets(topAssets));
-      });
-      fetchAggregatorMetadata(chainId, useNewSwapsApi).then(
-        (newAggregatorMetadata) => {
-          dispatch(setAggregatorMetadata(newAggregatorMetadata));
-        },
-      );
-      if (!networkAndAccountSupports1559) {
-        dispatch(fetchAndSetSwapsGasPriceInfo(chainId));
-      }
-      return () => {
-        dispatch(prepareToLeaveSwaps());
-      };
+    fetchTokens(chainId)
+      .then((tokens) => {
+        dispatch(setSwapsTokens(tokens));
+      })
+      .catch((error) => console.error(error));
+    fetchTopAssets(chainId).then((topAssets) => {
+      dispatch(setTopAssets(topAssets));
+    });
+    fetchAggregatorMetadata(chainId).then((newAggregatorMetadata) => {
+      dispatch(setAggregatorMetadata(newAggregatorMetadata));
+    });
+    if (!networkAndAccountSupports1559) {
+      dispatch(fetchAndSetSwapsGasPriceInfo(chainId));
    }
-    prevUseNewSwapsApi.current = useNewSwapsApi;
-  }, [
-    dispatch,
-    chainId,
-    isFeatureFlagLoaded,
-    useNewSwapsApi,
-    networkAndAccountSupports1559,
-  ]);
+    return () => {
+      dispatch(prepareToLeaveSwaps());
+    };
+  }, [dispatch, chainId, networkAndAccountSupports1559]);

  const hardwareWalletUsed = useSelector(isHardwareWallet);
  const hardwareWalletType = useSelector(getHardwareWalletType);
--- a/ui/pages/swaps/index.test.js
+++ b/ui/pages/swaps/index.test.js
@ -30,7 +30,7 @@ describe('Swap', () => {

  beforeEach(() => {
    nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/topAssets')
+      .get('/networks/1/topAssets')
      .reply(200, MOCKS.TOP_ASSETS_GET_RESPONSE);

    nock(CONSTANTS.METASWAP_BASE_URL)
@ -38,18 +38,18 @@ describe('Swap', () => {
      .reply(200, MOCKS.REFRESH_TIME_GET_RESPONSE);

    nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/aggregatorMetadata')
+      .get('/networks/1/aggregatorMetadata')
      .reply(200, MOCKS.AGGREGATOR_METADATA_GET_RESPONSE);

-    nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/gasPrices')
+    nock(CONSTANTS.GAS_API_URL)
+      .get('/networks/1/gasPrices')
      .reply(200, MOCKS.GAS_PRICES_GET_RESPONSE);

    nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/tokens')
+      .get('/networks/1/tokens')
      .reply(200, MOCKS.TOKENS_GET_RESPONSE);

-    featureFlagsNock = nock(CONSTANTS.METASWAP_API_V2_BASE_URL)
+    featureFlagsNock = nock(CONSTANTS.METASWAP_BASE_URL)
      .get('/featureFlags')
      .reply(200, MOCKS.createFeatureFlagsResponse());
  });
--- a/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
+++ b/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
@ -9,7 +9,6 @@ import { usePrevious } from '../../../../hooks/usePrevious';
 import { isValidHexAddress } from '../../../../../shared/modules/hexstring-utils';
 import { fetchToken } from '../../swaps.util';
 import { getCurrentChainId } from '../../../../selectors/selectors';
-import { getUseNewSwapsApi } from '../../../../ducks/swaps/swaps';

 const renderAdornment = () => (
  <InputAdornment position="start" style={{ marginRight: '12px' }}>
@ -29,7 +28,6 @@ export default function ListItemSearch({
  const fuseRef = useRef();
  const [searchQuery, setSearchQuery] = useState('');
  const chainId = useSelector(getCurrentChainId);
-  const useNewSwapsApi = useSelector(getUseNewSwapsApi);

  /**
   * Search a custom token for import based on a contract address.
@ -38,7 +36,7 @@ export default function ListItemSearch({
  const handleSearchTokenForImport = async (contractAddress) => {
    setSearchQuery(contractAddress);
    try {
-      const token = await fetchToken(contractAddress, chainId, useNewSwapsApi);
+      const token = await fetchToken(contractAddress, chainId);
      if (token) {
        token.primaryLabel = token.symbol;
        token.secondaryLabel = token.name;
--- a/ui/pages/swaps/swaps.util.js
+++ b/ui/pages/swaps/swaps.util.js
@ -3,7 +3,6 @@ import BigNumber from 'bignumber.js';
 import abi from 'human-standard-token-abi';
 import {
  SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
-  METASWAP_CHAINID_API_HOST_MAP,
  ALLOWED_CONTRACT_ADDRESSES,
  SWAPS_WRAPPED_TOKENS_ADDRESSES,
  ETHEREUM,
@ -79,14 +78,8 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
  return `${v2ApiBaseUrl}/networks/${chainIdDecimal}`;
 };

-export const getBaseApi = function (
-  type,
-  chainId = MAINNET_CHAIN_ID,
-  useNewSwapsApi = false,
-) {
-  const baseUrl = useNewSwapsApi
-    ? getBaseUrlForNewSwapsApi(type, chainId)
-    : METASWAP_CHAINID_API_HOST_MAP[chainId];
+export const getBaseApi = function (type, chainId = MAINNET_CHAIN_ID) {
+  const baseUrl = getBaseUrlForNewSwapsApi(type, chainId);
  const chainIdDecimal = chainId && parseInt(chainId, 16);
  if (!baseUrl) {
    throw new Error(`Swaps API calls are disabled for chainId: ${chainId}`);
@ -300,7 +293,7 @@ export async function fetchTradesInfo(
    fromAddress,
    exchangeList,
  },
-  { chainId, useNewSwapsApi },
+  { chainId },
 ) {
  const urlParams = {
    destinationToken,
@ -319,11 +312,7 @@ export async function fetchTradesInfo(
  }

  const queryString = new URLSearchParams(urlParams).toString();
-  const tradeURL = `${getBaseApi(
-    'trade',
-    chainId,
-    useNewSwapsApi,
-  )}${queryString}`;
+  const tradeURL = `${getBaseApi('trade', chainId)}${queryString}`;
  const tradesResponse = await fetchWithCache(
    tradeURL,
    { method: 'GET', headers: clientIdHeader },
@ -367,8 +356,8 @@ export async function fetchTradesInfo(
  return newQuotes;
 }

-export async function fetchToken(contractAddress, chainId, useNewSwapsApi) {
-  const tokenUrl = getBaseApi('token', chainId, useNewSwapsApi);
+export async function fetchToken(contractAddress, chainId) {
+  const tokenUrl = getBaseApi('token', chainId);
  const token = await fetchWithCache(
    `${tokenUrl}?address=${contractAddress}`,
    { method: 'GET', headers: clientIdHeader },
@ -377,8 +366,8 @@ export async function fetchToken(contractAddress, chainId, useNewSwapsApi) {
  return token;
 }

-export async function fetchTokens(chainId, useNewSwapsApi) {
-  const tokensUrl = getBaseApi('tokens', chainId, useNewSwapsApi);
+export async function fetchTokens(chainId) {
+  const tokensUrl = getBaseApi('tokens', chainId);
  const tokens = await fetchWithCache(
    tokensUrl,
    { method: 'GET', headers: clientIdHeader },
@ -399,12 +388,8 @@ export async function fetchTokens(chainId, useNewSwapsApi) {
  return filteredTokens;
 }

-export async function fetchAggregatorMetadata(chainId, useNewSwapsApi) {
-  const aggregatorMetadataUrl = getBaseApi(
-    'aggregatorMetadata',
-    chainId,
-    useNewSwapsApi,
-  );
+export async function fetchAggregatorMetadata(chainId) {
+  const aggregatorMetadataUrl = getBaseApi('aggregatorMetadata', chainId);
  const aggregators = await fetchWithCache(
    aggregatorMetadataUrl,
    { method: 'GET', headers: clientIdHeader },
@ -425,8 +410,8 @@ export async function fetchAggregatorMetadata(chainId, useNewSwapsApi) {
  return filteredAggregators;
 }

-export async function fetchTopAssets(chainId, useNewSwapsApi) {
-  const topAssetsUrl = getBaseApi('topAssets', chainId, useNewSwapsApi);
+export async function fetchTopAssets(chainId) {
+  const topAssetsUrl = getBaseApi('topAssets', chainId);
  const response = await fetchWithCache(
    topAssetsUrl,
    { method: 'GET', headers: clientIdHeader },
@ -473,8 +458,8 @@ export async function fetchTokenBalance(address, userAddress) {
  return usersToken;
 }

-export async function fetchSwapsGasPrices(chainId, useNewSwapsApi) {
-  const gasPricesUrl = getBaseApi('gasPrices', chainId, useNewSwapsApi);
+export async function fetchSwapsGasPrices(chainId) {
+  const gasPricesUrl = getBaseApi('gasPrices', chainId);
  const response = await fetchWithCache(
    gasPricesUrl,
    { method: 'GET', headers: clientIdHeader },
@ -816,7 +801,7 @@ export const getNetworkNameByChainId = (chainId) => {
 * It returns info about if Swaps are enabled and if we should use our new APIs for it.
 * @param {object} swapsFeatureFlags
 * @param {string} chainId
- * @returns object with 2 items: "swapsFeatureIsLive" and "useNewSwapsApi"
+ * @returns object with 2 items: "swapsFeatureIsLive"
 */
 export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
  const networkName = getNetworkNameByChainId(chainId);
@ -824,14 +809,12 @@ export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
  if ([LOCALHOST_CHAIN_ID, RINKEBY_CHAIN_ID].includes(chainId)) {
    return {
      swapsFeatureIsLive: true,
-      useNewSwapsApi: false,
    };
  }
  // If a network name is not found in the list of feature flags, disable Swaps.
  if (!swapsFeatureFlags[networkName]) {
    return {
      swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
    };
  }
  const isNetworkEnabledForNewApi =
@ -839,12 +822,10 @@ export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
  if (isNetworkEnabledForNewApi) {
    return {
      swapsFeatureIsLive: true,
-      useNewSwapsApi: true,
    };
  }
  return {
    swapsFeatureIsLive: swapsFeatureFlags[networkName].fallback_to_v1,
-    useNewSwapsApi: false,
  };
 };

--- a/ui/pages/swaps/swaps.util.test.js
+++ b/ui/pages/swaps/swaps.util.test.js
@ -91,8 +91,8 @@ describe('Swaps Util', () => {
      },
    };
    it('should fetch trade info on prod', async () => {
-      nock('https://api.metaswap.codefi.network')
-        .get('/trades')
+      nock('https://api2.metaswap.codefi.network')
+        .get('/networks/1/trades')
        .query(true)
        .reply(200, MOCK_TRADE_RESPONSE_2);

@ -117,9 +117,9 @@ describe('Swaps Util', () => {

  describe('fetchTokens', () => {
    beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
        .persist()
-        .get('/tokens')
+        .get('/networks/1/tokens')
        .reply(200, TOKENS);
    });

@ -136,9 +136,9 @@ describe('Swaps Util', () => {

  describe('fetchAggregatorMetadata', () => {
    beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
        .persist()
-        .get('/aggregatorMetadata')
+        .get('/networks/1/aggregatorMetadata')
        .reply(200, AGGREGATOR_METADATA);
    });

@ -155,9 +155,9 @@ describe('Swaps Util', () => {

  describe('fetchTopAssets', () => {
    beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
        .persist()
-        .get('/topAssets')
+        .get('/networks/1/topAssets')
        .reply(200, TOP_ASSETS);
    });

@ -327,7 +327,6 @@ describe('Swaps Util', () => {
    it('returns info that Swaps are enabled and cannot use API v2 for localhost chain ID', () => {
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
      };
      expect(
        getSwapsLivenessForNetwork(
@ -340,7 +339,6 @@ describe('Swaps Util', () => {
    it('returns info that Swaps are enabled and cannot use API v2 for Rinkeby chain ID', () => {
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
      };
      expect(
        getSwapsLivenessForNetwork(
@ -353,7 +351,6 @@ describe('Swaps Util', () => {
    it('returns info that Swaps are disabled and cannot use API v2 if network name is not found', () => {
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
      };
      expect(
        getSwapsLivenessForNetwork(
@ -366,7 +363,6 @@ describe('Swaps Util', () => {
    it('returns info that Swaps are enabled and can use API v2 for mainnet chain ID', () => {
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
      };
      expect(
        getSwapsLivenessForNetwork(
@ -379,7 +375,6 @@ describe('Swaps Util', () => {
    it('returns info that Swaps are enabled but can only use API v1 for mainnet chain ID', () => {
      const expectedSwapsLiveness = {
        swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
      };
      const swapsFeatureFlags = MOCKS.createFeatureFlagsResponse();
      swapsFeatureFlags[ETHEREUM].extension_active = false;