fix: can not open position

burrowHQ · Nov 26, 2024 · 646cc37 · 646cc37
1 parent 6bb1a56
commit 646cc37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/screens/Trading/components/ConfirmMobile.tsx b/screens/Trading/components/ConfirmMobile.tsx
@@ -21,13 +21,15 @@ import DataSource from "../../../data/datasource";
 import { getAccountId } from "../../../redux/accountSelectors";
 import { useRouterQuery } from "../../../utils/txhashContract";
 import { handleTransactionHash } from "../../../services/transaction";
+import { useToastMessage } from "../../../hooks/hooks";
 
 const getTokenSymbolOnly = (assetId) => {
   return assetId === "wNEAR" ? "NEAR" : assetId || "";
 };
 
 export const ModalContext = createContext(null) as any;
 const ConfirmMobile = ({ open, onClose, action, confirmInfo }) => {
+  const { toastMessage, showToast } = useToastMessage();
   const { query } = useRouterQuery();
   const accountId = useAppSelector(getAccountId);
   const dispatch = useAppDispatch();
@@ -37,6 +39,7 @@ const ConfirmMobile = ({ open, onClose, action, confirmInfo }) => {
   const actionShowRedColor = action === "Long";
   const [isDisabled, setIsDisabled] = useState(false);
   const { marginConfigTokens } = useMarginConfigToken();
+  const { max_active_user_margin_position } = marginConfigTokens;
   const { marginAccountList, parseTokenValue, getAssetDetails, getAssetById } = useMarginAccount();
   const {
     price: priceP,
@@ -47,8 +50,12 @@ const ConfirmMobile = ({ open, onClose, action, confirmInfo }) => {
       ? getAssetById(confirmInfo.longOutputName?.token_id)
       : getAssetById(confirmInfo.longInputName?.token_id),
   );
-  const cateSymbol = getTokenSymbolOnly(ReduxcategoryAssets1.metadata.symbol);
+  const cateSymbol = getTokenSymbolOnly(ReduxcategoryAssets1?.metadata?.symbol);
   const confirmOpenPosition = async () => {
+    if (Object.values(marginAccountList).length >= max_active_user_margin_position) {
+      return showToast("User has exceeded the maximum number of open positions！");
+    }
+
     setIsDisabled(true);
     if (action === "Long") {
       try {

diff --git a/screens/Trading/components/TradingOperate.tsx b/screens/Trading/components/TradingOperate.tsx
@@ -27,8 +27,9 @@ const TradingOperate = () => {
   const assets = useAppSelector(getAssets);
   const config = useAppSelector(getMarginConfig);
   const { categoryAssets1, categoryAssets2 } = useMarginConfigToken();
-  const { parseTokenValue, getAssetDetails, getAssetById } = useMarginAccount();
-  const { marginConfigTokens } = useMarginConfigToken();
+  const marginConfig = useAppSelector(getMarginConfig);
+  const { marginAccountList, parseTokenValue, getAssetDetails, getAssetById } = useMarginAccount();
+  const { marginConfigTokens, filterMarginConfigList } = useMarginConfigToken();
   const { max_active_user_margin_position } = marginConfigTokens;
   const {
     ReduxcategoryAssets1,
@@ -125,7 +126,7 @@ const TradingOperate = () => {
   //   }, 200);
   // };
 
-  const cateSymbol = getTokenSymbolOnly(ReduxcategoryAssets1.metadata.symbol);
+  const cateSymbol = getTokenSymbolOnly(ReduxcategoryAssets1?.metadata?.symbol);
   // slippageTolerance change ecent
   useEffect(() => {
     dispatch(setSlippageToleranceFromRedux(0.5));