From ed6426fad79eb3a54b7faa716b5e25fa1fa349ba Mon Sep 17 00:00:00 2001
From: surbhi <surbhi.jhavar@gmail.com>
Date: Mon, 3 Nov 2025 22:31:02 -0400
Subject: [PATCH] updating calcuated fees formula

---
 src/components/swap-form.tsx | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/swap-form.tsx b/src/components/swap-form.tsx
index 91358ab..6b010f3 100644
--- a/src/components/swap-form.tsx
+++ b/src/components/swap-form.tsx
@@ -346,13 +346,23 @@ export function SwapForm() {
               <span className="text-muted-foreground">Max Slippage:</span>
               <span className="font-medium">{maxSlippage}%</span>
             </div>
-            {swapAmounts && swapAmounts.length > 0 && selectedToToken && (
-              <div className="flex justify-between text-sm">
-                <span className="text-muted-foreground">Fee:</span>
-                <span className="font-medium">
-                  {(Number(swapAmounts[0].fee) / Math.pow(10, selectedToToken.decimals)).toFixed(6)} {selectedToToken.symbol}
-                </span>
-              </div>
+            {swapAmounts && swapAmounts.length > 0 && selectedFromToken && fromAmount && (
+              <>
+                <div className="flex justify-between text-sm">
+                  <span className="text-muted-foreground">Fee:</span>
+                  <span className="font-medium">
+                    {(Number(swapAmounts[0].fee) / Math.pow(10, selectedFromToken.decimals)).toFixed(6)} {selectedFromToken.symbol}
+                    {' '}
+                    ({((Number(swapAmounts[0].fee) / Number(parseUnits(fromAmount, selectedFromToken.decimals))) * 100).toFixed(2)}%)
+                  </span>
+                </div>
+                <div className="flex justify-between text-sm">
+                  <span className="text-muted-foreground">Total Amount In:</span>
+                  <span className="font-medium">
+                    {((Number(parseUnits(fromAmount, selectedFromToken.decimals)) + Number(swapAmounts[0].fee)) / Math.pow(10, selectedFromToken.decimals)).toFixed(6)} {selectedFromToken.symbol}
+                  </span>
+                </div>
+              </>
             )}
           </div>
         )}