@rango-dev/ui 0.1.11-next.4 → 0.1.11-next.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/ui",
-  "version": "0.1.11-next.4",
+  "version": "0.1.11-next.6",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/BlockchainSelector/BlockchainSelector.tsx

@@ -13,6 +13,7 @@ import { LoaderContainer } from '../TokenSelector/TokenSelector';
 
 const ListContainer = styled('div', {
   overflowY: 'auto',
+  padding: '0 $4',
 });
 
 const filterBlockchains = (list: BlockchainMeta[], searchedFor: string) =>

package/src/components/LiquiditySourceList/LiquiditySourceList.tsx

@@ -28,6 +28,7 @@ const MainContainer = styled('div', {
     loaded: {
       true: {
         overflowY: 'auto',
+        padding: '0 $4',
       },
     },
   },

package/src/components/StepDetail/StepDetail.tsx

@@ -1,7 +1,6 @@
 import React, { PropsWithChildren } from 'react';
 import { styled } from '../../theme';
 import { Typography } from '../Typography';
-import { Image } from '../common';
 
 const StepLogoContainer = styled('div', {
   position: 'relative',
@@ -16,6 +15,11 @@ const StepLogoContainer = styled('div', {
     },
   },
 });
+const Logo = styled('img', {
+  width: '$28',
+  height: '$28',
+  borderRadius: '50%',
+});
 
 const ChainLogo = styled('div', {
   position: 'absolute',
@@ -23,12 +27,15 @@ const ChainLogo = styled('div', {
   bottom: -4,
   width: '$16',
   height: '$16',
+  padding: '$2',
   borderRadius: '50%',
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
   backgroundColor: '$background',
   border: '1px solid $neutrals400',
+
+  img: {
+    width: '100%',
+    display: 'block',
+  },
 });
 const StepContainer = styled('div', {
   display: 'flex',
@@ -43,6 +50,12 @@ const StepContainer = styled('div', {
         justifyContent: 'center',
       },
     },
+    success: {
+      true: { filter: 'none' },
+      false: {
+        filter: 'grayscale(100%)',
+      },
+    },
   },
 });
 const Detail = styled('div', {
@@ -63,6 +76,7 @@ const Detail = styled('div', {
 const SubTitle = styled(Typography, {
   color: '$neutrals600',
   display: 'block',
+  paddingLeft: '$8',
 });
 export interface PropTypes {
   logo: string;
@@ -70,30 +84,53 @@ export interface PropTypes {
   amount: string;
   symbol: string;
   blockchain: string;
+  estimatedAmount?: string;
   direction?: 'horizontal' | 'vertical';
+  success?: boolean;
 }
 
-export function StepDetail({
-  logo,
-  chainLogo,
-  amount,
-  symbol,
-  blockchain,
-  direction = 'horizontal',
-}: PropsWithChildren<PropTypes>) {
+export function StepDetail(props: PropsWithChildren<PropTypes>) {
+  const {
+    logo,
+    chainLogo,
+    amount,
+    symbol,
+    blockchain,
+    estimatedAmount,
+    success = true,
+    direction = 'horizontal',
+  } = props;
   return (
-    <StepContainer direction={direction}>
+    <StepContainer direction={direction} success={success}>
       <StepLogoContainer direction={direction}>
-        <Image src={logo} alt={symbol} size={28} />
+        <Logo src={logo} alt={symbol} />
         <ChainLogo>
-          <Image src={chainLogo} alt={blockchain} size={12} />
+          <img src={chainLogo} alt={blockchain} />
         </ChainLogo>
       </StepLogoContainer>
       <Detail pl={direction === 'horizontal'}>
-        <Typography noWrap variant={direction === 'vertical' ? 'body2' : 'h6'}>
-          {amount ? parseFloat(amount).toFixed(2) : '?'} {symbol}
+        {amount && (
+          <Typography
+            noWrap
+            variant={direction === 'vertical' ? 'body2' : 'h6'}
+          >
+            {amount}
+          </Typography>
+        )}
+        {!amount && estimatedAmount && (
+          <Typography
+            noWrap
+            variant={direction === 'vertical' ? 'body2' : 'h6'}
+            color={'$neutrals500'}
+          >
+            {estimatedAmount}
+          </Typography>
+        )}
+        &nbsp;
+        <Typography variant={direction === 'vertical' ? 'body2' : 'h6'} noWrap>
+          {symbol}
         </Typography>
-        <SubTitle noWrap variant="caption" color="neutrals800">
+        <SubTitle noWrap variant="caption" color="$neutrals800">
           on {blockchain}
         </SubTitle>
       </Detail>

package/src/containers/SwapHistory/SwapHistory.tsx

@@ -25,7 +25,19 @@ import {
 export const SwapperContainer = styled('div', {
   display: 'flex',
   alignItems: 'center',
-  marginLeft: '6px',
+  paddingLeft: '$4',
+  variants: {
+    created: {
+      true: {
+        filter: 'grayscale(100%)',
+      },
+    },
+    running: {
+      true: {
+        animation: `${pulse} 2s ease-in-out infinite`,
+      },
+    },
+  },
 });
 
 export const BodyError = styled('div', {
@@ -39,6 +51,10 @@ export const ErrorMsg = styled(Typography, {
   color: '$error',
 });
 
+export const FeeContainer = styled('div', {
+  paddingLeft: '$4',
+});
+
 export const Fee = styled('div', {
   display: 'flex',
   alignItems: 'center',
@@ -58,7 +74,7 @@ export const Dot = styled('div', {
   height: '$8',
   backgroundColor: '$foreground',
   borderRadius: '4px',
-  marginLeft: '$8',
+  marginLeft: '11px',
 });
 
 export const ArrowDown = styled('div', {
@@ -67,7 +83,7 @@ export const ArrowDown = styled('div', {
   borderLeft: '5px solid transparent',
   borderRight: '5px solid transparent',
   borderTop: '5px solid $foreground',
-  marginLeft: '$8',
+  marginLeft: '$10',
 });
 
 const StyledAnchor = styled('a', {
@@ -102,14 +118,10 @@ const Description = styled(Typography, {
   marginLeft: '$8',
 });
 
-const Error = styled(Description, {
-  color: '$error',
-});
-
 export const Line = styled('div', {
   width: '0',
   minHeight: '$16',
-  marginLeft: '$12',
+  marginLeft: '14px',
   border: '1px dashed $foreground',
   borderRadius: 'inherit',
 });
@@ -157,23 +169,9 @@ const ExtraDetails = styled('div', {
   fontSize: '$12',
 });
 
-const StepContainer = styled('div', {
-  variants: {
-    hasNotStarted: {
-      true: {
-        filter: 'grayscale(100%)',
-      },
-    },
-    isRunning: {
-      true: {
-        animation: `${pulse} 2s ease-in-out infinite`,
-      },
-    },
-  },
-});
-
 const SwapFlowContainer = styled('div', {
   overflowY: 'auto',
+  paddingTop: '$8',
 });
 
 export type PropTypes = {
@@ -271,21 +269,12 @@ export function SwapHistory(props: PropTypes) {
         <Divider size={32} />
 
         {pendingSwap?.steps.map((step, index) => (
-          <StepContainer
-            key={index}
-            hasNotStarted={step.status === 'created'}
-            isRunning={
-              step.status != 'failed' &&
-              step.status != 'success' &&
-              step.status != 'created'
-            }
-          >
+          <div key={index}>
             {index === 0 && (
               <RelativeContainer>
                 <StepDetail
                   logo={step.fromLogo}
                   symbol={step.fromSymbol}
-                  // @ts-ignore
                   chainLogo={step.fromBlockchainLogo || ''}
                   blockchain={step.fromBlockchain}
                   amount={pendingSwap.inputAmount}
@@ -294,35 +283,28 @@ export function SwapHistory(props: PropTypes) {
               </RelativeContainer>
             )}
             <Line />
-            <SwapperContainer>
+            <SwapperContainer
+              created={step.status === 'created'}
+              running={!['created', 'success', 'failed'].includes(step.status)}
+            >
               <Image
-                // @ts-ignore
-                src={step.swapperLogo}
+                src={step.swapperLogo || ''}
                 alt={step.swapperId}
-                size={16}
+                size={20}
               />
-              <div>
-                <Typography ml={4} variant="caption">
-                  {
-                    // @ts-ignore
-                    step.swapperType
-                  }{' '}
-                  from {step.fromSymbol} to {step.toSymbol}
-                  via {step.swapperId}
+
+              <FeeContainer>
+                <Typography variant="caption">
+                  {step.swapperType} from {step.fromSymbol} to {step.toSymbol}
+                  &nbsp; via {step.swapperId}
                 </Typography>
                 <Fee>
                   <GasIcon />
-                  <Typography ml={4} variant="caption">
-                    $
-                    {
-                      // @ts-ignore
-
-                      step.feeInUsd
-                    }{' '}
-                    estimated gas fee
+                  <Typography variant="caption">
+                    &nbsp; ${step.feeInUsd} estimated gas fee
                   </Typography>
                 </Fee>
-              </div>
+              </FeeContainer>
             </SwapperContainer>
             <div
               style={{
@@ -331,56 +313,62 @@ export function SwapHistory(props: PropTypes) {
             >
               <InternalDetailsContainer>
                 <Line />
-                {!!step.explorerUrl && (
-                  <div>
-                    {step.explorerUrl.map((item, index) => (
-                      <InternalDetail key={index}>
-                        <DescriptionContainer>
-                          <CheckCircleIcon color="success" />
-                          <Description variant="body2">
-                            {!item.description ? (
-                              <b>View transaction</b>
-                            ) : (
-                              <b>
-                                {item.description.substring(0, 1).toUpperCase()}
-                                {item.description.substring(1)}
-                              </b>
-                            )}
-                          </Description>
-                        </DescriptionContainer>
-                        <StyledAnchor
-                          href={item.url}
-                          target="_blank"
-                          rel="noreferrer"
-                          key={index}
-                        >
-                          TX-Link
-                        </StyledAnchor>
-                      </InternalDetail>
-                    ))}
-                    {step.status === 'failed' && (
-                      <InternalDetail>
-                        <DescriptionContainer>
-                          <InfoCircleIcon color="error" />
-                          <Error variant="body2">Step failed</Error>
-                        </DescriptionContainer>
-                      </InternalDetail>
-                    )}
-                  </div>
-                )}
+                <div>
+                  {!!step.explorerUrl && (
+                    <div>
+                      {step.explorerUrl.map((item, index) => (
+                        <InternalDetail key={index}>
+                          <DescriptionContainer>
+                            <CheckCircleIcon color="success" />
+                            <Description variant="body2">
+                              {!item.description ? (
+                                <b>View transaction</b>
+                              ) : (
+                                <b>
+                                  {item.description
+                                    .substring(0, 1)
+                                    .toUpperCase()}
+                                  {item.description.substring(1)}
+                                </b>
+                              )}
+                            </Description>
+                          </DescriptionContainer>
+                          <StyledAnchor
+                            href={item.url}
+                            target="_blank"
+                            rel="noreferrer"
+                            key={index}
+                          >
+                            TX-Link
+                          </StyledAnchor>
+                        </InternalDetail>
+                      ))}
+                    </div>
+                  )}
+                  {step.status === 'failed' && (
+                    <InternalDetail>
+                      <DescriptionContainer>
+                        <InfoCircleIcon color="error" />
+                        <Description variant="body2" color="$error500">
+                          Step failed
+                        </Description>
+                      </DescriptionContainer>
+                    </InternalDetail>
+                  )}
+                </div>
               </InternalDetailsContainer>
             </div>
             {index + 1 === pendingSwap.steps.length && <ArrowDown />}
             <StepDetail
               logo={step.toLogo}
               symbol={step.toSymbol}
-              // @ts-ignore
-
               chainLogo={step.toBlockchainLogo || ''}
               blockchain={step.toBlockchain}
               amount={step.outputAmount || ''}
+              estimatedAmount={step.expectedOutputAmountHumanReadable || ''}
+              success={step.status === 'success'}
             />
-          </StepContainer>
+          </div>
         ))}
 
         <Divider size={32} />