From 0db051772e5582de1d1e5afc6bc96878ccf51676 Mon Sep 17 00:00:00 2001 From: Tay Sui Sin Date: Fri, 7 Mar 2025 18:15:24 +0800 Subject: [PATCH 1/2] chore: fix redirection to dtrader everytime --- packages/trader/src/Modules/Trading/Containers/trade.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/trader/src/Modules/Trading/Containers/trade.tsx b/packages/trader/src/Modules/Trading/Containers/trade.tsx index 17cf6b3097a9..b3d906387584 100644 --- a/packages/trader/src/Modules/Trading/Containers/trade.tsx +++ b/packages/trader/src/Modules/Trading/Containers/trade.tsx @@ -95,6 +95,14 @@ const Trade = observer(() => { return null; }, [try_synthetic_indices, try_open_markets, category, subcategory]); + React.useEffect(() => { + const has_session_storage = !!sessionStorage.getItem('tradershub_redirect_to'); + + if (has_session_storage) { + sessionStorage.removeItem('tradershub_redirect_to'); + } + }, []); + React.useEffect(() => { const html = document.querySelector('html'); if (isTabletPortrait && isTabletOs) { From a7defd8fda9b5e43545677722622399895483464 Mon Sep 17 00:00:00 2001 From: Tay Sui Sin Date: Mon, 10 Mar 2025 11:16:55 +0800 Subject: [PATCH 2/2] chore: added is logged in check for removing session storage --- packages/trader/src/Modules/Trading/Containers/trade.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/trader/src/Modules/Trading/Containers/trade.tsx b/packages/trader/src/Modules/Trading/Containers/trade.tsx index b3d906387584..54e0da48eae9 100644 --- a/packages/trader/src/Modules/Trading/Containers/trade.tsx +++ b/packages/trader/src/Modules/Trading/Containers/trade.tsx @@ -67,7 +67,7 @@ const Trade = observer(() => { is_dark_mode_on: is_dark_theme, notification_messages_ui: NotificationMessages, } = ui; - const { is_eu } = client; + const { is_eu, is_logged_in } = client; const { network_status } = common; const { isDesktop, isMobile, isTabletPortrait } = useDevice(); @@ -98,7 +98,7 @@ const Trade = observer(() => { React.useEffect(() => { const has_session_storage = !!sessionStorage.getItem('tradershub_redirect_to'); - if (has_session_storage) { + if (has_session_storage && is_logged_in) { sessionStorage.removeItem('tradershub_redirect_to'); } }, []);