@rango-dev/widget-embedded 0.17.1-next.1 → 0.17.1-next.10

package/src/pages/Home.tsx

@@ -1,32 +1,16 @@
-import type { SwapResult } from 'rango-sdk';
-
 import { i18n } from '@lingui/core';
-import {
-  Alert,
-  BestRoute,
-  BestRouteSkeleton,
-  Button,
-  Divider,
-  styled,
-  SwapInput,
-  Typography,
-  WarningIcon,
-} from '@rango-dev/ui';
+import { Button, styled, SwapInput, WarningIcon } from '@rango-dev/ui';
 import React, { useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { HomeButtons } from '../components/HeaderButtons';
 import { Layout } from '../components/Layout';
-import { NoRoutes } from '../components/NoRoutes';
-import { RouteErrors } from '../components/RouteErrors';
 import { SwitchFromAndToButton } from '../components/SwitchFromAndTo';
 import { errorMessages } from '../constants/errors';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import {
   BALANCE_MAX_DECIMALS,
   BALANCE_MIN_DECIMALS,
-  GAS_FEE_MAX_DECIMALS,
-  GAS_FEE_MIN_DECIMALS,
   PERCENTAGE_CHANGE_MAX_DECIMALS,
   PERCENTAGE_CHANGE_MIN_DECIMALS,
   TOKEN_AMOUNT_MAX_DECIMALS,
@@ -34,29 +18,22 @@ import {
   USD_VALUE_MAX_DECIMALS,
   USD_VALUE_MIN_DECIMALS,
 } from '../constants/routing';
+import { QuoteInfo } from '../containers/QuoteInfo';
 import { useSwapInput } from '../hooks/useSwapInput';
-import { useBestRouteStore } from '../store/bestRoute';
-import { useMetaStore } from '../store/meta';
+import { useAppStore } from '../store/AppStore';
+import { useQuoteStore } from '../store/quote';
 import { useUiStore } from '../store/ui';
 import { useWalletsStore } from '../store/wallets';
 import { ButtonState } from '../types';
-import { getContainer } from '../utils/common';
-import { getBlockchainShortNameFor } from '../utils/meta';
-import {
-  numberToString,
-  secondsToString,
-  totalArrivalTime,
-} from '../utils/numbers';
-import { getFormattedBestRoute, getPriceImpactLevel } from '../utils/routing';
+import { numberToString } from '../utils/numbers';
+import { getPriceImpact, getPriceImpactLevel } from '../utils/quote';
 import {
   canComputePriceImpact,
   getOutputRatio,
   getPercentageChange,
   getSwapButtonState,
-  getTotalFeeInUsd,
+  hasHighValueLoss,
   hasLimitError,
-  LimitErrorMessage,
-  outputRatioHasWarning,
 } from '../utils/swap';
 import { getBalanceFromWallet } from '../utils/wallets';
 
@@ -76,27 +53,13 @@ const InputsContainer = styled('div', {
   gap: 5,
   alignSelf: 'stretch',
 });
-
-const BestRouteContainer = styled('div', {
-  width: '100%',
-  paddingTop: '$2',
-});
-
-const FooterStepAlarm = styled('div', {
-  paddingBottom: '$15',
-});
-
-const FooterAlert = styled('div', {
-  width: '100%',
-  display: 'flex',
-});
-
 export function Home() {
   const navigate = useNavigate();
   const {
-    fetch: refetchBestRoute,
-    loading: fetchingBestRoute,
-    error: bestRouteError,
+    fetch: fetchQuote,
+    loading: fetchingQuote,
+    error: quoteError,
+    warning: quoteWarning,
   } = useSwapInput();
   const {
     fromToken,
@@ -108,51 +71,40 @@ export function Home() {
     inputUsdValue,
     outputAmount,
     outputUsdValue,
-    bestRoute,
-    resetRouteWallets,
-  } = useBestRouteStore();
+    quote,
+    resetQuoteWallets,
+    setQuoteWarningsConfirmed,
+  } = useQuoteStore();
 
-  const {
-    meta: { tokens, blockchains },
-    loadingStatus: loadingMetaStatus,
-  } = useMetaStore();
+  const fetchMetaStatus = useAppStore().fetchStatus;
 
   const connectedWallets = useWalletsStore.use.connectedWallets();
   const setCurrentPage = useUiStore.use.setCurrentPage();
-  const [openWarningModal, setOpenWarningModal] = useState(false);
-  const {
-    fromAmountRangeError,
-    swap: swapHasError,
-    recommendation,
-  } = LimitErrorMessage(bestRoute);
+  const [showQuoteWarningModal, setShowQuoteWarningModal] = useState(false);
   const layoutRef = useRef<HTMLDivElement>(null);
 
-  const showBestRoute =
-    !!Number(inputAmount) &&
-    (!!bestRoute || fetchingBestRoute || !!bestRouteError);
-
   const needsToWarnEthOnPath = false;
 
   const outToInRatio = getOutputRatio(inputUsdValue, outputUsdValue);
-  const highValueLoss = outputRatioHasWarning(inputUsdValue, outToInRatio);
+  const highValueLoss = hasHighValueLoss(inputUsdValue, outToInRatio);
 
   const priceImpactInputCanNotBeComputed = !canComputePriceImpact(
-    bestRoute,
+    quote,
     inputAmount,
     inputUsdValue
   );
 
   const priceImpactOutputCanNotBeComputed = !canComputePriceImpact(
-    bestRoute,
+    quote,
     inputAmount,
     outputUsdValue
   );
   const swapButtonState = getSwapButtonState(
-    loadingMetaStatus,
+    fetchMetaStatus,
     connectedWallets,
-    fetchingBestRoute,
-    bestRoute,
-    hasLimitError(bestRoute),
+    fetchingQuote,
+    quote,
+    hasLimitError(quote),
     highValueLoss,
     priceImpactInputCanNotBeComputed || priceImpactOutputCanNotBeComputed,
     needsToWarnEthOnPath,
@@ -193,7 +145,7 @@ export function Home() {
 
   useEffect(() => {
     setCurrentPage(navigationRoutes.home);
-    resetRouteWallets();
+    resetQuoteWallets();
     return setCurrentPage.bind(null, '');
   }, []);
 
@@ -201,83 +153,9 @@ export function Home() {
     !inputUsdValue || !outputUsdValue || !outputUsdValue.gt(0)
       ? null
       : getPercentageChange(
-          inputUsdValue.toNumber(),
-          outputUsdValue.toNumber()
+          inputUsdValue.toString(),
+          outputUsdValue.toString()
         );
-
-  const getBestRouteSteps = (swaps: SwapResult[]) => {
-    return swaps.map((swap, index) => ({
-      swapper: { displayName: swap.swapperId, image: swap.swapperLogo },
-      from: {
-        token: { displayName: swap.from.symbol, image: swap.from.logo },
-        chain: {
-          displayName:
-            getBlockchainShortNameFor(swap.from.blockchain, blockchains) ?? '',
-          image: swap.from.blockchainLogo,
-        },
-        price: {
-          value:
-            index === 0
-              ? numberToString(
-                  inputAmount,
-                  TOKEN_AMOUNT_MIN_DECIMALS,
-                  TOKEN_AMOUNT_MAX_DECIMALS
-                )
-              : swap.fromAmount,
-        },
-      },
-      to: {
-        token: { displayName: swap.to.symbol, image: swap.to.logo },
-        chain: {
-          displayName:
-            getBlockchainShortNameFor(swap.to.blockchain, blockchains) ?? '',
-          image: swap.to.blockchainLogo,
-        },
-        price: {
-          value: swap.toAmount,
-        },
-      },
-      alerts:
-        swap.swapperId === swapHasError?.swapperId ? (
-          <FooterStepAlarm>
-            <Alert
-              type="error"
-              title={recommendation}
-              footer={
-                <FooterAlert>
-                  <Typography size="xsmall" variant="body" color="neutral700">
-                    {fromAmountRangeError}
-                  </Typography>
-                  <Divider direction="horizontal" size={8} />
-                  <Typography size="xsmall" variant="body" color="neutral700">
-                    |
-                  </Typography>
-                  <Divider direction="horizontal" size={8} />
-                  <Typography size="xsmall" variant="body" color="neutral700">
-                    {i18n.t({
-                      id: 'Yours: {amount} {symbol}',
-                      values: {
-                        amount: numberToString(
-                          swapHasError?.fromAmount || null,
-                          TOKEN_AMOUNT_MIN_DECIMALS,
-                          TOKEN_AMOUNT_MAX_DECIMALS
-                        ),
-                        symbol: swap?.from.symbol,
-                      },
-                    })}
-                  </Typography>
-                </FooterAlert>
-              }
-            />
-          </FooterStepAlarm>
-        ) : undefined,
-    }));
-  };
-
-  const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
-
-  const bestRouteData = getFormattedBestRoute(bestRoute);
-
   return (
     <Layout
       ref={layoutRef}
@@ -296,8 +174,8 @@ export function Home() {
           onClick={() => {
             if (swapButtonState.state === ButtonState.WAITFORCONNECTING) {
               navigate(navigationRoutes.wallets);
-            } else if (swapButtonState.state === ButtonState.NEEDTOCONFIRM) {
-              setOpenWarningModal(true);
+            } else if (quoteWarning) {
+              setShowQuoteWarningModal(true);
             } else {
               navigate(navigationRoutes.confirmSwap);
             }
@@ -311,9 +189,7 @@ export function Home() {
         suffix: (
           <HomeButtons
             layoutRef={layoutRef.current}
-            onClickRefresh={
-              !!bestRoute || bestRouteError ? refetchBestRoute : undefined
-            }
+            onClickRefresh={!!quote || quoteError ? fetchQuote : undefined}
             onClickHistory={() => navigate(navigationRoutes.swaps)}
             onClickSettings={() => navigate(navigationRoutes.settings)}
           />
@@ -324,6 +200,8 @@ export function Home() {
           <FromContainer>
             <SwapInput
               label={i18n.t('From')}
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              //@ts-ignore
               mode="From"
               onInputChange={setInputAmount}
               balance={tokenBalance}
@@ -349,8 +227,8 @@ export function Home() {
                   ? errorMessages().unknownPriceError.impactTitle
                   : undefined,
               }}
-              disabled={loadingMetaStatus === 'failed'}
-              loading={loadingMetaStatus === 'loading'}
+              disabled={fetchMetaStatus === 'failed'}
+              loading={fetchMetaStatus === 'loading'}
               onSelectMaxBalance={() => {
                 if (tokenBalance !== '0') {
                   setInputAmount(tokenBalanceReal.split(',').join(''));
@@ -360,7 +238,7 @@ export function Home() {
             <SwitchFromAndToButton />
           </FromContainer>
           <SwapInput
-            sharpBottomStyle={!!bestRoute?.result || fetchingBestRoute}
+            sharpBottomStyle={!!quote?.result || fetchingQuote}
             label={i18n.t('To')}
             mode="To"
             chain={{
@@ -371,18 +249,12 @@ export function Home() {
               displayName: toToken?.symbol || '',
               image: toToken?.image || '',
             }}
-            percentageChange={
-              !!percentageChange?.lt(0)
-                ? numberToString(
-                    percentageChange,
-                    PERCENTAGE_CHANGE_MIN_DECIMALS,
-                    PERCENTAGE_CHANGE_MAX_DECIMALS
-                  )
-                : null
-            }
-            warningLevel={getPriceImpactLevel(
-              percentageChange?.toNumber() ?? 0
+            percentageChange={numberToString(
+              getPriceImpact(inputUsdValue, outputUsdValue),
+              PERCENTAGE_CHANGE_MIN_DECIMALS,
+              PERCENTAGE_CHANGE_MAX_DECIMALS
             )}
+            warningLevel={getPriceImpactLevel(percentageChange ?? 0)}
             price={{
               value: numberToString(
                 outputAmount,
@@ -401,88 +273,27 @@ export function Home() {
                 : undefined,
             }}
             onClickToken={() => navigate('to-swap')}
-            disabled={loadingMetaStatus === 'failed'}
-            loading={loadingMetaStatus === 'loading'}
+            disabled={fetchMetaStatus === 'failed'}
+            loading={fetchMetaStatus === 'loading'}
           />
         </InputsContainer>
-        {fetchingBestRoute && (
-          <BestRouteContainer>
-            <BestRouteSkeleton type="basic" />
-          </BestRouteContainer>
-        )}
-        {showBestRoute &&
-        !fetchingBestRoute &&
-        bestRouteData?.result?.swaps?.length ? (
-          <BestRouteContainer>
-            <BestRoute
-              type="basic"
-              recommended={true}
-              tooltipContainer={getContainer()}
-              input={{
-                value: numberToString(
-                  inputAmount,
-                  TOKEN_AMOUNT_MIN_DECIMALS,
-                  TOKEN_AMOUNT_MAX_DECIMALS
-                ),
-                usdValue: numberToString(
-                  inputUsdValue,
-                  USD_VALUE_MIN_DECIMALS,
-                  USD_VALUE_MAX_DECIMALS
-                ),
-              }}
-              output={{
-                value: numberToString(
-                  outputAmount,
-                  TOKEN_AMOUNT_MIN_DECIMALS,
-                  TOKEN_AMOUNT_MAX_DECIMALS
-                ),
-                usdValue: numberToString(
-                  outputUsdValue,
-                  USD_VALUE_MIN_DECIMALS,
-                  USD_VALUE_MAX_DECIMALS
-                ),
-              }}
-              steps={getBestRouteSteps(bestRouteData.result.swaps)}
-              percentageChange={numberToString(
-                percentageChange,
-                PERCENTAGE_CHANGE_MIN_DECIMALS,
-                PERCENTAGE_CHANGE_MAX_DECIMALS
-              )}
-              totalFee={numberToString(
-                totalFeeInUsd,
-                GAS_FEE_MIN_DECIMALS,
-                GAS_FEE_MAX_DECIMALS
-              )}
-              totalTime={secondsToString(
-                totalArrivalTime(bestRoute?.result?.swaps)
-              )}
-            />
-          </BestRouteContainer>
-        ) : showBestRoute && !fetchingBestRoute ? (
-          <>
-            <Divider size={20} />
-            <NoRoutes
-              diagnosisMessage={bestRouteData?.diagnosisMessages?.[0]}
-              fetch={refetchBestRoute}
-              error={!!bestRouteError}
-            />
-          </>
-        ) : null}
+        <QuoteInfo
+          quote={quote}
+          loading={fetchingQuote}
+          error={quoteError}
+          warning={quoteWarning}
+          type="basic"
+          refetchQuote={fetchQuote}
+          showWarningModal={showQuoteWarningModal}
+          onOpenWarningModal={() => setShowQuoteWarningModal(true)}
+          onCloseWarningModal={() => setShowQuoteWarningModal(false)}
+          onConfirmWarningModal={() => {
+            setShowQuoteWarningModal(false);
+            setQuoteWarningsConfirmed(true);
+            navigate(navigationRoutes.confirmSwap);
+          }}
+        />
       </Container>
-      <RouteErrors
-        openModal={openWarningModal}
-        onToggle={setOpenWarningModal}
-        totalFeeInUsd={totalFeeInUsd}
-        outputUsdValue={outputUsdValue}
-        inputUsdValue={inputUsdValue}
-        percentageChange={percentageChange}
-        highValueLoss={highValueLoss}
-        priceImpactCanNotBeComputed={
-          priceImpactInputCanNotBeComputed || priceImpactOutputCanNotBeComputed
-        }
-        loading={fetchingBestRoute || loadingMetaStatus === 'loading'}
-        extraSpace={!!bestRoute?.result || !bestRoute}
-      />
     </Layout>
   );
 }

package/src/pages/LanguagePage.tsx

@@ -38,7 +38,7 @@ export function LanguagePage() {
   return (
     <Layout
       header={{
-        onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
+        onBack: () => navigateBackFrom(navigationRoutes.settings),
         title: i18n.t('Language'),
       }}>
       <SettingsContainer>

package/src/pages/LiquiditySourcePage.tsx

@@ -25,30 +25,23 @@ import {
 } from '../components/SettingsContainer';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
-import { useMetaStore } from '../store/meta';
+import { useAppStore } from '../store/AppStore';
 import { useSettingsStore } from '../store/settings';
 import { containsText } from '../utils/numbers';
-import {
-  getUniqueSwappersGroups,
-  sortLiquiditySourcesByGroupTitle,
-} from '../utils/settings';
+import { getUniqueSwappersGroups } from '../utils/settings';
 
 interface PropTypes {
-  supportedSwappers?: string[];
   sourceType: 'Exchanges' | 'Bridges';
 }
 
-export function LiquiditySourcePage({
-  supportedSwappers,
-  sourceType,
-}: PropTypes) {
+export function LiquiditySourcePage({ sourceType }: PropTypes) {
+  const fetchStatus = useAppStore().fetchStatus;
+  const swappers = useAppStore().swappers();
   const [searchedFor, setSearchedFor] = useState<string>('');
   const toggleLiquiditySource = useSettingsStore.use.toggleLiquiditySource();
   const { navigateBackFrom } = useNavigateBack();
-  const loadingMetaStatus = useMetaStore.use.loadingStatus();
-
   const supportedUniqueSwappersGroups: Array<UniqueSwappersGroupType> =
-    getUniqueSwappersGroups(supportedSwappers);
+    getUniqueSwappersGroups(swappers);
 
   const validTypes: Array<LiquiditySourceType> = [];
   if (sourceType === 'Exchanges') {
@@ -79,22 +72,20 @@ export function LiquiditySourcePage({
     });
   };
 
-  const list = liquiditySources
-    .sort(sortLiquiditySourcesByGroupTitle)
-    .map((sourceItem) => {
-      const { selected, groupTitle, logo } = sourceItem;
-      return {
-        start: <Image src={logo} size={22} type="circular" />,
-        onClick: () => toggleLiquiditySource(groupTitle),
-        end: <Checkbox checked={selected} />,
-        title: (
-          <Typography variant="title" size="xmedium">
-            {i18n.t(groupTitle)}
-          </Typography>
-        ),
-        ...sourceItem,
-      };
-    });
+  const list = liquiditySources.map((sourceItem) => {
+    const { selected, groupTitle, logo } = sourceItem;
+    return {
+      start: <Image src={logo} size={22} type="circular" />,
+      onClick: () => toggleLiquiditySource(groupTitle),
+      end: <Checkbox checked={selected} />,
+      title: (
+        <Typography variant="title" size="xmedium">
+          {i18n.t(groupTitle)}
+        </Typography>
+      ),
+      ...sourceItem,
+    };
+  });
 
   const searchHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
     const value = event.target.value;
@@ -111,7 +102,7 @@ export function LiquiditySourcePage({
   return (
     <Layout
       header={{
-        onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
+        onBack: () => navigateBackFrom(navigationRoutes.settings),
         title: i18n.t(sourceType),
         suffix: (
           <LiquiditySourceSuffix>
@@ -131,7 +122,7 @@ export function LiquiditySourcePage({
           placeholder={i18n.t('Search {sourceType}', { sourceType })}
           onChange={searchHandler}
         />
-        {loadingMetaStatus === 'loading' && <LoadingLiquiditySourceList />}
+        {fetchStatus === 'loading' && <LoadingLiquiditySourceList />}
 
         {!filteredList.length && !!searchedFor ? (
           <NotFoundContainer>
@@ -141,7 +132,7 @@ export function LiquiditySourcePage({
             />
           </NotFoundContainer>
         ) : (
-          loadingMetaStatus === 'success' && (
+          fetchStatus === 'success' && (
             <LiquiditySourceList>
               {filteredList.map((sourceItem) => {
                 return (

package/src/pages/SelectBlockchainPage.tsx

@@ -7,9 +7,8 @@ import { Layout } from '../components/Layout';
 import { SearchInput } from '../components/SearchInput';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
-import { useAppStore } from '../store/app';
-import { useBestRouteStore } from '../store/bestRoute';
-import { useMetaStore } from '../store/meta';
+import { useAppStore } from '../store/AppStore';
+import { useQuoteStore } from '../store/quote';
 
 interface PropTypes {
   type: 'source' | 'destination';
@@ -20,9 +19,9 @@ export function SelectBlockchainPage(props: PropTypes) {
   const { navigateBackFrom } = useNavigateBack();
   const [searchedFor, setSearchedFor] = useState<string>('');
   const [blockchainCategory, setBlockchainCategory] = useState<string>('ALL');
-  const setToBlockchain = useBestRouteStore.use.setToBlockchain();
-  const setFromBlockchain = useBestRouteStore.use.setFromBlockchain();
-  const { loadingStatus } = useMetaStore();
+  const setToBlockchain = useQuoteStore.use.setToBlockchain();
+  const setFromBlockchain = useQuoteStore.use.setFromBlockchain();
+  const fetchStatus = useAppStore().fetchStatus;
 
   const blockchains = useAppStore().blockchains({
     type: type,
@@ -42,7 +41,7 @@ export function SelectBlockchainPage(props: PropTypes) {
         setCategory={setBlockchainCategory}
         category={blockchainCategory}
         blockchains={blockchains}
-        isLoading={loadingStatus === 'loading'}
+        isLoading={fetchStatus === 'loading'}
       />
       <Divider size={24} />
       <SearchInput

package/src/pages/SelectSwapItemsPage.tsx

@@ -11,8 +11,8 @@ import { SearchInput } from '../components/SearchInput';
 import { TokenList } from '../components/TokenList/TokenList';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
-import { useAppStore } from '../store/app';
-import { useBestRouteStore } from '../store/bestRoute';
+import { useAppStore } from '../store/AppStore';
+import { useQuoteStore } from '../store/quote';
 import { useWalletsStore } from '../store/wallets';
 import { getTokensBalanceFromWalletAndSort } from '../utils/wallets';
 
@@ -31,7 +31,7 @@ export function SelectSwapItemsPage(props: PropTypes) {
     setToToken,
     setFromBlockchain,
     setToBlockchain,
-  } = useBestRouteStore();
+  } = useQuoteStore();
   const { connectedWallets } = useWalletsStore();
   const [searchedFor, setSearchedFor] = useState<string>('');
 
@@ -63,9 +63,9 @@ export function SelectSwapItemsPage(props: PropTypes) {
 
   const updateToken = (token: Token) => {
     if (type === 'source') {
-      setFromToken(token);
+      setFromToken({ token, meta: { blockchains, tokens } });
     } else {
-      setToToken(token);
+      setToToken({ token, meta: { blockchains, tokens } });
     }
   };
 

package/src/pages/SettingsPage.tsx

@@ -19,26 +19,22 @@ import { Slippage } from '../components/Slippage';
 import { SlippageTooltipContainer as TooltipContainer } from '../components/Slippage/Slippage.styles';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
-import { useMetaStore } from '../store/meta';
+import { useAppStore } from '../store/AppStore';
 import { useSettingsStore } from '../store/settings';
 import { getContainer } from '../utils/common';
 import { getUniqueSwappersGroups } from '../utils/settings';
 
-interface PropTypes {
-  supportedSwappers?: string[];
-  singleTheme?: boolean;
-}
-
-export function SettingsPage({ supportedSwappers, singleTheme }: PropTypes) {
+export function SettingsPage() {
   const navigate = useNavigate();
+  const { theme } = useAppStore().config;
+  const fetchStatus = useAppStore().fetchStatus;
+  const swappers = useAppStore().swappers();
   const { navigateBackFrom } = useNavigateBack();
 
   const infiniteApprove = useSettingsStore.use.infiniteApprove();
   const toggleInfiniteApprove = useSettingsStore.use.toggleInfiniteApprove();
-  const loadingMetaStatus = useMetaStore.use.loadingStatus();
 
-  const supportedUniqueSwappersGroups =
-    getUniqueSwappersGroups(supportedSwappers);
+  const supportedUniqueSwappersGroups = getUniqueSwappersGroups(swappers);
 
   const bridgeSources = supportedUniqueSwappersGroups.filter(
     (uniqueItem) =>
@@ -58,7 +54,7 @@ export function SettingsPage({ supportedSwappers, singleTheme }: PropTypes) {
   ).length;
 
   const handleEndItem = (totalSelected: number, total: number) => {
-    switch (loadingMetaStatus) {
+    switch (fetchStatus) {
       case 'loading':
         return <Skeleton variant="text" size="medium" width={50} />;
       case 'failed':
@@ -167,7 +163,7 @@ export function SettingsPage({ supportedSwappers, singleTheme }: PropTypes) {
     exchangeItem,
     // languageItem
   ];
-  if (!singleTheme) {
+  if (!theme?.singleTheme) {
     settingItems.push(themeItem);
   }
   settingItems.push(infiniteApprovalItem);
@@ -175,7 +171,7 @@ export function SettingsPage({ supportedSwappers, singleTheme }: PropTypes) {
   return (
     <Layout
       header={{
-        onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
+        onBack: () => navigateBackFrom(navigationRoutes.settings),
         title: i18n.t('Setting'),
       }}>
       <SettingsContainer>