chore: remove useless script and move logic outside the component

binary-com · prince-deriv · Jan 30, 2023 · Jan 23, 2023 · Jan 23, 2023 · Jan 24, 2023
commit 54ae4e4ec4c0abe34659a6c9e78e83b582dca771
diff --git 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
@@ -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
@@ -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
@@ -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;
diff --git 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>