@rango-dev/widget-embedded 0.24.1 → 0.24.2-next.0

package/dist/pages/Home.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Home.d.ts","sourceRoot":"","sources":["../../src/pages/Home.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA8B,MAAM,OAAO,CAAC;AA4BnD,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAEjD,wBAAgB,IAAI,sBAyMnB"}
+{"version":3,"file":"Home.d.ts","sourceRoot":"","sources":["../../src/pages/Home.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA8B,MAAM,OAAO,CAAC;AA4BnD,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAEjD,wBAAgB,IAAI,sBAyMnB"}

package/dist/utils/numbers.d.ts

@@ -1,6 +1,6 @@
 import type { BestRouteResponse } from 'rango-sdk';
 import { BigNumber } from 'bignumber.js';
-export declare const secondsToString: (s: number) => string;
+export declare const roundedSecondsToString: (s: number) => string;
 export declare const numberToString: (number: BigNumber | string | number | null | undefined, minDecimals?: number | null, maxDecimals?: number | null) => string;
 export declare const uint8ArrayToHex: (buffer: Uint8Array) => string;
 export declare const totalArrivalTime: (data: {

package/dist/utils/numbers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.d.ts","sourceRoot":"","sources":["../../src/utils/numbers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,eAAO,MAAM,eAAe,MAAO,MAAM,KAAG,MAM3C,CAAC;AAEF,eAAO,MAAM,cAAc,WACjB,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,gBACzC,MAAM,GAAG,IAAI,gBACb,MAAM,GAAG,IAAI,KACzB,MA2EF,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,UAAU,KAAG,MAKpD,CAAC;AAEF,eAAO,MAAM,gBAAgB,SACrB;IAAE,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,SAAS,WACS,CAAC;AAEzE,eAAO,MAAM,OAAO,SAAU,iBAAiB,KAAG,MAOnC,CAAC;AAEhB,eAAO,MAAM,YAAY,SAAU,MAAM,cAAc,MAAM,YACF,CAAC;AAE5D,eAAO,MAAM,gBAAgB,UAAW,MAAM,YACd,CAAC;AAGjC,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,UAMvD"}
+{"version":3,"file":"numbers.d.ts","sourceRoot":"","sources":["../../src/utils/numbers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAQzC,eAAO,MAAM,sBAAsB,MAAO,MAAM,KAAG,MASlD,CAAC;AAEF,eAAO,MAAM,cAAc,WACjB,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,gBACzC,MAAM,GAAG,IAAI,gBACb,MAAM,GAAG,IAAI,KACzB,MA2EF,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,UAAU,KAAG,MAKpD,CAAC;AAEF,eAAO,MAAM,gBAAgB,SACrB;IAAE,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,SAAS,WACS,CAAC;AAEzE,eAAO,MAAM,OAAO,SAAU,iBAAiB,KAAG,MAOnC,CAAC;AAEhB,eAAO,MAAM,YAAY,SAAU,MAAM,cAAc,MAAM,YACF,CAAC;AAE5D,eAAO,MAAM,gBAAgB,UAAW,MAAM,YACd,CAAC;AAGjC,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,UAMvD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.24.1",
+  "version": "0.24.2-next.0",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -26,7 +26,7 @@
     "@rango-dev/queue-manager-core": "^0.26.0",
     "@rango-dev/queue-manager-rango-preset": "^0.29.1",
     "@rango-dev/queue-manager-react": "^0.26.0",
-    "@rango-dev/ui": "^0.30.0",
+    "@rango-dev/ui": "^0.30.1-next.0",
     "@rango-dev/wallets-react": "^0.15.0",
     "@rango-dev/wallets-shared": "^0.29.0",
     "bignumber.js": "^9.1.1",

package/src/components/Quote/Quote.tsx

@@ -42,7 +42,7 @@ import {
 import {
   formatTooltipNumbers,
   numberToString,
-  secondsToString,
+  roundedSecondsToString,
   totalArrivalTime,
 } from '../../utils/numbers';
 import {
@@ -292,7 +292,7 @@ export function Quote(props: QuoteProps) {
   const container = getContainer();
   const sortedQuoteTags = sortTags(props.quote.tags || []);
   const showAllRoutesButton = !!onClickAllRoutes;
-  const totalTime = secondsToString(totalArrivalTime(quote?.swaps));
+  const totalTime = roundedSecondsToString(totalArrivalTime(quote?.swaps));
   const totalFee = getTotalFeeInUsd(quote?.swaps ?? [], tokens);
   const fee = numberToString(
     totalFee,

package/src/components/SwapDetails/SwapDetails.tsx

@@ -43,7 +43,7 @@ import { getContainer } from '../../utils/common';
 import {
   formatTooltipNumbers,
   numberToString,
-  secondsToString,
+  roundedSecondsToString,
   totalArrivalTime,
 } from '../../utils/numbers';
 import { getPriceImpact, getPriceImpactLevel } from '../../utils/quote';
@@ -320,7 +320,7 @@ export function SwapDetails(props: SwapDetailsProps) {
               GAS_FEE_MIN_DECIMALS,
               GAS_FEE_MAX_DECIMALS
             )}
-            time={secondsToString(totalArrivalTime(swap.steps))}
+            time={roundedSecondsToString(totalArrivalTime(swap.steps))}
             steps={numberOfSteps}
           />
           <QuoteSummary

package/src/containers/Inputs/Inputs.tsx

@@ -107,9 +107,7 @@ export function Inputs(props: PropTypes) {
           loadingBalance={fetchingBalance}
           tooltipContainer={getContainer()}
           onSelectMaxBalance={() => {
-            if (fromTokenFormattedBalance !== '0') {
-              setInputAmount(tokenBalanceReal.split(',').join(''));
-            }
+            setInputAmount(tokenBalanceReal.split(',').join(''));
           }}
         />
         <SwitchFromAndToButton />

package/src/containers/Settings/Lists.tsx

@@ -150,7 +150,7 @@ export function SettingsLists() {
     id: 'bridge-item',
     title: (
       <Typography variant="title" size="xmedium">
-        {i18n.t('Enabled bridges')}
+        {i18n.t('Bridges')}
       </Typography>
     ),
     end: (
@@ -168,7 +168,7 @@ export function SettingsLists() {
     id: 'exchange-item',
     title: (
       <Typography variant="title" size="xmedium">
-        {i18n.t('Enabled exchanges')}
+        {i18n.t('Exchanges')}
       </Typography>
     ),
     end: (

package/src/pages/Home.tsx

@@ -2,6 +2,7 @@ import type { SelectedQuote } from '../types';
 
 import { i18n } from '@lingui/core';
 import { Button, Divider, styled, WarningIcon } from '@rango-dev/ui';
+import BigNumber from 'bignumber.js';
 import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -27,7 +28,7 @@ const MainContainer = styled('div', {
   alignItems: 'flex-start',
   maxHeight: 700,
   '& .footer__alert': {
-    paddingTop: '0',
+    paddingTop: '0 !important',
   },
 });
 export const TIME_TO_NAVIGATE_ANOTHER_PAGE = 300;
@@ -81,7 +82,7 @@ export function Home() {
     !!inputAmount &&
     !!fromToken &&
     !!toToken &&
-    inputAmount !== '0' &&
+    new BigNumber(inputAmount).gt(0) &&
     !isTokensIdentical(fromToken, toToken);
 
   const fetchingQuote = hasInputs && fetchMetaStatus === 'success' && loading;

package/src/store/slices/data.ts

@@ -155,12 +155,22 @@ export const createDataSlice: StateCreator<
           }
         }
 
-        //3. sort by token popularity
+        const blockChainA = blockchainsMapByName.get(tokenA.blockchain);
+        const blockChainB = blockchainsMapByName.get(tokenB.blockchain);
+
+        //3. sort by native token
+        const isNativeTokenA = isTokenNative(tokenA, blockChainA);
+        const isNativeTokenB = isTokenNative(tokenB, blockChainB);
+        if (isNativeTokenA !== isNativeTokenB) {
+          return isNativeTokenA ? -1 : 1;
+        }
+
+        //4. sort by token popularity
         if (tokenA.isPopular !== tokenB.isPopular) {
           return tokenA.isPopular ? -1 : 1;
         }
 
-        //4. sort by search phrase
+        //5. sort by search phrase
         if (options.searchFor) {
           const symbolSearchForCompare = compareWithSearchFor(
             tokenA,
@@ -172,16 +182,6 @@ export const createDataSlice: StateCreator<
           }
         }
 
-        const blockChainA = blockchainsMapByName.get(tokenA.blockchain);
-        const blockChainB = blockchainsMapByName.get(tokenB.blockchain);
-
-        //5. sort by native token
-        const isNativeTokenA = isTokenNative(tokenA, blockChainA);
-        const isNativeTokenB = isTokenNative(tokenB, blockChainB);
-        if (isNativeTokenA !== isNativeTokenB) {
-          return isNativeTokenA ? -1 : 1;
-        }
-
         //6. sort by token isSecondary
         if (tokenA.isSecondaryCoin !== tokenB.isSecondaryCoin) {
           return tokenA.isSecondaryCoin ? 1 : -1;

package/src/utils/numbers.ts

@@ -6,12 +6,19 @@ import { BigNumber } from 'bignumber.js';
 
 import { TOOLTIP_DECIMALS } from '../constants/routing';
 
-export const secondsToString = (s: number): string => {
-  const seconds = (s % 60).toString().padStart(2, '0');
-  const minutes = parseInt((s / 60).toString())
+/*
+ * if time > 1h -> rounded with 5 minutes precision
+ * if time < 1h -> rounded with 15 seconds precision
+ */
+export const roundedSecondsToString = (s: number): string => {
+  const seconds = Math.floor((s % 60) / 15) * 15;
+  const minutes = parseInt((s / 60).toString());
+  if (minutes >= 60) {
+    return `${Math.floor(minutes / 5) * 5}:00`;
+  }
+  return `${minutes.toString().padStart(2, '0')}:${seconds
     .toString()
-    .padStart(2, '0');
-  return `${minutes}:${seconds}`;
+    .padStart(2, '0')}`;
 };
 
 export const numberToString = (