@rango-dev/widget-embedded 0.19.0 → 0.19.1-next.1

package/src/components/Slippage/Slippage.tsx

@@ -1,6 +1,5 @@
 import { i18n } from '@lingui/core';
 import {
-  Chip,
   Divider,
   InfoIcon,
   TextField,
@@ -14,17 +13,20 @@ import {
   MIN_SLIPPGAE,
   SLIPPAGES,
 } from '../../constants/swapSettings';
-import { useSettingsStore } from '../../store/settings';
+import { useAppStore } from '../../store/AppStore';
 import { getContainer } from '../../utils/common';
 
-import { BaseContainer, Head, SlippageChipsContainer } from './Slippage.styles';
+import {
+  BaseContainer,
+  Head,
+  SlippageChip,
+  SlippageChipsContainer,
+} from './Slippage.styles';
 import { SlippageTooltipContent } from './SlippageTooltipContent';
 
 export function Slippage() {
-  const slippage = useSettingsStore.use.slippage();
-  const setSlippage = useSettingsStore.use.setSlippage();
-  const customSlippage = useSettingsStore.use.customSlippage();
-  const setCustomSlippage = useSettingsStore.use.setCustomSlippage();
+  const { slippage, setSlippage, customSlippage, setCustomSlippage } =
+    useAppStore();
 
   return (
     <BaseContainer>
@@ -36,6 +38,7 @@ export function Slippage() {
         <Tooltip
           container={getContainer()}
           side="top"
+          sideOffset={4}
           content={<SlippageTooltipContent />}>
           <InfoIcon color="gray" />
         </Tooltip>
@@ -45,8 +48,7 @@ export function Slippage() {
           const key = `slippage-${index}`;
           return (
             <>
-              <Chip
-                style={{ width: '64px', flexShrink: 0 }}
+              <SlippageChip
                 key={key}
                 onClick={() => {
                   if (customSlippage) {
@@ -57,7 +59,6 @@ export function Slippage() {
                 selected={!customSlippage && slippageItem === slippage}
                 label={`${slippageItem.toString()}%`}
               />
-              <Divider direction="horizontal" size={8} />
             </>
           );
         })}

package/src/components/SwapDetails/SwapDetails.Placeholder.tsx

@@ -10,8 +10,6 @@ import {
 } from '@rango-dev/ui';
 import React from 'react';
 
-import { navigationRoutes } from '../../constants/navigationRoutes';
-import { useNavigateBack } from '../../hooks/useNavigateBack';
 import { SuffixContainer } from '../HeaderButtons/HeaderButtons.styles';
 import { Layout } from '../Layout';
 import { LoadingSwapDetails } from '../LoadingSwapDetails';
@@ -20,28 +18,27 @@ import {
   Container,
   HeaderDetails,
   PlaceholderContainer,
+  requestIdStyles,
+  rowStyles,
 } from './SwapDetails.styles';
 
 export function SwapDetailsPlaceholder(props: SwapDetailsPlaceholderPropTypes) {
   const { requestId, showSkeleton } = props;
-  const { navigateBackFrom } = useNavigateBack();
-
   return (
     <Layout
       noPadding
       header={{
         title: i18n.t('Swap and Bridge'),
-        onBack: navigateBackFrom.bind(null, navigationRoutes.swapDetails),
         suffix: <SuffixContainer />,
       }}>
       {showSkeleton && (
         <Container>
           <HeaderDetails>
-            <div className="row">
+            <div className={rowStyles()}>
               <Typography variant="label" size="large" color="neutral700">
                 {`${i18n.t('Request ID')}:`}
               </Typography>
-              <div className="request-id">
+              <div className={requestIdStyles()}>
                 <Typography variant="label" size="small" color="neutral700">
                   <Skeleton width={60} height={10} variant="rounded" />
                 </Typography>
@@ -50,7 +47,7 @@ export function SwapDetailsPlaceholder(props: SwapDetailsPlaceholderPropTypes) {
                 </IconButton>
               </div>
             </div>
-            <div className="row">
+            <div className={rowStyles()}>
               <Typography variant="label" size="large" color="neutral700">
                 {`${i18n.t('Created at')}:`}
               </Typography>

package/src/components/SwapDetails/SwapDetails.helpers.tsx

@@ -1,6 +1,6 @@
 import type { GetStep } from '../SwapDetailsAlerts';
-import type { PendingSwapStep } from '@rango-dev/queue-manager-rango-preset';
 import type { Step, StepDetailsProps } from '@rango-dev/ui';
+import type { PendingSwapStep } from 'rango-types';
 
 import React from 'react';
 

package/src/components/SwapDetails/SwapDetails.styles.ts

@@ -1,4 +1,4 @@
-import { darkTheme, styled } from '@rango-dev/ui';
+import { css, darkTheme, styled } from '@rango-dev/ui';
 
 export const Container = styled('div', {
   display: 'flex',
@@ -7,38 +7,6 @@ export const Container = styled('div', {
   alignItems: 'center',
   height: '0',
   flexGrow: 1,
-  '& .row': {
-    display: 'flex',
-    width: '100%',
-    justifyContent: 'space-between',
-    alignItems: 'center',
-    padding: '$10 $20',
-    borderBottom: '1px solid',
-    $$color: '$colors$neutral300',
-    [`.${darkTheme} &`]: {
-      $$color: '$colors$neutral400',
-    },
-    borderColor: '$$color',
-    color: '$neutral500',
-  },
-  '& .request-id': {
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center',
-    height: '$24',
-  },
-  '& .output': {
-    display: 'flex',
-    width: '100%',
-    padding: '$15 $20 $20',
-    flexDirection: 'column',
-    alignItems: 'start',
-  },
-  '& .title-steps': {
-    textAlign: 'left',
-    width: '100%',
-    padding: '0 $20 $10',
-  },
 });
 
 export const HeaderDetails = styled('div', {
@@ -70,3 +38,38 @@ export const LoaderContainer = styled('div', {
   paddingTop: '33%',
   flex: 1,
 });
+
+export const rowStyles = css({
+  display: 'flex',
+  width: '100%',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  padding: '$10 $20',
+  borderBottom: '1px solid',
+  $$color: '$colors$neutral300',
+  [`.${darkTheme} &`]: {
+    $$color: '$colors$neutral400',
+  },
+  borderColor: '$$color',
+  color: '$neutral500',
+});
+
+export const requestIdStyles = css({
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  height: '$24',
+});
+
+export const outputStyles = css({
+  display: 'flex',
+  width: '100%',
+  padding: '$15 $20 $20',
+  flexDirection: 'column',
+  alignItems: 'start',
+});
+
+export const titleStepsStyles = css({
+  width: '100%',
+  padding: '0 $20 $10',
+});

package/src/components/SwapDetails/SwapDetails.tsx

@@ -6,24 +6,22 @@ import {
   getCurrentBlockchainOfOrNull,
   getCurrentStep,
   getRelatedWalletOrNull,
-  PendingSwapNetworkStatus,
 } from '@rango-dev/queue-manager-rango-preset';
 import {
   Button,
   CopyIcon,
   Divider,
   IconButton,
-  RouteCost,
-  RouteSummary,
+  QuoteCost,
   StepDetails,
   Typography,
   useCopyToClipboard,
 } from '@rango-dev/ui';
 import { useWallets } from '@rango-dev/wallets-react';
+import { PendingSwapNetworkStatus } from 'rango-types';
 import React, { useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { navigationRoutes } from '../../constants/navigationRoutes';
 import {
   GAS_FEE_MAX_DECIMALS,
   GAS_FEE_MIN_DECIMALS,
@@ -34,49 +32,54 @@ import {
   USD_VALUE_MAX_DECIMALS,
   USD_VALUE_MIN_DECIMALS,
 } from '../../constants/routing';
-import { useNavigateBack } from '../../hooks/useNavigateBack';
-import { useBestRouteStore } from '../../store/bestRoute';
-import { useMetaStore } from '../../store/meta';
+import { useAppStore } from '../../store/AppStore';
 import { useNotificationStore } from '../../store/notification';
+import { useQuoteStore } from '../../store/quote';
 import {
   numberToString,
   secondsToString,
   totalArrivalTime,
 } from '../../utils/numbers';
-import { getPriceImpactLevel } from '../../utils/routing';
+import { getPriceImpact, getPriceImpactLevel } from '../../utils/quote';
 import {
   getLastConvertedTokenInFailedSwap,
-  getPercentageChange,
   getSwapMessages,
   shouldRetrySwap,
 } from '../../utils/swap';
 import { getSwapDate } from '../../utils/time';
-import { getConciseAddress, getUsdPrice } from '../../utils/wallets';
+import { getConciseAddress } from '../../utils/wallets';
 import { SuffixContainer } from '../HeaderButtons/HeaderButtons.styles';
 import { Layout } from '../Layout';
+import { QuoteSummary } from '../Quote';
 import {
   SwapDetailsCompleteModal,
   SwapDetailsModal,
 } from '../SwapDetailsModal';
 
 import { getSteps, getStepState, RESET_INTERVAL } from './SwapDetails.helpers';
-import { Container, HeaderDetails, StepsList } from './SwapDetails.styles';
+import {
+  Container,
+  HeaderDetails,
+  outputStyles,
+  requestIdStyles,
+  rowStyles,
+  StepsList,
+  titleStepsStyles,
+} from './SwapDetails.styles';
 
 export function SwapDetails(props: SwapDetailsProps) {
   const { swap, requestId, onDelete, onCancel: onCancelProps } = props;
   const { canSwitchNetworkTo, connect, getWalletInfo } = useWallets();
-  const retry = useBestRouteStore.use.retry();
+  const blockchains = useAppStore().blockchains();
+  const tokens = useAppStore().tokens();
+  const retry = useQuoteStore.use.retry();
   const navigate = useNavigate();
-  const { navigateBackFrom } = useNavigateBack();
   const [_, handleCopy] = useCopyToClipboard(RESET_INTERVAL);
   const listRef = useRef<HTMLDivElement | null>(null);
   const [modalState, setModalState] = useState<ModalState>(null);
   const [showCompletedModal, setShowCompletedModal] = useState<
     'success' | 'failed' | null
   >(null);
-  const {
-    meta: { tokens, blockchains },
-  } = useMetaStore();
 
   const onCancel = () => {
     onCancelProps();
@@ -151,7 +154,7 @@ export function SwapDetails(props: SwapDetailsProps) {
     showNetworkModal: currentStepNetworkStatus,
     setNetworkModal: setModalState,
     message: stepMessage,
-    blockchains,
+    blockchains: blockchains,
   });
   const numberOfSteps = steps.length;
   const [firstStep, lastStep] = [swap.steps[0], swap.steps[numberOfSteps - 1]];
@@ -168,40 +171,24 @@ export function SwapDetails(props: SwapDetailsProps) {
   )?.diagnosisUrl;
 
   const outputUsdValue = numberToString(
-    String(
-      parseFloat(
-        numberToString(
-          outputAmount,
-          TOKEN_AMOUNT_MIN_DECIMALS,
-          TOKEN_AMOUNT_MAX_DECIMALS
-        )
-      ) *
-        (getUsdPrice(
-          lastStep.toBlockchain,
-          lastStep.toSymbol,
-          lastStep.toSymbolAddress,
-          tokens
-        ) || 0)
-    ),
+    parseFloat(
+      numberToString(
+        outputAmount,
+        TOKEN_AMOUNT_MIN_DECIMALS,
+        TOKEN_AMOUNT_MAX_DECIMALS
+      )
+    ) * (lastStep.toUsdPrice || 0),
     USD_VALUE_MIN_DECIMALS,
     USD_VALUE_MAX_DECIMALS
   );
 
   const inputUsdValue = numberToString(
-    String(
-      parseFloat(swap.inputAmount) *
-        (getUsdPrice(
-          firstStep.fromBlockchain,
-          firstStep.fromSymbol,
-          firstStep.fromSymbolAddress,
-          tokens
-        ) || 0)
-    ),
+    parseFloat(swap.inputAmount) * (firstStep.fromUsdPrice || 0),
     USD_VALUE_MIN_DECIMALS,
     USD_VALUE_MAX_DECIMALS
   );
 
-  const percentageChange = getPercentageChange(inputUsdValue, outputUsdValue);
+  const percentageChange = getPriceImpact(inputUsdValue, outputUsdValue);
 
   const completeModalDesc =
     swap.status === 'success'
@@ -239,7 +226,6 @@ export function SwapDetails(props: SwapDetailsProps) {
       noPadding
       header={{
         title: i18n.t('Swap and Bridge'),
-        onBack: navigateBackFrom.bind(null, navigationRoutes.swapDetails),
         onCancel:
           swap.status === 'running' ? () => setModalState('cancel') : undefined,
         suffix: swap.status !== 'running' && (
@@ -265,9 +251,10 @@ export function SwapDetails(props: SwapDetailsProps) {
             type="primary"
             size="large"
             onClick={() => {
-              retry(swap);
+              retry(swap, { blockchains: blockchains, tokens: tokens });
               setTimeout(() => {
-                navigate(navigationRoutes.home);
+                const home = '../../';
+                navigate(home);
               }, 0);
             }}>
             {i18n.t('Try again')}
@@ -276,11 +263,11 @@ export function SwapDetails(props: SwapDetailsProps) {
       }>
       <Container>
         <HeaderDetails>
-          <div className="row">
+          <div className={rowStyles()}>
             <Typography variant="label" size="large" color="neutral700">
               {`${i18n.t('Request ID')}:`}
             </Typography>
-            <div className="request-id">
+            <div className={requestIdStyles()}>
               <Typography variant="label" size="small" color="neutral700">
                 {requestId}
               </Typography>
@@ -291,7 +278,7 @@ export function SwapDetails(props: SwapDetailsProps) {
               </IconButton>
             </div>
           </div>
-          <div className="row">
+          <div className={rowStyles()}>
             <Typography variant="label" size="large" color="neutral700">
               {`${i18n.t('Created at')}:`}
             </Typography>
@@ -301,8 +288,8 @@ export function SwapDetails(props: SwapDetailsProps) {
           </div>
         </HeaderDetails>
 
-        <div className="output">
-          <RouteCost
+        <div className={outputStyles()}>
+          <QuoteCost
             fee={numberToString(
               String(totalFee),
               GAS_FEE_MIN_DECIMALS,
@@ -311,7 +298,7 @@ export function SwapDetails(props: SwapDetailsProps) {
             time={secondsToString(totalArrivalTime(swap.steps))}
             steps={numberOfSteps}
           />
-          <RouteSummary
+          <QuoteSummary
             from={{
               price: {
                 value: numberToString(
@@ -353,12 +340,10 @@ export function SwapDetails(props: SwapDetailsProps) {
               PERCENTAGE_CHANGE_MIN_DECIMALS,
               PERCENTAGE_CHANGE_MAX_DECIMALS
             )}
-            warningLevel={getPriceImpactLevel(
-              percentageChange?.toNumber() ?? 0
-            )}
+            warningLevel={getPriceImpactLevel(percentageChange ?? 0)}
           />
         </div>
-        <div className="title-steps">
+        <div className={titleStepsStyles()}>
           <Typography variant="title" size="small">
             {i18n.t('Swaps steps')}
           </Typography>
@@ -377,7 +362,7 @@ export function SwapDetails(props: SwapDetailsProps) {
               <StepDetails
                 key={key}
                 step={step}
-                type="route-progress"
+                type="swap-progress"
                 ref={listRef}
                 state={state}
                 hasSeparator={index !== 0}

package/src/components/SwapDetailsAlerts/SwapDetailsAlerts.Warning.tsx

@@ -1,8 +1,8 @@
 import type { WaningAlertsProps } from './SwapDetailsAlerts.types';
 
 import { i18n } from '@lingui/core';
-import { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
 import { Alert, Button } from '@rango-dev/ui';
+import { PendingSwapNetworkStatus } from 'rango-types';
 import React from 'react';
 
 export function WarningAlert(props: WaningAlertsProps) {

package/src/components/SwapDetailsModal/SwapDetailsCompleteModal.tsx

@@ -12,8 +12,6 @@ import {
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { navigationRoutes } from '../../constants/navigationRoutes';
-
 export function SwapDetailsCompleteModal(props: CompleteModalPropTypes) {
   const {
     open,
@@ -70,7 +68,10 @@ export function SwapDetailsCompleteModal(props: CompleteModalPropTypes) {
           variant="contained"
           type="primary"
           size="large"
-          onClick={() => navigate(navigationRoutes.home)}>
+          onClick={() => {
+            const home = '../../';
+            navigate(home);
+          }}>
           <Typography variant="title" size="medium" color="neutral100">
             {i18n.t('Done')}
           </Typography>

package/src/components/SwapDetailsModal/SwapDetailsModal.Cancel.tsx

@@ -10,8 +10,8 @@ export const CancelContent = ({ onCancel, onClose }: CancelContentProps) => {
       <Divider size={20} />
       <MessageBox
         type="error"
-        title={i18n.t('Transaction Cancel')}
-        description={i18n.t('Are you sure you want to Cancel this swap?')}
+        title={i18n.t('Cancel Swap')}
+        description={i18n.t('Are you sure you want to cancel this swap?')}
       />
       <Divider size={32} />
       <Button

package/src/components/SwapDetailsModal/SwapDetailsModal.WalletState.tsx

@@ -1,30 +1,36 @@
 import type { WalletStateContentProps } from './SwapDetailsModal.types';
 
-import { MessageBox, Wallet, WalletState } from '@rango-dev/ui';
+import { MessageBox, Wallet } from '@rango-dev/ui';
 import { useWallets } from '@rango-dev/wallets-react';
 import React from 'react';
 
 import { getContainer } from '../../utils/common';
+import { mapStatusToWalletState } from '../../utils/wallets';
 
 import { WalletContainer } from './SwapDetailsModal.styles';
 
 export const WalletStateContent = (props: WalletStateContentProps) => {
   const { type, title, currentStepWallet, message, showWalletButton } = props;
-  const { connect, getWalletInfo, state: walletState } = useWallets();
+  const { connect, getWalletInfo, state } = useWallets();
   const walletType = currentStepWallet?.walletType;
-  const isConnected = walletType && walletState(walletType).connected;
-  const state = isConnected ? WalletState.CONNECTED : WalletState.DISCONNECTED;
+  const walletState = walletType
+    ? mapStatusToWalletState(state(walletType))
+    : null;
+  const walletInfo = walletType ? getWalletInfo(walletType) : null;
+  const shouldShowWallet =
+    showWalletButton && !!walletType && !!walletState && !!walletInfo;
   return (
     <>
       <MessageBox type={type} title={title} description={message} />
-      {showWalletButton && walletType && (
+      {shouldShowWallet && (
         <WalletContainer>
           <Wallet
             container={getContainer()}
-            title={getWalletInfo(walletType).name}
-            image={getWalletInfo(walletType).img}
+            title={walletInfo.name}
+            image={walletInfo.img}
             type={walletType}
-            state={state}
+            state={walletState}
+            link={walletInfo.installLink}
             onClick={async () => connect(walletType)}
           />
         </WalletContainer>

package/src/components/SwapDetailsModal/SwapDetailsModal.helpers.tsx

@@ -1,7 +1,7 @@
 import type { ModalNetworkValueTypes } from './SwapDetailsModal.types';
 
 import { i18n } from '@lingui/core';
-import { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
+import { PendingSwapNetworkStatus } from 'rango-types';
 
 export const modalNetworkValues: Record<
   Exclude<PendingSwapNetworkStatus, PendingSwapNetworkStatus.WaitingForQueue>,

package/src/components/SwapDetailsModal/SwapDetailsModal.tsx

@@ -1,7 +1,7 @@
 import type { ModalPropTypes } from './SwapDetailsModal.types';
 
-import { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
 import { Modal } from '@rango-dev/ui';
+import { PendingSwapNetworkStatus } from 'rango-types';
 import React from 'react';
 
 import { CancelContent } from './SwapDetailsModal.Cancel';

package/src/components/SwapDetailsModal/SwapDetailsModal.types.ts

@@ -1,5 +1,5 @@
-import type { PendingSwapNetworkStatus } from '@rango-dev/queue-manager-rango-preset';
 import type { WalletType } from '@rango-dev/wallets-shared';
+import type { PendingSwapNetworkStatus } from 'rango-types';
 
 export type ModalState =
   | Exclude<PendingSwapNetworkStatus, PendingSwapNetworkStatus.WaitingForQueue>

package/src/components/SwapsGroup/SwapsGroup.styles.ts

@@ -1,9 +1,18 @@
-import { styled } from '@rango-dev/ui';
+import { css, darkTheme, styled } from '@rango-dev/ui';
+
+export const groupStyles = css();
 
 export const Group = styled('div', {
   width: '100%',
   display: 'flex',
   flexDirection: 'column',
+  [`& .${groupStyles}`]: {
+    $$color: '$colors$neutral600',
+    [`.${darkTheme} &`]: {
+      $$color: '$colors$neutral700',
+    },
+    color: '$$color',
+  },
 });
 
 export const Time = styled('div', {

package/src/components/SwapsGroup/SwapsGroup.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { limitDecimalPlaces } from '../../utils/numbers';
 
-import { Group, SwapList, Time } from './SwapsGroup.styles';
+import { Group, groupStyles, SwapList, Time } from './SwapsGroup.styles';
 
 export function SwapsGroup(props: PropTypes) {
   const { list, onSwapClick, groupBy, isLoading } = props;
@@ -34,8 +34,7 @@ export function SwapsGroup(props: PropTypes) {
                 <Typography
                   variant="label"
                   size="medium"
-                  color="neutral600"
-                  className="group-title">
+                  className={groupStyles()}>
                   {i18n.t(group.title)}
                 </Typography>
               </Time>
@@ -68,8 +67,7 @@ export function SwapsGroup(props: PropTypes) {
                 <Typography
                   variant="label"
                   size="medium"
-                  color="neutral600"
-                  className="group-title">
+                  className={groupStyles()}>
                   {i18n.t(group.title)}
                 </Typography>
               </Time>

package/src/components/SwitchFromAndTo.tsx

@@ -1,7 +1,7 @@
 import { ReverseIcon, styled } from '@rango-dev/ui';
 import React from 'react';
 
-import { useBestRouteStore } from '../store/bestRoute';
+import { useQuoteStore } from '../store/quote';
 
 const SwitchButtonContainer = styled('div', {
   position: 'absolute',
@@ -27,7 +27,7 @@ const StyledButton = styled('div', {
 });
 
 export function SwitchFromAndToButton() {
-  const switchFromAndTo = useBestRouteStore.use.switchFromAndTo();
+  const switchFromAndTo = useQuoteStore.use.switchFromAndTo();
 
   return (
     <SwitchButtonContainer>

package/src/components/TokenList/TokenList.helpers.ts

@@ -1,8 +1,8 @@
-import type { TokenWithBalance } from './TokenList.types';
+import type { Token } from 'rango-sdk';
 
 import { containsText } from '../../utils/common';
 
-export const filterTokens = (list: TokenWithBalance[], searchedFor: string) =>
+export const filterTokens = (list: Token[], searchedFor: string) =>
   list.filter(
     (token) =>
       containsText(token.symbol, searchedFor) ||