@rango-dev/widget-embedded 0.1.10-next.99 → 0.1.11-next.0

package/src/constants/navigationRoutes.ts

@@ -9,6 +9,5 @@ export const navigationRoutes = {
   swaps: '/swaps',
   wallets: '/wallets',
   confirmSwap: '/confirm-swap',
-  confirmWallets: '/confirm-wallets',
   swapDetails: '/swaps/:requestId',
 };

package/src/globalStyles.ts

@@ -2,9 +2,10 @@ import { globalCss } from '@rango-dev/ui';
 
 export const globalStyles = globalCss({
   '*': {
-    '&::-webkit-scrollbar': { width: '$8' },
+    '&::-webkit-scrollbar': { width: '$8', height: '$8' },
     '&::-webkit-scrollbar-thumb': {
       backgroundColor: '$neutrals400',
+      borderRadius: '$10',
     },
     '&::-webkit-scrollbar-thumb:hover': {
       backgroundColor: '$neutrals500',

package/src/hooks/useConfirmSwap.ts

@@ -93,6 +93,7 @@ export function useConfirmSwap(): ConfirmSwap {
           meta
         );
 
+        //@ts-ignore
         return newSwap;
       }
       return;
@@ -228,7 +229,7 @@ export function useConfirmSwap(): ConfirmSwap {
           false,
           meta
         );
-
+        //@ts-ignore
         return newSwap;
       } else if (!proceedAnywayRef.current) {
         proceedAnywayRef.current = true;

package/src/hooks/useNavigateBack.ts

@@ -8,6 +8,8 @@ export function useNavigateBack() {
   navigationRoutes;
 
   const navigateBackFrom = (currentRoute: string) => {
+    if (currentRoute === navigationRoutes.swapDetails)
+      return navigate(navigationRoutes.swaps, { replace: true });
     if (
       !isRouterInContext ||
       (window.history.state && window.history.state.idx > 0)
@@ -23,7 +25,7 @@ export function useNavigateBack() {
           navigationRoutes.settings,
           navigationRoutes.wallets,
           navigationRoutes.swaps,
-          navigationRoutes.confirmWallets,
+          navigationRoutes.confirmSwap,
         ].includes(currentRoute)
       )
         navigate(navigationRoutes.home, { replace: true });
@@ -31,8 +33,6 @@ export function useNavigateBack() {
         navigate(navigationRoutes.settings, { replace: true });
       else if (currentRoute === navigationRoutes.swapDetails)
         navigate(navigationRoutes.swaps, { replace: true });
-      else if (currentRoute === navigationRoutes.confirmSwap)
-        navigate(navigationRoutes.confirmWallets, { replace: true });
     }
   };
 

package/src/lib.tsx

@@ -1,11 +1,11 @@
 import { SwapContainer } from '@rango-dev/ui';
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { AppRouter } from './components/AppRouter';
 import { useMetaStore } from './store/meta';
 import { Events, Provider } from '@rango-dev/wallets-core';
 import { allProviders } from '@rango-dev/provider-all';
 import { EventHandler } from '@rango-dev/wallets-core/dist/wallet';
-import { Network } from '@rango-dev/wallets-shared';
+import { Network, WalletType } from '@rango-dev/wallets-shared';
 import {
   prepareAccountsForWalletStore,
   walletAndSupportedChainsNames,
@@ -41,6 +41,10 @@ export const SwapBox: React.FC<WidgetProps> = ({ configs }) => {
   const { changeLanguage } = useSelectLanguage();
   const clearConnectedWallet = useWalletsStore.use.clearConnectedWallet();
 
+  const [lastConnectedWalletWithNetwork, setLastConnectedWalletWithNetwork] =
+    useState<string>('');
+  const [disconnectedWallet, setDisconnectedWallet] = useState<WalletType>();
+
   const evmBasedChainNames = blockchains
     .filter(isEvmBlockchain)
     .map((chain) => chain.name);
@@ -49,7 +53,7 @@ export const SwapBox: React.FC<WidgetProps> = ({ configs }) => {
     type,
     event,
     value,
-    _,
+    state,
     supportedChains
   ) => {
     if (event === Events.ACCOUNTS) {
@@ -67,6 +71,19 @@ export const SwapBox: React.FC<WidgetProps> = ({ configs }) => {
         disconnectWallet(type);
       }
     }
+
+    if (event === Events.ACCOUNTS && state.connected) {
+      const key = `${type}-${state.network}-${value}`;
+
+      if (state.connected) {
+        setLastConnectedWalletWithNetwork(key);
+      }
+    }
+
+    if (event === Events.NETWORK && state.network) {
+      const key = `${type}-${state.network}`;
+      setLastConnectedWalletWithNetwork(key);
+    }
   };
   let providers = allProviders();
 
@@ -108,6 +125,11 @@ export const SwapBox: React.FC<WidgetProps> = ({ configs }) => {
               title={configs.title}
               titleSize={configs.titleSize}
               titleWeight={configs.titleWeight}
+              lastConnectedWallet={lastConnectedWalletWithNetwork}
+              disconnectedWallet={disconnectedWallet}
+              clearDisconnectedWallet={() => {
+                setDisconnectedWallet(undefined);
+              }}
             >
               <Layout configs={configs} />
             </AppRouter>

package/src/pages/ConfirmSwapPage.tsx

@@ -1,41 +1,104 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { ConfirmSwap } from '@rango-dev/ui';
 import { useBestRouteStore } from '../store/bestRoute';
-import { useSettingsStore } from '../store/settings';
-import { ConfirmSwapExtraMessages } from '../components/warnings/ConfirmSwapExtraMessages';
-import { useNavigateBack } from '../hooks/useNavigateBack';
+import { useWalletsStore } from '../store/wallets';
+import { useWallets } from '@rango-dev/wallets-core';
 import { navigationRoutes } from '../constants/navigationRoutes';
-import { ConfirmSwapErrors } from '../components/ConfirmSwapErrors';
-import { ConfirmSwapWarnings } from '../components/ConfirmSwapWarnings';
+import {
+  getKeplrCompatibleConnectedWallets,
+  getRequiredChains,
+  getSelectableWallets,
+  isExperimentalChain,
+} from '../utils/wallets';
+import { getTotalFeeInUsd, requiredWallets } from '../utils/swap';
+import { decimalNumber, numberToString } from '../utils/numbers';
+import { useMetaStore } from '../store/meta';
+import { Network, WalletType } from '@rango-dev/wallets-shared';
+import { useNavigateBack } from '../hooks/useNavigateBack';
+import { TokenPreview } from '../components/TokenPreview';
+// @ts-ignore // TODO: fix error in tsc build
+import { t } from 'i18next';
+import { Spacer, ConfirmSwap } from '@rango-dev/ui';
+import RoutesOverview from '../components/RoutesOverview';
 import { useManager } from '@rango-dev/queue-manager-react';
-import { useUiStore } from '../store/ui';
 import { useConfirmSwap } from '../hooks/useConfirmSwap';
+import { useSettingsStore } from '../store/settings';
+import { useUiStore } from '../store/ui';
 import { ConfirmSwapErrorTypes } from '../types';
-import { useMetaStore } from '../store/meta';
-import { getBestRouteWithCalculatedFees } from '../utils/routing';
+import { ConfirmSwapErrors } from '../components/ConfirmSwapErrors';
+import { ConfirmSwapWarnings } from '../components/ConfirmSwapWarnings';
+import { ConfirmSwapExtraMessages } from '../components/warnings/ConfirmSwapExtraMessages';
+import { getBestRouteStatus } from '../utils/routing';
+import { PercentageChange } from '../components/PercentageChange';
 
 export function ConfirmSwapPage() {
-  const setSelectedSwap = useUiStore.use.setSelectedSwap();
-  const { navigateBackFrom } = useNavigateBack();
-  const { manager } = useManager();
   const navigate = useNavigate();
-
+  const { navigateBackFrom } = useNavigateBack();
   const bestRoute = useBestRouteStore.use.bestRoute();
   const fetchingBestRoute = useBestRouteStore.use.loading();
-  const { tokens } = useMetaStore.use.meta();
-
+  const fetchingBestRouteError = useBestRouteStore.use.error();
+  const setSelectedSwap = useUiStore.use.setSelectedSwap();
+  const { blockchains, tokens } = useMetaStore.use.meta();
+  const accounts = useWalletsStore.use.accounts();
+  const selectedWallets = useWalletsStore.use.selectedWallets();
+  const initSelectedWallets = useWalletsStore.use.initSelectedWallets();
+  const setSelectedWallet = useWalletsStore.use.setSelectedWallet();
   const slippage = useSettingsStore.use.slippage();
   const customSlippage = useSettingsStore.use.customSlippage();
-  const selectedSlippage = customSlippage || slippage;
+  const inputUsdValue = useBestRouteStore.use.inputUsdValue();
+  const outputUsdValue = useBestRouteStore.use.outputUsdValue();
+
+  const bestRouteloadingStatus = getBestRouteStatus(
+    fetchingBestRoute,
+    !!fetchingBestRouteError
+  );
+
+  const { manager } = useManager();
   const { loading, errors, warnings, confirmSwap } = useConfirmSwap();
 
+  const selectedSlippage = customSlippage || slippage;
+
   const showHighSlippageWarning = !errors.find(
     (error) => error.type === ConfirmSwapErrorTypes.INSUFFICIENT_SLIPPAGE
   );
 
+  const { getWalletInfo, connect } = useWallets();
+  const confirmDisabled =
+    fetchingBestRoute ||
+    !requiredWallets(bestRoute).every((chain) =>
+      selectedWallets.map((wallet) => wallet.chain).includes(chain)
+    );
+
+  const firstStep = bestRoute?.result?.swaps[0];
+  const lastStep =
+    bestRoute?.result?.swaps[bestRoute?.result?.swaps.length - 1];
+
+  const fromAmount = decimalNumber(firstStep?.fromAmount, 3);
+  const toAmount = decimalNumber(lastStep?.toAmount, 3);
+  useEffect(() => {
+    initSelectedWallets();
+  }, []);
+
+  const selectableWallets = getSelectableWallets(
+    accounts,
+    selectedWallets,
+    getWalletInfo
+  );
+
+  const handleConnectChain = (wallet: string) => {
+    const network = wallet as Network;
+    getKeplrCompatibleConnectedWallets(selectableWallets).forEach(
+      (compatibleWallet: WalletType) => connect?.(compatibleWallet, network)
+    );
+  };
+
+  const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
+
   return (
     <ConfirmSwap
+      requiredWallets={getRequiredChains(bestRoute)}
+      selectableWallets={selectableWallets}
+      onBack={navigateBackFrom.bind(null, navigationRoutes.confirmSwap)}
       onConfirm={() => {
         confirmSwap?.().then((swap) => {
           if (swap) {
@@ -51,8 +114,59 @@ export function ConfirmSwapPage() {
           }
         });
       }}
-      onBack={navigateBackFrom.bind(null, navigationRoutes.confirmSwap)}
-      bestRoute={getBestRouteWithCalculatedFees(bestRoute, tokens)}
+      onChange={(wallet) => setSelectedWallet(wallet)}
+      confirmDisabled={confirmDisabled}
+      handleConnectChain={(wallet) => handleConnectChain(wallet)}
+      isExperimentalChain={(wallet) =>
+        getKeplrCompatibleConnectedWallets(selectableWallets).length > 0
+          ? isExperimentalChain(blockchains, wallet)
+          : false
+      }
+      previewInputs={
+        <>
+          <TokenPreview
+            chain={{
+              displayName: firstStep?.from.blockchain || '',
+              logo: firstStep?.from.blockchainLogo || '',
+            }}
+            token={{
+              symbol: firstStep?.from.symbol || '',
+              image: firstStep?.from.logo || '',
+            }}
+            usdValue={inputUsdValue}
+            amount={fromAmount}
+            label={t('From')}
+            loadingStatus={bestRouteloadingStatus}
+          />
+          <Spacer size={12} direction="vertical" />
+          <TokenPreview
+            chain={{
+              displayName: lastStep?.to.blockchain || '',
+              logo: lastStep?.to.blockchainLogo || '',
+            }}
+            token={{
+              symbol: lastStep?.to.symbol || '',
+              image: lastStep?.to.logo || '',
+            }}
+            usdValue={outputUsdValue}
+            amount={toAmount}
+            label={t('To')}
+            loadingStatus={bestRouteloadingStatus}
+            percentageChange={
+              <PercentageChange
+                inputUsdValue={inputUsdValue}
+                outputUsdValue={outputUsdValue}
+              />
+            }
+          />
+        </>
+      }
+      previewRoutes={
+        <RoutesOverview
+          routes={bestRoute}
+          totalFee={numberToString(totalFeeInUsd, 0, 2)}
+        />
+      }
       loading={loading}
       errors={ConfirmSwapErrors(errors)}
       warnings={ConfirmSwapWarnings(warnings)}
@@ -66,7 +180,6 @@ export function ConfirmSwapPage() {
           ? 'Proceed anyway!'
           : 'Confirm swap!'
       }
-      confirmButtonDisabled={fetchingBestRoute}
     />
   );
 }

package/src/pages/HistoryPage.tsx

@@ -6,6 +6,7 @@ import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
 import { getPendingSwaps } from '../utils/queue';
 import { useUiStore } from '../store/ui';
+import { groupSwapsByDate } from '../utils/date';
 
 export function HistoryPage() {
   const setSelectedSwap = useUiStore.use.setSelectedSwap();
@@ -16,12 +17,11 @@ export function HistoryPage() {
 
   return (
     <History
-      //todo: move PendingSwap type to rango-types
-      //@ts-ignore
       list={pendingSwaps}
-      onSwapClick={(requestId) => {
+      groupBy={groupSwapsByDate}
+      onSwapClick={requestId => {
         setSelectedSwap(requestId);
-        navigate(navigationRoutes.swaps + `/${requestId}`);
+        navigate(navigationRoutes.swaps + `/${requestId}`, { replace: true });
       }}
       onBack={navigateBackFrom.bind(null, navigationRoutes.swaps)}
     />

package/src/pages/Home.tsx

@@ -5,10 +5,10 @@ import {
   styled,
   Typography,
   VerticalSwapIcon,
+  Header,
 } from '@rango-dev/ui';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useInRouterContext, useNavigate } from 'react-router-dom';
-import { Header } from '../components/Header';
 import { TokenInfo } from '../components/TokenInfo';
 import { fetchBestRoute, useBestRouteStore } from '../store/bestRoute';
 import { BottomLogo } from '../components/BottomLogo';
@@ -34,6 +34,8 @@ import {
   totalArrivalTime,
 } from '../utils/numbers';
 import BigNumber from 'bignumber.js';
+import { HeaderButtons } from '../components/HeaderButtons';
+import { useUiStore } from '../store/ui';
 
 const Container = styled('div', {
   display: 'flex',
@@ -67,7 +69,7 @@ interface PropTypes {
   titleWeight?: number;
 }
 export function Home(props: PropTypes) {
-  const { title = 'SWAP', titleSize = 18, titleWeight = 600 } = props;
+  const { title = 'SWAP' } = props;
 
   const isRouterInContext = useInRouterContext();
   const navigate = useNavigate();
@@ -76,10 +78,6 @@ export function Home(props: PropTypes) {
   const fromToken = useBestRouteStore.use.fromToken();
   const toChain = useBestRouteStore.use.toChain();
   const toToken = useBestRouteStore.use.toToken();
-  const setFromChain = useBestRouteStore.use.setFromChain();
-  const setFromToken = useBestRouteStore.use.setFromToken();
-  const setToChain = useBestRouteStore.use.setToChain();
-  const setToToken = useBestRouteStore.use.setToToken();
   const setInputAmount = useBestRouteStore.use.setInputAmount();
   const inputUsdValue = useBestRouteStore.use.inputUsdValue();
   const inputAmount = useBestRouteStore.use.inputAmount();
@@ -91,15 +89,8 @@ export function Home(props: PropTypes) {
   const bestRouteError = useBestRouteStore.use.error();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
   const accounts = useWalletsStore.use.accounts();
-
-  const swithFromAndTo = () => {
-    setFromChain(toChain);
-    setFromToken(toToken);
-    setToChain(fromChain);
-    setToToken(fromToken);
-    setInputAmount(outputAmount?.toString() || '');
-    setCount((prev) => prev + 1);
-  };
+  const setCurrentPage = useUiStore.use.setCurrentPage();
+  const switchFromAndTo = useBestRouteStore.use.switchFromAndTo();
 
   const errorMessage =
     loadingMetaStatus === 'failed'
@@ -142,13 +133,21 @@ export function Home(props: PropTypes) {
 
   const highFee = hasHighFee(totalFeeInUsd);
 
+  useEffect(() => {
+    setCurrentPage(navigationRoutes.home);
+
+    return setCurrentPage.bind(null, '');
+  }, []);
+
   return (
     <Container>
       <Header
         title={title}
-        titleSize={titleSize}
-        titleWeight={titleWeight}
-        onClickRefresh={fetchBestRoute}
+        suffix={
+          <HeaderButtons
+            onClickRefresh={!!bestRoute ? fetchBestRoute : undefined}
+          />
+        }
       />
       <FromContainer>
         <TokenInfo
@@ -159,8 +158,14 @@ export function Home(props: PropTypes) {
           inputAmount={inputAmount}
         />
         <SwitchButtonContainer>
-          <Button variant="ghost" onClick={swithFromAndTo}>
-            <VerticalSwapIcon size={24} />
+          <Button
+            variant="ghost"
+            onClick={() => {
+              switchFromAndTo();
+              setCount((prev) => prev + 1);
+            }}
+          >
+            <VerticalSwapIcon size={32} />
             {isRouterInContext && <SwithFromAndTo count={count} />}
           </Button>
         </SwitchButtonContainer>
@@ -215,7 +220,7 @@ export function Home(props: PropTypes) {
             if (swapButtonState.title === 'Connect Wallet')
               navigate(navigationRoutes.wallets);
             else {
-              navigate(navigationRoutes.confirmWallets, { replace: true });
+              navigate(navigationRoutes.confirmSwap, { replace: true });
             }
           }}
         >

package/src/pages/LiquiditySourcesPage.tsx

@@ -11,6 +11,7 @@ interface PropTypes {
 }
 export function LiquiditySourcePage({ supportedSwappers }: PropTypes) {
   const swappers = useMetaStore.use.meta().swappers;
+  const loadingMetaStatus = useMetaStore.use.loadingStatus();
   const toggleLiquiditySource = useSettingsStore.use.toggleLiquiditySource();
   const disabledLiquiditySources =
     useSettingsStore.use.disabledLiquiditySources();
@@ -59,6 +60,7 @@ export function LiquiditySourcePage({ supportedSwappers }: PropTypes) {
         toggleLiquiditySource(liquiditySource.title)
       }
       onBack={navigateBackFrom.bind(null, navigationRoutes.liquiditySources)}
+      loadingStatus={loadingMetaStatus}
     />
   );
 }

package/src/pages/SelectTokenPage.tsx

@@ -5,6 +5,7 @@ import { Token } from 'rango-sdk';
 import { useNavigateBack } from '../hooks/useNavigateBack';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { tokensAreEqual } from '../utils/wallets';
+import { useMetaStore } from '../store/meta';
 
 interface PropTypes {
   type: 'from' | 'to';
@@ -41,12 +42,12 @@ export function SelectTokenPage(props: PropTypes) {
             tokensAreEqual(supportedToken, token)
           )
         );
-  console.log(supportedSourceTokens);
 
   const fromToken = useBestRouteStore.use.fromToken();
   const toToken = useBestRouteStore.use.toToken();
   const setFromToken = useBestRouteStore.use.setFromToken();
   const setToToken = useBestRouteStore.use.setToToken();
+  const loadingMetaStatus = useMetaStore.use.loadingStatus();
 
   return (
     <TokenSelector
@@ -59,6 +60,7 @@ export function SelectTokenPage(props: PropTypes) {
         navigateBackFrom(navigationRoutes.fromToken);
       }}
       onBack={navigateBackFrom.bind(null, navigationRoutes.fromToken)}
+      loadingStatus={loadingMetaStatus}
     />
   );
 }

package/src/pages/SettingsPage.tsx

@@ -30,6 +30,8 @@ export function SettingsPage({ supportedSwappers }: PropTypes) {
 
   const infiniteApprove = useSettingsStore.use.infiniteApprove();
   const toggleInfiniteApprove = useSettingsStore.use.toggleInfiniteApprove();
+  const loadingMetaStatus = useMetaStore.use.loadingStatus();
+
   const uniqueSwappersGroups: Array<{
     title: string;
     logo: string;
@@ -93,6 +95,7 @@ export function SettingsPage({ supportedSwappers }: PropTypes) {
       onThemeChange={setTheme}
       infiniteApprove={infiniteApprove}
       toggleInfiniteApprove={toggleInfiniteApprove}
+      loadingStatus={loadingMetaStatus}
     />
   );
 }