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() {
Max Slippage:
{maxSlippage}%
- {swapAmounts && swapAmounts.length > 0 && selectedToToken && (
-
- Fee:
-
- {(Number(swapAmounts[0].fee) / Math.pow(10, selectedToToken.decimals)).toFixed(6)} {selectedToToken.symbol}
-
-
+ {swapAmounts && swapAmounts.length > 0 && selectedFromToken && fromAmount && (
+ <>
+
+ Fee:
+
+ {(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)}%)
+
+
+
+ Total Amount In:
+
+ {((Number(parseUnits(fromAmount, selectedFromToken.decimals)) + Number(swapAmounts[0].fee)) / Math.pow(10, selectedFromToken.decimals)).toFixed(6)} {selectedFromToken.symbol}
+
+
+ >
)}
)}