From 4966d4e5d70f6b10b2cc69185e695e0c2d3ad4d9 Mon Sep 17 00:00:00 2001
From: plubber <51789398+ericHgorski@users.noreply.github.com>
Date: Fri, 1 Nov 2024 18:30:34 -0400
Subject: [PATCH] [FRE-1183, FRE-1185, FRE-1146] (#411)

---
 .../src/pages/ErrorPage/ErrorPageTransactionFailed.tsx    | 1 -
 .../SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx  | 6 ------
 .../SwapExecutionPage/SwapExecutionPageRouteSimpleRow.tsx | 8 +++++++-
 packages/widget-v2/src/pages/SwapPage/SwapDetailModal.tsx | 4 ----
 packages/widget-v2/src/stories/ErrorState.stories.tsx     | 1 -
 packages/widget-v2/src/utils/number.ts                    | 2 ++
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/widget-v2/src/pages/ErrorPage/ErrorPageTransactionFailed.tsx b/packages/widget-v2/src/pages/ErrorPage/ErrorPageTransactionFailed.tsx
index c1b3ca0a..d41dfb25 100644
--- a/packages/widget-v2/src/pages/ErrorPage/ErrorPageTransactionFailed.tsx
+++ b/packages/widget-v2/src/pages/ErrorPage/ErrorPageTransactionFailed.tsx
@@ -48,7 +48,6 @@ export const ErrorPageTransactionFailed = ({
         description={
           <>
             <SmallText color={theme.error.text} textAlign="center" textWrap="balance">
-              This transaction encountered a critical error. <br />
               Please contact our support team below.
             </SmallText>
             <Row
diff --git a/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx b/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx
index 16e6ea44..86ebfea4 100644
--- a/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx
+++ b/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx
@@ -14,8 +14,6 @@ import { useAtomValue } from "jotai";
 import { SwapExecutionState } from "./SwapExecutionPage";
 import { SwapExecutionPageRouteProps } from "./SwapExecutionPageRouteSimple";
 import React from "react";
-import { EvmDisclaimer } from "@/components/EvmDisclaimer";
-import { swapExecutionStateAtom } from "@/state/swapExecutionPage";
 
 type operationTypeToIcon = Record<OperationType, JSX.Element>;
 
@@ -52,9 +50,6 @@ export const SwapExecutionPageRouteDetailed = ({
   onClickEditDestinationWallet: _onClickEditDestinationWallet,
   swapExecutionState
 }: SwapExecutionPageRouteProps) => {
-  const { route } = useAtomValue(
-    swapExecutionStateAtom
-  );
   const { data: swapVenues } = useAtomValue(skipSwapVenuesAtom);
   const { data: bridges } = useAtomValue(skipBridgesAtom);
 
@@ -159,7 +154,6 @@ export const SwapExecutionPageRouteDetailed = ({
           );
         })}
       </Column>
-      <EvmDisclaimer route={route} />
     </StyledSwapExecutionPageRoute>
   );
 };
diff --git a/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimpleRow.tsx b/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimpleRow.tsx
index 09b1ec16..574c0881 100644
--- a/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimpleRow.tsx
+++ b/packages/widget-v2/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimpleRow.tsx
@@ -18,6 +18,7 @@ import { formatUSD } from "@/utils/intl";
 import { copyToClipboard } from "@/utils/misc";
 import {
   limitDecimalsDisplayed,
+  removeTrailingZeros,
 } from "@/utils/number";
 
 export type SwapExecutionPageRouteSimpleRowProps = {
@@ -75,6 +76,11 @@ export const SwapExecutionPageRouteSimpleRow = ({
     }
   }, [account?.address, account?.wallet.logo, chainAddresses, context]);
 
+  const displayAmount = useMemo(() => {
+    return removeTrailingZeros(limitDecimalsDisplayed(assetDetails.amount))
+  }
+    , [assetDetails.amount]);
+
   return (
     <Row gap={25} align="center">
       {assetDetails.assetImage && (
@@ -95,7 +101,7 @@ export const SwapExecutionPageRouteSimpleRow = ({
       )}
       <Column gap={5}>
         <StyledSymbolAndAmount>
-          {limitDecimalsDisplayed(assetDetails.amount)} {assetDetails?.symbol}
+          {displayAmount} {assetDetails?.symbol}
         </StyledSymbolAndAmount>
         {usdValue && (
           <SmallText>
diff --git a/packages/widget-v2/src/pages/SwapPage/SwapDetailModal.tsx b/packages/widget-v2/src/pages/SwapPage/SwapDetailModal.tsx
index 01340746..841738de 100644
--- a/packages/widget-v2/src/pages/SwapPage/SwapDetailModal.tsx
+++ b/packages/widget-v2/src/pages/SwapPage/SwapDetailModal.tsx
@@ -15,7 +15,6 @@ import { getClientOperations, OperationType } from "@/utils/clientType";
 import { convertTokenAmountToHumanReadableAmount } from "@/utils/crypto";
 import { getBrandButtonTextColor } from "@/utils/colors";
 import { QuestionMarkIcon } from "@/icons/QuestionMarkIcon";
-import { EvmDisclaimer } from "@/components/EvmDisclaimer";
 
 export const SwapDetailModal = createModal((modalProps: ModalProps) => {
   const { data: route } = useAtomValue(skipRouteAtom);
@@ -222,9 +221,6 @@ export const SwapDetailModal = createModal((modalProps: ModalProps) => {
           )}
         </Column>
       )}
-
-      <EvmDisclaimer route={route} />
-
       <SwapDetailText justify="space-between">
         <SwapPageFooterItems showRouteInfo />
       </SwapDetailText>
diff --git a/packages/widget-v2/src/stories/ErrorState.stories.tsx b/packages/widget-v2/src/stories/ErrorState.stories.tsx
index f5473676..1061b995 100644
--- a/packages/widget-v2/src/stories/ErrorState.stories.tsx
+++ b/packages/widget-v2/src/stories/ErrorState.stories.tsx
@@ -77,7 +77,6 @@ const transactionFailedProps = (theme: Theme) => {
     description: (
       <>
         <SmallText color={theme.error.text} textAlign="center">
-          This transaction encountered a critical error. <br />
           Please contact our support team below.
         </SmallText>
         <Row
diff --git a/packages/widget-v2/src/utils/number.ts b/packages/widget-v2/src/utils/number.ts
index e91c6aa3..e816b970 100644
--- a/packages/widget-v2/src/utils/number.ts
+++ b/packages/widget-v2/src/utils/number.ts
@@ -11,6 +11,8 @@ export function formatNumberWithoutCommas(str: string | number) {
   return str.toString().replace(/,/g, "");
 }
 
+export const removeTrailingZeros = (input: string | undefined) => input?.replace(/0+$/, '');
+
 export function limitDecimalsDisplayed(input: string | number | undefined, decimalPlaces = 6) {
   if (input === undefined) return "";