chore: sync staging -> main

src/components/AssetInput.tsx

@@ -2,24 +2,25 @@ import { PencilSquareIcon } from "@heroicons/react/20/solid";
 import { BigNumber } from "bignumber.js";
 import { clsx } from "clsx";
 import { ethers } from "ethers";
-import { FC, Fragment, useEffect, useMemo, useState } from "react";
+import { FC, Fragment, useMemo, useState } from "react";
 
 import { Chain } from "@/api/queries";
 import { AssetWithMetadata, useAssets } from "@/context/assets";
 import { disclosure } from "@/context/disclosures";
 import { useSettingsStore } from "@/context/settings";
 import Toast from "@/elements/Toast";
 import { useAccount } from "@/hooks/useAccount";
-import { getFee, useBalancesByChain } from "@/utils/utils";
+import { formatUSD, getFee, useBalancesByChain } from "@/utils/utils";
 
 import AssetSelect from "./AssetSelect";
 import ChainSelect from "./ChainSelect";
 import { ClientOnly } from "./ClientOnly";
 import { SimpleTooltip } from "./SimpleTooltip";
-import { UsdDiff, UsdValue, useUsdDiffReset } from "./UsdValue";
 
 interface Props {
   amount: string;
+  amountUSD?: string;
+  diffPercentage?: number;
   onAmountChange?: (amount: string) => void;
   asset?: AssetWithMetadata;
   onAssetChange?: (asset: AssetWithMetadata) => void;
@@ -33,6 +34,8 @@ interface Props {
 
 const AssetInput: FC<Props> = ({
   amount,
+  amountUSD,
+  diffPercentage = 0,
   onAmountChange,
   asset,
   onAssetChange,
@@ -93,15 +96,6 @@ const AssetInput: FC<Props> = ({
 
   const { slippage } = useSettingsStore();
 
-  const reset = useUsdDiffReset();
-  useEffect(() => {
-    const parsed = parseFloat(amount);
-
-    // hotfix side effect to prevent negative amounts
-    if (parsed < 0) onAmountChange?.("0.0");
-    if (parsed == 0) reset();
-  }, [amount, onAmountChange, reset]);
-
   return (
     <Fragment>
       <div className="space-y-4 border border-neutral-200 p-4 rounded-lg">
@@ -188,33 +182,24 @@ const AssetInput: FC<Props> = ({
             }}
           />
           <div className="flex items-center space-x-2 tabular-nums h-8">
-            {asset && parseFloat(amount) > 0 && (
-              <div className="text-neutral-400 text-sm">
-                <UsdValue
-                  error={null}
-                  chainId={asset.originChainID}
-                  denom={asset.originDenom}
-                  coingeckoID={asset.coingeckoID}
-                  value={amount}
-                  context={context}
-                />
-              </div>
-            )}
-            {context === "dest" && (
-              <UsdDiff.Value>
-                {({ isLoading, percentage }) => (
-                  <div
-                    className={clsx(
-                      "text-sm",
-                      isLoading && "hidden",
-                      percentage > 0 ? "text-green-500" : "text-red-500",
-                    )}
-                  >
-                    ({percentage.toFixed(2)}%)
-                  </div>
+            <p className="text-neutral-400 text-sm">
+              {amountUSD ? formatUSD(amountUSD) : null}
+            </p>
+            {amountUSD !== undefined &&
+            diffPercentage !== 0 &&
+            context === "dest" ? (
+              <p
+                className={clsx(
+                  "text-sm",
+                  diffPercentage >= 0 ? "text-green-500" : "text-red-500",
                 )}
-              </UsdDiff.Value>
-            )}
+              >
+                {new Intl.NumberFormat("en-US", {
+                  style: "percent",
+                  maximumFractionDigits: 2,
+                }).format(diffPercentage)}
+              </p>
+            ) : null}
             <div className="flex-grow" />
             {showBalance && address && selectedAssetBalance && asset && (
               <div className="text-neutral-400 text-sm flex items-center">

src/components/PriceImpactWarning.tsx

@@ -0,0 +1,65 @@
+import { useDisclosureKey } from "@/context/disclosures";
+
+interface Props {
+  onGoBack: () => void;
+  message?: string;
+  title?: string;
+}
+
+export const PriceImpactWarning = ({
+  onGoBack,
+  message = "",
+  title = "",
+}: Props) => {
+  const [isOpen, control] = useDisclosureKey("priceImpactWarning");
+
+  if (!isOpen || title === "") return null;
+
+  return (
+    <div className="absolute inset-0 bg-white rounded-3xl z-[999]">
+      <div className="h-full px-4 py-6 overflow-y-auto scrollbar-hide">
+        <div className="h-full flex flex-col">
+          <div className="flex-1 pt-8">
+            <div className="text-red-400 flex justify-center py-16">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                fill="currentColor"
+                className="h-24 w-24"
+              >
+                <path
+                  fillRule="evenodd"
+                  d="M9.401 3.003c1.155-2 4.043-2 5.197 0l7.355 12.748c1.154 2-.29 4.5-2.599 4.5H4.645c-2.309 0-3.752-2.5-2.598-4.5L9.4 3.003ZM12 8.25a.75.75 0 0 1 .75.75v3.75a.75.75 0 0 1-1.5 0V9a.75.75 0 0 1 .75-.75Zm0 8.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Z"
+                  clipRule="evenodd"
+                />
+              </svg>
+            </div>
+            <p className="font-bold text-lg text-center text-red-500 mb-2">
+              {title}
+            </p>
+            <p className="text-center text-lg px-4 leading-snug text-gray-500">
+              {message} Do you want to continue?
+            </p>
+          </div>
+          <div className="flex items-end gap-2">
+            <button
+              className="bg-[#FF486E] hover:bg-[#ed1149] transition-colors text-white font-semibold py-4 rounded-md w-full"
+              onClick={() => {
+                control.close();
+                onGoBack();
+              }}
+            >
+              Go Back
+            </button>
+            <button
+              className="border border-gray-400 text-gray-500 font-semibold py-4 rounded-md w-full transition-colors hover:bg-gray-50"
+              onClick={() => control.close()}
+            >
+              Continue
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

src/components/SwapWidget/SwapDetails.tsx

@@ -2,7 +2,7 @@ import { ChevronDownIcon, PencilSquareIcon } from "@heroicons/react/20/solid";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { RouteResponse } from "@skip-router/core";
 import { clsx } from "clsx";
-import { useMemo } from "react";
+import { Fragment, useEffect, useMemo } from "react";
 
 import { disclosure, useDisclosureKey } from "@/context/disclosures";
 import { useSettingsStore } from "@/context/settings";
@@ -15,6 +15,8 @@ import { FormValues } from "./useSwapWidget";
 type Props = FormValues & {
   amountOut: string;
   route: RouteResponse;
+  priceImpactPercent: number;
+  priceImpactThresholdReached: boolean;
 };
 
 export const SwapDetails = ({
@@ -25,6 +27,8 @@ export const SwapDetails = ({
   destinationChain,
   destinationAsset,
   route,
+  priceImpactPercent,
+  priceImpactThresholdReached,
 }: Props) => {
   const [open, control] = useDisclosureKey("swapDetailsCollapsible");
 
@@ -43,6 +47,12 @@ export const SwapDetails = ({
     return +feeAmount / Math.pow(10, 18);
   }, [axelarTransferOperation]);
 
+  useEffect(() => {
+    if (priceImpactThresholdReached) {
+      control.open();
+    }
+  }, [control, priceImpactThresholdReached]);
+
   if (!(sourceChain && sourceAsset && destinationChain && destinationAsset)) {
     return null;
   }
@@ -110,6 +120,29 @@ export const SwapDetails = ({
             "[&_dd]:text-end [&_dd]:tabular-nums",
           )}
         >
+          {priceImpactPercent ? (
+            <Fragment>
+              <dt>
+                <span
+                  className={clsx(
+                    priceImpactThresholdReached ? "text-red-500" : undefined,
+                  )}
+                >
+                  Price Impact
+                </span>
+              </dt>
+              <dd
+                className={clsx(
+                  priceImpactThresholdReached ? "text-red-500" : undefined,
+                )}
+              >
+                {new Intl.NumberFormat("en-US", {
+                  style: "percent",
+                  maximumFractionDigits: 2,
+                }).format(priceImpactPercent)}
+              </dd>
+            </Fragment>
+          ) : null}
           <dt>
             Max Slippage{" "}
             <SimpleTooltip label="Click to change max slippage">

src/components/SwapWidget/SwapWidget.tsx

@@ -47,9 +47,20 @@ export const SwapWidget: FC = () => {
     onSourceAssetChange,
     onDestinationChainChange,
     onDestinationAssetChange,
+    swapPriceImpactPercent,
+    priceImpactThresholdReached,
     routeError,
+    routeWarningTitle,
+    routeWarningMessage,
   } = useSwapWidget();
 
+  let usdDiffPercent = 0.0;
+  if (route?.usdAmountIn && route?.usdAmountOut) {
+    usdDiffPercent =
+      (parseFloat(route.usdAmountOut) - parseFloat(route.usdAmountIn)) /
+      parseFloat(route.usdAmountIn);
+  }
+
   const {
     address,
     isWalletConnected: isSourceWalletConnected,
@@ -114,6 +125,7 @@ export const SwapWidget: FC = () => {
           <div data-testid="source">
             <AssetInput
               amount={amountIn}
+              amountUSD={route?.usdAmountIn}
               asset={sourceAsset}
               chain={sourceChain}
               chains={chains ?? []}
@@ -174,6 +186,8 @@ export const SwapWidget: FC = () => {
           <div data-testid="destination">
             <AssetInput
               amount={amountOut}
+              amountUSD={route?.usdAmountOut}
+              diffPercentage={usdDiffPercent}
               asset={destinationAsset}
               chain={destinationChain}
               chains={chains ?? []}
@@ -196,6 +210,8 @@ export const SwapWidget: FC = () => {
               destinationChain={destinationChain}
               destinationAsset={destinationAsset}
               route={route}
+              priceImpactPercent={swapPriceImpactPercent ?? 0}
+              priceImpactThresholdReached={priceImpactThresholdReached}
             />
           )}
           {routeLoading && <RouteLoadingBanner />}
@@ -251,6 +267,11 @@ export const SwapWidget: FC = () => {
                 route={route}
                 transactionCount={numberOfTransactions}
                 insufficientBalance={insufficientBalance}
+                shouldShowPriceImpactWarning={
+                  !!routeWarningTitle && !!routeWarningMessage
+                }
+                routeWarningTitle={routeWarningTitle}
+                routeWarningMessage={routeWarningMessage}
               />
               {insufficientBalance && (
                 <p className="text-center font-semibold text-sm text-red-500">