diff --git a/package-lock.json b/package-lock.json index 9d09baae751f..be5219e2d0d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8506,9 +8506,9 @@ }, "dependencies": { "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz", + "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -12440,9 +12440,9 @@ } }, "smartcharts-beta": { - "version": "0.4.27", - "resolved": "https://registry.npmjs.org/smartcharts-beta/-/smartcharts-beta-0.4.27.tgz", - "integrity": "sha512-1SEwqz1NgUi7Mi8V66JbZRHXno3spET6JJnFcm/s5HqmK3g++QIJeHaleyDdfItbNU+mXCc1MtQwI11MV7DemQ==", + "version": "0.4.28", + "resolved": "https://registry.npmjs.org/smartcharts-beta/-/smartcharts-beta-0.4.28.tgz", + "integrity": "sha512-PlizaOhL7N22kzQ0B4n6TONnUb2IO/4EwboCMg6BiJ5GR0thah6PrX0alH+8uqE9ZnURjpDZq07F3RVXOu4cPw==", "requires": { "event-emitter-es6": "^1.1.5", "lodash.debounce": "^4.0.8", diff --git a/package.json b/package.json index af5545fb2e10..577cb9fe9801 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "react-router-dom": "5.0.0", "react-transition-group": "2.4.0", "sinon": "7.2.2", - "smartcharts-beta": "0.4.27", + "smartcharts-beta": "0.4.28", "tt-react-custom-scrollbars": "4.2.1-tt2", "url-polyfill": "1.0.9", "web-push-notifications": "3.2.15" diff --git a/src/images/app/header/symbol.svg b/src/images/app/header/symbol.svg deleted file mode 100644 index 6da850ac0274..000000000000 --- a/src/images/app/header/symbol.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/javascript/app/App/Components/Layout/Header/menu-links.jsx b/src/javascript/app/App/Components/Layout/Header/menu-links.jsx index 90bbd5888323..1b3738b48c1b 100644 --- a/src/javascript/app/App/Components/Layout/Header/menu-links.jsx +++ b/src/javascript/app/App/Components/Layout/Header/menu-links.jsx @@ -1,13 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; -import Symbol from 'Images/app/header/symbol.svg'; import { BinaryLink } from '../../Routes'; const MenuLinks = ({ is_logged_in, items }) => ( -
- -
{!!items.length &&
{ @@ -16,7 +12,12 @@ const MenuLinks = ({ is_logged_in, items }) => ( null : - {item.icon}{item.text}{item.logo} + {item.text && + {item.icon}{item.text}{item.logo} + } + {item.image && + {item.image}{item.logo} + } )) } diff --git a/src/javascript/app/App/Constants/header-links.js b/src/javascript/app/App/Constants/header-links.js index f728f34c2b2c..196f2bb9d3fa 100644 --- a/src/javascript/app/App/Constants/header-links.js +++ b/src/javascript/app/App/Constants/header-links.js @@ -1,13 +1,15 @@ import React from 'react'; import { localize } from '_common/localize'; import { Icon } from 'Assets/Common'; -import { IconReports } from 'Assets/Header/NavBar/index'; +import { + IconReports, + IconDeriv } from 'Assets/Header/NavBar/index'; import { routes } from 'Constants/index'; const header_links = [ { logo :
{localize('BETA')}
, - text : localize('Deriv'), + image : , link_to: routes.trade, }, { diff --git a/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx b/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx new file mode 100644 index 000000000000..9a421ebbfd89 --- /dev/null +++ b/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx @@ -0,0 +1,20 @@ +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; + +const IconDeriv = ({ className }) => ( + + + + + + + + +); + +IconDeriv.propTypes = { + className: PropTypes.string, +}; + +export { IconDeriv }; diff --git a/src/javascript/app/Assets/Header/NavBar/index.js b/src/javascript/app/Assets/Header/NavBar/index.js index 2a1910dc27ae..add56737210d 100644 --- a/src/javascript/app/Assets/Header/NavBar/index.js +++ b/src/javascript/app/Assets/Header/NavBar/index.js @@ -1,5 +1,6 @@ export * from './icon-bell.jsx'; export * from './icon-cashier.jsx'; +export * from './icon-deriv.jsx'; export * from './icon-hamburger.jsx'; export * from './icon-portfolio.jsx'; export * from './icon-reports.jsx'; diff --git a/src/javascript/app/Modules/Contract/Containers/info-box.jsx b/src/javascript/app/Modules/Contract/Containers/info-box.jsx index 8f69c8194370..7f2e0d972e25 100644 --- a/src/javascript/app/Modules/Contract/Containers/info-box.jsx +++ b/src/javascript/app/Modules/Contract/Containers/info-box.jsx @@ -18,9 +18,10 @@ const InfoBox = ({ }) => { const Contents = InfoBoxLongcode; const info = is_trade_page ? contract_info : replay_info; + const is_ready = is_contract_mode && !!(info.longcode); return ( (
-
+
{ Array.from(new Array(5)).map((x, inx) => (
))}