@rango-dev/widget-embedded 0.20.1-next.0 → 0.20.1-next.2

package/src/pages/Home.tsx

@@ -22,7 +22,8 @@ import { useAppStore } from '../store/AppStore';
 import { useQuoteStore } from '../store/quote';
 import { useUiStore } from '../store/ui';
 import { useWalletsStore } from '../store/wallets';
-import { numberToString } from '../utils/numbers';
+import { getContainer } from '../utils/common';
+import { formatTooltipNumbers, numberToString } from '../utils/numbers';
 import { getPriceImpact, getPriceImpactLevel } from '../utils/quote';
 import { canComputePriceImpact, getSwapButtonState } from '../utils/swap';
 import { formatBalance, isFetchingBalance } from '../utils/wallets';
@@ -192,6 +193,9 @@ export function Home() {
                       USD_VALUE_MIN_DECIMALS,
                       USD_VALUE_MAX_DECIMALS
                     ),
+                realUsdValue: priceImpactInputCanNotBeComputed
+                  ? undefined
+                  : formatTooltipNumbers(inputUsdValue),
                 error: priceImpactInputCanNotBeComputed
                   ? errorMessages().unknownPriceError.impactTitle
                   : undefined,
@@ -199,6 +203,7 @@ export function Home() {
               disabled={fetchMetaStatus === 'failed'}
               loading={fetchMetaStatus === 'loading'}
               loadingBalance={fetchingBalance}
+              tooltipContainer={getContainer()}
               onSelectMaxBalance={() => {
                 if (fromTokenFormattedBalance !== '0') {
                   setInputAmount(tokenBalanceReal.split(',').join(''));
@@ -239,6 +244,10 @@ export function Home() {
                     USD_VALUE_MIN_DECIMALS,
                     USD_VALUE_MAX_DECIMALS
                   ),
+              realValue: formatTooltipNumbers(outputAmount),
+              realUsdValue: priceImpactOutputCanNotBeComputed
+                ? undefined
+                : formatTooltipNumbers(outputUsdValue),
               error: priceImpactOutputCanNotBeComputed
                 ? errorMessages().unknownPriceError.impactTitle
                 : undefined,
@@ -246,6 +255,7 @@ export function Home() {
             onClickToken={() => navigate(navigationRoutes.toSwap)}
             disabled={fetchMetaStatus === 'failed'}
             loading={fetchMetaStatus === 'loading'}
+            tooltipContainer={getContainer()}
           />
         </InputsContainer>
         <div className="quote__container">

package/src/utils/common.ts

@@ -1,3 +1,5 @@
+import { RANGO_SWAP_BOX_ID } from '../constants';
+
 export function removeDuplicateFrom<T>(array: T[]): T[] {
   return Array.from(new Set(array));
 }
@@ -31,4 +33,4 @@ export function containsText(text: string, searchText: string): boolean {
 }
 
 export const getContainer = () =>
-  document.getElementById('swap-box') as HTMLElement;
+  document.getElementById(RANGO_SWAP_BOX_ID) as HTMLElement;

package/src/utils/date.ts

@@ -19,39 +19,53 @@ export const groupSwapsByDate: GroupBy = (swaps) => {
       },
     ],
     [
-      'month',
+      'week',
       {
-        title: 'Last month',
+        title: 'This week',
         swaps: [],
       },
     ],
     [
-      'year',
+      'month',
       {
-        title: 'Last year',
+        title: 'This month',
         swaps: [],
       },
     ],
     [
-      'history',
+      'year',
       {
-        title: 'History',
+        title: 'This year',
         swaps: [],
       },
     ],
   ]);
 
+  function addYearsToOutput(key: string, swap: PendingSwap) {
+    if (!output.has(key)) {
+      output.set(key, {
+        title: key,
+        swaps: [],
+      });
+    }
+    output.get(key)?.swaps.push(swap);
+  }
+
   const now = dayjs();
   swaps.forEach((swap) => {
-    const swapDate = dayjs(Number(swap.creationTime));
+    const time = Number(swap.creationTime);
+    const swapDate = dayjs(time);
     if (now.isSame(swapDate, 'day')) {
       output.get('today')?.swaps.push(swap);
+    } else if (now.isSame(swapDate, 'week')) {
+      output.get('week')?.swaps.push(swap);
     } else if (now.isSame(swapDate, 'month')) {
       output.get('month')?.swaps.push(swap);
     } else if (now.isSame(swapDate, 'year')) {
       output.get('year')?.swaps.push(swap);
     } else {
-      output.get('history')?.swaps.push(swap);
+      const year = new Date(time).getFullYear().toString();
+      addYearsToOutput(year, swap);
     }
   });
 

package/src/utils/numbers.ts

@@ -4,8 +4,7 @@ import type { BestRouteResponse } from 'rango-sdk';
 
 import { BigNumber } from 'bignumber.js';
 
-export const percentToString = (p: number, fractions = 0): string =>
-  (p * 100).toFixed(fractions);
+import { TOOLTIP_DECIMALS } from '../constants/routing';
 
 export const secondsToString = (s: number): string => {
   const seconds = (s % 60).toString().padStart(2, '0');
@@ -96,13 +95,6 @@ export const numberToString = (
   );
 };
 
-export const convertBigNumberToHex = (
-  value: BigNumber,
-  decimals: number
-): string => {
-  return '0x' + value.shiftedBy(decimals).toString(16);
-};
-
 export const uint8ArrayToHex = (buffer: Uint8Array): string => {
   // buffer is an ArrayBuffer
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -110,43 +102,6 @@ export const uint8ArrayToHex = (buffer: Uint8Array): string => {
   return [...buffer].map((x) => x.toString(16).padStart(2, '0')).join('');
 };
 
-export function dollarToConciseString(num: number | undefined): string {
-  if (!num) {
-    return '-';
-  }
-  if (num < 1) {
-    return ' < 1$';
-  }
-  if (num < 1000) {
-    return numberToString(new BigNumber(num)) + '$';
-  }
-  if (num < 10_000) {
-    return parseInt((num / 100).toString()) / 10 + 'K';
-  }
-  if (num < 1_000_000) {
-    return parseInt((num / 1000).toString()) + 'K';
-  }
-  if (num < 100_000_000) {
-    return parseInt((num / 100000).toString()) / 10 + 'M';
-  }
-  return parseInt((num / 1000000).toString()) + 'M';
-}
-
-export function removeExtraDecimals(num: string, maxDecimals: number): string {
-  try {
-    if (!num.includes('.')) {
-      return num;
-    }
-    const [b, f] = num.split('.');
-    if (f && f.length > maxDecimals) {
-      return `${b}.${f.substring(0, maxDecimals)}`;
-    }
-    return num;
-  } catch (e) {
-    return num;
-  }
-}
-
 export const totalArrivalTime = (
   data: { estimatedTimeInSeconds: number | null }[] | undefined
 ) => data?.reduce((a, b) => a + (b.estimatedTimeInSeconds ?? 0), 0) || 0;
@@ -167,16 +122,11 @@ export const isPositiveNumber = (text?: string) =>
   !!text && parseFloat(text) > 0;
 10;
 
-export function limitDecimalPlaces(
-  numberString: string,
-  maxDecimalPlaces = 4
-): string {
-  const number = parseFloat(numberString);
-  if (isNaN(number)) {
-    return numberString;
-  } // Return the original string if it's not a valid number
-
-  const multiplier = Math.pow(10, maxDecimalPlaces);
-  const roundedNumber = Math.round(number * multiplier) / multiplier;
-  return roundedNumber.toString();
+export function formatTooltipNumbers(
+  number: BigNumber | string | number | null | undefined
+) {
+  return numberToString(number, TOOLTIP_DECIMALS, TOOLTIP_DECIMALS).replace(
+    /(?:\.0*|(\.\d+?)0*)$/,
+    '$1'
+  );
 }

package/src/utils/time.ts

@@ -2,76 +2,32 @@ import type { PendingSwap } from 'rango-types';
 
 import { i18n } from '@lingui/core';
 
-const MILLISECOND_PER_SECOND = 1000;
-const SECONDS_PER_YEAR = 31536000;
-const SECONDS_PER_MONTH = 2592000;
-const SECONDS_PER_DAY = 86400;
-const SECONDS_PER_HOUR = 3600;
-const SECONDS_PER_MINUTE = 60;
-
-export function timeSince(millisecond: number): string {
-  const seconds = Math.floor(
-    (Date.now() - millisecond) / MILLISECOND_PER_SECOND
-  );
-
-  const intervals = [
-    {
-      turningPoint: SECONDS_PER_YEAR,
-      label: i18n.t('year'),
-      pluralLabel: i18n.t('years'),
-    },
-    {
-      turningPoint: SECONDS_PER_MONTH,
-      label: i18n.t('month'),
-      pluralLabel: i18n.t('months'),
-    },
-    {
-      turningPoint: SECONDS_PER_DAY,
-      label: i18n.t('day'),
-      pluralLabel: i18n.t('days'),
-    },
-    {
-      turningPoint: SECONDS_PER_HOUR,
-      label: i18n.t('hour'),
-      pluralLabel: i18n.t('hours'),
-    },
-    {
-      turningPoint: SECONDS_PER_MINUTE,
-      label: i18n.t('minute'),
-      pluralLabel: i18n.t('minutes'),
-    },
-  ];
-
-  const sortedIntervals = intervals.sort(
-    (a, b) => b.turningPoint - a.turningPoint
-  );
-
-  for (const interval of sortedIntervals) {
-    const { turningPoint, label, pluralLabel } = interval;
-    const intervalCount = Math.floor(seconds / turningPoint);
-    if (intervalCount > 1) {
-      return `${intervalCount} ${pluralLabel}`;
-    }
-    if (intervalCount === 1) {
-      return `${intervalCount} ${label}`;
-    }
-  }
-
-  if (seconds > 1) {
-    return `${seconds} ${i18n.t('seconds')}`;
-  }
-
-  return `${seconds} ${i18n.t('second')}`;
+const daysOfWeek = [
+  i18n.t('Sunday'),
+  i18n.t('Monday'),
+  i18n.t('Tuesday'),
+  i18n.t('Wednesday'),
+  i18n.t('Thursday'),
+  i18n.t('Friday'),
+  i18n.t('Saturday'),
+];
+
+export function timeSince(millisecond: number) {
+  const date = new Date(millisecond);
+  const day = date.getDate();
+  const month = date.toLocaleString('default', { month: 'long' });
+  const year = date.getFullYear();
+  const isToday = date.getDay() === new Date().getDay();
+  const formattedDate = isToday
+    ? i18n.t('Today')
+    : `${daysOfWeek[date.getDay()]} ${day} ${month} ${year}`;
+
+  return `${formattedDate}, ${new Date(millisecond).toLocaleTimeString()}`;
 }
 
 export function getSwapDate(pendingSwap: PendingSwap) {
-  return pendingSwap.finishTime
-    ? i18n.t({
-        id: '{time} ago',
-        values: { time: timeSince(parseInt(pendingSwap.finishTime)) },
-      })
-    : i18n.t({
-        id: '{time} ago',
-        values: { time: timeSince(parseInt(pendingSwap.creationTime)) },
-      });
+  const time = pendingSwap.finishTime
+    ? timeSince(parseInt(pendingSwap.finishTime))
+    : timeSince(parseInt(pendingSwap.creationTime));
+  return time;
 }