From e5a7364c7cd67ca1e08e6d9d767d9843f9f3793c Mon Sep 17 00:00:00 2001
From: Adrienne Rio <adrienne@deriv.com>
Date: Fri, 24 Jan 2025 17:34:53 +0800
Subject: [PATCH 1/4] feat: store redirect metadata for traders hub from
 os-redirect

---
 .../core/src/App/Containers/OSRedirect/os-redirect.tsx     | 4 ++++
 packages/core/src/Modules/Callback/CallbackPage.tsx        | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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/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 (

From 28e274386d39cd60389f9f676ee41330ef6f0f20 Mon Sep 17 00:00:00 2001
From: Adrienne Rio <adrienne@deriv.com>
Date: Fri, 21 Feb 2025 15:23:40 +0800
Subject: [PATCH 2/4] Merge branch 'master' of github.com:deriv-com/deriv-app


From 7cf090795992e79b905f182f819c95ea5c9ec41c Mon Sep 17 00:00:00 2001
From: Adrienne Rio <adrienne@deriv.com>
Date: Wed, 5 Mar 2025 18:11:53 +0800
Subject: [PATCH 3/4] chore: added loader to wallets before redirecting to th

---
 .../src/routes/WalletsListingRoute/WalletsListingRoute.tsx     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/wallets/src/routes/WalletsListingRoute/WalletsListingRoute.tsx b/packages/wallets/src/routes/WalletsListingRoute/WalletsListingRoute.tsx
index ad6b483bcf67..ec2320001f3f 100644
--- a/packages/wallets/src/routes/WalletsListingRoute/WalletsListingRoute.tsx
+++ b/packages/wallets/src/routes/WalletsListingRoute/WalletsListingRoute.tsx
@@ -3,6 +3,7 @@ import { useActiveWalletAccount, useAllWalletAccounts, useIsEuRegion } from '@de
 import { useDevice } from '@deriv-com/ui';
 import {
     WalletListHeader,
+    WalletLoader,
     WalletsAddMoreCarousel,
     WalletsCardLoader,
     WalletsDisclaimerBanner,
@@ -27,7 +28,7 @@ const WalletsListingRoute: React.FC<TWalletsListingRouteProps> = ({ isHubRedirec
     const shouldHideAddMoreCarousel = isAllWalletsLoading || isEuRegionLoading || (isEuRegion && hasAddedWallet);
 
     if (isHubRedirectionEnabled) {
-        return null;
+        return <WalletLoader />;
     }
 
     return (

From 7df02611054ea6a0e71664d0f9cc47df3d3557cf Mon Sep 17 00:00:00 2001
From: Adrienne Rio <adrienne@deriv.com>
Date: Thu, 6 Mar 2025 11:31:53 +0800
Subject: [PATCH 4/4]