diff --git a/components/HashResultModal/ModalWithCountdown.tsx b/components/HashResultModal/ModalWithCountdown.tsx index e07008f8..7d534338 100644 --- a/components/HashResultModal/ModalWithCountdown.tsx +++ b/components/HashResultModal/ModalWithCountdown.tsx @@ -71,7 +71,11 @@ const ModalWithCountdown = ({ const renderProgressBar = () => (
); @@ -88,7 +92,9 @@ const ModalWithCountdown = ({ {title}
{type} {positionSize.symbol} @@ -104,7 +110,9 @@ const ModalWithCountdown = ({ Position Size {positionSize.amount} {positionSize.symbol} - ({positionSize.usdValue}) + + ({(Number(positionSize.amount) * Number(price)).toFixed(6)}) +
{renderProgressBar()}
diff --git a/components/HashResultModal/index.tsx b/components/HashResultModal/index.tsx index 662e2736..a3b9f3f9 100644 --- a/components/HashResultModal/index.tsx +++ b/components/HashResultModal/index.tsx @@ -1,5 +1,5 @@ import React from "react"; -import ReactDOM from "react-dom"; +import { createRoot } from "react-dom/client"; import ModalWithCountdown from "./ModalWithCountdown"; interface ShowPositionResultParams { @@ -15,6 +15,7 @@ interface ShowPositionResultParams { } let container: HTMLDivElement | null = null; +let root: ReturnType | null = null; export const showPositionResult = (params: ShowPositionResultParams) => { if (params.transactionHashes) { @@ -36,15 +37,19 @@ export const showPositionResult = (params: ShowPositionResultParams) => { container = document.createElement("div"); container.id = "position-result-container"; document.body.appendChild(container); + root = createRoot(container); } const handleClose = () => { + if (root) { + root.unmount(); + } if (container) { - ReactDOM.unmountComponentAtNode(container); container.remove(); container = null; + root = null; } }; - ReactDOM.render(, container); + root?.render(); }; diff --git a/interfaces/margin.ts b/interfaces/margin.ts index adaeef51..daf80479 100644 --- a/interfaces/margin.ts +++ b/interfaces/margin.ts @@ -9,6 +9,7 @@ export interface IMarginConfig { open_position_fee_rate: number; registered_dexes: { [dexId: string]: number }; registered_tokens: { [tokenId: string]: number }; + max_active_user_margin_position: number; } export interface IMarginTradingPositionView { diff --git a/redux/marginConfigSlice.ts b/redux/marginConfigSlice.ts index 609c9d65..a9325d6f 100644 --- a/redux/marginConfigSlice.ts +++ b/redux/marginConfigSlice.ts @@ -33,6 +33,7 @@ export const marginConfigSlice = createSlice({ open_position_fee_rate, registered_dexes, registered_tokens, + max_active_user_margin_position, } = action.payload; state.max_leverage_rate = max_leverage_rate; state.pending_debt_scale = pending_debt_scale; @@ -42,6 +43,7 @@ export const marginConfigSlice = createSlice({ state.open_position_fee_rate = open_position_fee_rate; state.registered_dexes = registered_dexes; state.registered_tokens = registered_tokens; + state.max_active_user_margin_position = max_active_user_margin_position; }); }, }); diff --git a/redux/marginConfigState.ts b/redux/marginConfigState.ts index 3775c3e0..e2300dcc 100644 --- a/redux/marginConfigState.ts +++ b/redux/marginConfigState.ts @@ -10,6 +10,7 @@ export interface IMarginConfigState { registered_tokens: Record; status: Status; fetchedAt: string | undefined; + max_active_user_margin_position: number; } export const initialState: IMarginConfigState = { @@ -23,4 +24,5 @@ export const initialState: IMarginConfigState = { registered_tokens: {}, status: undefined, fetchedAt: undefined, + max_active_user_margin_position: 0, }; diff --git a/screens/Trading/components/TradingOperate.tsx b/screens/Trading/components/TradingOperate.tsx index 465d1ce9..e8a7eb93 100644 --- a/screens/Trading/components/TradingOperate.tsx +++ b/screens/Trading/components/TradingOperate.tsx @@ -434,6 +434,14 @@ const TradingOperate = () => {
+
+
Minimum received
+
+ {Number(toInternationalCurrencySystem_number(longOutput)) * + (1 - slippageTolerance / 100)}{" "} + NEAR +
+
Position Size
@@ -569,6 +577,14 @@ const TradingOperate = () => {
+
+
Minimum received
+
+ {Number(toInternationalCurrencySystem_number(longOutput)) * + (1 - slippageTolerance / 100)}{" "} + NEAR +
+
Position Size
diff --git a/screens/Trading/index.tsx b/screens/Trading/index.tsx index 2535774b..018b9f02 100644 --- a/screens/Trading/index.tsx +++ b/screens/Trading/index.tsx @@ -21,12 +21,13 @@ import { useMarginConfigToken } from "../../hooks/useMarginConfig"; import { setCategoryAssets1, setCategoryAssets2 } from "../../redux/marginTrading"; import { useMarginAccount } from "../../hooks/useMarginAccount"; import { useAccountId, usePortfolioAssets } from "../../hooks/hooks"; -import { useRouterQuery, getTransactionResult } from "../../utils/txhashContract"; +import { useRouterQuery, getTransactionResult, parsedArgs } from "../../utils/txhashContract"; import { showPositionResult } from "../../components/HashResultModal"; init_env("dev"); const Trading = () => { + const marginConfig = useAppSelector(getMarginConfig); const { query } = useRouterQuery(); const accountId = useAccountId(); const { marginAccountList, parseTokenValue, getAssetDetails, getAssetById } = useMarginAccount(); @@ -53,27 +54,6 @@ const Trading = () => { }; let timer; - // - useEffect(() => { - if (router.query.transactionHashes) { - // - showPositionResult({ - title: "Open Position", - type: "Long", // optional，"Long" 或 "Short" - price: "100", // optional， - transactionHashes: Array.isArray(router.query.transactionHashes) - ? router.query.transactionHashes[0] - : (router.query.transactionHashes as string), - positionSize: { - // optional， - amount: "10", - symbol: "NEAR", - usdValue: "1000", - }, - }); - } - }, [router]); - // computed currentTokenCate1 dropdown useEffect(() => { if (id) { @@ -168,11 +148,58 @@ const Trading = () => { const results = await Promise.all( txhash.map(async (txHash: string) => { const result: any = await getTransactionResult(txHash); - console.log(result); - return { txHash }; + const hasStorageDeposit = result.transaction.actions.some( + (action: any) => action?.FunctionCall?.method_name === "margin_execute_with_pyth", + ); + return { txHash, result, hasStorageDeposit }; }), ); - console.log(results, ";rrrr"); + results.forEach(({ txHash, result, hasStorageDeposit }: any) => { + if (hasStorageDeposit) { + // handleClaimTokenMobile({ level, count }); + console.log(result); + + const args = parsedArgs(result?.transaction?.actions?.[0]?.FunctionCall?.args || ""); + const { actions } = JSON.parse(args || ""); + + // const ft_on_transfer_id = result?.receipts?.findIndex((r: any) => + // r?.receipt?.Action?.actions?.some( + // (a: any) => a?.FunctionCall?.method_name === "margin_execute_with_pyth", + // ), + // ); + + // const ft_on_transfer_logs = + // result?.receipts_outcome?.[ft_on_transfer_id]?.outcome?.logs || ""; + // const ft_on_transfer_log = ft_on_transfer_logs?.[ft_on_transfer_logs?.length - 1]; + // const idx = ft_on_transfer_log?.indexOf("{"); + + // const parsed_ft_on_transfer_log = JSON.parse(ft_on_transfer_log.slice(idx) || ""); + const isLong = actions[0]?.OpenPosition?.token_p_id == "wrap.testnet"; + console.log(actions); + console.log(marginConfig); + showPositionResult({ + title: "Open Position", + type: isLong ? "Long" : "Short", + price: (isLong + ? Number(shrinkToken(actions[0]?.OpenPosition?.token_d_amount, 18)) / + Number(shrinkToken(actions[0]?.OpenPosition?.min_token_p_amount, 24)) + : Number(shrinkToken(actions[0]?.OpenPosition?.min_token_p_amount, 18)) / + Number(shrinkToken(actions[0]?.OpenPosition?.token_d_amount, 24)) + ).toString(), + transactionHashes: Array.isArray(router.query.transactionHashes) + ? router.query.transactionHashes[0] + : (router.query.transactionHashes as string), + positionSize: { + // optional， + amount: isLong + ? shrinkToken(actions[0]?.OpenPosition?.min_token_p_amount, 24, 6) + : shrinkToken(actions[0]?.OpenPosition?.token_d_amount, 24, 6), + symbol: "NEAR", + usdValue: "1000", + }, + }); + } + }); } catch (error) { console.error("Error processing transactions:", error); } diff --git a/utils/txhashContract.ts b/utils/txhashContract.ts index 03e97fdd..5e394bb2 100644 --- a/utils/txhashContract.ts +++ b/utils/txhashContract.ts @@ -73,3 +73,9 @@ export function useRouterQuery() { return { query, replaceQuery }; } + +export const parsedArgs = (res: any) => { + const buff = Buffer.from(res, "base64"); + const parsedData = buff.toString("ascii"); + return parsedData; +};