@rango-dev/widget-embedded 0.18.0 → 0.19.0

package/src/pages/HistoryPage.tsx

@@ -1,4 +1,5 @@
-import type { PendingSwap, PendingSwapStep } from 'rango-types';
+import type { PendingSwap } from '@rango-dev/queue-manager-rango-preset';
+import type { PendingSwapStep } from 'rango-types';
 
 import { i18n } from '@lingui/core';
 import { useManager } from '@rango-dev/queue-manager-react';
@@ -10,6 +11,8 @@ import { Layout } from '../components/Layout';
 import { SearchInput } from '../components/SearchInput';
 import { SwapsGroup } from '../components/SwapsGroup';
 import { NotFoundContainer } from '../components/SwapsGroup/SwapsGroup.styles';
+import { navigationRoutes } from '../constants/navigationRoutes';
+import { useNavigateBack } from '../hooks/useNavigateBack';
 import { useUiStore } from '../store/ui';
 import { groupSwapsByDate } from '../utils/date';
 import { containsText } from '../utils/numbers';
@@ -48,6 +51,7 @@ const isStepContainsText = (steps: PendingSwapStep[], value: string) => {
 export function HistoryPage() {
   const setSelectedSwap = useUiStore.use.setSelectedSwap();
   const navigate = useNavigate();
+  const { navigateBackFrom } = useNavigateBack();
   const { manager, state } = useManager();
   const list: PendingSwap[] = getPendingSwaps(manager).map(({ swap }) => swap);
   const [searchedFor, setSearchedFor] = useState<string>('');
@@ -74,6 +78,7 @@ export function HistoryPage() {
   return (
     <Layout
       header={{
+        onBack: navigateBackFrom.bind(null, navigationRoutes.swaps),
         title: i18n.t('History'),
       }}>
       <Container>
@@ -103,7 +108,7 @@ export function HistoryPage() {
               list={filteredList}
               onSwapClick={(requestId) => {
                 setSelectedSwap(requestId);
-                navigate(requestId);
+                navigate(`${requestId}`, { replace: true });
               }}
               groupBy={groupSwapsByDate}
               isLoading={loading}

package/src/pages/Home.tsx

@@ -1,14 +1,32 @@
+import type { SwapResult } from 'rango-sdk';
+
 import { i18n } from '@lingui/core';
-import { Button, styled, SwapInput, WarningIcon } from '@rango-dev/ui';
+import {
+  Alert,
+  BestRoute,
+  BestRouteSkeleton,
+  Button,
+  Divider,
+  styled,
+  SwapInput,
+  Typography,
+  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,
@@ -16,24 +34,36 @@ import {
   USD_VALUE_MAX_DECIMALS,
   USD_VALUE_MIN_DECIMALS,
 } from '../constants/routing';
-import { QuoteInfo } from '../containers/QuoteInfo';
 import { useSwapInput } from '../hooks/useSwapInput';
-import { useAppStore } from '../store/AppStore';
-import { useQuoteStore } from '../store/quote';
+import { useBestRouteStore } from '../store/bestRoute';
+import { useMetaStore } from '../store/meta';
 import { useUiStore } from '../store/ui';
 import { useWalletsStore } from '../store/wallets';
-import { numberToString } from '../utils/numbers';
-import { getPriceImpact, getPriceImpactLevel } from '../utils/quote';
-import { canComputePriceImpact, getSwapButtonState } from '../utils/swap';
-import { formatBalance, isFetchingBalance } from '../utils/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 {
+  canComputePriceImpact,
+  getOutputRatio,
+  getPercentageChange,
+  getSwapButtonState,
+  getTotalFeeInUsd,
+  hasLimitError,
+  LimitErrorMessage,
+  outputRatioHasWarning,
+} from '../utils/swap';
+import { getBalanceFromWallet } from '../utils/wallets';
 
 const Container = styled('div', {
   display: 'flex',
   flexDirection: 'column',
   overflowY: 'visible',
-  '& .quote__container': {
-    paddingTop: '$2',
-  },
 });
 
 const FromContainer = styled('div', {
@@ -46,13 +76,27 @@ 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: fetchQuote,
-    loading: fetchingQuote,
-    error: quoteError,
-    warning: quoteWarning,
+    fetch: refetchBestRoute,
+    loading: fetchingBestRoute,
+    error: bestRouteError,
   } = useSwapInput();
   const {
     fromToken,
@@ -64,66 +108,175 @@ export function Home() {
     inputUsdValue,
     outputAmount,
     outputUsdValue,
-    quote,
-    resetQuoteWallets,
-    setQuoteWarningsConfirmed,
-  } = useQuoteStore();
+    bestRoute,
+    resetRouteWallets,
+  } = useBestRouteStore();
 
-  const fetchMetaStatus = useAppStore().fetchStatus;
+  const {
+    meta: { tokens, blockchains },
+    loadingStatus: loadingMetaStatus,
+  } = useMetaStore();
 
-  const { connectedWallets, getBalanceFor } = useWalletsStore();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const setCurrentPage = useUiStore.use.setCurrentPage();
-  const [showQuoteWarningModal, setShowQuoteWarningModal] = useState(false);
+  const [openWarningModal, setOpenWarningModal] = useState(false);
+  const {
+    fromAmountRangeError,
+    swap: swapHasError,
+    recommendation,
+  } = LimitErrorMessage(bestRoute);
   const layoutRef = useRef<HTMLDivElement>(null);
-  const fetchingBalance =
-    !!fromBlockchain &&
-    isFetchingBalance(connectedWallets, fromBlockchain.name);
+
+  const showBestRoute =
+    !!Number(inputAmount) &&
+    (!!bestRoute || fetchingBestRoute || !!bestRouteError);
 
   const needsToWarnEthOnPath = false;
 
+  const outToInRatio = getOutputRatio(inputUsdValue, outputUsdValue);
+  const highValueLoss = outputRatioHasWarning(inputUsdValue, outToInRatio);
+
   const priceImpactInputCanNotBeComputed = !canComputePriceImpact(
-    quote,
+    bestRoute,
     inputAmount,
     inputUsdValue
   );
 
   const priceImpactOutputCanNotBeComputed = !canComputePriceImpact(
-    quote,
+    bestRoute,
     inputAmount,
     outputUsdValue
   );
-
-  const swapButtonState = getSwapButtonState({
-    fetchMetaStatus,
-    fetchingQuote,
-    inputAmount,
-    quote,
-    anyWalletConnected: connectedWallets.length > 0,
-    error: quoteError,
-    warning: quoteWarning,
+  const swapButtonState = getSwapButtonState(
+    loadingMetaStatus,
+    connectedWallets,
+    fetchingBestRoute,
+    bestRoute,
+    hasLimitError(bestRoute),
+    highValueLoss,
+    priceImpactInputCanNotBeComputed || priceImpactOutputCanNotBeComputed,
     needsToWarnEthOnPath,
-  });
-
-  const fromTokenBalance = fromToken ? getBalanceFor(fromToken) : null;
+    inputAmount
+  );
 
-  const fromTokenFormattedBalance =
-    formatBalance(fromTokenBalance)?.amount ?? '0';
+  const tokenBalance =
+    !!fromBlockchain && !!fromToken
+      ? numberToString(
+          getBalanceFromWallet(
+            connectedWallets,
+            fromBlockchain?.name,
+            fromToken?.symbol,
+            fromToken?.address
+          )?.amount || '0',
+          BALANCE_MIN_DECIMALS,
+          BALANCE_MAX_DECIMALS
+        )
+      : '0';
 
   const tokenBalanceReal =
     !!fromBlockchain && !!fromToken
-      ? numberToString(fromTokenBalance?.amount, fromTokenBalance?.decimals)
+      ? numberToString(
+          getBalanceFromWallet(
+            connectedWallets,
+            fromBlockchain?.name,
+            fromToken?.symbol,
+            fromToken?.address
+          )?.amount || '0',
+          getBalanceFromWallet(
+            connectedWallets,
+            fromBlockchain?.name,
+            fromToken?.symbol,
+            fromToken?.address
+          )?.decimal
+        )
       : '0';
 
   useEffect(() => {
     setCurrentPage(navigationRoutes.home);
-    resetQuoteWallets();
+    resetRouteWallets();
     return setCurrentPage.bind(null, '');
   }, []);
 
   const percentageChange =
     !inputUsdValue || !outputUsdValue || !outputUsdValue.gt(0)
       ? null
-      : getPriceImpact(inputUsdValue.toString(), outputUsdValue.toString());
+      : getPercentageChange(
+          inputUsdValue.toNumber(),
+          outputUsdValue.toNumber()
+        );
+
+  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
@@ -136,14 +289,15 @@ export function Home() {
           size="large"
           disabled={swapButtonState.disabled}
           prefix={
-            swapButtonState.action === 'confirm-warning' && <WarningIcon />
+            !swapButtonState.disabled &&
+            swapButtonState.hasWarning && <WarningIcon />
           }
           fullWidth
           onClick={() => {
-            if (swapButtonState.action === 'connect-wallet') {
+            if (swapButtonState.state === ButtonState.WAITFORCONNECTING) {
               navigate(navigationRoutes.wallets);
-            } else if (swapButtonState.action === 'confirm-warning') {
-              setShowQuoteWarningModal(true);
+            } else if (swapButtonState.state === ButtonState.NEEDTOCONFIRM) {
+              setOpenWarningModal(true);
             } else {
               navigate(navigationRoutes.confirmSwap);
             }
@@ -152,15 +306,14 @@ export function Home() {
         </Button>
       }
       header={{
-        onWallet: () => {
-          navigate(navigationRoutes.wallets);
-        },
-        hasBackButton: false,
+        hasConnectWallet: true,
         title: i18n.t('Swap'),
         suffix: (
           <HomeButtons
             layoutRef={layoutRef.current}
-            onClickRefresh={!!quote || quoteError ? fetchQuote : undefined}
+            onClickRefresh={
+              !!bestRoute || bestRouteError ? refetchBestRoute : undefined
+            }
             onClickHistory={() => navigate(navigationRoutes.swaps)}
             onClickSettings={() => navigate(navigationRoutes.settings)}
           />
@@ -173,7 +326,7 @@ export function Home() {
               label={i18n.t('From')}
               mode="From"
               onInputChange={setInputAmount}
-              balance={fromTokenFormattedBalance}
+              balance={tokenBalance}
               chain={{
                 displayName: fromBlockchain?.displayName || '',
                 image: fromBlockchain?.logo || '',
@@ -182,7 +335,7 @@ export function Home() {
                 displayName: fromToken?.symbol || '',
                 image: fromToken?.image || '',
               }}
-              onClickToken={() => navigate(navigationRoutes.fromSwap)}
+              onClickToken={() => navigate('from-swap')}
               price={{
                 value: inputAmount,
                 usdValue: priceImpactInputCanNotBeComputed
@@ -196,11 +349,10 @@ export function Home() {
                   ? errorMessages().unknownPriceError.impactTitle
                   : undefined,
               }}
-              disabled={fetchMetaStatus === 'failed'}
-              loading={fetchMetaStatus === 'loading'}
-              loadingBalance={fetchingBalance}
+              disabled={loadingMetaStatus === 'failed'}
+              loading={loadingMetaStatus === 'loading'}
               onSelectMaxBalance={() => {
-                if (fromTokenFormattedBalance !== '0') {
+                if (tokenBalance !== '0') {
                   setInputAmount(tokenBalanceReal.split(',').join(''));
                 }
               }}
@@ -208,10 +360,9 @@ export function Home() {
             <SwitchFromAndToButton />
           </FromContainer>
           <SwapInput
-            sharpBottomStyle={!!quote?.result || fetchingQuote}
+            sharpBottomStyle={!!bestRoute?.result || fetchingBestRoute}
             label={i18n.t('To')}
             mode="To"
-            fetchingQuote={fetchingQuote}
             chain={{
               displayName: toBlockchain?.displayName || '',
               image: toBlockchain?.logo || '',
@@ -220,12 +371,18 @@ export function Home() {
               displayName: toToken?.symbol || '',
               image: toToken?.image || '',
             }}
-            percentageChange={numberToString(
-              getPriceImpact(inputUsdValue, outputUsdValue),
-              PERCENTAGE_CHANGE_MIN_DECIMALS,
-              PERCENTAGE_CHANGE_MAX_DECIMALS
+            percentageChange={
+              !!percentageChange?.lt(0)
+                ? numberToString(
+                    percentageChange,
+                    PERCENTAGE_CHANGE_MIN_DECIMALS,
+                    PERCENTAGE_CHANGE_MAX_DECIMALS
+                  )
+                : null
+            }
+            warningLevel={getPriceImpactLevel(
+              percentageChange?.toNumber() ?? 0
             )}
-            warningLevel={getPriceImpactLevel(percentageChange ?? 0)}
             price={{
               value: numberToString(
                 outputAmount,
@@ -243,31 +400,89 @@ export function Home() {
                 ? errorMessages().unknownPriceError.impactTitle
                 : undefined,
             }}
-            onClickToken={() => navigate(navigationRoutes.toSwap)}
-            disabled={fetchMetaStatus === 'failed'}
-            loading={fetchMetaStatus === 'loading'}
+            onClickToken={() => navigate('to-swap')}
+            disabled={loadingMetaStatus === 'failed'}
+            loading={loadingMetaStatus === 'loading'}
           />
         </InputsContainer>
-        <div className="quote__container">
-          <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);
-            }}
-            onChangeSettings={() => navigate(navigationRoutes.settings)}
-          />
-        </div>
+        {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}
       </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

@@ -10,9 +10,13 @@ import React from 'react';
 
 import { Layout } from '../components/Layout';
 import { SettingsContainer } from '../components/SettingsContainer';
+import { navigationRoutes } from '../constants/navigationRoutes';
 import { useLanguage } from '../hooks/useLanguage';
+import { useNavigateBack } from '../hooks/useNavigateBack';
 
 export function LanguagePage() {
+  const { navigateBackFrom } = useNavigateBack();
+
   const { activeLanguage, changeLanguage, languages } = useLanguage();
 
   const languageList = languages.map((languageItem) => {
@@ -34,6 +38,7 @@ export function LanguagePage() {
   return (
     <Layout
       header={{
+        onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
         title: i18n.t('Language'),
       }}>
       <SettingsContainer>