From 3605299711132d9c601613ce1d6d33ce4dca7028 Mon Sep 17 00:00:00 2001
From: rupato-deriv <rupato@deriv.com>
Date: Wed, 19 Apr 2023 14:13:01 +0800
Subject: [PATCH 1/2] fix: for sync changes

---
 src/botPage/view/deriv/layout/Main/main.jsx | 4 ++--
 src/common/utils/storageManager.js          | 8 +++-----
 templates/deriv/index.mustache              | 2 +-
 templates/deriv/localstorage-sync.mustache  | 3 ++-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/botPage/view/deriv/layout/Main/main.jsx b/src/botPage/view/deriv/layout/Main/main.jsx
index 62af25048..6d81cfff5 100644
--- a/src/botPage/view/deriv/layout/Main/main.jsx
+++ b/src/botPage/view/deriv/layout/Main/main.jsx
@@ -23,7 +23,7 @@ import initialize, { applyToolboxPermissions } from '../../blockly-worksace';
 import SidebarToggle from '../../components/SidebarToggle';
 import { updateActiveAccount, updateActiveToken, updateIsLogged } from '../../store/client-slice';
 import { setShouldReloadWorkspace, updateShowTour } from '../../store/ui-slice';
-import { getRelatedDeriveOrigin, isLoggedIn } from '../../utils';
+import { isLoggedIn } from '../../utils';
 import BotUnavailableMessage from '../Error/bot-unavailable-message-page.jsx';
 import ToolBox from '../ToolBox';
 
@@ -57,7 +57,7 @@ const Main = () => {
     const init = () => {
         const local_storage_sync = document.getElementById('localstorage-sync');
         if (local_storage_sync) {
-            local_storage_sync.src = `${getRelatedDeriveOrigin().origin}/localstorage-sync.html`;
+            local_storage_sync.src = `https://deriv-app-git-fork-rupato-deriv-fix-localstorage-to-get-token.binary.sx/localstorage-sync.html`;
         }
 
         const days_passed = Date.now() > (parseInt(getStorage('closedTourPopup')) || 0) + 24 * 60 * 60 * 1000;
diff --git a/src/common/utils/storageManager.js b/src/common/utils/storageManager.js
index 1df35be96..b5ddb4080 100644
--- a/src/common/utils/storageManager.js
+++ b/src/common/utils/storageManager.js
@@ -1,5 +1,3 @@
-import { getRelatedDeriveOrigin } from '../../botPage/view/deriv/utils';
-
 let store = {};
 let hasReadystateListener = false;
 
@@ -88,7 +86,7 @@ export const remove = varName => delete store[varName];
 
 export const syncWithDerivApp = () => {
     const iframe = document.getElementById('localstorage-sync');
-    const { origin } = getRelatedDeriveOrigin();
+    const test_origin = 'https://deriv-app-git-fork-rupato-deriv-fix-localstorage-to-get-token.binary.sx';
 
     const postMessages = () => {
         iframe.contentWindow.postMessage(
@@ -96,14 +94,14 @@ export const syncWithDerivApp = () => {
                 key: 'client.accounts',
                 value: get('client.accounts'),
             },
-            origin
+            test_origin
         );
         iframe.contentWindow.postMessage(
             {
                 key: 'active_loginid',
                 value: get('active_loginid'),
             },
-            origin
+            test_origin
         );
     };
 
diff --git a/templates/deriv/index.mustache b/templates/deriv/index.mustache
index e5bbbd196..babc264cb 100644
--- a/templates/deriv/index.mustache
+++ b/templates/deriv/index.mustache
@@ -90,7 +90,7 @@
         <div class="notifyjs-corner" style="bottom: 0px; right: 0px;"></div>
         <div class="notifyjs-corner" style="bottom: 0px; left: 0px;"></div>
         <script>
-           document.getElementById("localstorage-sync").src = window.location.hostname.includes("staging") ? "https://staging-app.deriv.com/localstorage-sync.html" : "https://app.deriv.com/localstorage-sync.html";
+           document.getElementById("localstorage-sync").src = 'https://deriv-app-git-fork-rupato-deriv-fix-localstorage-to-get-token.binary.sx'
 
             // Auto login from deriv app
             const login_url = localStorage.getItem('login_url')
diff --git a/templates/deriv/localstorage-sync.mustache b/templates/deriv/localstorage-sync.mustache
index 1ff208f97..4aecd5cdd 100644
--- a/templates/deriv/localstorage-sync.mustache
+++ b/templates/deriv/localstorage-sync.mustache
@@ -12,7 +12,8 @@
                     'https://app.deriv.me',
                     'https://staging-app.deriv.com',
                     'https://staging-app.deriv.be',
-                    'https://staging-app.deriv.me'
+                    'https://staging-app.deriv.me',
+                    'https://deriv-app-git-fork-rupato-deriv-fix-localstorage-to-get-token.binary.sx',
                 ];
 
                 const autoLogin = message => {

From 0263c1140760cf569195be04ddfcf06f526ff858 Mon Sep 17 00:00:00 2001
From: rupato-deriv <rupato@deriv.com>
Date: Wed, 19 Apr 2023 19:13:42 +0800
Subject: [PATCH 2/2] fix: addded console

---
 templates/deriv/localstorage-sync.mustache | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/deriv/localstorage-sync.mustache b/templates/deriv/localstorage-sync.mustache
index 4aecd5cdd..76c15168f 100644
--- a/templates/deriv/localstorage-sync.mustache
+++ b/templates/deriv/localstorage-sync.mustache
@@ -6,6 +6,7 @@
         <meta name="referrer" content="origin" />
         <script>
             window.addEventListener('message', function (message) {
+                console.log('test',message);
                 var allowed_origins = [
                     'https://app.deriv.com',
                     'https://app.deriv.be',
@@ -46,6 +47,7 @@
                 };
 
                 if (allowed_origins.includes(message.origin)) {
+                    console.log(message);
                     switch (message.data.key) {
                         case 'active_loginid': {
                             if (localStorage.getItem(message.data.key) !== message.data.value) {