fix: pool fee percantage and calculated values

fluidity-money · Aug 26, 2024 · e616e3a · e616e3a
1 parent 426d778
commit e616e3a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/web/src/components/ConfirmStake.tsx b/web/src/components/ConfirmStake.tsx
@@ -603,8 +603,8 @@ export const ConfirmStake = ({ mode, positionId }: ConfirmStakeProps) => {
             <div className="flex flex-row justify-between">
               <div>Fees</div>
               <div>
-                Pool Fee {+feePercentage.toFixed(6)}% ={" "}
-                {+(usdTokenOPrice * feePercentage).toFixed(6)}$
+                Pool Fee {+feePercentage.toFixed(3)}% ={" "}
+                {+((usdTokenOPrice * feePercentage) / 100).toFixed(6)}$
               </div>
             </div>
 

diff --git a/web/src/components/ConfirmSwap.tsx b/web/src/components/ConfirmSwap.tsx
@@ -352,8 +352,8 @@ export const ConfirmSwap = () => {
             </div>
             <div className="flex flex-row justify-end">
               <span>
-                Pool Fee {+feePercentage.toFixed(6)}% ={" "}
-                {+(usdPriceToken0 * feePercentage).toFixed(6)}$
+                Pool Fee {+feePercentage.toFixed(3)}% ={" "}
+                {+((usdPriceToken0 * feePercentage) / 100).toFixed(6)}$
               </span>
             </div>
 

diff --git a/web/src/components/StakeForm.tsx b/web/src/components/StakeForm.tsx
@@ -645,7 +645,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
               >
                 <div className="flex flex-col items-center gap-[3px]">
                   <div className="iridescent-text text-xs font-medium md:text-sm">
-                    {+feePercentage.toFixed(6)}%
+                    {+feePercentage.toFixed(3)}%
                   </div>
                   <Badge
                     variant="iridescent"
@@ -870,8 +870,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
                       }
                     >
                       <div>
-                        {/* {+feePercentage.toFixed(6)}% ={" "} */}
-                        {+(feePercentage * usdPriceToken0).toFixed(2)}$
+                        {+((usdPriceToken0 * feePercentage) / 100).toFixed(6)}$
                       </div>
                       <div
                         className={
@@ -981,7 +980,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
               <div className={"flex flex-row items-center"}>
                 <Token />
                 <Token className={"-ml-1 mr-1"} />
-                {+feePercentage.toFixed(6)}%
+                {+feePercentage.toFixed(3)}%
               </div>
             </div>
 

diff --git a/web/src/components/SwapForm.tsx b/web/src/components/SwapForm.tsx
@@ -624,8 +624,8 @@ export const SwapForm = () => {
               </div>
               <div className={"flex flex-row justify-end"}>
                 <span>
-                  Pool Fee {+feePercentage.toFixed(6)}% ={" "}
-                  {+(usdPriceToken0 * feePercentage).toFixed(6)}$
+                  Pool Fee {+feePercentage.toFixed(3)}% ={" "}
+                  {+((usdPriceToken0 * feePercentage) / 100).toFixed(6)}$
                 </span>
               </div>
               <div className={"flex flex-row justify-between"}>

diff --git a/web/src/stores/useStakeStore.ts b/web/src/stores/useStakeStore.ts
@@ -208,5 +208,5 @@ export const useStakeStore = create<StakeStore>((set) => ({
     });
   },
   feePercentage: 0,
-  setFeePercentage: (fee) => set({ feePercentage: 100 / (fee * 100) }),
+  setFeePercentage: (fee) => set({ feePercentage: 100 / fee }),
 }));
diff --git a/web/src/stores/useSwapStore.ts b/web/src/stores/useSwapStore.ts
@@ -124,5 +124,5 @@ export const useSwapStore = create<SwapStore>((set) => ({
   gas: 0n,
   setGas: (gas) => set({ gas }),
   feePercentage: 0,
-  setFeePercentage: (fee) => set({ feePercentage: 100 / (fee * 100) }),
+  setFeePercentage: (fee) => set({ feePercentage: 100 / fee }),
 }));