From 4f77456a13b7495dc7b48aa035e7f72782d59b92 Mon Sep 17 00:00:00 2001
From: Sui Sin <103026762+suisin-deriv@users.noreply.github.com>
Date: Mon, 10 Mar 2025 16:17:51 +0800
Subject: [PATCH] chore: fix staging breaking redirection issue (#18123)

---
 packages/core/src/App/Containers/Redirect/redirect.jsx | 4 ++--
 packages/core/src/Stores/client-store.js               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/App/Containers/Redirect/redirect.jsx b/packages/core/src/App/Containers/Redirect/redirect.jsx
index 731af01b2be0..7d76eeec232a 100644
--- a/packages/core/src/App/Containers/Redirect/redirect.jsx
+++ b/packages/core/src/App/Containers/Redirect/redirect.jsx
@@ -394,8 +394,8 @@ const Redirect = observer(() => {
             let updated_search = url_query_string;
             const params = new URLSearchParams(url_query_string);
             params.set('account', queryCurrency);
-            params.set('trade_type', matched_route.type);
-            if (matched_route && matched_route.type) {
+            params.set('trade_type', matched_route?.type);
+            if (matched_route && matched_route?.type) {
                 updated_search = `${params.toString()}`;
             }
 
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index 039c8dd25476..e7ae1715688a 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -1168,7 +1168,7 @@ export default class ClientStore extends BaseStore {
         // eslint-disable-next-line max-len
         const { loginid, landing_company_shortcode, currency, account_settings, preferred_language, user_id } = this;
 
-        const client_accounts = JSON.parse(LocalStore.get(storage_key));
+        const client_accounts = JSON.parse(LocalStore.get(storage_key) || '{}');
         const email = this.email || client_accounts[loginid]?.email;
         const residence = this.residence || client_accounts[loginid]?.residence;