@rango-dev/widget-embedded 0.17.1-next.2 → 0.17.1-next.4

package/src/hooks/useSwapInput.ts

@@ -1,37 +1,49 @@
+import type { QuoteError, QuoteWarning } from '../types';
+
 import { useEffect, useRef, useState } from 'react';
 
-import { useBestRouteStore } from '../store/bestRoute';
+import { useMetaStore } from '../store/meta';
+import { useQuoteStore } from '../store/quote';
 import { useSettingsStore } from '../store/settings';
+import { QuoteErrorType } from '../types';
 import { debounce } from '../utils/common';
 import { isPositiveNumber } from '../utils/numbers';
-import { createBestRouteRequestBody } from '../utils/swap';
+import { generateQuoteWarnings } from '../utils/quote';
+import { createQuoteRequestBody } from '../utils/swap';
 import { tokensAreEqual } from '../utils/wallets';
 
-import { useFetchBestRoute } from './useFetchBestRoute';
+import {
+  handleQuoteErrors,
+  throwErrorIfResponseIsNotValid,
+} from './useConfirmSwap/useConfirmSwap.helpers';
+import { useFetchQuote } from './useFetchQuote';
 
 const DEBOUNCE_DELAY = 600;
 
 type UseSwapInput = {
   fetch: () => void;
   loading: boolean;
-  error: string;
+  error: QuoteError | null;
+  warning: QuoteWarning | null;
 };
 
 /**
- * a hook for fetching best route based on from and to input values
+ * a hook for fetching quote based on from and to input values
  * we use this hook in home page
  */
 export function useSwapInput(): UseSwapInput {
-  const { fetch: fetchBestRoute, cancelFetch } = useFetchBestRoute();
-  const [loading, setLoading] = useState(false);
+  const { fetch: fetchQuote, cancelFetch } = useFetchQuote();
   const {
     fromToken,
     toToken,
     inputAmount,
     inputUsdValue,
-    resetRoute,
-    setRoute,
-  } = useBestRouteStore();
+    resetQuote,
+    setQuote,
+  } = useQuoteStore();
+  const {
+    meta: { tokens },
+  } = useMetaStore();
   const {
     slippage,
     customSlippage,
@@ -40,7 +52,9 @@ export function useSwapInput(): UseSwapInput {
     affiliateWallets,
     disabledLiquiditySources,
   } = useSettingsStore();
-  const [error, setError] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<QuoteError | null>(null);
+  const [warning, setWarning] = useState<QuoteWarning | null>(null);
   const prevDisabledLiquiditySources = useRef(disabledLiquiditySources);
   const userSlippage = customSlippage ?? slippage;
   const hasTokensValue = !fromToken || !toToken;
@@ -49,13 +63,19 @@ export function useSwapInput(): UseSwapInput {
     tokensAreEqual(fromToken, toToken) ||
     !isPositiveNumber(inputAmount);
 
+  const resetState = (loading: boolean) => {
+    setLoading(loading);
+    setError(null);
+    setWarning(null);
+  };
+
   const fetch: UseSwapInput['fetch'] = () => {
     if (!loading) {
-      setLoading(true);
+      resetState(true);
     }
     if (!shouldSkipRequest) {
-      resetRoute();
-      const requestBody = createBestRouteRequestBody({
+      resetQuote();
+      const requestBody = createQuoteRequestBody({
         fromToken,
         toToken,
         inputAmount,
@@ -65,15 +85,29 @@ export function useSwapInput(): UseSwapInput {
         affiliatePercent,
         affiliateWallets,
       });
-      fetchBestRoute(requestBody)
+      fetchQuote(requestBody)
         .then((res) => {
           setLoading(false);
-          setRoute(res);
+          setQuote(res);
+          throwErrorIfResponseIsNotValid(res);
+          const quoteWarning = generateQuoteWarnings(res, {
+            fromToken,
+            toToken,
+            userSlippage,
+            tokens,
+          });
+          setWarning(quoteWarning);
         })
         .catch((error) => {
-          resetRoute();
-          if (error?.code !== 'ERR_CANCELED') {
-            setError(error.message);
+          const { error: quoteError } = handleQuoteErrors(error);
+          if (
+            quoteError?.type === QuoteErrorType.NO_RESULT ||
+            quoteError?.type === QuoteErrorType.REQUEST_FAILED
+          ) {
+            resetQuote();
+          }
+          if (quoteError?.type !== QuoteErrorType.REQUEST_CANCELED) {
+            setError(quoteError);
             setLoading(false);
           }
         });
@@ -88,15 +122,15 @@ export function useSwapInput(): UseSwapInput {
 
   useEffect(() => {
     if (!isPositiveNumber(inputAmount) || inputUsdValue?.eq(0)) {
-      setLoading(false);
+      resetState(false);
       cancelFetch();
       return;
     }
     if (shouldSkipRequest) {
       return;
     }
-    resetRoute();
-    setLoading(true);
+    resetQuote();
+    resetState(true);
     debouncedFetch();
     return cancelFetch;
   }, [inputAmount, shouldSkipRequest]);
@@ -112,5 +146,5 @@ export function useSwapInput(): UseSwapInput {
     return cancelFetch;
   }, [disabledLiquiditySources.length]);
 
-  return { fetch, loading, error };
+  return { fetch, loading, error, warning };
 }

package/src/hooks/useSyncStoresWithConfig.ts

@@ -3,8 +3,8 @@ import type { Asset } from 'rango-sdk';
 
 import { useEffect, useMemo, useRef } from 'react';
 
-import { useBestRouteStore } from '../store/bestRoute';
 import { useMetaStore } from '../store/meta';
+import { useQuoteStore } from '../store/quote';
 import { useSettingsStore } from '../store/settings';
 import { tokensAreEqual } from '../utils/wallets';
 
@@ -19,7 +19,7 @@ export function useSyncStoresWithConfig(config: WidgetConfig | undefined) {
     toToken,
     fromBlockchain,
     toBlockchain,
-  } = useBestRouteStore();
+  } = useQuoteStore();
 
   const {
     meta: { tokens, blockchains },

package/src/pages/ConfirmSwapPage.tsx

@@ -2,20 +2,16 @@
 import type {
   ConfirmSwap,
   ConfirmSwapFetchResult,
-} from '../hooks/useConfirmSwap';
+} from '../hooks/useConfirmSwap/useConfirmSwap.types';
 import type { WidgetConfig } from '../types';
 
 import { i18n } from '@lingui/core';
 import { useManager } from '@rango-dev/queue-manager-react';
 import {
   Alert,
-  BestRoute,
-  BestRouteSkeleton,
   Button,
   Divider,
   IconButton,
-  MessageBox,
-  Modal,
   RefreshIcon,
   SettingsIcon,
   styled,
@@ -27,46 +23,19 @@ import React, { useEffect, useState } from 'react';
 import { flushSync } from 'react-dom';
 import { useNavigate } from 'react-router-dom';
 
-import {
-  formatBestRoute,
-  getRequiredWallets,
-} from '../components/ConfirmWalletsModal/ConfirmWallets.helpers';
+import { getRequiredWallets } from '../components/ConfirmWalletsModal/ConfirmWallets.helpers';
 import { ConfirmWalletsModal } from '../components/ConfirmWalletsModal/ConfirmWalletsModal';
 import { HeaderButton } from '../components/HeaderButtons/HeaderButtons.styles';
 import { Layout } from '../components/Layout';
-import { NoRoutes } from '../components/NoRoutes';
-import { getConfirmSwapErrorMessage } from '../constants/errors';
 import { navigationRoutes } from '../constants/navigationRoutes';
-import {
-  GAS_FEE_MAX_DECIMALS,
-  GAS_FEE_MIN_DECIMALS,
-  PERCENTAGE_CHANGE_MAX_DECIMALS,
-  PERCENTAGE_CHANGE_MIN_DECIMALS,
-  TOKEN_AMOUNT_MAX_DECIMALS,
-  TOKEN_AMOUNT_MIN_DECIMALS,
-  USD_VALUE_MAX_DECIMALS,
-  USD_VALUE_MIN_DECIMALS,
-} from '../constants/routing';
-import { getRouteWarningMessage } from '../constants/warnings';
+import { getQuoteUpdateWarningMessage } from '../constants/warnings';
+import { QuoteInfo } from '../containers/QuoteInfo';
 import { useConfirmSwap } from '../hooks/useConfirmSwap';
-import { useBestRouteStore } from '../store/bestRoute';
-import { useMetaStore } from '../store/meta';
-import { useSettingsStore } from '../store/settings';
+import { useQuoteStore } from '../store/quote';
 import { useUiStore } from '../store/ui';
 import { useWalletsStore } from '../store/wallets';
-import {
-  ConfirmSwapErrorTypes,
-  RouteWarningType,
-  SlippageWarningType,
-} from '../types';
+import { QuoteWarningType } from '../types';
 import { getContainer } from '../utils/common';
-import {
-  numberToString,
-  secondsToString,
-  totalArrivalTime,
-} from '../utils/numbers';
-import { getPriceImpactLevel } from '../utils/routing';
-import { getPercentageChange, getTotalFeeInUsd } from '../utils/swap';
 
 const Container = styled('div', {
   position: 'relative',
@@ -108,36 +77,26 @@ export function ConfirmSwapPage(props: PropTypes) {
   //TODO: move component's logics to a custom hook
   const { config } = props;
   const {
-    bestRoute,
-    inputAmount,
-    outputAmount,
-    inputUsdValue,
-    outputUsdValue,
+    quote,
     setInputAmount,
     selectedWallets,
-    routeWalletsConfirmed,
-    setRouteWalletConfirmed,
+    quoteWalletsConfirmed,
+    setQuoteWalletConfirmed,
     customDestination,
-  } = useBestRouteStore();
+    quoteWarningsConfirmed,
+  } = useQuoteStore();
   const navigate = useNavigate();
   const [dbErrorMessage, setDbErrorMessage] = useState<string>('');
-  const [showSlippageWarning, setShowSlippageWarning] = useState(false);
 
   const { connectedWallets } = useWalletsStore();
-  const showWalletsOnInit = !routeWalletsConfirmed;
+  const showWalletsOnInit = !quoteWalletsConfirmed;
   const [showWallets, setShowWallets] = useState(false);
   const setSelectedSwap = useUiStore.use.setSelectedSwap();
-  const {
-    meta: { tokens, blockchains },
-    loadingStatus: loadingMetaStatus,
-  } = useMetaStore();
-  const slippage = useSettingsStore.use.slippage();
-  const customSlippage = useSettingsStore.use.customSlippage();
+
   const { manager } = useManager();
-  const selectedSlippage = customSlippage || slippage;
   const {
     fetch: confirmSwap,
-    loading: fetchingConfirmationRoute,
+    loading: fetchingConfirmationQuote,
     cancelFetch,
   } = useConfirmSwap();
   const [confirmSwapResult, setConfirmSwapResult] =
@@ -146,32 +105,8 @@ export function ConfirmSwapPage(props: PropTypes) {
       error: null,
       warnings: null,
     });
-  const showSkeleton =
-    fetchingConfirmationRoute || loadingMetaStatus === 'loading';
-  const showNoRouteFound =
-    !fetchingConfirmationRoute &&
-    confirmSwapResult.error &&
-    [
-      ConfirmSwapErrorTypes.NO_ROUTE,
-      ConfirmSwapErrorTypes.REQUEST_FAILED,
-    ].includes(confirmSwapResult.error.type);
-  const showBestRoute =
-    !showNoRouteFound &&
-    !fetchingConfirmationRoute &&
-    bestRoute &&
-    bestRoute.result;
-
-  const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
-  const percentageChange = numberToString(
-    getPercentageChange(
-      inputUsdValue?.toNumber() ?? 0,
-      outputUsdValue?.toNumber() ?? 0
-    ),
-    PERCENTAGE_CHANGE_MIN_DECIMALS,
-    PERCENTAGE_CHANGE_MAX_DECIMALS
-  );
 
-  const warningLevel = getPriceImpactLevel(parseFloat(percentageChange));
+  const [showQuoteWarningModal, setShowQuoteWarningModal] = useState(false);
 
   const onConfirmSwap: ConfirmSwap['fetch'] = async ({
     selectedWallets,
@@ -183,7 +118,7 @@ export function ConfirmSwapPage(props: PropTypes) {
   };
 
   const addNewSwap = async () => {
-    if (confirmSwapResult.swap && routeWalletsConfirmed) {
+    if (confirmSwapResult.swap && quoteWalletsConfirmed) {
       try {
         await manager?.create(
           'swap',
@@ -211,8 +146,8 @@ export function ConfirmSwapPage(props: PropTypes) {
   };
 
   const onStartConfirmSwap = async () => {
-    if (confirmSwapResult?.warnings?.slippage) {
-      setShowSlippageWarning(true);
+    if (confirmSwapResult?.warnings?.quote && !quoteWarningsConfirmed) {
+      setShowQuoteWarningModal(true);
     } else {
       await onConfirm();
     }
@@ -252,10 +187,10 @@ export function ConfirmSwapPage(props: PropTypes) {
   }, []);
 
   useEffect(() => {
-    const routeChanged =
-      confirmSwapResult.warnings?.route?.type &&
-      Object.values(RouteWarningType).includes(
-        confirmSwapResult.warnings?.route?.type
+    const quoteChanged =
+      confirmSwapResult.warnings?.quote?.type &&
+      Object.values(QuoteWarningType).includes(
+        confirmSwapResult.warnings?.quote?.type
       );
 
     const selectedWalletDisconnected =
@@ -269,16 +204,15 @@ export function ConfirmSwapPage(props: PropTypes) {
         )
       );
 
-    let routeWalletsChanged = false;
+    let quoteWalletsChanged = false;
 
-    if (routeChanged) {
-      let requiredWallets = getRequiredWallets(bestRoute);
+    if (quoteChanged) {
+      let requiredWallets = getRequiredWallets(quote);
 
       const lastStepToBlockchain =
-        bestRoute?.result?.swaps[bestRoute.result.swaps.length - 1].to
-          .blockchain;
+        quote?.result?.swaps[quote.result.swaps.length - 1].to.blockchain;
 
-      const isLastWalletRequired = !!bestRoute?.result?.swaps.find(
+      const isLastWalletRequired = !!quote?.result?.swaps.find(
         (swap) => swap.from.blockchain === lastStepToBlockchain
       );
 
@@ -297,16 +231,16 @@ export function ConfirmSwapPage(props: PropTypes) {
       );
 
       if (!allRequiredWalletsSelected) {
-        routeWalletsChanged = true;
+        quoteWalletsChanged = true;
       }
     }
 
-    if (bestRoute && (selectedWalletDisconnected || routeWalletsChanged)) {
+    if (quote && (selectedWalletDisconnected || quoteWalletsChanged)) {
       queueMicrotask(() => flushSync(setShowWallets.bind(null, true)));
-      setRouteWalletConfirmed(false);
+      setQuoteWalletConfirmed(false);
     }
   }, [
-    confirmSwapResult.warnings?.route,
+    confirmSwapResult.warnings?.quote,
     selectedWallets.length,
     connectedWallets.length,
   ]);
@@ -315,7 +249,7 @@ export function ConfirmSwapPage(props: PropTypes) {
     <Layout
       header={{
         title: i18n.t('Confirm Swap'),
-        onBack: navigate.bind(null, -1),
+        onBack: () => navigate(-1),
         hasConnectWallet: true,
         suffix: (
           <Tooltip
@@ -339,7 +273,7 @@ export function ConfirmSwapPage(props: PropTypes) {
               type="primary"
               size="large"
               fullWidth
-              loading={fetchingConfirmationRoute}
+              loading={fetchingConfirmationQuote}
               disabled={!!confirmSwapResult.error}
               onClick={onStartConfirmSwap}>
               {i18n.t('Start Swap')}
@@ -349,70 +283,18 @@ export function ConfirmSwapPage(props: PropTypes) {
             variant="contained"
             type="primary"
             size="large"
-            loading={fetchingConfirmationRoute}
+            loading={fetchingConfirmationQuote}
             onClick={setShowWallets.bind(null, true)}>
             <WalletIcon size={24} />
           </IconButton>
         </Buttons>
       }>
-      <Modal
-        anchor="bottom"
-        open={showSlippageWarning}
-        prefix={
-          <Button
-            size="small"
-            variant="ghost"
-            onClick={() => navigate('/' + navigationRoutes.settings)}>
-            <Typography variant="label" size="medium" color="$neutral700">
-              {i18n.t('Change settings')}
-            </Typography>
-          </Button>
-        }
-        container={document.querySelector('#swap-box') as HTMLDivElement}
-        onClose={setShowSlippageWarning.bind(null, (prevState) => !prevState)}>
-        {confirmSwapResult.warnings?.slippage && (
-          <MessageBox
-            type="warning"
-            title={
-              confirmSwapResult.warnings.slippage.type ===
-              SlippageWarningType.HIGH_SLIPPAGE
-                ? i18n.t('High slippage')
-                : i18n.t('Low slippage')
-            }
-            description={
-              confirmSwapResult.warnings.slippage.type ===
-              SlippageWarningType.HIGH_SLIPPAGE
-                ? i18n.t({
-                    id: ' Caution, your slippage is high (={selectedSlippage}). Your trade may be front run.',
-                    values: { selectedSlippage },
-                  })
-                : i18n.t({
-                    id: 'We recommend you to increase slippage to at least {minRequiredSlippage} for this route.',
-                    values: {
-                      minRequiredSlippage:
-                        confirmSwapResult.warnings.slippage.slippage,
-                    },
-                  })
-            }>
-            <Divider size={18} />
-            <Divider size={32} />
-            <Button
-              size="large"
-              type="primary"
-              variant="contained"
-              fullWidth
-              onClick={onConfirm}>
-              {i18n.t('Confirm anyway')}
-            </Button>
-          </MessageBox>
-        )}
-      </Modal>
       {showWallets && (
         <ConfirmWalletsModal
           open={showWallets}
           onClose={() => setShowWallets(false)}
           onCancel={cancelFetch}
-          loading={fetchingConfirmationRoute}
+          loading={fetchingConfirmationQuote}
           onCheckBalance={onConfirmSwap}
           config={config}
         />
@@ -426,7 +308,7 @@ export function ConfirmSwapPage(props: PropTypes) {
           <Button
             style={{ padding: '0' }}
             variant="ghost"
-            disabled={fetchingConfirmationRoute}
+            disabled={fetchingConfirmationQuote}
             onClick={onRefresh}>
             <div className="icon">
               <RefreshIcon size={16} />
@@ -439,88 +321,37 @@ export function ConfirmSwapPage(props: PropTypes) {
             <Divider size={12} />
           </>
         )}
-        {confirmSwapResult.warnings?.route && (
+        {confirmSwapResult.warnings?.quoteUpdate && (
           <>
             <Alert
               variant="alarm"
               type="warning"
-              title={getRouteWarningMessage(confirmSwapResult.warnings.route)}
-            />
-            <Divider size={12} />
-          </>
-        )}
-        {showSkeleton && <BestRouteSkeleton type="swap-preview" expanded />}
-        {showBestRoute && (
-          <BestRoute
-            expanded={true}
-            tooltipContainer={getContainer()}
-            steps={formatBestRoute(bestRoute, blockchains) ?? []}
-            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
-              ),
-            }}
-            totalFee={numberToString(
-              totalFeeInUsd,
-              GAS_FEE_MIN_DECIMALS,
-              GAS_FEE_MAX_DECIMALS
-            )}
-            totalTime={secondsToString(
-              totalArrivalTime(bestRoute.result?.swaps)
-            )}
-            recommended={true}
-            type="swap-preview"
-            percentageChange={percentageChange}
-            warningLevel={warningLevel}
-          />
-        )}
-        {showNoRouteFound && (
-          <>
-            <Divider size={12} />
-            <NoRoutes
-              diagnosisMessage={
-                confirmSwapResult.error?.type === ConfirmSwapErrorTypes.NO_ROUTE
-                  ? confirmSwapResult.error.diagnosisMessage
-                  : undefined
+              title={
+                confirmSwapResult.warnings.quoteUpdate &&
+                getQuoteUpdateWarningMessage(
+                  confirmSwapResult.warnings.quoteUpdate
+                )
               }
-              error={
-                confirmSwapResult.error?.type ===
-                ConfirmSwapErrorTypes.REQUEST_FAILED
-              }
-              fetch={onRefresh}
-            />
-          </>
-        )}
-        {confirmSwapResult.error?.type ===
-          ConfirmSwapErrorTypes.ROUTE_UPDATED_WITH_HIGH_VALUE_LOSS && (
-          <>
-            <Alert
-              variant="alarm"
-              type="error"
-              title={getConfirmSwapErrorMessage(confirmSwapResult.error)}
             />
             <Divider size={12} />
           </>
         )}
+        <QuoteInfo
+          quote={quote}
+          type="swap-preview"
+          expanded={true}
+          error={confirmSwapResult.error}
+          loading={fetchingConfirmationQuote}
+          warning={confirmSwapResult.warnings?.quote ?? null}
+          refetchQuote={onRefresh}
+          showWarningModal={showQuoteWarningModal}
+          onOpenWarningModal={() => setShowQuoteWarningModal(true)}
+          onCloseWarningModal={() => setShowQuoteWarningModal(false)}
+          onConfirmWarningModal={async () => {
+            setShowQuoteWarningModal(false);
+            await addNewSwap();
+          }}
+        />
       </Container>
     </Layout>
   );

package/src/pages/HistoryPage.tsx

@@ -78,7 +78,7 @@ export function HistoryPage() {
   return (
     <Layout
       header={{
-        onBack: navigateBackFrom.bind(null, navigationRoutes.swaps),
+        onBack: () => navigateBackFrom(navigationRoutes.swaps),
         title: i18n.t('History'),
       }}>
       <Container>