diff --git a/packages/milkomeda-wsc-ui/src/components/Pages/Overview/index.tsx b/packages/milkomeda-wsc-ui/src/components/Pages/Overview/index.tsx
index d34bec7..9bdc62b 100644
--- a/packages/milkomeda-wsc-ui/src/components/Pages/Overview/index.tsx
+++ b/packages/milkomeda-wsc-ui/src/components/Pages/Overview/index.tsx
@@ -23,14 +23,17 @@ const Overview: React.FC<{ selectedWrapToken: WrapToken | null }> = ({ selectedW
   } = useTransactionConfigWSC();
 
   const amount = React.useMemo(() => {
-    if (!defaultWrapToken) return;
+    if (!defaultWrapToken || !selectedWrapToken) return;
     return defaultWrapToken.unit === LOVELACE_UNIT
       ? convertWeiToTokens({
           valueWei: defaultWrapToken.amount,
           token: { decimals: 18 },
         }).dp(2, BigNumber.ROUND_UP)
-      : new BigNumber(+defaultWrapToken.amount).dp(4, BigNumber.ROUND_UP);
-  }, [defaultWrapToken]);
+      : convertWeiToTokens({
+          valueWei: defaultWrapToken.amount,
+          token: selectedWrapToken,
+        });
+  }, [defaultWrapToken, selectedWrapToken]);
 
   const tranferTotalAmount =
     amount &&
@@ -53,11 +56,11 @@ const Overview: React.FC<{ selectedWrapToken: WrapToken | null }> = ({ selectedW
                 : selectedWrapToken?.assetName
               : null
           }
-          {...(defaultWrapToken?.unit !== LOVELACE_UNIT && {
-            tooltipMessage: `Please keep in mind that number of decimals calculation for the token is different, eg: ${amount?.toFixed()} tReserveCoin is equivalent to ${amount?.dividedBy(
-              10 ** (selectedWrapToken?.decimals ?? 0)
-            )} RC `,
-          })}
+          // {...(defaultWrapToken?.unit !== LOVELACE_UNIT && {
+          //   tooltipMessage: `Please keep in mind that number of decimals calculation for the token is different, eg: ${amount?.toFixed()} tReserveCoin is equivalent to ${amount?.dividedBy(
+          //     10 ** (selectedWrapToken?.decimals ?? 0)
+          //   )} RC `,
+          // })}
         />
         <LabelWithBalance
           label="Bridge fees:"
diff --git a/packages/milkomeda-wsc-ui/src/components/TransactionStepper/WrapStep.tsx b/packages/milkomeda-wsc-ui/src/components/TransactionStepper/WrapStep.tsx
index 433e30e..2269fc3 100644
--- a/packages/milkomeda-wsc-ui/src/components/TransactionStepper/WrapStep.tsx
+++ b/packages/milkomeda-wsc-ui/src/components/TransactionStepper/WrapStep.tsx
@@ -77,10 +77,7 @@ export const useSelectedWrapToken = () => {
 
       const defaultToken = {
         ...token,
-        quantity:
-          token.unit === LOVELACE_UNIT
-            ? convertWeiToTokens({ valueWei: token.quantity, token })
-            : new BigNumber(token.quantity),
+        quantity: convertWeiToTokens({ valueWei: token.quantity, token }),
       };
       setSelectedWrapToken(defaultToken);
     };
@@ -167,13 +164,18 @@ const WrapStep = ({ nextStep }) => {
     }
   };
 
-  const formattedAmount =
-    defaultWrapToken.unit === LOVELACE_UNIT
+  const formattedAmount = React.useMemo(() => {
+    if (!defaultWrapToken || !selectedWrapToken) return;
+    return defaultWrapToken.unit === LOVELACE_UNIT
       ? convertWeiToTokens({
           valueWei: defaultWrapToken.amount,
           token: { decimals: 18 },
         }).dp(2, BigNumber.ROUND_UP)
-      : new BigNumber(defaultWrapToken.amount).dp(4, BigNumber.ROUND_UP);
+      : convertWeiToTokens({
+          valueWei: defaultWrapToken.amount,
+          token: selectedWrapToken,
+        });
+  }, [defaultWrapToken, selectedWrapToken]);
 
   const isAmountValid = React.useMemo(() => {
     if (!formattedAmount || !wrappingFee || !bridgeFees || !selectedWrapToken || isLoading) return;