@rango-dev/widget-embedded 0.1.16-next.2 → 0.1.16-next.8

package/dist/widget-embedded.esm.js

@@ -1,4 +1,4 @@
-import { WalletState, InfoCircleIcon, Typography, Button, Image, Spacer, styled, ChevronRightIcon, GasIcon, Alert, ConfirmSwap, LoadingFailedAlert, History, AngleDownIcon, TextField, Tooltip, RetryIcon, HistoryIcon, SettingsIcon, Header as Header$1, VerticalSwapIcon, BestRoute, LiquiditySourcesSelector, BlockchainSelector, TokenSelector, Settings, SecondaryPage, Spinner, Wallet, useCopyToClipboard, SwapHistory, AddWalletIcon, globalCss, createTheme, SwapContainer } from '@rango-dev/ui';
+import { WalletState, InfoCircleIcon, Typography, Button, Image, Spacer, styled, ChevronRightIcon, GasIcon, Alert, ConfirmSwap, LoadingFailedAlert, History, AngleDownIcon, TextField, Tooltip, RetryIcon, HistoryIcon, SettingsIcon, Header as Header$1, VerticalSwapIcon, BestRoute, LiquiditySourcesSelector, BlockchainSelector, TokenSelector, Settings, SecondaryPage, Spinner, Wallet, useCopyToClipboard, SwapHistory, AddWalletIcon, globalCss, generateRangeColors, createTheme, SwapContainer } from '@rango-dev/ui';
 import React, { useRef, useEffect, Fragment, useState, useLayoutEffect, useMemo } from 'react';
 import { useInRouterContext, MemoryRouter } from 'react-router';
 import { PendingSwapNetworkStatus, useQueueManager, calculatePendingSwap, getCurrentStep, getCurrentBlockchainOfOrNull, getRelatedWalletOrNull, cancelSwap, makeQueueDefinition, checkWaitingForNetworkChange } from '@rango-dev/queue-manager-rango-preset';
@@ -29,24 +29,6 @@ function removeDuplicateFrom(array) {
 function areEqual(array1, array2) {
   return array1.length === array2.length && array1.every((v, i) => v === array2[i]);
 }
-function shadeColor(color, percent) {
-  var R = parseInt(color.substring(1, 3), 16);
-  var G = parseInt(color.substring(3, 5), 16);
-  var B = parseInt(color.substring(5, 7), 16);
-  R = R * (100 + percent) / 100;
-  G = G * (100 + percent) / 100;
-  B = B * (100 + percent) / 100;
-  R = R < 255 ? R : 255;
-  G = G < 255 ? G : 255;
-  B = B < 255 ? B : 255;
-  R = Math.round(R);
-  G = Math.round(G);
-  B = Math.round(B);
-  var RR = R.toString(16).length == 1 ? '0' + R.toString(16) : R.toString(16);
-  var GG = G.toString(16).length == 1 ? '0' + G.toString(16) : G.toString(16);
-  var BB = B.toString(16).length == 1 ? '0' + B.toString(16) : B.toString(16);
-  return '#' + RR + GG + BB;
-}
 function debounce(fn, time) {
   let timeoutId;
   return wrapper;
@@ -310,8 +292,8 @@ function getStateWallet(state) {
       return WalletState.DISCONNECTED;
   }
 }
+const excludedWallets = [WalletType.UNKNOWN, WalletType.LEAP];
 function getlistWallet(getState, getWalletInfo, list) {
-  const excludedWallets = [WalletType.UNKNOWN, WalletType.TERRA_STATION, WalletType.LEAP];
   return list.filter(wallet => !excludedWallets.includes(wallet)).map(type => {
     const {
       name,
@@ -1359,10 +1341,10 @@ const Container = /*#__PURE__*/styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300'
+        backgroundColor: '$neutral100'
       },
       outlined: {
-        border: '1px solid $neutrals300'
+        border: '1px solid $neutral100'
       }
     }
   },
@@ -1398,14 +1380,14 @@ const Container = /*#__PURE__*/styled('div', {
 const ImagePlaceholder = /*#__PURE__*/styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px'
 });
 const OutputContainer = /*#__PURE__*/styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -1439,10 +1421,10 @@ function TokenPreview(props) {
     className: "head"
   }, React.createElement(Typography, {
     variant: "body2",
-    color: "neutrals800"
+    color: "neutral800"
   }, props.label), React.createElement("div", null, percentageChange, props.usdValue && React.createElement(Typography, {
     variant: "caption",
-    color: "neutrals600",
+    color: "neutral600",
     className: "usd-value"
   }, `$${numberToString(props.usdValue)}`))), React.createElement("div", {
     className: "form"
@@ -1485,8 +1467,8 @@ const Container$1 = /*#__PURE__*/styled('div', {
   justifyContent: 'space-between',
   padding: '$8',
   borderRadius: '$5',
-  backgroundColor: '$neutrals300',
-  color: '$neutrals800',
+  backgroundColor: '$neutral100',
+  color: '$neutral800',
   fontSize: '$12',
   '.routes': {
     display: 'flex',
@@ -1838,6 +1820,7 @@ function ConfirmSwapPage() {
   const inputUsdValue = useBestRouteStore.use.inputUsdValue();
   const outputUsdValue = useBestRouteStore.use.outputUsdValue();
   const setInputAmount = useBestRouteStore.use.setInputAmount();
+  const [dbErrorMessage, setDbErrorMessage] = useState('');
   const bestRouteloadingStatus = getBestRouteStatus(fetchingBestRoute, !!fetchingBestRouteError);
   const {
     manager
@@ -1872,21 +1855,25 @@ function ConfirmSwapPage() {
     requiredWallets: getRequiredChains(bestRoute),
     selectableWallets: selectableWallets,
     onBack: navigateBackFrom.bind(null, navigationRoutes.confirmSwap),
-    onConfirm: () => {
-      confirmSwap?.().then(swap => {
+    onConfirm: async () => {
+      confirmSwap?.().then(async swap => {
         if (swap) {
-          manager?.create('swap', {
-            swapDetails: swap
-          }, {
-            id: swap.requestId
-          });
-          setSelectedSwap(swap.requestId);
-          navigate('/' + navigationRoutes.swaps + `/${swap.requestId}`, {
-            replace: true
-          });
-          setTimeout(() => {
-            setInputAmount('');
-          }, 0);
+          try {
+            await manager?.create('swap', {
+              swapDetails: swap
+            }, {
+              id: swap.requestId
+            });
+            setSelectedSwap(swap.requestId);
+            navigate('/' + navigationRoutes.swaps + `/${swap.requestId}`, {
+              replace: true
+            });
+            setTimeout(() => {
+              setInputAmount('');
+            }, 0);
+          } catch (e) {
+            setDbErrorMessage('Error: ' + e?.message);
+          }
         }
       });
     },
@@ -1933,7 +1920,7 @@ function ConfirmSwapPage() {
       totalFee: numberToString(totalFeeInUsd, 0, 2)
     }),
     loading: fetchingConfirmedRoute,
-    errors: ConfirmSwapErrors(errors),
+    errors: dbErrorMessage ? [dbErrorMessage, ...ConfirmSwapErrors(errors)] : ConfirmSwapErrors(errors),
     warnings: ConfirmSwapWarnings(warnings),
     extraMessages: React.createElement(React.Fragment, null, loadingMetaStatus === 'failed' && React.createElement(LoadingFailedAlert, null), loadingMetaStatus === 'failed' && showHighSlippageWarning && React.createElement(Spacer, {
       direction: "vertical"
@@ -2027,10 +2014,11 @@ const Container$2 = /*#__PURE__*/styled('div', {
   variants: {
     type: {
       filled: {
-        backgroundColor: '$neutrals300'
+        backgroundColor: '$neutral100'
       },
       outlined: {
-        border: '1px solid $neutrals300'
+        border: '1px solid $neutral100',
+        backgroundColor: '$surface'
       }
     }
   },
@@ -2078,14 +2066,14 @@ const Options = /*#__PURE__*/styled('div', {
 const ImagePlaceholder$1 = /*#__PURE__*/styled('span', {
   width: '24px',
   height: '24px',
-  backgroundColor: '$neutrals300',
+  backgroundColor: '$neutral100',
   borderRadius: '99999px'
 });
 const OutputContainer$1 = /*#__PURE__*/styled('div', {
   windth: '100%',
   height: '$48',
   borderRadius: '$5',
-  backgroundColor: '$background',
+  backgroundColor: '$surface',
   border: '1px solid transparent',
   position: 'relative',
   display: 'flex',
@@ -2131,7 +2119,7 @@ function TokenInfo(props) {
     className: "head"
   }, React.createElement(Typography, {
     variant: "body2",
-    color: "neutrals800"
+    color: "neutral800"
   }, t(type)), props.type === 'From' ? React.createElement(Options, null, React.createElement("div", {
     className: "balance",
     onClick: () => {
@@ -2139,7 +2127,7 @@ function TokenInfo(props) {
     }
   }, React.createElement(Typography, {
     variant: "body3",
-    color: "neutrals600"
+    color: "neutral600"
   }, `${t('Balance')}: ${tokenBalance} ${fromToken?.symbol || ''}`), React.createElement(Spacer, {
     size: 4
   }), React.createElement(Button, {
@@ -2153,7 +2141,7 @@ function TokenInfo(props) {
     outputUsdValue: props.outputUsdValue
   }), React.createElement("div", null, React.createElement(Typography, {
     variant: "caption",
-    color: "neutrals600"
+    color: "neutral600"
   }, `$${numberToString(props.outputUsdValue)}`)))), React.createElement("div", {
     className: "form"
   }, React.createElement(Button, {
@@ -2209,7 +2197,7 @@ function TokenInfo(props) {
       }
     }, React.createElement(Typography, {
       variant: "caption",
-      color: "neutrals800"
+      color: "neutral800"
     }, `$${numberToString(inputUsdValue)}`)),
     value: props.inputAmount || '',
     min: 0,
@@ -2245,7 +2233,7 @@ function BottomLogo() {
   } = useTranslation();
   return React.createElement(Container$3, null, React.createElement(Typography, {
     variant: "caption",
-    color: "$neutrals600"
+    color: "$neutral600"
   }, t('Powered By')), React.createElement(StyledAnchor, {
     href: "https://rango.exchange",
     target: "_blank"
@@ -2563,7 +2551,8 @@ function SelectTokenPage(props) {
 
 function SettingsPage(_ref) {
   let {
-    supportedSwappers
+    supportedSwappers,
+    singleTheme
   } = _ref;
   const slippage = useSettingsStore.use.slippage();
   const setSlippage = useSettingsStore.use.setSlippage();
@@ -2605,6 +2594,7 @@ function SettingsPage(_ref) {
     onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
     liquiditySources: supportedUniqueSwappersGroups,
     selectedLiquiditySources: supportedUniqueSwappersGroups.filter(s => s.selected),
+    singleTheme: singleTheme,
     customSlippage: customSlippage || NaN,
     onCustomSlippageChange: setCustomSlippage,
     minSlippage: MIN_SLIPPGAE,
@@ -2916,6 +2906,7 @@ function AppRoutes(props) {
   }, {
     path: navigationRoutes.settings,
     element: React.createElement(SettingsPage, {
+      singleTheme: config?.theme?.singleTheme,
       supportedSwappers: config?.liquiditySources
     })
   }, {
@@ -3063,89 +3054,66 @@ function useTheme(_ref) {
   const theme = useSettingsStore.use.theme();
   const fetchMeta = useMetaStore.use.fetchMeta();
   const setTheme = useSettingsStore.use.setTheme();
-  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 light = themeColors?.light;
+  const dark = themeColors?.dark;
+  const neutral = light?.neutral || '#fafafa';
+  const background = light?.background || '#fff';
+  const foreground = light?.foreground || '#000';
+  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)
+    foreground
   };
   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
+      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 => {
-      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.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', switchTheme);
     return () => {
@@ -3164,7 +3132,7 @@ function useTheme(_ref) {
     classList.add(`font_${fontFamily.replace(/ /g, '')}`);
   }, [fontFamily]);
   const getActiveTheme = () => {
-    if (theme === 'auto') return OSTheme;else return theme === 'dark' ? customeDarkTheme : customeLightTheme;
+    if (theme === 'auto') return OSTheme === 'dark' ? customeDarkTheme : customeLightTheme;else return theme === 'dark' ? customeDarkTheme : customeLightTheme;
   };
   return {
     activeTheme: getActiveTheme()