From 1d344f0654a638df12c3a9e0fd029921a39226d1 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Mon, 23 Jan 2023 14:36:12 +0300
Subject: [PATCH 01/16] feat: branding removal for other domains

---
 .gitignore                              |  3 +-
 src/botPage/view/View.js                |  6 ++--
 src/common/utils/tools.js               |  3 ++
 src/indexPage/react-components/logo.jsx | 15 ++++----
 templates/bot.mustache                  | 46 ++++++++++++++++---------
 templates/index.mustache                | 10 +++++-
 6 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce7a9fb20d..d0b8c45095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ lib/
 old/
 CNAME
 *.env
-.DS_Store
\ No newline at end of file
+.DS_Store
+.idea
\ No newline at end of file
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 21382e1e0d..461a5b913a 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -41,7 +41,7 @@ import {
     getToken,
     remove,
 } from '../../common/utils/storageManager';
-import { isProduction, parseQueryString, serialize } from '../../common/utils/tools';
+import { isBinaryDomain, isProduction, parseQueryString, serialize } from '../../common/utils/tools';
 import GTM from '../../common/gtm';
 import {
     getMissingBlocksTypes,
@@ -196,9 +196,9 @@ const updateLogo = token => {
     $('.binary-logo-text > img').attr('src', '');
     const currentLandingCompany = getLandingCompanyForToken(token);
     if (currentLandingCompany === 'maltainvest') {
-        $('.binary-logo-text > img').attr('src', './image/binary-type-logo.svg');
+        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-type-logo.svg'}`);
     } else {
-        $('.binary-logo-text > img').attr('src', './image/binary-style/logo/type.svg');
+        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-style/logo/type.svg'}`);
     }
     setTimeout(() => window.dispatchEvent(new Event('resize')));
 };
diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index 3c2566d88c..482581dada 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -147,3 +147,6 @@ export const errLogger = (err, msg) => {
     const errMsg = `${msg} - Error: ${errStr}`;
     console.warn(errMsg);
 };
+
+export const isBinaryDomain =
+    document.location.hostname !== 'localhost' && document.location.hostname !== 'bot.binary.com';
diff --git a/src/indexPage/react-components/logo.jsx b/src/indexPage/react-components/logo.jsx
index 25d9d91e0e..f545a9f53e 100644
--- a/src/indexPage/react-components/logo.jsx
+++ b/src/indexPage/react-components/logo.jsx
@@ -1,16 +1,17 @@
 import React from 'react';
-import { createUrl } from '../../common/utils/tools';
+import {createUrl, isBinaryDomain} from '../../common/utils/tools';
 
-const Logo = () => (
-    <a href={createUrl({ path: '', isNonBotPage: true })} target="blank" id="logo">
+const Logo = () => {
+    if(isBinaryDomain) { return ( <a href={createUrl({path: '', isNonBotPage: true})} target="blank" id="logo">
         <div className="logo-parent">
             <div className="logo">
-                <img className="responsive" src={'image/binary-style/logo/symbol.svg'} alt="Binary logo" />
+                <img className="responsive" src={'image/binary-style/logo/symbol.svg'} alt="Binary logo"/>
             </div>
             <div className="binary-logo-text">
-                <img className="responsive" src={'image/binary-style/logo/type.svg'} alt="Binary logo" />
+                <img className="responsive" src={'image/binary-style/logo/type.svg'} alt="Binary logo"/>
             </div>
         </div>
-    </a>
-);
+    </a>)
+    } return <></>
+};
 export default Logo;
\ No newline at end of file
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 375f9b6394..51283bc044 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -9,8 +9,14 @@
     {{> bot_css }}
 </head>
 
+<script>
+    const host_name = $(location).attr('hostname');
+    const isBinaryDomain = host_name !== 'localhos' && host_name !== 'bot.binary.com';
+    document.getElementById("logo").remove()
+</script>
+
 <body>
-    <div id="bot-main" class="hidden" style="width: 100%;position: relative;height: 100%;">  
+    <div id="bot-main" class="hidden" style="width: 100%;position: relative;height: 100%;">
     <div id="tour"></div>
     <div id="center"></div>
     <div id="workspace_center"></div>
@@ -114,11 +120,11 @@
                 <button id="login" data-i18n-text="Log in" />
             </div>
         </div>
-    
+
     </div>
-   
-    
-    
+
+
+
     <div id="toolbox" class="actions_menu show-on-load hidden">
         <button data-i18n-title="Reset the blocks to their initial state" id="resetButton"
             class="toolbox-button icon-reset"></button>
@@ -127,31 +133,31 @@
             class="toolbox-button icon-save"></button>
         <button data-i18n-title="Connect Binary Bot to your Google Drive to easily save and re-use your blocks"
             id="integrations" class="toolbox-button icon-integrations invisible"></button>
-    
+
         <span class="toolbox-separator"></span>
         <button data-i18n-title="Undo the changes (Ctrl+Z)" id="undo" class="toolbox-button icon-undo"></button>
         <button data-i18n-title="Redo the changes (Ctrl+Shift+Z)" id="redo" class="toolbox-button icon-redo"></button>
-    
+
         <span class="toolbox-separator"></span>
         <button data-i18n-title="Zoom In (Ctrl + +)" id="zoomIn" class="toolbox-button icon-zoom-in"></button>
         <button data-i18n-title="Zoom Out (Ctrl + -)" id="zoomOut" class="toolbox-button icon-zoom-out"></button>
         <button data-i18n-title="Rearrange Vertically" id="rearrange" class="toolbox-button icon-sort"></button>
-    
+
         <span class="toolbox-separator"></span>
         <button data-i18n-title="Show/hide the summary pop-up" id="showSummary"
             class="toolbox-button icon-summary"></button>
         <button data-i18n-title="Run the bot" id="runButton" class="toolbox-button icon-run"></button>
         <button data-i18n-title="Stop the bot" id="stopButton" class="toolbox-button icon-stop"></button>
         <button data-i18n-title="Show log" id="logButton" class="toolbox-button icon-info"></button>
-    
+
         <span class="toolbox-separator"></span>
         <button data-i18n-title="Show chart" id="chartButton" class="toolbox-button icon-chart-line"></button>
         <button data-i18n-title="Show Trading View" id="tradingViewButton"
             class="toolbox-button icon-trading-view"></button>
-    
+
         <span class="toolbox-separator"></span>
         <button data-i18n-title="Toggle header" id="toggleHeaderButton" class="toolbox-button icon-hide-header"></button>
-    
+
         {{! Toolbox main account + list }}
         <div id="toolbox-account" class="right-header" style="display: none">
             <button id="toolbox-login" data-i18n-text="Log in"></button>
@@ -166,11 +172,11 @@
                 </a>
             </div>
         </div>
-    
+
     </div>
     <div id="errorArea"></div>
     <div id="notification-banner"></div>
-    
+
     <ul id="toolbox-all-accounts" class="nav-menu main-nav" style="display: none;">
         <li>
             <ul>
@@ -181,11 +187,11 @@
             </ul>
         </li>
     </ul>
-    
+
     <div id="blocklyArea"></div>
-    
+
     <div id="blocklyDiv" style="position: absolute;"></div>
-    
+
     <form id="fileUploadForm" style="display: none;">
         <input data-i18n-title="Open an already saved XML file and retrieve its blocks" type="file" id="files" accept=".xml"
             multiple />
@@ -217,6 +223,14 @@
     <div class="notifyjs-corner" style="bottom: 0px; right: 0px;"></div>
     <div class="notifyjs-corner" style="bottom: 0px; left: 0px;"></div>
     </div>
+
+    <script>
+        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com') {
+            const element = document.getElementsByClassName('dbot-banner eu-hide');
+            element[0].remove();
+            document.getElementById('logo').remove();
+        };
+    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/templates/index.mustache b/templates/index.mustache
index 7b3b028814..514eb965da 100644
--- a/templates/index.mustache
+++ b/templates/index.mustache
@@ -26,7 +26,7 @@
     </div>
     <div id="movetoderiv"></div>
     <div id="bot-landing"></div>
-	
+
 	<div id="header">
 		<div class="wrapper">
             <div class="logo-wrapper">
@@ -66,5 +66,13 @@
     {{> index}}
     {{> gtm_iframe }}
    </div>
+    <script>
+        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com') {
+            const puzzle = document.getElementsByClassName('half-width bottom-image puzzle-logo');
+            const logo = document.getElementsByClassName('logo-wrapper');
+            puzzle[0].remove();
+            logo[0].remove();
+        };
+    </script>
 </body>
 </html>
\ No newline at end of file

From 6a796a7a4e250f3fb37ae5165263aa2d81f7f171 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Mon, 23 Jan 2023 14:54:07 +0300
Subject: [PATCH 02/16] feat: add behaviour for test links as well

---
 src/common/utils/tools.js | 7 +++++--
 templates/bot.mustache    | 2 +-
 templates/index.mustache  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index 482581dada..ee12599ff5 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -148,5 +148,8 @@ export const errLogger = (err, msg) => {
     console.warn(errMsg);
 };
 
-export const isBinaryDomain =
-    document.location.hostname !== 'localhost' && document.location.hostname !== 'bot.binary.com';
+export const isBinaryDomain = !(
+    document.location.hostname !== 'localhost' &&
+    document.location.hostname !== 'bot.binary.com' &&
+    !document.location.hostname.includes('binary-bot-git-fork')
+);
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 51283bc044..e8e9e5e016 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -225,7 +225,7 @@
     </div>
 
     <script>
-        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com') {
+        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com' && !location.hostname.includes('binary-bot-git-fork')) {
             const element = document.getElementsByClassName('dbot-banner eu-hide');
             element[0].remove();
             document.getElementById('logo').remove();
diff --git a/templates/index.mustache b/templates/index.mustache
index 514eb965da..9c3383fd80 100644
--- a/templates/index.mustache
+++ b/templates/index.mustache
@@ -67,7 +67,7 @@
     {{> gtm_iframe }}
    </div>
     <script>
-        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com') {
+        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com' && !location.hostname.includes('binary-bot-git-fork')) {
             const puzzle = document.getElementsByClassName('half-width bottom-image puzzle-logo');
             const logo = document.getElementsByClassName('logo-wrapper');
             puzzle[0].remove();

From 54ae4e4ec4c0abe34659a6c9e78e83b582dca771 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Tue, 24 Jan 2023 14:12:55 +0300
Subject: [PATCH 03/16] chore: remove useless script and move logic outside the
 component

---
 gulpfile.babel.js                       |  9 ++++++---
 src/common/utils/tools.js               |  9 ++++-----
 src/indexPage/index.js                  |  4 ++--
 src/indexPage/react-components/logo.jsx | 11 +++++------
 templates/bot.mustache                  |  6 ------
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 12c597d1c6..72f3ae1e2e 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -12,7 +12,7 @@ gulp.task(
     gulp.series(done => {
         connect.server({
             root      : 'www',
-            port      : 80,
+            port      : 8000,
             livereload: true,
         });
         done();
@@ -24,7 +24,7 @@ gulp.task(
     gulp.series(done => {
         gulp.src('www/index.html').pipe(
             open({
-                uri: 'http://localhost:80/',
+                uri: 'http://localhost:8000/',
             })
         );
         done();
@@ -75,7 +75,10 @@ gulp.task(
     })
 );
 
-gulp.task('test-deploy', gulp.series('build-min', 'serve', () => {}));
+gulp.task(
+    'test-deploy',
+    gulp.series('build-min', 'serve', () => {})
+);
 
 gulp.task(
     'watch-static',
diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index ee12599ff5..f41f0d3695 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -148,8 +148,7 @@ export const errLogger = (err, msg) => {
     console.warn(errMsg);
 };
 
-export const isBinaryDomain = !(
-    document.location.hostname !== 'localhost' &&
-    document.location.hostname !== 'bot.binary.com' &&
-    !document.location.hostname.includes('binary-bot-git-fork')
-);
+export const isBinaryDomain =
+    document.location.hostname === 'localhost' ||
+    document.location.hostname === 'bot.binary.com' ||
+    document.location.hostname.includes('binary-bot-git-fork');
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 5fda3f8f0a..5cc228a227 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -9,7 +9,7 @@ import GTM from '../common/gtm';
 import { load as loadLang, showBanner } from '../common/lang';
 import { moveToDeriv } from '../common/utils/utility';
 import { get as getStorage, set as setStorage, remove, getTokenList } from '../common/utils/storageManager';
-import { createUrl, parseQueryString, serialize } from '../common/utils/tools';
+import { createUrl, isBinaryDomain, parseQueryString, serialize } from '../common/utils/tools';
 import '../common/binary-ui/dropdown';
 import BotLanding from './react-components/bot-landing';
 import BinaryLanding from './react-components/binary-landing';
@@ -111,7 +111,7 @@ const renderElements = () => {
             return false;
         }
         if (window.location.pathname.indexOf('/bot') === -1) {
-            render(<Logo />, document.getElementById('binary-logo'));
+            render(isBinaryDomain && <Logo />, document.getElementById('binary-logo'));
             render(<Footer />, document.getElementById('footer'));
             isEuCountry().then(isEu => showHideEuElements(isEu));
             showBanner();
diff --git a/src/indexPage/react-components/logo.jsx b/src/indexPage/react-components/logo.jsx
index f545a9f53e..1e115ac0fc 100644
--- a/src/indexPage/react-components/logo.jsx
+++ b/src/indexPage/react-components/logo.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import {createUrl, isBinaryDomain} from '../../common/utils/tools';
+import {createUrl} from '../../common/utils/tools';
 
-const Logo = () => {
-    if(isBinaryDomain) { return ( <a href={createUrl({path: '', isNonBotPage: true})} target="blank" id="logo">
+const Logo = () => (
+    <a href={createUrl({path: '', isNonBotPage: true})} target="blank" id="logo">
         <div className="logo-parent">
             <div className="logo">
                 <img className="responsive" src={'image/binary-style/logo/symbol.svg'} alt="Binary logo"/>
@@ -11,7 +11,6 @@ const Logo = () => {
                 <img className="responsive" src={'image/binary-style/logo/type.svg'} alt="Binary logo"/>
             </div>
         </div>
-    </a>)
-    } return <></>
-};
+    </a>
+);
 export default Logo;
\ No newline at end of file
diff --git a/templates/bot.mustache b/templates/bot.mustache
index e8e9e5e016..120af4aac8 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -9,12 +9,6 @@
     {{> bot_css }}
 </head>
 
-<script>
-    const host_name = $(location).attr('hostname');
-    const isBinaryDomain = host_name !== 'localhos' && host_name !== 'bot.binary.com';
-    document.getElementById("logo").remove()
-</script>
-
 <body>
     <div id="bot-main" class="hidden" style="width: 100%;position: relative;height: 100%;">
     <div id="tour"></div>

From 874f3428cda49aa6555b4261a97421bb7d4ac8c1 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Tue, 24 Jan 2023 14:17:38 +0300
Subject: [PATCH 04/16] fix: make gulp setup as was before

---
 gulpfile.babel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 72f3ae1e2e..eb280c1c7d 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -12,7 +12,7 @@ gulp.task(
     gulp.series(done => {
         connect.server({
             root      : 'www',
-            port      : 8000,
+            port      : 80,
             livereload: true,
         });
         done();
@@ -24,7 +24,7 @@ gulp.task(
     gulp.series(done => {
         gulp.src('www/index.html').pipe(
             open({
-                uri: 'http://localhost:8000/',
+                uri: 'http://localhost:80/',
             })
         );
         done();

From 6c616b1edcc835c83855188c15d390a53ba58739 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Tue, 24 Jan 2023 15:22:23 +0300
Subject: [PATCH 05/16] chore: move script logic outside, in .js file

---
 src/botPage/view/index.js | 11 ++++++++++-
 src/indexPage/index.js    |  9 +++++++++
 templates/bot.mustache    |  8 --------
 templates/index.mustache  |  8 --------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 0717a740b0..4ae890ae48 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -5,7 +5,7 @@ import View from './View';
 import '../../common/binary-ui/dropdown';
 import Elevio from '../../common/elevio';
 import GTM from '../../common/gtm';
-import { isProduction } from '../../common/utils/tools';
+import { isBinaryDomain, isProduction } from '../../common/utils/tools';
 
 $.ajaxSetup({
     cache: false,
@@ -40,3 +40,12 @@ view.initPromise.then(() => {
         });
     }
 });
+
+window.onload = () => {
+    if (document.readyState === 'complete') {
+        if (!isBinaryDomain) {
+            document.getElementsByClassName('dbot-banner eu-hide')[0].remove();
+            document.getElementById('logo').remove();
+        }
+    }
+};
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 5cc228a227..c7eaac9d28 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -157,3 +157,12 @@ const loginCheck = () => {
 };
 
 loginCheck();
+
+window.onload = () => {
+    if (document.readyState === 'complete') {
+        if (!isBinaryDomain) {
+            document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
+            document.getElementsByClassName('logo-wrapper')[0].remove();
+        }
+    }
+};
diff --git a/templates/bot.mustache b/templates/bot.mustache
index 120af4aac8..4a59492dc3 100644
--- a/templates/bot.mustache
+++ b/templates/bot.mustache
@@ -217,14 +217,6 @@
     <div class="notifyjs-corner" style="bottom: 0px; right: 0px;"></div>
     <div class="notifyjs-corner" style="bottom: 0px; left: 0px;"></div>
     </div>
-
-    <script>
-        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com' && !location.hostname.includes('binary-bot-git-fork')) {
-            const element = document.getElementsByClassName('dbot-banner eu-hide');
-            element[0].remove();
-            document.getElementById('logo').remove();
-        };
-    </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/templates/index.mustache b/templates/index.mustache
index 9c3383fd80..b463e4082c 100644
--- a/templates/index.mustache
+++ b/templates/index.mustache
@@ -66,13 +66,5 @@
     {{> index}}
     {{> gtm_iframe }}
    </div>
-    <script>
-        if(location.hostname !== 'localhost' && location.hostname !== 'bot.binary.com' && !location.hostname.includes('binary-bot-git-fork')) {
-            const puzzle = document.getElementsByClassName('half-width bottom-image puzzle-logo');
-            const logo = document.getElementsByClassName('logo-wrapper');
-            puzzle[0].remove();
-            logo[0].remove();
-        };
-    </script>
 </body>
 </html>
\ No newline at end of file

From 0b73053e42b76fe2ba87b55ff837d5e69c842f5e Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 08:49:55 +0300
Subject: [PATCH 06/16] chore: replace camelCase on sneake_case

---
 src/botPage/view/View.js  | 6 +++---
 src/botPage/view/index.js | 4 ++--
 src/common/utils/tools.js | 4 ++--
 src/indexPage/index.js    | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index 461a5b913a..a59ebd6c59 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -41,7 +41,7 @@ import {
     getToken,
     remove,
 } from '../../common/utils/storageManager';
-import { isBinaryDomain, isProduction, parseQueryString, serialize } from '../../common/utils/tools';
+import { is_binary_domain, isProduction, parseQueryString, serialize } from '../../common/utils/tools';
 import GTM from '../../common/gtm';
 import {
     getMissingBlocksTypes,
@@ -196,9 +196,9 @@ const updateLogo = token => {
     $('.binary-logo-text > img').attr('src', '');
     const currentLandingCompany = getLandingCompanyForToken(token);
     if (currentLandingCompany === 'maltainvest') {
-        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-type-logo.svg'}`);
+        $('.binary-logo-text > img').attr('src', `${is_binary_domain && './image/binary-type-logo.svg'}`);
     } else {
-        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-style/logo/type.svg'}`);
+        $('.binary-logo-text > img').attr('src', `${is_binary_domain && './image/binary-style/logo/type.svg'}`);
     }
     setTimeout(() => window.dispatchEvent(new Event('resize')));
 };
diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 4ae890ae48..7433d8e76c 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -5,7 +5,7 @@ import View from './View';
 import '../../common/binary-ui/dropdown';
 import Elevio from '../../common/elevio';
 import GTM from '../../common/gtm';
-import { isBinaryDomain, isProduction } from '../../common/utils/tools';
+import { is_binary_domain, isProduction } from '../../common/utils/tools';
 
 $.ajaxSetup({
     cache: false,
@@ -43,7 +43,7 @@ view.initPromise.then(() => {
 
 window.onload = () => {
     if (document.readyState === 'complete') {
-        if (!isBinaryDomain) {
+        if (!is_binary_domain) {
             document.getElementsByClassName('dbot-banner eu-hide')[0].remove();
             document.getElementById('logo').remove();
         }
diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index f41f0d3695..56c687bb12 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -148,7 +148,7 @@ export const errLogger = (err, msg) => {
     console.warn(errMsg);
 };
 
-export const isBinaryDomain =
-    document.location.hostname === 'localhost' ||
+export const is_binary_domain =
+    document.location.hostname === 'localhos' ||
     document.location.hostname === 'bot.binary.com' ||
     document.location.hostname.includes('binary-bot-git-fork');
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index c7eaac9d28..8c969e4452 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -9,7 +9,7 @@ import GTM from '../common/gtm';
 import { load as loadLang, showBanner } from '../common/lang';
 import { moveToDeriv } from '../common/utils/utility';
 import { get as getStorage, set as setStorage, remove, getTokenList } from '../common/utils/storageManager';
-import { createUrl, isBinaryDomain, parseQueryString, serialize } from '../common/utils/tools';
+import { createUrl, is_binary_domain, parseQueryString, serialize } from '../common/utils/tools';
 import '../common/binary-ui/dropdown';
 import BotLanding from './react-components/bot-landing';
 import BinaryLanding from './react-components/binary-landing';
@@ -111,7 +111,7 @@ const renderElements = () => {
             return false;
         }
         if (window.location.pathname.indexOf('/bot') === -1) {
-            render(isBinaryDomain && <Logo />, document.getElementById('binary-logo'));
+            render(is_binary_domain && <Logo />, document.getElementById('binary-logo'));
             render(<Footer />, document.getElementById('footer'));
             isEuCountry().then(isEu => showHideEuElements(isEu));
             showBanner();
@@ -160,7 +160,7 @@ loginCheck();
 
 window.onload = () => {
     if (document.readyState === 'complete') {
-        if (!isBinaryDomain) {
+        if (!is_binary_domain) {
             document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
             document.getElementsByClassName('logo-wrapper')[0].remove();
         }

From b58aba322a03efa81945e589332f15c06eb2bbba Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 09:33:24 +0300
Subject: [PATCH 07/16] chore: return camelCase back

---
 src/botPage/view/View.js  | 6 +++---
 src/botPage/view/index.js | 4 ++--
 src/common/utils/tools.js | 2 +-
 src/indexPage/index.js    | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
index a59ebd6c59..461a5b913a 100644
--- a/src/botPage/view/View.js
+++ b/src/botPage/view/View.js
@@ -41,7 +41,7 @@ import {
     getToken,
     remove,
 } from '../../common/utils/storageManager';
-import { is_binary_domain, isProduction, parseQueryString, serialize } from '../../common/utils/tools';
+import { isBinaryDomain, isProduction, parseQueryString, serialize } from '../../common/utils/tools';
 import GTM from '../../common/gtm';
 import {
     getMissingBlocksTypes,
@@ -196,9 +196,9 @@ const updateLogo = token => {
     $('.binary-logo-text > img').attr('src', '');
     const currentLandingCompany = getLandingCompanyForToken(token);
     if (currentLandingCompany === 'maltainvest') {
-        $('.binary-logo-text > img').attr('src', `${is_binary_domain && './image/binary-type-logo.svg'}`);
+        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-type-logo.svg'}`);
     } else {
-        $('.binary-logo-text > img').attr('src', `${is_binary_domain && './image/binary-style/logo/type.svg'}`);
+        $('.binary-logo-text > img').attr('src', `${isBinaryDomain && './image/binary-style/logo/type.svg'}`);
     }
     setTimeout(() => window.dispatchEvent(new Event('resize')));
 };
diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 7433d8e76c..4ae890ae48 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -5,7 +5,7 @@ import View from './View';
 import '../../common/binary-ui/dropdown';
 import Elevio from '../../common/elevio';
 import GTM from '../../common/gtm';
-import { is_binary_domain, isProduction } from '../../common/utils/tools';
+import { isBinaryDomain, isProduction } from '../../common/utils/tools';
 
 $.ajaxSetup({
     cache: false,
@@ -43,7 +43,7 @@ view.initPromise.then(() => {
 
 window.onload = () => {
     if (document.readyState === 'complete') {
-        if (!is_binary_domain) {
+        if (!isBinaryDomain) {
             document.getElementsByClassName('dbot-banner eu-hide')[0].remove();
             document.getElementById('logo').remove();
         }
diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index 56c687bb12..945514159a 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -148,7 +148,7 @@ export const errLogger = (err, msg) => {
     console.warn(errMsg);
 };
 
-export const is_binary_domain =
+export const isBinaryDomain =
     document.location.hostname === 'localhos' ||
     document.location.hostname === 'bot.binary.com' ||
     document.location.hostname.includes('binary-bot-git-fork');
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 8c969e4452..c7eaac9d28 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -9,7 +9,7 @@ import GTM from '../common/gtm';
 import { load as loadLang, showBanner } from '../common/lang';
 import { moveToDeriv } from '../common/utils/utility';
 import { get as getStorage, set as setStorage, remove, getTokenList } from '../common/utils/storageManager';
-import { createUrl, is_binary_domain, parseQueryString, serialize } from '../common/utils/tools';
+import { createUrl, isBinaryDomain, parseQueryString, serialize } from '../common/utils/tools';
 import '../common/binary-ui/dropdown';
 import BotLanding from './react-components/bot-landing';
 import BinaryLanding from './react-components/binary-landing';
@@ -111,7 +111,7 @@ const renderElements = () => {
             return false;
         }
         if (window.location.pathname.indexOf('/bot') === -1) {
-            render(is_binary_domain && <Logo />, document.getElementById('binary-logo'));
+            render(isBinaryDomain && <Logo />, document.getElementById('binary-logo'));
             render(<Footer />, document.getElementById('footer'));
             isEuCountry().then(isEu => showHideEuElements(isEu));
             showBanner();
@@ -160,7 +160,7 @@ loginCheck();
 
 window.onload = () => {
     if (document.readyState === 'complete') {
-        if (!is_binary_domain) {
+        if (!isBinaryDomain) {
             document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
             document.getElementsByClassName('logo-wrapper')[0].remove();
         }

From 61b9bca438bf660056d734790e3f3fdc5e6f21c2 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 11:47:08 +0300
Subject: [PATCH 08/16] chore: move banner back

---
 src/botPage/view/index.js | 2 +-
 src/common/utils/tools.js | 2 +-
 src/indexPage/index.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 4ae890ae48..3d12d1b8eb 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -44,7 +44,7 @@ view.initPromise.then(() => {
 window.onload = () => {
     if (document.readyState === 'complete') {
         if (!isBinaryDomain) {
-            document.getElementsByClassName('dbot-banner eu-hide')[0].remove();
+            document.getElementsByClassName('dbot-banner__separator')[0].remove();
             document.getElementById('logo').remove();
         }
     }
diff --git a/src/common/utils/tools.js b/src/common/utils/tools.js
index 945514159a..f41f0d3695 100644
--- a/src/common/utils/tools.js
+++ b/src/common/utils/tools.js
@@ -149,6 +149,6 @@ export const errLogger = (err, msg) => {
 };
 
 export const isBinaryDomain =
-    document.location.hostname === 'localhos' ||
+    document.location.hostname === 'localhost' ||
     document.location.hostname === 'bot.binary.com' ||
     document.location.hostname.includes('binary-bot-git-fork');
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index c7eaac9d28..664b5efd00 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -162,7 +162,7 @@ window.onload = () => {
     if (document.readyState === 'complete') {
         if (!isBinaryDomain) {
             document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
-            document.getElementsByClassName('logo-wrapper')[0].remove();
+            document.getElementsByClassName('dbot-banner__separator')[0].remove();
         }
     }
 };

From bd6202ccec8a9efa79fe046ba1877ca11610adc6 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 12:05:36 +0300
Subject: [PATCH 09/16] fix: aligning text

---
 static/css/index.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/css/index.scss b/static/css/index.scss
index b6829fa464..6d5614202f 100644
--- a/static/css/index.scss
+++ b/static/css/index.scss
@@ -72,7 +72,7 @@ ul.bullet {
     text-align: center;
 }
 .half-width {
-    width: 50%;
+    width: 100%;
     float: left;
 }
 .clear {
@@ -96,7 +96,7 @@ ul.bullet {
     z-index: 101;
 }
 
-/* Keep this below since css after this 
+/* Keep this below since css after this
  * will be interfering with small
  * screen sizes
  */
@@ -123,7 +123,7 @@ ul.bullet {
         width: 100%;
     }
     .half-width p, .half-width img {
-        margin: 1em; 
+        margin: 1em;
     }
     .bottom-image {
         display: none;

From 38749baddb288410d68557b816d29ae8528dcb92 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 15:45:18 +0300
Subject: [PATCH 10/16] chore: remove banner for mobile

---
 src/indexPage/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 664b5efd00..10958868d6 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -163,6 +163,7 @@ window.onload = () => {
         if (!isBinaryDomain) {
             document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
             document.getElementsByClassName('dbot-banner__separator')[0].remove();
+            document.getElementsByClassName('half-width top-image')[0].remove();
         }
     }
 };

From cc2ffc8fc5197e37be7e13fa3635d80ef393faf2 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Wed, 25 Jan 2023 16:19:56 +0300
Subject: [PATCH 11/16] fix: resolve flashing icon issue

---
 src/botPage/view/index.js | 12 ++++--------
 src/indexPage/index.js    | 14 +++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 3d12d1b8eb..4628f9e83a 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -41,11 +41,7 @@ view.initPromise.then(() => {
     }
 });
 
-window.onload = () => {
-    if (document.readyState === 'complete') {
-        if (!isBinaryDomain) {
-            document.getElementsByClassName('dbot-banner__separator')[0].remove();
-            document.getElementById('logo').remove();
-        }
-    }
-};
+if (!isBinaryDomain) {
+    document.getElementsByClassName('dbot-banner__separator')[0].remove();
+    document.getElementById('logo').remove();
+}
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 10958868d6..132487025a 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -158,12 +158,8 @@ const loginCheck = () => {
 
 loginCheck();
 
-window.onload = () => {
-    if (document.readyState === 'complete') {
-        if (!isBinaryDomain) {
-            document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
-            document.getElementsByClassName('dbot-banner__separator')[0].remove();
-            document.getElementsByClassName('half-width top-image')[0].remove();
-        }
-    }
-};
+if (!isBinaryDomain) {
+    document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
+    document.getElementsByClassName('dbot-banner__separator')[0].remove();
+    document.getElementsByClassName('half-width top-image')[0].remove();
+}

From 0d84fd7ce711e75cf3bbe0a519761a5e68704f70 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Thu, 26 Jan 2023 08:45:35 +0300
Subject: [PATCH 12/16] chore: trigger vercel


From 2d35541399658ca4ea3ab2b3b221c53ada893a72 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Thu, 26 Jan 2023 09:50:39 +0300
Subject: [PATCH 13/16] fix: bot page inst show

---
 src/botPage/view/index.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 4628f9e83a..3d12d1b8eb 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -41,7 +41,11 @@ view.initPromise.then(() => {
     }
 });
 
-if (!isBinaryDomain) {
-    document.getElementsByClassName('dbot-banner__separator')[0].remove();
-    document.getElementById('logo').remove();
-}
+window.onload = () => {
+    if (document.readyState === 'complete') {
+        if (!isBinaryDomain) {
+            document.getElementsByClassName('dbot-banner__separator')[0].remove();
+            document.getElementById('logo').remove();
+        }
+    }
+};

From ab621012ccbb2e1d59de8ce0c7af6b52181ccf12 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Thu, 26 Jan 2023 09:55:27 +0300
Subject: [PATCH 14/16] fix: bot page not shows

---
 src/botPage/view/index.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 3d12d1b8eb..3485e90a7b 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -42,10 +42,8 @@ view.initPromise.then(() => {
 });
 
 window.onload = () => {
-    if (document.readyState === 'complete') {
-        if (!isBinaryDomain) {
-            document.getElementsByClassName('dbot-banner__separator')[0].remove();
-            document.getElementById('logo').remove();
-        }
+    if (window.document.readyState === 'complete' && !isBinaryDomain) {
+        window.document.getElementsByClassName('dbot-banner__separator')[0]?.remove();
+        window.document.getElementById('logo')?.remove();
     }
 };

From 43c77d2f0470ccd5f512f8ed01ec4a060a271c6f Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Thu, 26 Jan 2023 10:15:36 +0300
Subject: [PATCH 15/16] fix: bot page not shows

---
 src/botPage/view/index.js | 12 ++++++------
 src/indexPage/index.js    |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 3485e90a7b..83341a9837 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -41,9 +41,9 @@ view.initPromise.then(() => {
     }
 });
 
-window.onload = () => {
-    if (window.document.readyState === 'complete' && !isBinaryDomain) {
-        window.document.getElementsByClassName('dbot-banner__separator')[0]?.remove();
-        window.document.getElementById('logo')?.remove();
-    }
-};
+if (!isBinaryDomain) {
+    const separator = document.getElementsByClassName('dbot-banner__separator');
+    const logo = document.getElementById('logo');
+    separator[0].remove();
+    logo.remove();
+}
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 132487025a..6cced3a4af 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -159,7 +159,10 @@ const loginCheck = () => {
 loginCheck();
 
 if (!isBinaryDomain) {
-    document.getElementsByClassName('half-width bottom-image puzzle-logo')[0].remove();
-    document.getElementsByClassName('dbot-banner__separator')[0].remove();
-    document.getElementsByClassName('half-width top-image')[0].remove();
+    const puzzle = document.getElementsByClassName('half-width bottom-image puzzle-logo');
+    const separator = document.getElementsByClassName('dbot-banner__separator');
+    const banner = document.getElementsByClassName('half-width top-image');
+    puzzle[0].remove();
+    separator[0].remove();
+    banner[0].remove();
 }

From 43a71d167b9cef2d26753150656d9325b9d8b469 Mon Sep 17 00:00:00 2001
From: NikitK-deriv <nikita.kolesnik@deriv.com>
Date: Thu, 26 Jan 2023 10:22:14 +0300
Subject: [PATCH 16/16] fix: bot page not shows

---
 src/botPage/view/index.js |  8 ++++----
 src/indexPage/index.js    | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
index 83341a9837..13e81def50 100644
--- a/src/botPage/view/index.js
+++ b/src/botPage/view/index.js
@@ -42,8 +42,8 @@ view.initPromise.then(() => {
 });
 
 if (!isBinaryDomain) {
-    const separator = document.getElementsByClassName('dbot-banner__separator');
-    const logo = document.getElementById('logo');
-    separator[0].remove();
-    logo.remove();
+    // eslint-disable-next-line no-unused-expressions
+    document.getElementsByClassName('dbot-banner__separator')[0]?.remove();
+    // eslint-disable-next-line no-unused-expressions
+    document.getElementById('logo')?.remove();
 }
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
index 6cced3a4af..da432a4906 100644
--- a/src/indexPage/index.js
+++ b/src/indexPage/index.js
@@ -159,10 +159,10 @@ const loginCheck = () => {
 loginCheck();
 
 if (!isBinaryDomain) {
-    const puzzle = document.getElementsByClassName('half-width bottom-image puzzle-logo');
-    const separator = document.getElementsByClassName('dbot-banner__separator');
-    const banner = document.getElementsByClassName('half-width top-image');
-    puzzle[0].remove();
-    separator[0].remove();
-    banner[0].remove();
+    // eslint-disable-next-line no-unused-expressions
+    document.getElementsByClassName('half-width bottom-image puzzle-logo')[0]?.remove();
+    // eslint-disable-next-line no-unused-expressions
+    document.getElementsByClassName('dbot-banner__separator')[0]?.remove();
+    // eslint-disable-next-line no-unused-expressions
+    document.getElementsByClassName('half-width top-image')[0]?.remove();
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/binary-com/binary-bot/pull/3805.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/binary-com/binary-bot/pull/3805.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/binary-com/binary-bot/pull/3805.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/binary-com/binary-bot/pull/3805.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>