From f3b3439cca6d8ccd28caa72d5b14f9f452f3b2e5 Mon Sep 17 00:00:00 2001
From: deep-path <476044723@qq.com>
Date: Mon, 18 Nov 2024 17:51:09 +0800
Subject: [PATCH] fix: fee change

---
 screens/Trading/components/TradingOperate.tsx | 11 ++++++-----
 store/helper.ts                               |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/screens/Trading/components/TradingOperate.tsx b/screens/Trading/components/TradingOperate.tsx
index 4fe3cfe0..8a681118 100644
--- a/screens/Trading/components/TradingOperate.tsx
+++ b/screens/Trading/components/TradingOperate.tsx
@@ -314,12 +314,13 @@ const TradingOperate = () => {
   }, [longOutput, shortOutput]);
 
   const Fee = useMemo(() => {
-    console.log(ReduxcategoryAssets1, ReduxcategoryAssets2);
     return {
-      fee: (Number(longInput || shortInput) * config.open_position_fee_rate) / 10000,
+      fee:
+        (Number(longInput || shortInput) * config.open_position_fee_rate) / 10000 +
+        (estimateData?.fee ?? 0) / 10000,
       price: getAssetPrice(ReduxcategoryAssets1),
     };
-  }, [longInput, shortInput, ReduxcategoryAssets1]);
+  }, [longInput, shortInput, ReduxcategoryAssets1, estimateData]);
 
   function getAssetPrice(categoryId) {
     return categoryId ? assets.data[categoryId["token_id"]].price?.usd : 0;
@@ -509,10 +510,10 @@ const TradingOperate = () => {
               <div className="flex items-center justify-between text-sm mb-4">
                 <div className="text-gray-300">Fee</div>
                 <div className="flex items-center justify-center">
-                  <p className="border-b border-dashed border-dark-800">{Fee.fee}</p>
+                  <p className="border-b border-dashed border-dark-800">{Fee.fee.toFixed(6)}</p>
                   NEAR
                   <span className="text-xs text-gray-300 ml-1.5">
-                    (${Fee.fee * (Fee.price || 0)})
+                    (${(Fee.fee * (Fee.price || 0)).toFixed(6)})
                   </span>
                 </div>
               </div>
diff --git a/store/helper.ts b/store/helper.ts
index c1d5d667..73f8420b 100644
--- a/store/helper.ts
+++ b/store/helper.ts
@@ -239,7 +239,6 @@ export const shrinkToken = (
   decimals: string | number,
   fixed?: number,
 ): string => {
-  console.log(value, decimals, fixed, "......");
   if (!value) return "";
   return new Decimal(value).div(new Decimal(10).pow(decimals)).toFixed(fixed);
 };