From eafde3e144d37cc1b2907904e1b5c3404ad2c2a0 Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 11:27:14 +0800
Subject: [PATCH 1/7] fix: fixing iframe load issue

---
 package-lock.json                             |  8 +++----
 package.json                                  |  2 +-
 .../localstorage-sync.html                    |  0
 src/components/DerivIframe/DerivIframe.tsx    | 21 ++++++++++++-------
 vite.config.ts                                |  1 +
 5 files changed, 19 insertions(+), 13 deletions(-)
 rename localstorage-sync.html => public/localstorage-sync.html (100%)

diff --git a/package-lock.json b/package-lock.json
index e66f9f92..1ad110e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
                 "@deriv-com/api-hooks": "^0.1.24",
                 "@deriv-com/translations": "^1.2.4",
                 "@deriv-com/ui": "^1.27.9",
-                "@deriv-com/utils": "latest",
+                "@deriv-com/utils": "^0.0.25",
                 "@deriv/deriv-api": "^1.0.15",
                 "@deriv/quill-design": "^1.2.24",
                 "@deriv/quill-icons": "^1.22.10",
@@ -2687,9 +2687,9 @@
             }
         },
         "node_modules/@deriv-com/utils": {
-            "version": "0.0.24",
-            "resolved": "https://registry.npmjs.org/@deriv-com/utils/-/utils-0.0.24.tgz",
-            "integrity": "sha512-dK9H6GfI/DB7eRTjZS3+K9cEg3gZlCJV+zmDL27OpRHSyddrw2Z//PuMq3WZxtXTGuHt3g7TLDUP7PdvXL8DdA=="
+            "version": "0.0.25",
+            "resolved": "https://registry.npmjs.org/@deriv-com/utils/-/utils-0.0.25.tgz",
+            "integrity": "sha512-zIJLDHgc8Aja+u8YDZ0FVNbMX8DQB3T+ioRzwIj8SevEo/VDEke1IUMxJe5PXCHYNs7ml2mB/mXSfLOr7KGqdA=="
         },
         "node_modules/@deriv/api-types": {
             "version": "1.0.659",
diff --git a/package.json b/package.json
index f18cf7e6..f4b1558a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "@deriv-com/api-hooks": "^0.1.24",
         "@deriv-com/translations": "^1.2.4",
         "@deriv-com/ui": "^1.27.9",
-        "@deriv-com/utils": "latest",
+        "@deriv-com/utils": "^0.0.25",
         "@deriv/deriv-api": "^1.0.15",
         "@deriv/quill-design": "^1.2.24",
         "@deriv/quill-icons": "^1.22.10",
diff --git a/localstorage-sync.html b/public/localstorage-sync.html
similarity index 100%
rename from localstorage-sync.html
rename to public/localstorage-sync.html
diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 5da42b5d..296de27b 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -1,10 +1,15 @@
-const DerivIframe = () => (
-    <iframe
-        id='localstorage-sync'
-        sandbox='allow-same-origin allow-scripts'
-        src='../../../../localstorage-sync.html'
-        style={{ display: 'none', visibility: 'hidden' }}
-    />
-);
+import { URLConstants } from '@deriv-com/utils';
+
+const DerivIframe = () => {
+    const origin = URLConstants.derivP2pProduction;
+    return (
+        <iframe
+            id='localstorage-sync'
+            sandbox='allow-same-origin allow-scripts'
+            src={`${origin}/public/localstorage-sync.html`}
+            style={{ display: 'none', visibility: 'hidden' }}
+        />
+    );
+};
 
 export default DerivIframe;
diff --git a/vite.config.ts b/vite.config.ts
index f8bc18c8..5737718b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,6 +23,7 @@ export default defineConfig({
         },
     },
     plugins: [react(), svgr()],
+    publicDir: 'public',
     resolve: {
         alias: {
             '@': path.resolve(__dirname, './src'),

From 04e59f17ba4db5a0d758796833f3599b22237ce9 Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 11:38:03 +0800
Subject: [PATCH 2/7] ci: fixed npm i issue in ci

---
 package-lock.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index ae7a0803..777e29d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2619,6 +2619,11 @@
                 "@rollup/rollup-linux-x64-gnu": "^4.18.0"
             }
         },
+        "node_modules/@deriv-com/api-hooks/node_modules/@deriv-com/utils": {
+            "version": "0.0.24",
+            "resolved": "https://registry.npmjs.org/@deriv-com/utils/-/utils-0.0.24.tgz",
+            "integrity": "sha512-dK9H6GfI/DB7eRTjZS3+K9cEg3gZlCJV+zmDL27OpRHSyddrw2Z//PuMq3WZxtXTGuHt3g7TLDUP7PdvXL8DdA=="
+        },
         "node_modules/@deriv-com/eslint-config-deriv": {
             "version": "2.1.0-beta.3",
             "resolved": "https://registry.npmjs.org/@deriv-com/eslint-config-deriv/-/eslint-config-deriv-2.1.0-beta.3.tgz",

From 126cd3467a0129560e098c58716b5f61b220da2c Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 11:45:08 +0800
Subject: [PATCH 3/7] chore: updated the path in iframe

---
 src/components/DerivIframe/DerivIframe.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 296de27b..8d7a7628 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -6,7 +6,7 @@ const DerivIframe = () => {
         <iframe
             id='localstorage-sync'
             sandbox='allow-same-origin allow-scripts'
-            src={`${origin}/public/localstorage-sync.html`}
+            src={`${origin}/localstorage-sync.html`}
             style={{ display: 'none', visibility: 'hidden' }}
         />
     );

From 861c291d5af0d09420de014da602950f56faf9b9 Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 12:16:43 +0800
Subject: [PATCH 4/7] chore: updated iframe url

---
 src/components/DerivIframe/DerivIframe.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 8d7a7628..2dfc1a13 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -1,7 +1,17 @@
 import { URLConstants } from '@deriv-com/utils';
 
 const DerivIframe = () => {
-    const origin = URLConstants.derivP2pProduction;
+    const getAllowedLocalStorageOrigin = () => {
+        if (/^staging-p2p\.deriv\.com$/i.test(window.location.hostname)) {
+            return 'http://staging-p2p.deriv.com';
+        } else if (/^p2p\.deriv\.com$/i.test(window.location.hostname)) {
+            return URLConstants.derivP2pProduction;
+        }
+        return URLConstants.derivP2pProduction;
+    };
+
+    const origin = getAllowedLocalStorageOrigin();
+
     return (
         <iframe
             id='localstorage-sync'

From 06b5e1e0c72944972f222689e38b0894a63161f9 Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 12:22:56 +0800
Subject: [PATCH 5/7] chore: added https

---
 src/components/DerivIframe/DerivIframe.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 2dfc1a13..865acf0c 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -3,7 +3,7 @@ import { URLConstants } from '@deriv-com/utils';
 const DerivIframe = () => {
     const getAllowedLocalStorageOrigin = () => {
         if (/^staging-p2p\.deriv\.com$/i.test(window.location.hostname)) {
-            return 'http://staging-p2p.deriv.com';
+            return 'https://staging-p2p.deriv.com';
         } else if (/^p2p\.deriv\.com$/i.test(window.location.hostname)) {
             return URLConstants.derivP2pProduction;
         }

From f0d2de2e664c29f882f8b1257e38894cedbb9fec Mon Sep 17 00:00:00 2001
From: shayan khaleghparast <iman@regentmarkets.com>
Date: Wed, 12 Jun 2024 13:13:39 +0800
Subject: [PATCH 6/7] chore: resolved pr comment

---
 src/components/DerivIframe/DerivIframe.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 865acf0c..0303fcef 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -3,7 +3,7 @@ import { URLConstants } from '@deriv-com/utils';
 const DerivIframe = () => {
     const getAllowedLocalStorageOrigin = () => {
         if (/^staging-p2p\.deriv\.com$/i.test(window.location.hostname)) {
-            return 'https://staging-p2p.deriv.com';
+            return URLConstants.derivP2pStaging;
         } else if (/^p2p\.deriv\.com$/i.test(window.location.hostname)) {
             return URLConstants.derivP2pProduction;
         }

From b8cc74ab3640e36958d5c25d518f44a690970283 Mon Sep 17 00:00:00 2001
From: Shayan Khaleghparast <100833613+shayan-deriv@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:23:02 +0800
Subject: [PATCH 7/7] Update src/components/DerivIframe/DerivIframe.tsx

Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com>
---
 src/components/DerivIframe/DerivIframe.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/DerivIframe/DerivIframe.tsx b/src/components/DerivIframe/DerivIframe.tsx
index 0303fcef..823d0167 100644
--- a/src/components/DerivIframe/DerivIframe.tsx
+++ b/src/components/DerivIframe/DerivIframe.tsx
@@ -4,10 +4,9 @@ const DerivIframe = () => {
     const getAllowedLocalStorageOrigin = () => {
         if (/^staging-p2p\.deriv\.com$/i.test(window.location.hostname)) {
             return URLConstants.derivP2pStaging;
-        } else if (/^p2p\.deriv\.com$/i.test(window.location.hostname)) {
-            return URLConstants.derivP2pProduction;
-        }
-        return URLConstants.derivP2pProduction;
+        } 
+       
+         return URLConstants.derivP2pProduction;
     };
 
     const origin = getAllowedLocalStorageOrigin();