Fix margin page

burrowHQ · Nov 20, 2024 · eaaeea8 · eaaeea8
1 parent 9e77174
commit eaaeea8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/components/LayoutContainer/LayoutContainer.tsx b/components/LayoutContainer/LayoutContainer.tsx
@@ -10,10 +10,10 @@ type Props = {
 
 const LayoutContainer = ({ children, className = "" }: Props) => {
   const router = useRouter();
-  const isStakPage = router.route.includes("staking");
+  const isSpecialPage = router.route.includes("staking") || router.route.includes("marginTrading");
   return (
     <StyledWrapper className={className}>
-      {!isStakPage && <NonFarmedAssets />}
+      {!isSpecialPage && <NonFarmedAssets />}
       {children}
     </StyledWrapper>
   );
@@ -35,13 +35,13 @@ LayoutContainer.displayName = "LayoutContainer";
 export default LayoutContainer;
 
 export const LayoutBox = ({ children, className = "" }: Props) => {
+  const router = useRouter();
+  const isSpecialPage = router.route.includes("staking") || router.route.includes("marginTrading");
   return (
     <div
       className={`mx-auto lg:min-w-[800px] xl:max-w-[1200px] xsm:w-full xsm:overflow-x-hidden ${className}`}
     >
-      <div className="xsm:hidden lg:w-full">
-        <NonFarmedAssets />
-      </div>
+      <div className="xsm:hidden lg:w-full">{!isSpecialPage && <NonFarmedAssets />}</div>
       {children}
     </div>
   );

diff --git a/screens/Trading/components/ChangeCollateralMobile.tsx b/screens/Trading/components/ChangeCollateralMobile.tsx
@@ -155,14 +155,16 @@ const ChangeCollateralMobile = ({ open, onClose, rowData, collateralTotal }) =>
       return;
     }
     setSelectedLever(value);
+    let newInputValue;
     if (value === "Max") {
       const maxPercentage = Number(balance) / priceC;
-      setInputValue(Number(maxPercentage));
+      newInputValue = Number(maxPercentage);
     } else {
       const percentage = parseFloat(value);
-      const selectedPercentage = (Number(balance) * percentage) / 100 / priceC;
-      setInputValue(Number(selectedPercentage));
+      newInputValue = (Number(balance) * percentage) / 100 / priceC;
     }
+    setInputValue(newInputValue);
+    handleCollateralChange({ target: { value: newInputValue } }, true);
   };
   const handleLeverDeleteClick = (value) => {
     if (selectedLever === value) {
@@ -171,14 +173,16 @@ const ChangeCollateralMobile = ({ open, onClose, rowData, collateralTotal }) =>
       return;
     }
     setSelectedLever(value);
+    let newInputValue;
     if (value === "Max") {
       const maxPercentage = collateralTotal / priceC;
-      setInputValue(Number(maxPercentage));
+      newInputValue = Number(maxPercentage);
     } else {
       const percentage = parseFloat(value);
-      const selectedPercentage = (collateralTotal * percentage) / 100 / priceC;
-      setInputValue(Number(selectedPercentage));
+      newInputValue = (collateralTotal * percentage) / 100 / priceC;
     }
+    setInputValue(newInputValue);
+    handleCollateralChange({ target: { value: newInputValue } }, false);
   };
 
   return (