@rango-dev/widget-embedded 0.23.1-next.8 → 0.24.0

package/src/components/HeaderButtons/InProgressTransactionBadge.tsx

@@ -0,0 +1,26 @@
+import type { PendingSwap } from 'rango-types';
+
+import { useManager } from '@rango-dev/queue-manager-react';
+import { InProgressIcon } from '@rango-dev/ui';
+import React from 'react';
+
+import { getPendingSwaps } from '../../utils/queue';
+
+import { InProgressTransactionBadgeContainer } from './HeaderButtons.styles';
+
+const InProgressTransactionBadge = () => {
+  const { manager } = useManager();
+  const list: PendingSwap[] = getPendingSwaps(manager).map(({ swap }) => swap);
+
+  if (!list.find((swap) => swap.status === 'running')) {
+    return null;
+  }
+
+  return (
+    <InProgressTransactionBadgeContainer>
+      <InProgressIcon color="info" size={6} />
+    </InProgressTransactionBadgeContainer>
+  );
+};
+
+export default InProgressTransactionBadge;

package/src/components/HeaderButtons/RefreshButton.tsx

@@ -63,13 +63,14 @@ function RefreshButton({ onClick }: { onClick: (() => void) | undefined }) {
     <HeaderButton
       variant="ghost"
       size="small"
+      style={{ paddingTop: 0, paddingBottom: 0 }}
       onClick={handleRefreshClick}
       disabled={!onClick}>
       <ProgressIcon
         onTransitionEnd={() => setIsRefetched(false)}
         isRefetched={isRefetched}>
         <RefreshProgressButton
-          size={24}
+          size={22}
           color={!onClick ? 'gray' : 'black'}
           progress={(elapsedTime / MAX_ELAPSED_TIME) * MAX_PERCENTAGE}
         />

package/src/components/HeaderButtons/UnreadNotificationsBadge.tsx

@@ -1,3 +1,4 @@
+import { EventSeverity } from '@rango-dev/queue-manager-rango-preset';
 import { Typography } from '@rango-dev/ui';
 import React from 'react';
 
@@ -8,10 +9,17 @@ import { NotificationsBadgeContainer } from './HeaderButtons.styles';
 export function UnreadNotificationsBadge() {
   const { getUnreadNotifications } = useNotificationStore();
 
-  const notificationsCount = getUnreadNotifications().length;
+  const notificationsList = getUnreadNotifications();
+
+  const notificationsCount = notificationsList.length;
+
+  const hasSeverNotification = !!notificationsList.find(
+    (notificationItem) =>
+      notificationItem.event.messageSeverity === EventSeverity.WARNING
+  );
 
   return notificationsCount ? (
-    <NotificationsBadgeContainer>
+    <NotificationsBadgeContainer isSever={hasSeverNotification}>
       <Typography variant="body" size="xsmall" color="$background">
         {notificationsCount}
       </Typography>

package/src/components/HeaderButtons/WalletButton.tsx

@@ -1,17 +1,37 @@
 import type { PropTypes } from './HeaderButtons.types';
 
 import { i18n } from '@lingui/core';
-import { Tooltip, WalletIcon } from '@rango-dev/ui';
+import { Image, Tooltip, WalletIcon } from '@rango-dev/ui';
 import React from 'react';
 
-import { ConnectedIcon, HeaderButton } from './HeaderButtons.styles';
+import { useWalletList } from '../../hooks/useWalletList';
+
+import {
+  ConnectedIcon,
+  HeaderButton,
+  rowStyles,
+  WalletImageContainer,
+} from './HeaderButtons.styles';
 
 function WalletButton(props: PropTypes) {
+  const { list } = useWalletList({});
+  const connectedWallets = list.filter(
+    (wallet) => wallet.state === 'connected'
+  );
+  const content = !connectedWallets.length ? (
+    i18n.t('Connect Wallet')
+  ) : (
+    <div className={rowStyles()}>
+      {connectedWallets.map((wallet) => (
+        <WalletImageContainer key={wallet.title}>
+          <Image src={wallet.image} size={14} />
+        </WalletImageContainer>
+      ))}
+    </div>
+  );
+
   return (
-    <Tooltip
-      container={props.container}
-      side="top"
-      content={i18n.t('Connect Wallet')}>
+    <Tooltip container={props.container} side="bottom" content={content}>
       <HeaderButton variant="ghost" size="small" onClick={props.onClick}>
         {props.isConnected && <ConnectedIcon />}
         <WalletIcon size={18} color="black" />

package/src/components/LoadingLiquiditySourceList/LoadingLiquiditySourceList.styles.ts

@@ -1,5 +1,5 @@
 import { ListItem, styled } from '@rango-dev/ui';
 
-export const CustomeListItem = styled(ListItem, {
+export const CustomListItem = styled(ListItem, {
   height: 61,
 });

package/src/components/LoadingLiquiditySourceList/LoadingLiquiditySourceList.tsx

@@ -3,16 +3,16 @@ import React from 'react';
 
 import { LiquiditySourceList } from '../SettingsContainer';
 
-import { CustomeListItem } from './LoadingLiquiditySourceList.styles';
+import { CustomListItem } from './LoadingLiquiditySourceList.styles';
 
 const ITEM_SKELETON_COUNT = 30;
 export function LoadingLiquiditySourceList() {
   return (
     <LiquiditySourceList>
-      {Array.from(Array(ITEM_SKELETON_COUNT), (e) => (
-        <CustomeListItem
+      {Array.from(Array(ITEM_SKELETON_COUNT), (_, index) => (
+        <CustomListItem
           hasDivider
-          key={e}
+          key={index}
           start={<Skeleton variant="circular" width={35} height={35} />}
           title={<Skeleton variant="text" size="large" width={90} />}
           end={<Checkbox checked={false} />}

package/src/components/NoResult/NoResult.helpers.ts

@@ -9,6 +9,9 @@ import {
   type QuoteRequestFailed,
 } from '../../types';
 
+const SMALL_NO_ROUTE__ICON_SIZE = 24;
+const LARGE_NO_ROUTE_ICON_SIZE = 60;
+
 export function makeInfo(
   error: NoResultError | QuoteRequestFailed | null,
   disabledLiquiditySources: string[],
@@ -57,3 +60,13 @@ export function makeInfo(
     description: errorMessages().noResultError.description,
   };
 }
+
+export enum NoRouteIconSize {
+  small = SMALL_NO_ROUTE__ICON_SIZE,
+  large = LARGE_NO_ROUTE_ICON_SIZE,
+}
+
+export enum NoRouteTitleSize {
+  small = 'small',
+  large = 'medium',
+}

package/src/components/NoResult/NoResult.styles.ts

@@ -6,8 +6,26 @@ export const Container = styled('div', {
   alignItems: 'center',
 });
 
+export const ErrorDescription = styled('div', {
+  variants: {
+    size: {
+      small: {},
+      large: {
+        maxWidth: '316px',
+      },
+    },
+  },
+});
+
 export const Footer = styled('div', {
-  width: '100%',
+  variants: {
+    size: {
+      small: {
+        width: '100%',
+      },
+      large: {},
+    },
+  },
 });
 
 export const PrefixIcon = styled('div', {

package/src/components/NoResult/NoResult.tsx

@@ -13,16 +13,24 @@ import React from 'react';
 import { errorMessages } from '../../constants/errors';
 import { useAppStore } from '../../store/AppStore';
 
-import { makeInfo } from './NoResult.helpers';
-import { Container, Footer, PrefixIcon } from './NoResult.styles';
+import {
+  makeInfo,
+  NoRouteIconSize,
+  NoRouteTitleSize,
+} from './NoResult.helpers';
+import {
+  Container,
+  ErrorDescription,
+  Footer,
+  PrefixIcon,
+} from './NoResult.styles';
 
 export function NoResult(props: PropTypes) {
-  const { fetch, error } = props;
+  const { fetch, error, size = 'small' } = props;
   const disabledLiquiditySources = useAppStore().getDisabledLiquiditySources();
   const toggleAllLiquiditySources = useAppStore().toggleAllLiquiditySources;
 
   const swappers = useAppStore().swappers();
-
   const info = makeInfo(
     error,
     disabledLiquiditySources,
@@ -32,27 +40,30 @@ export function NoResult(props: PropTypes) {
 
   return (
     <Container>
-      <NoRouteIcon size={24} color="gray" />
+      <NoRouteIcon size={NoRouteIconSize[size]} color="gray" />
       <Divider size={4} />
-      <Typography variant="title" size="small">
+      <Typography variant="title" size={NoRouteTitleSize[size]}>
         {errorMessages().noResultError.title}
       </Typography>
+      {size === 'large' && <Divider size={4} />}
       {!!info.description && (
-        <Typography
-          variant="body"
-          size="small"
-          align="center"
-          color="neutral700">
-          {info.description}
-        </Typography>
+        <ErrorDescription size={size}>
+          <Typography
+            variant="body"
+            size="small"
+            align="center"
+            color="neutral700">
+            {info.description}
+          </Typography>
+        </ErrorDescription>
       )}
-      <Divider size={4} />
+      <Divider size={size === 'large' ? '24' : '4'} />
       {!!info.alert && (
-        <Footer>
+        <Footer size={size}>
           <Alert
             type={info.alert.type}
             title={info.alert.text}
-            titleAlign={'center'}
+            titleAlign={'left'}
             action={
               info.alert.action && (
                 <Button

package/src/components/NoResult/NoResult.types.ts

@@ -3,6 +3,7 @@ import type { NoResultError, QuoteRequestFailed } from '../../types';
 export interface PropTypes {
   fetch: () => void;
   error: NoResultError | QuoteRequestFailed | null;
+  size?: 'small' | 'large';
 }
 
 type AlertAction = {

package/src/components/NotificationContent/NotificationContent.styles.ts

@@ -1,4 +1,4 @@
-import { styled } from '@rango-dev/ui';
+import { darkTheme, ListItemButton, styled } from '@rango-dev/ui';
 
 export const Container = styled('div', {
   padding: '$10',
@@ -17,6 +17,19 @@ export const List = styled('ul', {
   },
 });
 
+export const ListItem = styled(ListItemButton, {
+  variants: {
+    actionRequired: {
+      true: {
+        backgroundColor: '$error300',
+        [`.${darkTheme} &`]: {
+          backgroundColor: '$error600',
+        },
+      },
+    },
+  },
+});
+
 export const Images = styled('div', {
   display: 'flex',
   padding: 0,

package/src/components/NotificationContent/NotificationContent.tsx

@@ -5,7 +5,7 @@ import { EventSeverity } from '@rango-dev/queue-manager-rango-preset';
 import {
   ChainToken,
   ChevronRightIcon,
-  ListItemButton,
+  Divider,
   Typography,
 } from '@rango-dev/ui';
 import React from 'react';
@@ -16,7 +16,12 @@ import { useAppStore } from '../../store/AppStore';
 import { useNotificationStore } from '../../store/notification';
 import { areTokensEqual } from '../../utils/wallets';
 
-import { Container, Images, List } from './NotificationContent.styles';
+import {
+  Container,
+  Images,
+  List,
+  ListItem,
+} from './NotificationContent.styles';
 import { NotificationNotFound } from './NotificationNotFound';
 
 const MAX_NOTIFICATIONS_DISPLAYED = 4;
@@ -41,7 +46,7 @@ export function NotificationContent() {
     <Container>
       {sortedNotification.length ? (
         <List>
-          {sortedNotification.map((notificationItem) => {
+          {sortedNotification.map((notificationItem, index) => {
             const { route, requestId, event } = notificationItem;
             const fromToken = tokens.find((tokenItem) =>
               areTokensEqual(tokenItem, route.from)
@@ -60,42 +65,47 @@ export function NotificationContent() {
             );
 
             return (
-              <ListItemButton
-                key={requestId}
-                onClick={() => handleOnClick(requestId)}
-                title={
-                  <Typography
-                    variant="body"
-                    size="small"
-                    color={
-                      event.messageSeverity === EventSeverity.WARNING
-                        ? '$foreground'
-                        : '$neutral700'
-                    }>
-                    {i18n.t(event.message)}
-                  </Typography>
-                }
-                id={requestId}
-                start={
-                  <Images>
-                    <div className="from-chain-token">
-                      <ChainToken
-                        tokenImage={fromToken ? fromToken.image : ''}
-                        chainImage={fromBlockchain ? fromBlockchain.logo : ''}
-                        size="small"
-                      />
-                    </div>
-                    <div className="to-chain-token">
-                      <ChainToken
-                        tokenImage={toToken ? toToken.image : ''}
-                        chainImage={toBlockchain ? toBlockchain.logo : ''}
-                        size="small"
-                      />
-                    </div>
-                  </Images>
-                }
-                end={<ChevronRightIcon size={12} color="gray" />}
-              />
+              <React.Fragment key={requestId}>
+                {index > 0 && <Divider size={4} />}
+                <ListItem
+                  onClick={() => handleOnClick(requestId)}
+                  actionRequired={
+                    event.messageSeverity === EventSeverity.WARNING
+                  }
+                  title={
+                    <Typography
+                      variant="body"
+                      size="small"
+                      color={
+                        event.messageSeverity === EventSeverity.WARNING
+                          ? '$foreground'
+                          : '$neutral700'
+                      }>
+                      {i18n.t(event.message)}
+                    </Typography>
+                  }
+                  id={requestId}
+                  start={
+                    <Images>
+                      <div className="from-chain-token">
+                        <ChainToken
+                          tokenImage={fromToken ? fromToken.image : ''}
+                          chainImage={fromBlockchain ? fromBlockchain.logo : ''}
+                          size="small"
+                        />
+                      </div>
+                      <div className="to-chain-token">
+                        <ChainToken
+                          tokenImage={toToken ? toToken.image : ''}
+                          chainImage={toBlockchain ? toBlockchain.logo : ''}
+                          size="small"
+                        />
+                      </div>
+                    </Images>
+                  }
+                  end={<ChevronRightIcon size={12} color="gray" />}
+                />
+              </React.Fragment>
             );
           })}
         </List>

package/src/components/Quote/Quote.styles.ts

@@ -55,19 +55,6 @@ export const QuoteContainer = styled(Collapsible.Root, {
         backgroundColor: '$$color',
       },
     },
-    {
-      listItem: true,
-      selected: false,
-      css: {
-        cursor: 'pointer',
-        '&:hover': {
-          backgroundColor: '$neutral300',
-          [`.${darkTheme} &`]: {
-            backgroundColor: '$neutral400',
-          },
-        },
-      },
-    },
   ],
 });
 
@@ -107,6 +94,18 @@ export const SummaryContainer = styled('div', {
         },
         backgroundColor: '$$color',
         '&:hover': {
+          '& .quote_container': {
+            '& button': {
+              backgroundColor: '$neutral500',
+              [`.${darkTheme} &`]: {
+                backgroundColor: '$neutral200',
+              },
+            },
+            backgroundColor: '$neutral500',
+            [`.${darkTheme} &`]: {
+              backgroundColor: '$neutral200',
+            },
+          },
           backgroundColor: '$neutral300',
           [`.${darkTheme} &`]: {
             backgroundColor: '$neutral400',
@@ -376,6 +375,6 @@ export const Line = styled('div', {
   borderTopColor: '$neutral',
   margin: '$5 0',
   [`.${darkTheme} &`]: {
-    borderTopColor: '$neutral400',
+    borderTopColor: '$neutral800',
   },
 });