binary-com · prince-deriv · Jan 30, 2023 · Jan 23, 2023 · Jan 23, 2023 · Jan 24, 2023
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ lib/
 old/
 CNAME
 *.env
-.DS_Store
+.DS_Store
+.idea
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -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/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/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/common/utils/tools.js b/src/common/utils/tools.js
@@ -147,3 +147,8 @@ 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' ||
+    document.location.hostname.includes('binary-bot-git-fork');
diff --git 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();
@@ -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/src/indexPage/react-components/logo.jsx b/src/indexPage/react-components/logo.jsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import { createUrl } from '../../common/utils/tools';
+import {createUrl} from '../../common/utils/tools';
 
 const Logo = () => (
-    <a href={createUrl({ path: '', isNonBotPage: true })} target="blank" id="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" />
+                <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>

diff --git a/templates/bot.mustache b/templates/bot.mustache
@@ -10,7 +10,7 @@
 </head>
 
 <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 +114,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 +127,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 +166,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 +181,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 />

diff --git 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">
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,5 @@ lib/ @@
     old/
     CNAME
     *.env
-    .DS_Store
+    .DS_Store
+    .idea