@rango-dev/widget-embedded 0.22.4-next.1 → 0.22.4-next.11

package/src/hooks/useSwapInput.ts

@@ -1,14 +1,18 @@
-import type { QuoteError, QuoteWarning } from '../types';
 import type { Token } from 'rango-sdk';
 
 import { useCallback, useEffect, useState } from 'react';
 
 import { useAppStore } from '../store/AppStore';
 import { useQuoteStore } from '../store/quote';
+import { useWalletsStore } from '../store/wallets';
 import { QuoteErrorType } from '../types';
 import { debounce } from '../utils/common';
 import { isPositiveNumber } from '../utils/numbers';
-import { generateQuoteWarnings } from '../utils/quote';
+import {
+  generateQuoteWarnings,
+  getDefaultQuote,
+  sortQuotesBy,
+} from '../utils/quote';
 import { isFeatureEnabled } from '../utils/settings';
 import { createQuoteRequestBody } from '../utils/swap';
 import { areTokensEqual } from '../utils/wallets';
@@ -17,7 +21,7 @@ import {
   handleQuoteErrors,
   throwErrorIfResponseIsNotValid,
 } from './useConfirmSwap/useConfirmSwap.helpers';
-import { useFetchQuote } from './useFetchQuote';
+import { useFetchAllQuotes } from './useFetchAllQuotes';
 
 const DEBOUNCE_DELAY = 600;
 const FIRST_INDEX = 0;
@@ -28,28 +32,34 @@ type FetchQuoteParams = Omit<
 > & { fromToken: Token | null; toToken: Token | null };
 
 type UseSwapInput = {
-  fetch: () => void;
+  fetch: (shouldChangeSelectedQuote?: boolean) => void;
   loading: boolean;
-  error: QuoteError | null;
-  warning: QuoteWarning | null;
 };
-
+type UseSwapInputProps = {
+  refetchQuote: boolean;
+};
 /**
  * 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: fetchQuote, cancelFetch } = useFetchQuote();
+export function useSwapInput({
+  refetchQuote,
+}: UseSwapInputProps): UseSwapInput {
+  const { fetch: fetchQuote, cancelFetch } = useFetchAllQuotes();
   const { enableNewLiquiditySources, features } = useAppStore().config;
+  const connectedWallets = useWalletsStore.use.connectedWallets();
+
   const tokens = useAppStore().tokens();
   const {
     fromToken,
     toToken,
     inputAmount,
     inputUsdValue,
-    quote,
+    selectedQuote,
+    sortStrategy,
     resetQuote,
-    setQuote,
+    setSelectedQuote,
+    updateQuotePartialState,
   } = useQuoteStore();
   const {
     slippage,
@@ -64,8 +74,6 @@ export function useSwapInput(): UseSwapInput {
   const excludeLiquiditySources = useAppStore().excludeLiquiditySources();
 
   const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<QuoteError | null>(null);
-  const [warning, setWarning] = useState<QuoteWarning | null>(null);
   const userSlippage = customSlippage ?? slippage;
   const tokensValueInvalid = !fromToken || !toToken;
   const shouldSkipRequest =
@@ -75,8 +83,6 @@ export function useSwapInput(): UseSwapInput {
 
   const resetState = (loading: boolean) => {
     setLoading(loading);
-    setError(null);
-    setWarning(null);
   };
 
   const fetch = (params: FetchQuoteParams) => {
@@ -92,6 +98,7 @@ export function useSwapInput(): UseSwapInput {
       affiliatePercent,
       affiliateWallets,
     } = params;
+
     if (!loading) {
       resetState(true);
     }
@@ -104,6 +111,7 @@ export function useSwapInput(): UseSwapInput {
         liquiditySources: liquiditySources,
         excludeLiquiditySources,
         disabledLiquiditySources,
+        wallets: connectedWallets,
         slippage,
         affiliateRef,
         affiliatePercent,
@@ -114,16 +122,32 @@ export function useSwapInput(): UseSwapInput {
       }
       fetchQuote(requestBody)
         .then((res) => {
+          const sortQuotes = sortQuotesBy(sortStrategy, res.results);
+          const quote = getDefaultQuote(
+            selectedQuote,
+            sortQuotes,
+            res.requestAmount
+          );
+
           setLoading(false);
-          setQuote(res);
-          throwErrorIfResponseIsNotValid(res);
-          const quoteWarning = generateQuoteWarnings(res, {
-            fromToken,
-            toToken,
-            userSlippage,
-            tokens,
+          updateQuotePartialState('quotes', res);
+          setSelectedQuote(quote);
+
+          throwErrorIfResponseIsNotValid({
+            diagnosisMessages: res.diagnosisMessages,
+            requestId: quote?.requestId || '',
+            swaps: quote?.swaps,
           });
-          setWarning(quoteWarning);
+
+          const quoteWarning =
+            quote &&
+            generateQuoteWarnings(quote, {
+              fromToken,
+              toToken,
+              userSlippage,
+              tokens,
+            });
+          updateQuotePartialState('warning', quoteWarning);
         })
         .catch((error) => {
           const { error: quoteError } = handleQuoteErrors(error);
@@ -134,7 +158,7 @@ export function useSwapInput(): UseSwapInput {
             resetQuote();
           }
           if (quoteError?.type !== QuoteErrorType.REQUEST_CANCELED) {
-            setError(quoteError);
+            updateQuotePartialState('error', quoteError);
             setLoading(false);
           }
         });
@@ -151,20 +175,26 @@ export function useSwapInput(): UseSwapInput {
   );
 
   useEffect(() => {
-    if (fetchStatus !== 'success') {
+    if (!refetchQuote) {
+      setLoading(false);
       return;
     }
-    if (!isPositiveNumber(inputAmount) || inputUsdValue?.eq(0)) {
-      resetState(false);
-      cancelFetch();
+    if (fetchStatus !== 'success') {
       return;
     }
     if (shouldSkipRequest) {
-      if (quote) {
+      setLoading(false);
+      if (selectedQuote) {
         resetQuote();
       }
       return;
     }
+    if (!isPositiveNumber(inputAmount) || inputUsdValue?.eq(0)) {
+      resetState(false);
+      cancelFetch();
+      return;
+    }
+
     resetQuote();
     resetState(true);
     debouncedFetch({
@@ -214,7 +244,5 @@ export function useSwapInput(): UseSwapInput {
         affiliateWallets,
       }),
     loading,
-    error,
-    warning,
   };
 }

package/src/hooks/useWalletList.ts

@@ -9,12 +9,13 @@ import {
   type WalletType,
   WalletTypes,
 } from '@rango-dev/wallets-shared';
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { useAppStore } from '../store/AppStore';
 import { useWalletsStore } from '../store/wallets';
 import { configWalletsToWalletName } from '../utils/providers';
 import {
+  hashWalletsState,
   isExperimentalChain,
   mapWalletTypesToWalletInfo,
   sortWalletsBasedOnConnectionState,
@@ -87,14 +88,14 @@ export function useWalletList(params: Params) {
     }
   };
 
-  const disconnectConnectingWallets = () => {
+  const disconnectConnectingWallets = useCallback(() => {
     const connectingWallets =
       wallets?.filter((wallet) => wallet.state === WalletState.CONNECTING) ||
       [];
     for (const wallet of connectingWallets) {
       void disconnect(wallet.type);
     }
-  };
+  }, [hashWalletsState(wallets)]);
 
   useEffect(() => {
     return () => {
@@ -141,5 +142,6 @@ export function useWalletList(params: Params) {
     ),
     error,
     handleClick,
+    disconnectConnectingWallets,
   };
 }

package/src/pages/ConfirmSwapPage.tsx

@@ -72,7 +72,7 @@ const descriptionStyles = css({
 export function ConfirmSwapPage() {
   //TODO: move component's logics to a custom hook
   const {
-    quote,
+    selectedQuote,
     setInputAmount,
     selectedWallets,
     quoteWalletsConfirmed,
@@ -102,7 +102,6 @@ export function ConfirmSwapPage() {
       error: null,
       warnings: null,
     });
-
   const [showQuoteWarningModal, setShowQuoteWarningModal] = useState(false);
 
   const onConfirmSwap: ConfirmSwap['fetch'] = async ({
@@ -110,6 +109,7 @@ export function ConfirmSwapPage() {
     customDestination,
   }) => {
     const result = await confirmSwap?.({ selectedWallets, customDestination });
+
     setConfirmSwapResult(result);
     return result;
   };
@@ -212,12 +212,12 @@ export function ConfirmSwapPage() {
     let quoteWalletsChanged = false;
 
     if (quoteChanged) {
-      let requiredWallets = getRequiredWallets(quote);
+      let requiredWallets = getRequiredWallets(selectedQuote?.swaps || null);
 
       const lastStepToBlockchain =
-        quote?.result?.swaps[quote.result.swaps.length - 1].to.blockchain;
+        selectedQuote?.swaps[selectedQuote.swaps.length - 1].to.blockchain;
 
-      const isLastWalletRequired = !!quote?.result?.swaps.find(
+      const isLastWalletRequired = !!selectedQuote?.swaps.find(
         (swap) => swap.from.blockchain === lastStepToBlockchain
       );
 
@@ -240,7 +240,7 @@ export function ConfirmSwapPage() {
       }
     }
 
-    if (quote && (selectedWalletDisconnected || quoteWalletsChanged)) {
+    if (selectedQuote && (selectedWalletDisconnected || quoteWalletsChanged)) {
       queueMicrotask(() => flushSync(setShowWallets.bind(null, true)));
       setQuoteWalletConfirmed(false);
     }
@@ -251,7 +251,7 @@ export function ConfirmSwapPage() {
   ]);
 
   useLayoutEffect(() => {
-    if (!quote) {
+    if (!selectedQuote) {
       navigate(`../${location.search}`);
     }
   }, []);
@@ -277,6 +277,7 @@ export function ConfirmSwapPage() {
   }
 
   if (quoteWarning || quoteError) {
+    const settings_url = `../${navigationRoutes.settings}`;
     alerts.push(
       <QuoteWarningsAndErrors
         warning={quoteWarning}
@@ -291,7 +292,7 @@ export function ConfirmSwapPage() {
           setShowQuoteWarningModal(false);
           await addNewSwap();
         }}
-        onChangeSettings={() => navigate(navigationRoutes.settings)}
+        onChangeSettings={() => navigate(settings_url)}
       />
     );
   }
@@ -375,9 +376,11 @@ export function ConfirmSwapPage() {
         {alerts.length > 0 ? <Divider size={10} /> : null}
 
         <QuoteInfo
-          quote={quote}
+          quote={selectedQuote}
           type="swap-preview"
           expanded={true}
+          selected
+          tagHidden
           error={confirmSwapResult.error}
           loading={fetchingConfirmationQuote}
           warning={confirmSwapResult.warnings?.quote ?? null}

package/src/pages/Home.tsx

@@ -3,7 +3,7 @@ import { Button, Divider, styled, SwapInput, WarningIcon } from '@rango-dev/ui';
 import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { HomeButtons } from '../components/HeaderButtons';
+import { HeaderButtons } from '../components/HeaderButtons';
 import { Layout, PageContainer } from '../components/Layout';
 import { QuoteWarningsAndErrors } from '../components/QuoteWarningsAndErrors';
 import { SwitchFromAndToButton } from '../components/SwitchFromAndTo';
@@ -41,12 +41,6 @@ const InputsContainer = styled('div', {
 });
 export function Home() {
   const navigate = useNavigate();
-  const {
-    fetch: fetchQuote,
-    loading,
-    error: quoteError,
-    warning: quoteWarning,
-  } = useSwapInput();
   const {
     fromToken,
     fromBlockchain,
@@ -57,10 +51,16 @@ export function Home() {
     inputUsdValue,
     outputAmount,
     outputUsdValue,
-    quote,
+    selectedQuote,
+    refetchQuote,
+    error: quoteError,
+    warning: quoteWarning,
+    quotes,
     resetQuoteWallets,
     setQuoteWarningsConfirmed,
+    updateQuotePartialState,
   } = useQuoteStore();
+  const { fetch: fetchQuote, loading } = useSwapInput({ refetchQuote });
 
   const { config, fetchStatus: fetchMetaStatus } = useAppStore();
 
@@ -74,13 +74,13 @@ export function Home() {
   const needsToWarnEthOnPath = false;
 
   const priceImpactInputCanNotBeComputed = !canComputePriceImpact(
-    quote,
+    selectedQuote,
     inputAmount,
     inputUsdValue
   );
 
   const priceImpactOutputCanNotBeComputed = !canComputePriceImpact(
-    quote,
+    selectedQuote,
     inputAmount,
     outputUsdValue
   );
@@ -89,7 +89,7 @@ export function Home() {
     fetchMetaStatus,
     fetchingQuote: loading,
     inputAmount,
-    quote,
+    quote: selectedQuote,
     anyWalletConnected: connectedWallets.length > 0,
     error: quoteError,
     warning: quoteWarning,
@@ -102,7 +102,7 @@ export function Home() {
     formatBalance(fromTokenBalance)?.amount ?? '0';
 
   const tokenBalanceReal =
-    !!fromBlockchain && !!fromToken
+    !!fromBlockchain && !!fromToken && fromTokenBalance?.amount
       ? numberToString(fromTokenBalance?.amount, fromTokenBalance?.decimals)
       : '0';
 
@@ -115,6 +115,7 @@ export function Home() {
 
   useEffect(() => {
     resetQuoteWallets();
+    updateQuotePartialState('refetchQuote', true);
   }, []);
 
   const percentageChange =
@@ -153,9 +154,9 @@ export function Home() {
         hasBackButton: false,
         title: config.title || i18n.t('Swap'),
         suffix: (
-          <HomeButtons
+          <HeaderButtons
             onClickRefresh={
-              (!!quote || quoteError) && !showQuoteWarningModal
+              (!!selectedQuote || quoteError) && !showQuoteWarningModal
                 ? fetchQuote
                 : undefined
             }
@@ -202,15 +203,13 @@ export function Home() {
               loadingBalance={fetchingBalance}
               tooltipContainer={getContainer()}
               onSelectMaxBalance={() => {
-                if (fromTokenFormattedBalance !== '0') {
-                  setInputAmount(tokenBalanceReal.split(',').join(''));
-                }
+                setInputAmount(tokenBalanceReal.split(',').join(''));
               }}
             />
             <SwitchFromAndToButton />
           </FromContainer>
           <SwapInput
-            sharpBottomStyle={!!quote?.result || fetchingQuote}
+            sharpBottomStyle={!!selectedQuote || fetchingQuote}
             label={i18n.t('To')}
             mode="To"
             fetchingQuote={fetchingQuote}
@@ -257,11 +256,20 @@ export function Home() {
         </InputsContainer>
         <Divider size="2" />
         <QuoteInfo
-          quote={quote}
+          quote={selectedQuote}
           loading={fetchingQuote}
           error={quoteError}
+          tagHidden={false}
           warning={quoteWarning}
           type="basic"
+          onClickAllRoutes={
+            !!quotes && quotes.results.length > 1
+              ? () => {
+                  updateQuotePartialState('refetchQuote', false);
+                  navigate(navigationRoutes.routes);
+                }
+              : undefined
+          }
         />
         {quoteWarning || quoteError ? (
           <>

package/src/pages/LiquiditySourcePage.tsx

@@ -1,7 +1,5 @@
-import type {
-  LiquiditySourceType,
-  UniqueSwappersGroupType,
-} from '../utils/settings';
+import type { UniqueSwappersGroupType } from '../utils/settings';
+import type { SwapperType } from 'rango-sdk';
 
 import { i18n } from '@lingui/core';
 import {
@@ -41,7 +39,7 @@ export function LiquiditySourcePage({ sourceType }: PropTypes) {
     getUniqueSwappersGroups(swappers, disabledLiquiditySources);
 
   const types = { Exchanges: i18n.t('Exchanges'), Bridges: i18n.t('Bridges') };
-  const validTypes: Array<LiquiditySourceType> = [];
+  const validTypes: Array<SwapperType> = [];
   if (sourceType === 'Exchanges') {
     validTypes.push('DEX');
   }

package/src/pages/Routes.tsx

@@ -0,0 +1,131 @@
+import type { SelectedQuote } from '../types';
+import type { MultiRouteSimulationResult } from 'rango-sdk';
+
+import { i18n } from '@lingui/core';
+import { Divider } from '@rango-dev/ui';
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import { HeaderButtons } from '../components/HeaderButtons';
+import { Layout, PageContainer } from '../components/Layout';
+import { QuoteSkeleton } from '../components/QuoteSkeleton';
+import { navigationRoutes } from '../constants/navigationRoutes';
+import { QuoteInfo } from '../containers/QuoteInfo';
+import { getQuoteError } from '../hooks/useConfirmSwap/useConfirmSwap.helpers';
+import { useNavigateBack } from '../hooks/useNavigateBack';
+import { useSwapInput } from '../hooks/useSwapInput';
+import { useAppStore } from '../store/AppStore';
+import { useQuoteStore } from '../store/quote';
+import { generateQuoteWarnings } from '../utils/quote';
+
+const ITEM_SKELETON_COUNT = 3;
+export function RoutesPage() {
+  const navigate = useNavigate();
+  const navigateBack = useNavigateBack();
+
+  const {
+    selectedQuote,
+    quotes,
+    refetchQuote,
+    setSelectedQuote,
+    updateQuotePartialState,
+    fromToken,
+    toToken,
+    error: quoteError,
+  } = useQuoteStore();
+  const { slippage, customSlippage } = useAppStore();
+  const tokens = useAppStore().tokens();
+
+  const userSlippage = customSlippage ?? slippage;
+
+  const { fetch: fetchQuote, loading: fetchingQuote } = useSwapInput({
+    refetchQuote,
+  });
+
+  const onClickOnQuote = (quote: SelectedQuote) => {
+    setSelectedQuote(quote);
+    updateQuotePartialState('refetchQuote', false);
+    navigateBack();
+  };
+  const getQuoteWarning = (quote: MultiRouteSimulationResult) => {
+    if (!fromToken || !toToken || !quotes) {
+      return null;
+    }
+    const mergedQuote: SelectedQuote = {
+      requestAmount: quotes.requestAmount, // Assuming quotes is an array
+      ...quote,
+    };
+
+    return generateQuoteWarnings(mergedQuote, {
+      fromToken,
+      toToken,
+      userSlippage,
+      tokens,
+    });
+  };
+  const settings_url = `../${navigationRoutes.settings}`;
+  const wallets_url = `../${navigationRoutes.wallets}`;
+  return (
+    <Layout
+      header={{
+        onWallet: () => {
+          navigate(wallets_url);
+        },
+        onBack: () => {
+          updateQuotePartialState('refetchQuote', false);
+        },
+        title: i18n.t('Routes'),
+        suffix: (
+          <HeaderButtons
+            onClickRefresh={
+              !!selectedQuote || quoteError ? fetchQuote : undefined
+            }
+            hidden={['notifications', 'history']}
+            onClickSettings={() => navigate(settings_url)}
+          />
+        ),
+      }}>
+      <PageContainer>
+        {fetchingQuote
+          ? Array.from({ length: ITEM_SKELETON_COUNT }, (_, index) => (
+              <React.Fragment key={index}>
+                <QuoteSkeleton
+                  tagHidden={false}
+                  type="list-item"
+                  expanded={false}
+                />
+                <Divider size={16} />
+              </React.Fragment>
+            ))
+          : !!quotes &&
+            quotes.results?.map((quote) => {
+              const quoteWarning = getQuoteWarning(quote);
+              const quoteError = getQuoteError(quote.swaps);
+
+              return (
+                <React.Fragment key={quote.requestId}>
+                  <QuoteInfo
+                    selected={selectedQuote?.requestId === quote.requestId}
+                    tagHidden={false}
+                    quote={{ ...quote, requestAmount: quotes.requestAmount }}
+                    loading={fetchingQuote}
+                    error={quoteError?.options || null}
+                    warning={quoteWarning}
+                    onClick={(quote) => {
+                      updateQuotePartialState('warning', quoteWarning);
+                      updateQuotePartialState(
+                        'error',
+                        quoteError?.options || null
+                      );
+                      onClickOnQuote(quote);
+                    }}
+                    type="list-item"
+                  />
+                  <Divider size={16} />
+                </React.Fragment>
+              );
+            })}
+      </PageContainer>
+    </Layout>
+  );
+}

package/src/pages/SettingsPage.tsx

@@ -129,18 +129,16 @@ export function SettingsPage() {
     onClick: () => navigate(navigationRoutes.exchanges),
   };
 
-  /*
-   * const languageItem = {
-   *   id: 'language-item',
-   *   title: (
-   *     <Typography variant="title" size="xmedium">
-   *       {i18n.t('Language')}
-   *     </Typography>
-   *   ),
-   *   end: <ChevronRightIcon color="gray" />,
-   *   onClick: () => navigate(navigationRoutes.languages),
-   * };
-   */
+  const languageItem = {
+    id: 'language-item',
+    title: (
+      <Typography variant="title" size="xmedium">
+        {i18n.t('Language')}
+      </Typography>
+    ),
+    end: <ChevronRightIcon color="gray" />,
+    onClick: () => navigate(navigationRoutes.languages),
+  };
 
   const themeItem = {
     id: 'theme-item',
@@ -185,7 +183,7 @@ export function SettingsPage() {
   const settingItems = isLiquidityHidden ? [] : [bridgeItem, exchangeItem];
 
   if (!isLanguageHidden) {
-    // settingItems.push(languageItem);
+    settingItems.push(languageItem);
   }
   if (!theme?.singleTheme && !isThemeHidden) {
     settingItems.push(themeItem);