@rango-dev/widget-embedded 0.1.16-next.0 → 0.1.16-next.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.1.16-next.0",
+  "version": "0.1.16-next.10",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -10,11 +10,7 @@
   ],
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "scripts": {
-    "watch-tsc": "tsc --watch --noEmit",
-    "dev": "parcel public/index.html -p 3001 --no-cache",
-    "dev-tsc": "npm-run-all --parallel watch-tsc dev",
-    "build:app": "parcel build --cache-dir=.parcel-cache",
-    "build": "tsdx build --entry ./src/lib.tsx"
+    "build": "tsdx build --tsconfig ./tsconfig.json"
   },
   "husky": {
     "hooks": {
@@ -28,13 +24,13 @@
     "trailingComma": "es5"
   },
   "dependencies": {
-    "@rango-dev/provider-all": "^0.1.12",
-    "@rango-dev/queue-manager-core": "^0.1.12",
-    "@rango-dev/queue-manager-rango-preset": "^0.1.12",
-    "@rango-dev/queue-manager-react": "^0.1.11",
-    "@rango-dev/ui": "^0.1.13",
-    "@rango-dev/wallets-core": "^0.1.12",
-    "@rango-dev/wallets-shared": "^0.1.11",
+    "@rango-dev/provider-all": "^0.1.14-next.4",
+    "@rango-dev/queue-manager-core": "^0.1.13-next.0",
+    "@rango-dev/queue-manager-rango-preset": "^0.1.13-next.1",
+    "@rango-dev/queue-manager-react": "^0.1.12-next.0",
+    "@rango-dev/ui": "^0.1.14-next.1",
+    "@rango-dev/wallets-core": "^0.1.14-next.0",
+    "@rango-dev/wallets-shared": "^0.1.13-next.0",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",
@@ -50,6 +46,7 @@
     "react-dom": "^18.2.0",
     "react-i18next": "^12.2.0",
     "react-router-dom": "^6.8.0",
+    "values.js": "2.1.1",
     "zustand": "^4.3.2"
   },
   "publishConfig": {

package/src/QueueManager.tsx

@@ -34,13 +34,12 @@ function QueueManager(props: PropsWithChildren<{}>) {
     });
   }, []);
   const getOneOfWalletsDetails = useWalletsStore.use.getOneOfWalletsDetails();
-  const accounts = useWalletsStore.use.accounts();
 
   const { blockchains } = useMetaStore.use.meta();
-  const balances = useWalletsStore.use.balances();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
 
   const wallets = {
-    blockchains: balances.map((wallet) => ({
+    blockchains: connectedWallets.map((wallet) => ({
       accounts: [wallet],
       name: wallet.chain,
     })),
@@ -79,12 +78,12 @@ function QueueManager(props: PropsWithChildren<{}>) {
         lastStep?.id !== data.step?.id) ||
       !!outputAmount
     ) {
-      const fromAccount = accounts.find(
+      const fromAccount = connectedWallets.find(
         (account) => account.chain === step?.fromBlockchain
       );
       const toAccount =
         step?.fromBlockchain !== step?.toBlockchain &&
-        accounts.find((account) => account.chain === step?.toBlockchain);
+        connectedWallets.find((wallet) => wallet.chain === step?.toBlockchain);
 
       fromAccount && getOneOfWalletsDetails(fromAccount);
       toAccount && getOneOfWalletsDetails(toAccount);
@@ -112,7 +111,6 @@ function QueueManager(props: PropsWithChildren<{}>) {
 
   return (
     <ManagerProvider
-      //@ts-ignore
       queuesDefs={[swapQueueDef]}
       context={context}
       onPersistedDataLoaded={(manager) => {

package/src/components/AppRoutes.tsx

@@ -55,7 +55,7 @@ export function AppRoutes(props: PropTypes) {
     },
     {
       path: navigationRoutes.settings,
-      element: <SettingsPage supportedSwappers={config?.liquiditySources} />,
+      element: <SettingsPage singleTheme= {config?.theme?.singleTheme} supportedSwappers={config?.liquiditySources} />,
     },
     {
       path: navigationRoutes.liquiditySources,

package/src/components/BottomLogo.tsx

@@ -29,7 +29,7 @@ export function BottomLogo() {
 
   return (
     <Container>
-      <Typography variant="caption" color="$neutrals600">
+      <Typography variant="caption" color="$neutral600">
         {t('Powered By')}
       </Typography>
       <StyledAnchor href="https://rango.exchange" target="_blank">

package/src/components/Layout.tsx

@@ -39,7 +39,7 @@ const WalletImageContainer = styled('div', {
   marginRight: '$6',
   '& img': {
     borderRadius: '50%',
-  }
+  },
 });
 
 export type LayoutProps = {
@@ -48,10 +48,10 @@ export type LayoutProps = {
 
 export function Layout({ config }: LayoutProps) {
   const navigate = useNavigate();
-  const { balances, accounts, selectedWallets } = useWalletsStore();
+  const { connectedWallets, selectedWallets } = useWalletsStore();
   const { getWalletInfo } = useWallets();
   const connectedWalletsImages = removeDuplicateFrom(
-    getSelectableWallets(accounts, selectedWallets, getWalletInfo).map(
+    getSelectableWallets(connectedWallets, selectedWallets, getWalletInfo).map(
       (w) => w.image
     )
   );
@@ -63,7 +63,7 @@ export function Layout({ config }: LayoutProps) {
   const setInputAmount = useBestRouteStore.use.setInputAmount();
   const setAffiliateRef = useSettingsStore.use.setAffiliateRef();
 
-  const totalBalance = calculateWalletUsdValue(balances);
+  const totalBalance = calculateWalletUsdValue(connectedWallets);
   const connectWalletsButtonDisabled =
     useUiStore.use.connectWalletsButtonDisabled();
   const loadingMetaStatus = useMetaStore.use.loadingStatus();
@@ -71,31 +71,35 @@ export function Layout({ config }: LayoutProps) {
 
   const { t } = useTranslation();
   useEffect(() => {
-    const chain = blockchains.find(
-      (chain) => chain.name === config?.to?.blockchain
-    );
-    const token = tokens.find((t) =>
-      tokensAreEqual(t, config?.to?.token || null)
-    );
-    setToChain(chain || null);
-    setToToken(token || null);
-  }, [config?.to?.token, config?.to?.blockchain]);
+    if (loadingMetaStatus === 'success') {
+      const chain = blockchains.find(
+        (chain) => chain.name === config?.to?.blockchain
+      );
+      const token = tokens.find((t) =>
+        tokensAreEqual(t, config?.to?.token || null)
+      );
+      setToChain(chain || null);
+      setToToken(token || null);
+    }
+  }, [config?.to?.token, config?.to?.blockchain, loadingMetaStatus]);
 
   useEffect(() => {
     setInputAmount(config?.amount?.toString() || '');
   }, [config?.amount]);
 
   useEffect(() => {
-    const chain = blockchains.find(
-      (chain) => chain.name === config?.from?.blockchain
-    );
-    const token = tokens.find((t) =>
-      tokensAreEqual(t, config?.from?.token || null)
-    );
+    if (loadingMetaStatus === 'success') {
+      const chain = blockchains.find(
+        (chain) => chain.name === config?.from?.blockchain
+      );
+      const token = tokens.find((t) =>
+        tokensAreEqual(t, config?.from?.token || null)
+      );
 
-    setFromChain(chain || null);
-    setFromToken(token || null);
-  }, [config?.from?.token, config?.from?.blockchain]);
+      setFromChain(chain || null);
+      setFromToken(token || null);
+    }
+  }, [config?.from?.token, config?.from?.blockchain, loadingMetaStatus]);
 
   useEffect(() => {
     setAffiliateRef(config?.affiliateRef || null);
@@ -126,7 +130,7 @@ export function Layout({ config }: LayoutProps) {
           )}
           <div className="balance">
             <Typography variant="body2">
-              {!accounts?.length
+              {!connectedWallets?.length
                 ? t('Connect Wallet')
                 : `$${totalBalance || 0}`}
             </Typography>

package/src/components/RoutesOverview.tsx

@@ -8,8 +8,8 @@ export const Container = styled('div', {
   justifyContent: 'space-between',
   padding: '$8',
   borderRadius: '$5',
-  backgroundColor: '$neutrals300',
-  color: '$neutrals800',
+  backgroundColor: '$neutral100',
+  color: '$neutral800',
   fontSize: '$12',
 
   '.routes': {

package/src/components/TokenInfo.tsx

@@ -37,7 +37,7 @@ const Box = styled('div', {
   display: 'flex',
   flexDirection: 'column',
   width: '100%',
-  overflow: 'hidden'
+  overflow: 'hidden',
 });
 
 const Container = styled('div', {
@@ -48,10 +48,11 @@ const Container = styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300',
+        backgroundColor: '$neutral100',
       },
       outlined: {
-        border: '1px solid $neutrals300',
+        border: '1px solid $neutral100',
+        backgroundColor: '$surface',
       },
     },
   },
@@ -105,7 +106,7 @@ const Options = styled('div', {
 const ImagePlaceholder = styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px',
 });
 
@@ -113,7 +114,7 @@ const OutputContainer = styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -132,7 +133,7 @@ export function TokenInfo(props: PropTypes) {
   const setInputAmount = useBestRouteStore.use.setInputAmount();
   const bestRoute = useBestRouteStore.use.bestRoute();
   const inputAmount = useBestRouteStore.use.inputAmount();
-  const balances = useWalletsStore.use.balances();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const fetchingBestRoute = useBestRouteStore.use.loading();
   const navigate = useNavigate();
   const { t } = useTranslation();
@@ -141,7 +142,7 @@ export function TokenInfo(props: PropTypes) {
     !!fromChain && !!fromToken
       ? numberToString(
           getBalanceFromWallet(
-            balances,
+            connectedWallets,
             fromChain?.name,
             fromToken?.symbol,
             fromToken?.address
@@ -154,13 +155,13 @@ export function TokenInfo(props: PropTypes) {
     !!fromChain && !!fromToken
       ? numberToString(
           getBalanceFromWallet(
-            balances,
+            connectedWallets,
             fromChain?.name,
             fromToken?.symbol,
             fromToken?.address
           )?.amount || '0',
           getBalanceFromWallet(
-            balances,
+            connectedWallets,
             fromChain?.name,
             fromToken?.symbol,
             fromToken?.address
@@ -185,7 +186,7 @@ export function TokenInfo(props: PropTypes) {
     <Box>
       <Container type={props.type === 'From' ? 'filled' : 'outlined'}>
         <div className="head">
-          <Typography variant="body2" color="neutrals800">
+          <Typography variant="body2" color="neutral800">
             {t(type)}
           </Typography>
           {props.type === 'From' ? (
@@ -197,7 +198,7 @@ export function TokenInfo(props: PropTypes) {
                     setInputAmount(tokenBalanceReal.split(',').join(''));
                 }}
               >
-                <Typography variant="body3" color="neutrals600">{`${t(
+                <Typography variant="body3" color="neutral600">{`${t(
                   'Balance'
                 )}: ${tokenBalance} ${fromToken?.symbol || ''}`}</Typography>
                 <Spacer size={4} />
@@ -215,7 +216,7 @@ export function TokenInfo(props: PropTypes) {
               <div>
                 <Typography
                   variant="caption"
-                  color="neutrals600"
+                  color="neutral600"
                 >{`$${numberToString(props.outputUsdValue)}`}</Typography>
               </div>
             </div>
@@ -293,7 +294,7 @@ export function TokenInfo(props: PropTypes) {
                   >
                     <Typography
                       variant="caption"
-                      color="neutrals800"
+                      color="neutral800"
                     >{`$${numberToString(inputUsdValue)}`}</Typography>
                   </span>
                 }

package/src/components/TokenPreview.tsx

@@ -27,10 +27,10 @@ const Container = styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300',
+        backgroundColor: '$neutral100',
       },
       outlined: {
-        border: '1px solid $neutrals300',
+        border: '1px solid $neutral100',
       },
     },
   },
@@ -70,7 +70,7 @@ const Container = styled('div', {
 const ImagePlaceholder = styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px',
 });
 
@@ -78,7 +78,7 @@ const OutputContainer = styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -123,7 +123,7 @@ export function TokenPreview(props: PropTypes) {
     <Box>
       <Container type={'outlined'}>
         <div className="head">
-          <Typography variant="body2" color="neutrals800">
+          <Typography variant="body2" color="neutral800">
             {props.label}
           </Typography>
           <div>
@@ -131,7 +131,7 @@ export function TokenPreview(props: PropTypes) {
             {props.usdValue && (
               <Typography
                 variant="caption"
-                color="neutrals600"
+                color="neutral600"
                 className="usd-value"
               >{`$${numberToString(props.usdValue)}`}</Typography>
             )}

package/src/hooks/useConfirmSwap.ts

@@ -51,7 +51,7 @@ export function useConfirmSwap(): ConfirmSwap {
   const inputUsdValue = useBestRouteStore.use.inputUsdValue();
   const affiliateRef = useSettingsStore.use.affiliateRef();
 
-  const accounts = useWalletsStore.use.accounts();
+  const connectedWallets = useWalletsStore.use.connectedWallets();
   const selectedWallets = useWalletsStore.use.selectedWallets();
   const meta = useMetaStore.use.meta();
   const customSlippage = useSettingsStore.use.customSlippage();
@@ -108,7 +108,7 @@ export function useConfirmSwap(): ConfirmSwap {
       fromToken,
       toToken,
       inputAmount,
-      accounts,
+      connectedWallets,
       selectedWallets,
       disabledLiquiditySources,
       userSlippage,

package/src/hooks/useTheme.ts

@@ -1,9 +1,8 @@
-import { createTheme } from '@rango-dev/ui';
+import { createTheme, generateRangeColors } from '@rango-dev/ui';
 import { useState, useEffect, useLayoutEffect } from 'react';
 import { useMetaStore } from '../store/meta';
 import { useSettingsStore } from '../store/settings';
 import { WidgetTheme } from '../types';
-import { shadeColor } from '../utils/common';
 import usePrevious from './usePrevious';
 
 export function useTheme({
@@ -15,98 +14,81 @@ export function useTheme({
   const theme = useSettingsStore.use.theme();
   const fetchMeta = useMetaStore.use.fetchMeta();
   const setTheme = useSettingsStore.use.setTheme();
+  const light = themeColors?.light;
+  const dark = themeColors?.dark;
+  const neutral = light?.neutral || '#fafafa';
+  const background = light?.background || '#fff';
+  const foreground = light?.foreground || '#000';
 
-  const primary = themeColors?.primary || '#5FA425',
-    background = themeColors?.background || '#fff',
-    foreground = themeColors?.foreground || '#000',
-    error = themeColors?.error || '#FF0000',
-    warning = themeColors?.warning || '#F5A623',
-    success = themeColors?.success || '#0070F3';
-  const colors = {
-    neutrals200: '#FAFAFA',
-    neutrals300: '#f2f2f2',
-    neutrals400: '#dedede',
-    neutrals500: '#cccccc',
-    neutrals600: '#acacac',
-    neutrals700: '#444444',
-    neutrals800: '#333333',
-    neutrals900: '#111111',
-    primary,
-    primary100: shadeColor(primary, 15),
-    primary200: shadeColor(primary, -10),
-    primary300: shadeColor(primary, -15),
-    primary400: shadeColor(primary, -20),
-    primary500: shadeColor(primary, -25),
-    primary600: shadeColor(primary, -30),
-    primary700: shadeColor(primary, -35),
-    primary800: shadeColor(primary, -40),
-    primary900: shadeColor(primary, -45),
+  const darkColors = {
+    ...generateRangeColors('primary', 'dark', dark?.primary),
+    ...generateRangeColors('error', 'dark', dark?.error),
+    ...generateRangeColors('warning', 'dark', dark?.warning),
+    ...generateRangeColors('success', 'dark', dark?.success),
+    ...generateRangeColors('neutral', 'dark', dark?.neutral),
+    surface: dark?.surface,
+    background: dark?.background,
+    foreground: dark?.foreground,
+  };
+
+  const lightColors = {
+    surface: light?.surface || '#fff',
+    ...generateRangeColors('primary', 'light', light?.primary || '#5FA425'),
+    ...generateRangeColors('error', 'light', light?.error || '#FF0000'),
+    ...generateRangeColors('warning', 'light', light?.warning || '#F5A623'),
+    ...generateRangeColors('success', 'light', light?.success || '#0070F3'),
+    ...generateRangeColors('neutral', 'light', neutral),
     background,
     foreground,
-    error,
-    error100: shadeColor(error, 50),
-    error300: shadeColor(error, -10),
-    error500: shadeColor(error, -20),
-    error700: shadeColor(error, -30),
-    warning,
-    warning100: shadeColor(warning, 50),
-    warning300: shadeColor(warning, -10),
-    warning500: shadeColor(warning, -20),
-    warning700: shadeColor(warning, -30),
-    success,
-    success100: shadeColor(success, 50),
-    success300: shadeColor(success, -10),
-    success500: shadeColor(success, -20),
-    success700: shadeColor(success, -30),
   };
 
   const customeLightTheme = createTheme({
-    colors,
+    colors: lightColors,
     radii: {
       5: `${borderRadius}px`,
     },
     shadows: {
-      s: '0px 3px 5px 3px #f0f2f5, 0px 6px 10px 3px #f0f2f5, 0px 1px 18px 3px #f0f2f5',
+      s: `0px 3px 5px 3px ${light?.neutral || '#f0f2f5'} ,0px 6px 10px 3px ${
+        light?.neutral || '#f0f2f5'
+      }, 0px 1px 18px 3px ${light?.neutral || '#f0f2f5'}`,
     },
   });
 
   const customeDarkTheme = createTheme({
     colors: {
-      ...colors,
-      neutrals200: '#111111',
-      neutrals300: '#333333',
-      neutrals400: '#444444',
-      neutrals500: '#acacac',
-      neutrals600: '#cccccc',
-      neutrals700: '#dedede',
-      neutrals800: '#f2f2f2',
-      neutrals900: '#FAFAFA',
+      ...lightColors,
+      ...generateRangeColors('neutral', 'dark', '#111111'),
       foreground: background,
       background: foreground,
+      surface: '#000',
+      ...JSON.parse(JSON.stringify(darkColors)),
     },
     radii: {
       5: `${borderRadius}px`,
     },
     shadows: {
-      s: '0px 3px 5px 3px #222, 0px 6px 10px 3px #222, 0px 1px 18px 3px #222',
+      s: `0px 3px 5px 3px ${dark?.neutral || '#222'}, 0px 6px 10px 3px ${
+        dark?.neutral || '#222'
+      }, 0px 1px 18px 3px ${dark?.neutral || '#222'}`,
     },
   });
-  const [OSTheme, setOSTheme] = useState(customeLightTheme);
+  const [OSTheme, setOSTheme] = useState('light');
+
   useEffect(() => {
     (async () => {
       await fetchMeta();
     })();
 
     const switchTheme = (event: MediaQueryListEvent) => {
-      if (event.matches) setOSTheme(customeDarkTheme);
-      else setOSTheme(customeLightTheme);
+      if (event.matches) setOSTheme('dark');
+      else setOSTheme('light');
     };
 
     if (
       window.matchMedia &&
       window.matchMedia('(prefers-color-scheme: dark)').matches
     ) {
-      setOSTheme(customeDarkTheme);
+      setOSTheme('dark');
     }
 
     window
@@ -131,7 +113,8 @@ export function useTheme({
   }, [fontFamily]);
 
   const getActiveTheme = () => {
-    if (theme === 'auto') return OSTheme;
+    if (theme === 'auto')
+      return OSTheme === 'dark' ? customeDarkTheme : customeLightTheme;
     else return theme === 'dark' ? customeDarkTheme : customeLightTheme;
   };