From 99fe70afdca9d9602f9af0d4a52c1405e0d14918 Mon Sep 17 00:00:00 2001
From: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Date: Fri, 24 Jan 2025 18:43:13 +0800
Subject: [PATCH] Adrienne / Store redirect metadata for traders hub from
 os-redirect (#18021)

* feat: store redirect metadata for traders hub from os-redirect

* chore: change redirect url for traders hub as requested
---
 .../core/src/App/Containers/OSRedirect/os-redirect.tsx     | 4 ++++
 .../src/App/Containers/RootComponent/root-component.jsx    | 4 ++--
 packages/core/src/Modules/Callback/CallbackPage.tsx        | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/App/Containers/OSRedirect/os-redirect.tsx b/packages/core/src/App/Containers/OSRedirect/os-redirect.tsx
index c99b2c04c6c0..69ad8e88e2a3 100644
--- a/packages/core/src/App/Containers/OSRedirect/os-redirect.tsx
+++ b/packages/core/src/App/Containers/OSRedirect/os-redirect.tsx
@@ -50,6 +50,10 @@ const OSRedirect = () => {
         ];
         const route = routes_list.find(({ pattern }) => pattern.test(url_query_string));
         route?.type && params.set('trade_type', route.type);
+
+        if (route) {
+            sessionStorage.setItem('tradershub_redirect_to', `${route?.route}?${params.toString()}`);
+        }
         /**
          * Redirect to route if user is logged in
          * Need to wait logged in state to be updated before redirecting
diff --git a/packages/core/src/App/Containers/RootComponent/root-component.jsx b/packages/core/src/App/Containers/RootComponent/root-component.jsx
index 1640f573d9df..420c6d1b9cfe 100644
--- a/packages/core/src/App/Containers/RootComponent/root-component.jsx
+++ b/packages/core/src/App/Containers/RootComponent/root-component.jsx
@@ -34,8 +34,8 @@ const RootComponent = observer(props => {
     };
     const { isHubRedirectionEnabled } = useIsHubRedirectionEnabled();
 
-    const PRODUCTION_REDIRECT_URL = 'https://hub.deriv.com/tradershub/options';
-    const STAGING_REDIRECT_URL = 'https://staging-hub.deriv.com/tradershub/options';
+    const PRODUCTION_REDIRECT_URL = 'https://hub.deriv.com/tradershub/cfds';
+    const STAGING_REDIRECT_URL = 'https://staging-hub.deriv.com/tradershub/cfds';
 
     useEffect(() => {
         if (isHubRedirectionEnabled && has_wallet && !prevent_redirect_to_hub) {
diff --git a/packages/core/src/Modules/Callback/CallbackPage.tsx b/packages/core/src/Modules/Callback/CallbackPage.tsx
index bd24d093218f..e0661d28e136 100644
--- a/packages/core/src/Modules/Callback/CallbackPage.tsx
+++ b/packages/core/src/Modules/Callback/CallbackPage.tsx
@@ -14,7 +14,12 @@ const CallbackPage = () => {
                 localStorage.setItem('config.account1', tokens.token1);
                 localStorage.setItem('active_loginid', tokens.acct1);
 
-                window.location.href = routes.traders_hub;
+                const redirectTo = sessionStorage.getItem('tradershub_redirect_to');
+                if (redirectTo) {
+                    window.location.href = redirectTo;
+                } else {
+                    window.location.href = routes.traders_hub;
+                }
             }}
             renderReturnButton={() => {
                 return (