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/gulpfile.babel.js b/gulpfile.babel.js index 12c597d1c6..eb280c1c7d 100644 --- 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 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/botPage/view/index.js b/src/botPage/view/index.js index 0717a740b0..13e81def50 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,10 @@ view.initPromise.then(() => { }); } }); + +if (!isBinaryDomain) { + // 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/common/utils/tools.js b/src/common/utils/tools.js index 3c2566d88c..f41f0d3695 100644 --- 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 index 5fda3f8f0a..da432a4906 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(, document.getElementById('binary-logo')); + render(isBinaryDomain && , document.getElementById('binary-logo')); render(