@rango-dev/widget-embedded 0.1.10-next.98 → 0.1.10

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,105 @@
-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 {
+  calcOutputUsdValue,
+  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';
 
 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 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 +115,53 @@ 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={calcOutputUsdValue(fromAmount, firstStep?.from.usdPrice)}
+            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={calcOutputUsdValue(toAmount, lastStep?.to.usdPrice)}
+            amount={toAmount}
+            label={t('To')}
+            loadingStatus={bestRouteloadingStatus}
+          />
+        </>
+      }
+      previewRoutes={
+        <RoutesOverview
+          routes={bestRoute}
+          totalFee={numberToString(totalFeeInUsd, 0, 2)}
+        />
+      }
       loading={loading}
       errors={ConfirmSwapErrors(errors)}
       warnings={ConfirmSwapWarnings(warnings)}
@@ -66,7 +175,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';
@@ -33,20 +33,25 @@ import {
   secondsToString,
   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',
   flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
 });
 
-const SwitchButtonContainer = styled('div', {
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
+const FromContainer = styled('div', {
   position: 'relative',
-  top: '11px',
+  paddingBottom: '$12',
+});
+
+const SwitchButtonContainer = styled('div', {
+  position: 'absolute',
+  bottom: '-12px',
+  left: '50%',
+  transform: 'translate(-50%, 10%)',
 });
 
 const BestRouteContainer = styled('div', {
@@ -64,9 +69,8 @@ interface PropTypes {
   titleWeight?: number;
 }
 export function Home(props: PropTypes) {
-  const { title = 'SWAP', titleSize = 18, titleWeight = 600 } = props;
+  const { title = 'SWAP' } = props;
 
-  const waningMessage = '';
   const isRouterInContext = useInRouterContext();
   const navigate = useNavigate();
   const [count, setCount] = useState(0);
@@ -89,6 +93,7 @@ export function Home(props: PropTypes) {
   const bestRouteError = useBestRouteStore.use.error();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
   const accounts = useWalletsStore.use.accounts();
+  const setCurrentPage = useUiStore.use.setCurrentPage();
 
   const swithFromAndTo = () => {
     setFromChain(toChain);
@@ -123,6 +128,7 @@ export function Home(props: PropTypes) {
     outputUsdValue
   );
 
+  const inputIsZero = inputAmount === '0';
   const swapButtonState = getSwapButtonState(
     loadingMetaStatus,
     accounts,
@@ -131,40 +137,52 @@ export function Home(props: PropTypes) {
     hasLimitError(bestRoute),
     highValueLoss,
     priceImpactCanNotBeComputed,
-    needsToWarnEthOnPath
+    needsToWarnEthOnPath,
+    inputIsZero
   );
 
   const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
 
   const highFee = hasHighFee(totalFeeInUsd);
 
- 
+  useEffect(() => {
+    setCurrentPage(navigationRoutes.home);
+
+    return setCurrentPage.bind(null, '');
+  }, []);
+
   return (
     <Container>
       <Header
         title={title}
-        titleSize={titleSize}
-        titleWeight={titleWeight}
-        onClickRefresh={fetchBestRoute}
-      />
-      <TokenInfo
-        type="From"
-        chain={fromChain}
-        token={fromToken}
-        onAmountChange={setInputAmount}
-        inputAmount={inputAmount}
+        suffix={
+          <HeaderButtons
+            onClickRefresh={!!bestRoute ? fetchBestRoute : undefined}
+          />
+        }
       />
-      <SwitchButtonContainer>
-        <Button variant="ghost" onClick={swithFromAndTo}>
-          <VerticalSwapIcon size={36} />
-          {isRouterInContext && <SwithFromAndTo count={count} />}
-        </Button>
-      </SwitchButtonContainer>
+      <FromContainer>
+        <TokenInfo
+          type="From"
+          chain={fromChain}
+          token={fromToken}
+          onAmountChange={setInputAmount}
+          inputAmount={inputAmount}
+        />
+        <SwitchButtonContainer>
+          <Button variant="ghost" onClick={swithFromAndTo}>
+            <VerticalSwapIcon size={32} />
+            {isRouterInContext && <SwithFromAndTo count={count} />}
+          </Button>
+        </SwitchButtonContainer>
+      </FromContainer>
       <TokenInfo
         type="To"
         chain={toChain}
         token={toToken}
-        outputAmount={outputAmount}
+        outputAmount={
+          outputAmount ? new BigNumber(outputAmount) : new BigNumber(0)
+        }
         outputUsdValue={outputUsdValue}
       />
       {showBestRoute && (
@@ -179,13 +197,9 @@ export function Home(props: PropTypes) {
           />
         </BestRouteContainer>
       )}
-      {(errorMessage || waningMessage || hasLimitError(bestRoute)) && (
+      {(errorMessage || hasLimitError(bestRoute)) && (
         <Alerts>
-          {errorMessage && (
-            <Alert type="error">
-              {<Typography variant="body2">{errorMessage}</Typography>}
-            </Alert>
-          )}
+          {errorMessage && <Alert type="error">{errorMessage}</Alert>}
           {hasLimitError(bestRoute) && (
             <Alert type="error" title={`${swap?.swapperId} Limit`}>
               <>
@@ -200,11 +214,6 @@ export function Home(props: PropTypes) {
               </>
             </Alert>
           )}
-          {waningMessage && (
-            <Alert type="warning">
-              <Typography variant="body2">{waningMessage}</Typography>
-            </Alert>
-          )}
         </Alerts>
       )}
       <Footer>
@@ -217,7 +226,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}
     />
   );
 }