@rango-dev/widget-embedded 0.23.1-next.2 → 0.23.1-next.21

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',
   },
 });

package/src/components/Quote/Quote.tsx

@@ -6,6 +6,7 @@ import { i18n } from '@lingui/core';
 import {
   Alert,
   Divider,
+  FullExpandedQuote,
   InfoIcon,
   QuoteTag,
   StepDetails,
@@ -33,7 +34,7 @@ import {
 } from '../../containers/QuoteInfo/QuoteInfo.styles';
 import { useAppStore } from '../../store/AppStore';
 import { QuoteErrorType, QuoteWarningType } from '../../types';
-import { getContainer } from '../../utils/common';
+import { getContainer, getExpanded } from '../../utils/common';
 import {
   getBlockchainShortNameFor,
   getSwapperDisplayName,
@@ -83,6 +84,7 @@ export function Quote(props: QuoteProps) {
     tagHidden = true,
     showModalFee = true,
     onClickAllRoutes,
+    fullExpandedMode = false,
   } = props;
   const blockchains = useAppStore().blockchains();
   const tokens = useAppStore().tokens();
@@ -298,157 +300,176 @@ export function Quote(props: QuoteProps) {
     GAS_FEE_MAX_DECIMALS
   );
 
-  return (
-    <>
-      <SummaryContainer
-        selected={selected}
-        listItem={type === 'list-item'}
-        basic={type === 'basic'}>
-        <div className={summaryStyles()}>
-          {!tagHidden && sortedQuoteTags.length ? (
-            <>
-              <TagContainer>
-                {sortedQuoteTags.map((tag, index) => {
-                  const key = `${tag.value}_${index}`;
-                  return (
-                    <>
-                      <QuoteTag label={tag.label} key={key} value={tag.value} />
-                      <Divider size={4} direction="horizontal" />
-                    </>
-                  );
-                })}
-              </TagContainer>
-              <Line />
-              {!showAllRoutesButton && <Divider size={4} />}
-            </>
-          ) : null}
-          <div id="portal-root" className={summaryHeaderStyles()}>
-            <QuoteCostDetails
-              quote={quote}
-              time={totalTime}
-              fee={fee}
-              feeWarning={totalFee.gte(new BigNumber(GAS_FEE_MAX))}
-              showModalFee={showModalFee}
-              steps={numberOfSteps}
-            />
+  const feeWarning = totalFee.gte(new BigNumber(GAS_FEE_MAX));
 
-            {showAllRoutesButton && (
-              <AllRoutesButton
-                onClick={(e) => {
-                  e.stopPropagation();
-                  onClickAllRoutes();
-                }}
-                size="xxsmall"
-                type="secondary"
-                variant="default">
-                <Typography color="secondary" variant="label" size="medium">
-                  {i18n.t('See All Routes')}
-                </Typography>
-              </AllRoutesButton>
-            )}
-          </div>
-          {type === 'basic' && (
-            <div className={basicInfoStyles()}>
-              <FrameIcon>
-                <InfoIcon size={12} color="gray" />
-              </FrameIcon>
-              <ContainerInfoOutput>
-                <BasicInfoOutput size="small" variant="body">
-                  {`${roundedInput} ${steps[0].from.token.displayName} = `}
-                </BasicInfoOutput>
-                <Tooltip
-                  content={formatTooltipNumbers(output.value)}
-                  container={container}
-                  open={!output.value ? false : undefined}>
-                  <BasicInfoOutput size="small" variant="body">
-                    &nbsp;
-                    {`${roundedOutput} ${
-                      steps[steps.length - 1].to.token.displayName
-                    }`}
-                  </BasicInfoOutput>
-                </Tooltip>
-              </ContainerInfoOutput>
+  return fullExpandedMode ? (
+    <FullExpandedQuote
+      selected={selected}
+      fee={fee}
+      time={totalTime}
+      tooltipContainer={getExpanded()}
+      steps={steps}
+      tags={sortedQuoteTags}
+      feeWarning={feeWarning}
+      percentageChange={percentageChange}
+      warningLevel={priceImpactWarningLevel}
+      outputPrice={{
+        value: roundedOutput,
+        usdValue: roundedOutputUsdValue,
+        realValue: formatTooltipNumbers(output.value),
+        realUsdValue: formatTooltipNumbers(output.usdValue),
+      }}
+    />
+  ) : (
+    <SummaryContainer
+      selected={selected}
+      listItem={type === 'list-item'}
+      basic={type === 'basic'}>
+      <div className={summaryStyles()}>
+        {!tagHidden && sortedQuoteTags.length ? (
+          <>
+            <TagContainer>
+              {sortedQuoteTags.map((tag, index) => {
+                const key = `${tag.value}_${index}`;
+                return (
+                  <React.Fragment key={key}>
+                    <QuoteTag label={tag.label} value={tag.value} />
+                    <Divider size={4} direction="horizontal" />
+                  </React.Fragment>
+                );
+              })}
+            </TagContainer>
+            <Line />
+            {!showAllRoutesButton && <Divider size={4} />}
+          </>
+        ) : null}
+        <div id="portal-root" className={summaryHeaderStyles()}>
+          <QuoteCostDetails
+            quote={quote}
+            time={totalTime}
+            fee={fee}
+            feeWarning={feeWarning}
+            showModalFee={showModalFee}
+            steps={numberOfSteps}
+          />
+
+          {showAllRoutesButton && (
+            <AllRoutesButton
+              onClick={(e) => {
+                e.stopPropagation();
+                onClickAllRoutes();
+              }}
+              size="xxsmall"
+              type="secondary"
+              variant="default">
+              <Typography color="secondary" variant="label" size="medium">
+                {i18n.t('See All Routes')}
+              </Typography>
+            </AllRoutesButton>
+          )}
+        </div>
+        {type === 'basic' && (
+          <div className={basicInfoStyles()}>
+            <FrameIcon>
+              <InfoIcon size={12} color="gray" />
+            </FrameIcon>
+            <ContainerInfoOutput>
+              <BasicInfoOutput size="small" variant="body">
+                {`${roundedInput} ${steps[0].from.token.displayName} = `}
+              </BasicInfoOutput>
               <Tooltip
-                content={formatTooltipNumbers(output.usdValue)}
+                content={formatTooltipNumbers(output.value)}
                 container={container}
-                style={{
-                  display: 'flex',
-                }}>
-                <Typography
-                  color="$neutral600"
-                  ml={2}
-                  size="xsmall"
-                  variant="body">
-                  {`($${roundedOutputUsdValue})`}
-                </Typography>
+                open={!output.value ? false : undefined}>
+                <BasicInfoOutput size="small" variant="body">
+                  &nbsp;
+                  {`${roundedOutput} ${
+                    steps[steps.length - 1].to.token.displayName
+                  }`}
+                </BasicInfoOutput>
               </Tooltip>
-            </div>
-          )}
-          {type === 'list-item' && (
-            <TokenAmount
-              tooltipContainer={container}
-              type="output"
-              direction="vertical"
-              price={{
-                value: roundedOutput,
-                usdValue: roundedOutputUsdValue,
-                realValue: formatTooltipNumbers(output.value),
-                realUsdValue: formatTooltipNumbers(output.usdValue),
-              }}
-              token={{
-                displayName: steps[numberOfSteps - 1].to.token.displayName,
-                image: steps[numberOfSteps - 1].to.token.image,
-              }}
-              chain={{ image: steps[numberOfSteps - 1].to.chain.image }}
+            </ContainerInfoOutput>
+            <Tooltip
+              content={formatTooltipNumbers(output.usdValue)}
+              container={container}
+              style={{
+                display: 'flex',
+              }}>
+              <Typography
+                color="$neutral600"
+                ml={2}
+                size="xsmall"
+                variant="body">
+                {`($${roundedOutputUsdValue})`}
+              </Typography>
+            </Tooltip>
+          </div>
+        )}
+        {type === 'list-item' && (
+          <TokenAmount
+            tooltipContainer={container}
+            type="output"
+            direction="vertical"
+            price={{
+              value: roundedOutput,
+              usdValue: roundedOutputUsdValue,
+              realValue: formatTooltipNumbers(output.value),
+              realUsdValue: formatTooltipNumbers(output.usdValue),
+            }}
+            token={{
+              displayName: steps[numberOfSteps - 1].to.token.displayName,
+              image: steps[numberOfSteps - 1].to.token.image,
+            }}
+            chain={{ image: steps[numberOfSteps - 1].to.chain.image }}
+            percentageChange={percentageChange}
+            warningLevel={priceImpactWarningLevel}
+          />
+        )}
+        {type === 'swap-preview' && (
+          <>
+            <QuoteSummary
+              from={steps[0].from}
+              to={steps[numberOfSteps - 1].to}
               percentageChange={percentageChange}
               warningLevel={priceImpactWarningLevel}
             />
-          )}
-          {type === 'swap-preview' && (
-            <>
-              <QuoteSummary
-                from={steps[0].from}
-                to={steps[numberOfSteps - 1].to}
-                percentageChange={percentageChange}
-                warningLevel={priceImpactWarningLevel}
-              />
-              <Divider size={4} />
-            </>
-          )}
-        </div>
-        <QuoteContainer
+            <Divider size={4} />
+          </>
+        )}
+      </div>
+      <QuoteContainer
+        selected={selected}
+        listItem={type === 'list-item'}
+        open={expanded}
+        className="quote_container"
+        onOpenChange={setExpanded}>
+        <QuoteTrigger
+          type={type}
+          quoteRef={quoteRef}
           selected={selected}
-          listItem={type === 'list-item'}
-          open={expanded}
-          onOpenChange={setExpanded}>
-          <QuoteTrigger
-            type={type}
-            quoteRef={quoteRef}
-            selected={selected}
-            setExpanded={setExpanded}
-            expanded={expanded}
-            steps={steps}
-          />
-          <Content open={expanded}>
-            <HorizontalSeparator />
-            <div className={stepsDetailsStyles()}>
-              {steps.map((step, index) => {
-                const key = `item-${index}`;
-                return (
-                  <StepDetails
-                    type="quote-details"
-                    key={key}
-                    tooltipContainer={container}
-                    step={step}
-                    hasSeparator={index !== steps.length - 1}
-                    state={step.state}
-                  />
-                );
-              })}
-            </div>
-          </Content>
-        </QuoteContainer>
-      </SummaryContainer>
-    </>
+          setExpanded={setExpanded}
+          expanded={expanded}
+          steps={steps}
+        />
+        <Content open={expanded}>
+          <HorizontalSeparator />
+          <div className={stepsDetailsStyles()}>
+            {steps.map((step, index) => {
+              const key = `item-${index}`;
+              return (
+                <StepDetails
+                  type="quote-details"
+                  key={key}
+                  tooltipContainer={container}
+                  step={step}
+                  hasSeparator={index !== steps.length - 1}
+                  state={step.state}
+                />
+              );
+            })}
+          </div>
+        </Content>
+      </QuoteContainer>
+    </SummaryContainer>
   );
 }

package/src/components/Quote/Quote.types.ts

@@ -14,6 +14,7 @@ export type QuoteProps = {
   selected?: boolean;
   showModalFee?: boolean;
   onClickAllRoutes?: () => void;
+  fullExpandedMode?: boolean;
 };
 
 export type optionProps = {