diff --git a/package-lock.json b/package-lock.json index ee909e278602..fa54dd4a2f29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1102,6 +1102,12 @@ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, + "array-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", + "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=", + "dev": true + }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -1151,13 +1157,24 @@ "dev": true }, "array.prototype.find": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz", - "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz", + "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.13.0" + } + }, + "array.prototype.flat": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz", + "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==", "dev": true, "requires": { "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" + "es-abstract": "^1.10.0", + "function-bind": "^1.1.1" } }, "arrify": { @@ -4491,42 +4508,48 @@ "dev": true }, "enzyme": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.3.0.tgz", - "integrity": "sha512-l8csyPyLmtxskTz6pX9W8eDOyH1ckEtDttXk/vlFWCjv00SkjTjtoUrogqp4yEvMyneU9dUJoOLnqFoiHb8IHA==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.10.0.tgz", + "integrity": "sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg==", "dev": true, "requires": { + "array.prototype.flat": "^1.2.1", "cheerio": "^1.0.0-rc.2", - "function.prototype.name": "^1.0.3", - "has": "^1.0.1", + "function.prototype.name": "^1.1.0", + "has": "^1.0.3", + "html-element-map": "^1.0.0", "is-boolean-object": "^1.0.0", - "is-callable": "^1.1.3", + "is-callable": "^1.1.4", "is-number-object": "^1.0.3", + "is-regex": "^1.0.4", "is-string": "^1.0.4", "is-subset": "^0.1.1", - "lodash": "^4.17.4", - "object-inspect": "^1.5.0", + "lodash.escape": "^4.0.1", + "lodash.isequal": "^4.5.0", + "object-inspect": "^1.6.0", "object-is": "^1.0.1", "object.assign": "^4.1.0", "object.entries": "^1.0.4", "object.values": "^1.0.4", "raf": "^3.4.0", - "rst-selector-parser": "^2.2.3" + "rst-selector-parser": "^2.2.3", + "string.prototype.trim": "^1.1.2" } }, "enzyme-adapter-react-16": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.8.0.tgz", - "integrity": "sha512-7cVHIKutqnesGeM3CjNFHSvktpypSWBokrBO8wIW+BVx+HGxWCF87W9TpkIIYJqgCtdw9FQGFrAbLg8kSwPRuQ==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz", + "integrity": "sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==", "dev": true, "requires": { - "enzyme-adapter-utils": "^1.10.0", - "function.prototype.name": "^1.1.0", + "enzyme-adapter-utils": "^1.12.0", + "has": "^1.0.3", "object.assign": "^4.1.0", "object.values": "^1.1.0", - "prop-types": "^15.6.2", - "react-is": "^16.7.0", - "react-test-renderer": "^16.0.0-0" + "prop-types": "^15.7.2", + "react-is": "^16.8.6", + "react-test-renderer": "^16.0.0-0", + "semver": "^5.7.0" }, "dependencies": { "prop-types": { @@ -4543,12 +4566,12 @@ } }, "enzyme-adapter-utils": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.11.0.tgz", - "integrity": "sha512-0VZeoE9MNx+QjTfsjmO1Mo+lMfunucYB4wt5ficU85WB/LoetTJrbuujmHP3PJx6pSoaAuLA+Mq877x4LoxdNg==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz", + "integrity": "sha512-wkZvE0VxcFx/8ZsBw0iAbk3gR1d9hK447ebnSYBf95+r32ezBq+XDSAvRErkc4LZosgH8J7et7H7/7CtUuQfBA==", "dev": true, "requires": { - "airbnb-prop-types": "^2.12.0", + "airbnb-prop-types": "^2.13.2", "function.prototype.name": "^1.1.0", "object.assign": "^4.1.0", "object.fromentries": "^2.0.0", @@ -7379,6 +7402,15 @@ "wbuf": "^1.1.0" } }, + "html-element-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.0.1.tgz", + "integrity": "sha512-BZSfdEm6n706/lBfXKWa4frZRZcT5k1cOusw95ijZsHlI+GdgY0v95h6IzO3iIDf2ROwq570YTwqNPqHcNMozw==", + "dev": true, + "requires": { + "array-filter": "^1.0.0" + } + }, "html-encoding-sniffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", @@ -8628,6 +8660,12 @@ "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", "dev": true }, + "lodash.escape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz", + "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=", + "dev": true + }, "lodash.every": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.every/-/lodash.every-4.6.0.tgz", @@ -12943,6 +12981,17 @@ "strip-ansi": "^3.0.0" } }, + "string.prototype.trim": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", + "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.5.0", + "function-bind": "^1.0.2" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", diff --git a/package.json b/package.json index 05f5fb7df727..90ec93f58479 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "connect-modrewrite": "0.9.0", "deep-diff": "0.3.8", "emphasize": "2.0.0", - "enzyme": "3.3.0", - "enzyme-adapter-react-16": "1.8.0", + "enzyme": "3.10.0", + "enzyme-adapter-react-16": "1.14.0", "eslint-config-airbnb-base": "13.1.0", "eslint-config-binary": "1.0.2", "eslint-config-prettier": "2.9.0", diff --git a/src/javascript/_common/base/login.js b/src/javascript/_common/base/login.js index 553a98c5a637..b7db736857ee 100644 --- a/src/javascript/_common/base/login.js +++ b/src/javascript/_common/base/login.js @@ -24,12 +24,14 @@ const Login = (() => { const marketing_queries = `&signup_device=${signup_device}${date_first_contact ? `&date_first_contact=${date_first_contact}` : ''}`; const default_binary_url = `https://oauth.binary.com/oauth2/authorize?app_id=${getAppId()}&l=${language}${marketing_queries}`; - return ((server_url && /qa/.test(server_url)) ? - `https://${server_url}/oauth2/authorize?app_id=${getAppId()}&l=${language}${marketing_queries}` : - getAppId() === domain_app_ids['deriv.app'] ? - default_binary_url - : urlForCurrentDomain(default_binary_url) - ); + if (server_url && /qa/.test(server_url)) { + return `https://${server_url}/oauth2/authorize?app_id=${getAppId()}&l=${language}${marketing_queries}`; + } + if (getAppId === domain_app_ids['deriv.app']) { + return default_binary_url; + } + + return urlForCurrentDomain(default_binary_url); }; // TODO: update this to handle logging into /app/ url diff --git a/src/javascript/_common/url.js b/src/javascript/_common/url.js index ef6eabbcc359..50e9a2092b0a 100644 --- a/src/javascript/_common/url.js +++ b/src/javascript/_common/url.js @@ -46,7 +46,7 @@ const Url = (() => { if (/localhost|binary\.sx/.test(domain)) { domain = `https://binary.com/${url_lang}/`; } else { - domain = domain.replace(/deriv\.app/, 'binary\.com'); + domain = domain.replace(/deriv\.app/, 'binary.com'); } } const new_url = `${domain}${(normalizePath(path) || 'home')}.html${(pars ? `?${pars}` : '')}`; diff --git a/src/javascript/app/App/Components/Elements/Calendar/calendar-footer.jsx b/src/javascript/app/App/Components/Elements/Calendar/calendar-footer.jsx index 66a14454fbb6..9da6312f0b9b 100644 --- a/src/javascript/app/App/Components/Elements/Calendar/calendar-footer.jsx +++ b/src/javascript/app/App/Components/Elements/Calendar/calendar-footer.jsx @@ -1,9 +1,7 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import { - Icon, - IconCalendarToday } from 'Assets/Common'; -import { localize } from '_common/localize'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; +import { localize } from '_common/localize'; const CalendarFooter = ({ footer, @@ -20,7 +18,7 @@ const CalendarFooter = ({ { has_range_selection && { `${!is_minimum ? localize('Duration: ') : ''}${duration_date}` } } { has_today_btn && diff --git a/src/javascript/app/App/Components/Elements/Calendar/calendar-header.jsx b/src/javascript/app/App/Components/Elements/Calendar/calendar-header.jsx index 9fb5679d9623..f1431fa8cb4e 100644 --- a/src/javascript/app/App/Components/Elements/Calendar/calendar-header.jsx +++ b/src/javascript/app/App/Components/Elements/Calendar/calendar-header.jsx @@ -1,23 +1,18 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { - Icon, - IconChevronDoubleLeft, - IconChevronDoubleRight, - IconChevronLeft, - IconChevronRight } from 'Assets/Common'; -import { month_headers } from 'Constants/date-time'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; +import { month_headers } from 'Constants/date-time'; import { addMonths, addYears, subMonths, subYears, - toMoment } from 'Utils/Date'; -import CalendarButton from './calendar-button.jsx'; + toMoment } from 'Utils/Date'; +import CalendarButton from './calendar-button.jsx'; import { getCentury, - getDecade } from './helper'; + getDecade } from './helper'; const CalendarHeader = ({ calendar_date, @@ -56,7 +51,7 @@ const CalendarHeader = ({ })} onClick={is_prev_year_disabled ? undefined : () => navigateTo(subYears(calendar_date, num_of_years))} > - + navigateTo(subMonths(calendar_date, 1))} > - + @@ -106,7 +101,7 @@ const CalendarHeader = ({ is_hidden={!is_date_view} onClick={is_next_month_disabled ? undefined : () => navigateTo(addMonths(calendar_date, 1))} > - + navigateTo(addYears(calendar_date, num_of_years))} > - + ); diff --git a/src/javascript/app/App/Components/Elements/Calendar/panels/calendar-days.jsx b/src/javascript/app/App/Components/Elements/Calendar/panels/calendar-days.jsx index fff328011b3e..aa31c43c3504 100644 --- a/src/javascript/app/App/Components/Elements/Calendar/panels/calendar-days.jsx +++ b/src/javascript/app/App/Components/Elements/Calendar/panels/calendar-days.jsx @@ -123,7 +123,7 @@ const getDays = ({ message={message} /> } - {moment_date.date()} + {moment_date.date()} ); }); diff --git a/src/javascript/app/App/Components/Elements/ContractAudit/contract-audit.jsx b/src/javascript/app/App/Components/Elements/ContractAudit/contract-audit.jsx index 529c046f8e36..58543fb9f76b 100644 --- a/src/javascript/app/App/Components/Elements/ContractAudit/contract-audit.jsx +++ b/src/javascript/app/App/Components/Elements/ContractAudit/contract-audit.jsx @@ -1,9 +1,9 @@ -import classNames from 'classnames'; -import moment from 'moment'; -import PropTypes from 'prop-types'; -import React, { Component } from 'react'; -import Localize from 'App/Components/Elements/localize.jsx'; -import { Icon, IconArrowBold } from 'Assets/Common'; +import classNames from 'classnames'; +import moment from 'moment'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; +import Localize from 'App/Components/Elements/localize.jsx'; +import Icon from 'Assets/icon.jsx'; const Pair = ({ value, label }) => (
@@ -66,7 +66,7 @@ class ContractAudit extends Component { onClick={this.toggleVisibility.bind(this)} > this.props.history.goBack()} > - +

{body_content}
diff --git a/src/javascript/app/App/Components/Elements/Drawer/drawer-header.jsx b/src/javascript/app/App/Components/Elements/Drawer/drawer-header.jsx index f8eac6928df8..314c20ffd933 100644 --- a/src/javascript/app/App/Components/Elements/Drawer/drawer-header.jsx +++ b/src/javascript/app/App/Components/Elements/Drawer/drawer-header.jsx @@ -2,9 +2,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import { localize } from '_common/localize'; -import { - Icon, - IconClose } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; export const DrawerHeader = ({ alignment, @@ -16,7 +14,7 @@ export const DrawerHeader = ({ {alignment && alignment === 'right' ?
- +

{localize('all notifications')}

@@ -25,7 +23,7 @@ export const DrawerHeader = ({ :
- +
diff --git a/src/javascript/app/App/Components/Elements/NotificationMessage/notification.jsx b/src/javascript/app/App/Components/Elements/NotificationMessage/notification.jsx index 73358420502b..7380f8291b79 100644 --- a/src/javascript/app/App/Components/Elements/NotificationMessage/notification.jsx +++ b/src/javascript/app/App/Components/Elements/NotificationMessage/notification.jsx @@ -1,15 +1,11 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import classNames from 'classnames'; -import { Icon } from 'Assets/Common'; -import { IconDanger } from 'Assets/Common/icon-danger.jsx'; -import { IconInformation } from 'Assets/Common/icon-information.jsx'; -import { IconWarning } from 'Assets/Common/icon-warning.jsx'; -import { IconSuccess } from 'Assets/Common/icon-success.jsx'; -import CloseButton from './close-button.jsx'; +import PropTypes from 'prop-types'; +import React from 'react'; +import classNames from 'classnames'; +import Icon from 'Assets/icon.jsx'; +import CloseButton from './close-button.jsx'; import { default_delay, - types } from './constants'; + types } from './constants'; const Notification = ({ data, @@ -36,11 +32,11 @@ const Notification = ({ })} >
- { data.type === 'danger' && } + { data.type === 'danger' && } { (data.type === 'info' || data.type === 'contract_sold') - && } - { data.type === 'success' && } - { data.type === 'warning' && } + && } + { data.type === 'success' && } + { data.type === 'warning' && }

{data.header}

diff --git a/src/javascript/app/App/Components/Elements/Notifications/__tests__/empty-notification.spec.js b/src/javascript/app/App/Components/Elements/Notifications/__tests__/empty-notification.spec.js index ac98fe167ad4..ebaf5da1b00e 100644 --- a/src/javascript/app/App/Components/Elements/Notifications/__tests__/empty-notification.spec.js +++ b/src/javascript/app/App/Components/Elements/Notifications/__tests__/empty-notification.spec.js @@ -3,8 +3,7 @@ import { expect } from 'chai'; import { configure, shallow } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import { EmptyNotification } from '../empty-notification'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconBell } from 'Assets/Header/NavBar'; +import Icon from 'Assets/icon.jsx'; configure({ adapter: new Adapter() }); @@ -13,8 +12,8 @@ describe('Notifications', () => { const wrapper = shallow(); expect(wrapper).to.have.length(1); }); - it('should render Icon icon={IconBell}', () => { + it('should render Icon icon=\'IconBell\'', () => { const wrapper = shallow(); - expect(wrapper.contains()).to.be.true; + expect(wrapper.contains()).to.be.true; }); }); diff --git a/src/javascript/app/App/Components/Elements/Notifications/empty-notification.jsx b/src/javascript/app/App/Components/Elements/Notifications/empty-notification.jsx index 78923d887bc9..757412fc6595 100644 --- a/src/javascript/app/App/Components/Elements/Notifications/empty-notification.jsx +++ b/src/javascript/app/App/Components/Elements/Notifications/empty-notification.jsx @@ -1,13 +1,12 @@ import React from 'react'; import { localize } from '_common/localize'; -import { Icon } from 'Assets/Common'; -import { IconBell } from 'Assets/Header/NavBar'; +import Icon from 'Assets/icon.jsx'; const EmptyNotification = () => (
- +

{localize('No Notifications')}

diff --git a/src/javascript/app/App/Components/Elements/Notifications/notification-bar.jsx b/src/javascript/app/App/Components/Elements/Notifications/notification-bar.jsx index 522cf79cf740..24e98e543512 100644 --- a/src/javascript/app/App/Components/Elements/Notifications/notification-bar.jsx +++ b/src/javascript/app/App/Components/Elements/Notifications/notification-bar.jsx @@ -2,7 +2,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import { CSSTransition } from 'react-transition-group'; -import { IconClose } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; class NotificationBar extends React.Component { state = {}; @@ -63,7 +63,7 @@ class NotificationBar extends React.Component { onClick={this.onClose.bind(this)} className='notification-bar__button' > - +
}
diff --git a/src/javascript/app/App/Components/Elements/Notifications/notifications.jsx b/src/javascript/app/App/Components/Elements/Notifications/notifications.jsx index 4e90fb502f85..e528460d97ee 100644 --- a/src/javascript/app/App/Components/Elements/Notifications/notifications.jsx +++ b/src/javascript/app/App/Components/Elements/Notifications/notifications.jsx @@ -20,7 +20,7 @@ const Notifications = ({ list }) => ( ); Notifications.propTypes = { - list: PropTypes.object, + list: PropTypes.array, }; export { Notifications }; diff --git a/src/javascript/app/App/Components/Elements/Popover/popover-bubble.jsx b/src/javascript/app/App/Components/Elements/Popover/popover-bubble.jsx index 673de9d3178b..2c133d44ca11 100644 --- a/src/javascript/app/App/Components/Elements/Popover/popover-bubble.jsx +++ b/src/javascript/app/App/Components/Elements/Popover/popover-bubble.jsx @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import ReactDOM from 'react-dom'; import posed, { PoseGroup } from 'react-pose'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconInfoBlue } from 'Assets/Common/icon-info-blue.jsx'; +import Icon from 'Assets/icon.jsx'; const FadeIn = posed.span({ enter: { @@ -79,7 +78,7 @@ class PopoverBubble extends React.PureComponent { > { icon === 'info' && - + } diff --git a/src/javascript/app/App/Components/Elements/Popover/popover.jsx b/src/javascript/app/App/Components/Elements/Popover/popover.jsx index b09e2683fe55..b5c516aeb4cd 100644 --- a/src/javascript/app/App/Components/Elements/Popover/popover.jsx +++ b/src/javascript/app/App/Components/Elements/Popover/popover.jsx @@ -1,11 +1,8 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconInfoOutline } from 'Assets/Common/icon-info-outline.jsx'; -import { IconQuestion } from 'Assets/Common/icon-question.jsx'; -import { IconRedDot } from 'Assets/Common/icon-red-dot.jsx'; -import PopoverBubble from './popover-bubble.jsx'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; +import PopoverBubble from './popover-bubble.jsx'; class Popover extends React.PureComponent { constructor(props) { @@ -53,9 +50,9 @@ class Popover extends React.PureComponent { >
- {(icon === 'info') && } - {(icon === 'question') && } - {(icon === 'dot') && } + {(icon === 'info') && } + {(icon === 'question') && } + {(icon === 'dot') && } { children } diff --git a/src/javascript/app/App/Components/Elements/PositionsDrawer/contract-type-cell.jsx b/src/javascript/app/App/Components/Elements/PositionsDrawer/contract-type-cell.jsx index ed215c1f550d..1599e9d036fa 100644 --- a/src/javascript/app/App/Components/Elements/PositionsDrawer/contract-type-cell.jsx +++ b/src/javascript/app/App/Components/Elements/PositionsDrawer/contract-type-cell.jsx @@ -1,12 +1,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import { getContractTypeDisplay } from 'Constants/contract'; -import { IconTradeType } from 'Assets/Trading/Types'; +import Icon from 'Assets/icon.jsx'; const ContractTypeCell = ({ type }) => (
- +
{getContractTypeDisplay(type) || ''} diff --git a/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer-card.jsx b/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer-card.jsx index 727d9b6d8eef..f5624ef0e669 100644 --- a/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer-card.jsx +++ b/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer-card.jsx @@ -5,7 +5,7 @@ import { CSSTransition } from 'react-transition-group'; import Money from 'App/Components/Elements/money.jsx'; import ContractLink from 'Modules/Contract/Containers/contract-link.jsx'; import { localize } from '_common/localize'; -import { IconPriceMove } from 'Assets/Trading/icon-price-move.jsx'; +import Icon from 'Assets/icon.jsx'; import Button from 'App/Components/Form/button.jsx'; import { UnderlyingIcon } from 'App/Components/Elements/underlying-icon.jsx'; import ContractTypeCell from './contract-type-cell.jsx'; @@ -134,7 +134,8 @@ class PositionsDrawerCard extends React.PureComponent { }, )} > -
@@ -147,7 +148,8 @@ class PositionsDrawerCard extends React.PureComponent { }, )} > -
@@ -238,7 +240,8 @@ class PositionsDrawerCard extends React.PureComponent { }, )} > -
@@ -251,7 +254,8 @@ class PositionsDrawerCard extends React.PureComponent { }, )} > -
diff --git a/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer.jsx b/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer.jsx index 04e536380eeb..85b53b7c1bb3 100644 --- a/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer.jsx +++ b/src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer.jsx @@ -6,9 +6,7 @@ import { NavLink } from 'react-router-dom'; import { CSSTransition } from 'react-transition-group'; import { Scrollbars } from 'tt-react-custom-scrollbars'; import { localize } from '_common/localize'; -import { - Icon, - IconMinimize } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; import routes from 'Constants/routes'; import EmptyPortfolioMessage from 'Modules/Portfolio/Components/empty-portfolio-message.jsx'; import { connect } from 'Stores/connect'; @@ -88,7 +86,7 @@ class PositionsDrawer extends React.Component { className='positions-drawer__icon-close' onClick={toggleDrawer} > - +
diff --git a/src/javascript/app/App/Components/Elements/PositionsDrawer/result-details.jsx b/src/javascript/app/App/Components/Elements/PositionsDrawer/result-details.jsx index c21a204cfa7e..d7bf3326c01e 100644 --- a/src/javascript/app/App/Components/Elements/PositionsDrawer/result-details.jsx +++ b/src/javascript/app/App/Components/Elements/PositionsDrawer/result-details.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import { IconArrow } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; import { localize } from '_common/localize'; import { epochToMoment, @@ -91,7 +91,7 @@ class ResultDetails extends React.PureComponent { })} onClick={this.toggleDetails} > - +
); diff --git a/src/javascript/app/App/Components/Elements/PositionsDrawer/result-overlay.jsx b/src/javascript/app/App/Components/Elements/PositionsDrawer/result-overlay.jsx index b487135efe10..00e6aae1f11f 100644 --- a/src/javascript/app/App/Components/Elements/PositionsDrawer/result-overlay.jsx +++ b/src/javascript/app/App/Components/Elements/PositionsDrawer/result-overlay.jsx @@ -2,8 +2,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import { CSSTransition } from 'react-transition-group'; -import IconCheck from 'Images/app/portfolio/ic-check.svg'; -import IconCross from 'Images/app/portfolio/ic-cross.svg'; +import Icon from 'Assets/icon.jsx'; import { localize } from '_common/localize'; const ResultOverlay = ({ @@ -46,12 +45,12 @@ const ResultOverlay = ({ (result === 'won') ? {localize('won')} - + : {localize('lost')} - + } diff --git a/src/javascript/app/App/Components/Elements/SettingsDialog/language-dialog.jsx b/src/javascript/app/App/Components/Elements/SettingsDialog/language-dialog.jsx index c01bf7807a65..fe59a7463b58 100644 --- a/src/javascript/app/App/Components/Elements/SettingsDialog/language-dialog.jsx +++ b/src/javascript/app/App/Components/Elements/SettingsDialog/language-dialog.jsx @@ -1,13 +1,13 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import Localize from 'App/Components/Elements/localize.jsx'; -import { IconCountryFlag } from 'Assets/Common'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Localize from 'App/Components/Elements/localize.jsx'; +import Icon from 'Assets/icon.jsx'; import { getAllowedLanguages, getURL, currentLanguage, -} from 'Utils/Language'; +} from 'Utils/Language'; const isCurrentLanguage = (lang) => lang === currentLanguage; @@ -22,7 +22,8 @@ const NonClickableLink = ({ children, lang }) => ( const LanguageLink = ({ lang }) => ( - diff --git a/src/javascript/app/App/Components/Elements/SettingsDialog/settings-dialog.jsx b/src/javascript/app/App/Components/Elements/SettingsDialog/settings-dialog.jsx index 234fc2ab2ca7..5fd445f6e73a 100644 --- a/src/javascript/app/App/Components/Elements/SettingsDialog/settings-dialog.jsx +++ b/src/javascript/app/App/Components/Elements/SettingsDialog/settings-dialog.jsx @@ -1,23 +1,16 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import ReactDOM from 'react-dom'; -import { localize } from '_common/localize'; -import VerticalTab from 'App/Components/Elements/VerticalTabs'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import ReactDOM from 'react-dom'; +import { localize } from '_common/localize'; +import VerticalTab from 'App/Components/Elements/VerticalTabs'; import { ChartSettings, LanguageSettings, ThemeSelectSettings, // PurchaseSettings, -} from 'App/Containers/SettingsDialog'; -import { Icon } from 'Assets/Common'; -import { - IconCharts, - IconClose, - IconLanguage, - // IconPurchase, - IconTheme, -} from 'Assets/Settings'; +} from 'App/Containers/SettingsDialog'; +import Icon from 'Assets/icon.jsx'; class SettingsDialog extends React.PureComponent { constructor(props) { @@ -58,7 +51,7 @@ class SettingsDialog extends React.PureComponent {

{localize('Platform settings')}

- +
@@ -78,15 +71,15 @@ class SettingsDialog extends React.PureComponent { settings_content = () => [ { - icon : IconTheme, + icon : 'IconTheme', label: localize('Themes'), value: ThemeSelectSettings, }, { - icon : IconLanguage, + icon : 'IconLanguage', label: localize('Language'), value: LanguageSettings, }, { - icon : IconCharts, + icon : 'IconCharts', label: localize('Charts'), value: ChartSettings, // uncomment below lines to bring back purchase lock and purchase confirmation diff --git a/src/javascript/app/App/Components/Elements/VerticalTabs/__tests__/vertical-tab.spec.js b/src/javascript/app/App/Components/Elements/VerticalTabs/__tests__/vertical-tab.spec.js index 05a0db977cff..04608be2a0aa 100644 --- a/src/javascript/app/App/Components/Elements/VerticalTabs/__tests__/vertical-tab.spec.js +++ b/src/javascript/app/App/Components/Elements/VerticalTabs/__tests__/vertical-tab.spec.js @@ -6,12 +6,12 @@ import VerticalTab from '../vertical-tab.jsx'; describe('', () => { const valid_tab_items = [ { - icon: () => , + icon: '', label: 'Label 1', value: () => }, { - icon: () => , + icon: '', label: 'Label 2', value: () => } diff --git a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-content-container.jsx b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-content-container.jsx index 867321e5a7d5..accb00bc6196 100644 --- a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-content-container.jsx +++ b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-content-container.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import React from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; -import { Icon } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; import routes from 'Constants/routes'; class VerticalTabContentContainer extends React.PureComponent { diff --git a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-headers.jsx b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-headers.jsx index 3f1b1ab3c26b..69ae86aecdd5 100644 --- a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-headers.jsx +++ b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab-headers.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import React from 'react'; import { NavLink } from 'react-router-dom'; -import { Icon } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; class VerticalTabHeaders extends React.PureComponent { render() { diff --git a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab.jsx b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab.jsx index e1af9ac2011b..22f5578e3889 100644 --- a/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab.jsx +++ b/src/javascript/app/App/Components/Elements/VerticalTabs/vertical-tab.jsx @@ -11,9 +11,9 @@ class VerticalTab extends React.PureComponent { const applicable_routes = props.list.filter(item => ( item.path === props.current_path || item.default )); - const selected = applicable_routes.length > 1 ? - applicable_routes[applicable_routes.length - 1] - : applicable_routes.length === 1 ? applicable_routes[0] : undefined; + const selected = applicable_routes.length > 1 + ? applicable_routes[applicable_routes.length - 1] + : applicable_routes[0]; this.state = { selected, @@ -60,7 +60,7 @@ class VerticalTab extends React.PureComponent { VerticalTab.propTypes = { action_bar: PropTypes.arrayOf( PropTypes.shape({ - icon : PropTypes.func, + icon : PropTypes.string, onClick: PropTypes.func, title : PropTypes.string, }) @@ -73,7 +73,7 @@ VerticalTab.propTypes = { list : PropTypes.arrayOf( PropTypes.shape({ default: PropTypes.bool, - icon : PropTypes.func, + icon : PropTypes.string, label : PropTypes.string, path : PropTypes.string, value : PropTypes.oneOfType([PropTypes.func, PropTypes.object]), diff --git a/src/javascript/app/App/Components/Elements/tooltip.jsx b/src/javascript/app/App/Components/Elements/tooltip.jsx index 060008f4a3f5..01a46befb94d 100644 --- a/src/javascript/app/App/Components/Elements/tooltip.jsx +++ b/src/javascript/app/App/Components/Elements/tooltip.jsx @@ -1,11 +1,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconInfoBlue } from 'Assets/Common/icon-info-blue.jsx'; -import { IconInfoOutline } from 'Assets/Common/icon-info-outline.jsx'; -import { IconQuestion } from 'Assets/Common/icon-question.jsx'; -import { IconRedDot } from 'Assets/Common/icon-red-dot.jsx'; +import Icon from 'Assets/icon.jsx'; class Tooltip extends React.PureComponent { state = { @@ -41,21 +37,21 @@ class Tooltip extends React.PureComponent { {icon === 'info' && } - {icon === 'question' && } - {icon === 'dot' && } + {icon === 'question' && } + {icon === 'dot' && } {children} ); diff --git a/src/javascript/app/App/Components/Form/DatePicker/date-picker.jsx b/src/javascript/app/App/Components/Form/DatePicker/date-picker.jsx index ccd7ef40c6ee..4dee2ca254d6 100644 --- a/src/javascript/app/App/Components/Form/DatePicker/date-picker.jsx +++ b/src/javascript/app/App/Components/Form/DatePicker/date-picker.jsx @@ -3,11 +3,7 @@ import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; import React from 'react'; import { CSSTransition } from 'react-transition-group'; -import { - Icon, - IconArrow, - IconCalendar, - IconClear } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; import InputField from 'App/Components/Form/InputField'; import { addDays, @@ -225,7 +221,7 @@ class DatePicker extends React.Component { />
); @@ -241,7 +237,7 @@ class DatePicker extends React.Component { > { this.renderInputField() } {this.props.is_clearable && { !is_single_option && - + ); diff --git a/src/javascript/app/App/Components/Form/TimePicker/time-picker.jsx b/src/javascript/app/App/Components/Form/TimePicker/time-picker.jsx index 0805c0f63738..303fcd4cbecb 100644 --- a/src/javascript/app/App/Components/Form/TimePicker/time-picker.jsx +++ b/src/javascript/app/App/Components/Form/TimePicker/time-picker.jsx @@ -3,9 +3,7 @@ import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; import React from 'react'; import { CSSTransition } from 'react-transition-group'; -import { - Icon, - IconClock } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; import Dialog from './dialog.jsx'; import InputField from '../InputField'; @@ -91,7 +89,7 @@ class TimePicker extends React.Component { name={name} placeholder={placeholder} /> - + { }); it('should contain Tooltip message passed in status', () => { const wrapper = shallow(); - console.log(wrapper); expect(wrapper.contains(
@@ -36,7 +35,6 @@ describe('NetworkStatus', () => { it('should contain Popover with default message and div with only default class if status does not contain them', () => { status = {}; const wrapper = shallow(); - console.log(wrapper); expect(wrapper.contains(
diff --git a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-fullscreen.spec.js b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-fullscreen.spec.js index 2b4da2d60c3f..c751d4853172 100644 --- a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-fullscreen.spec.js +++ b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-fullscreen.spec.js @@ -4,8 +4,7 @@ import { spy, stub } from 'sinon'; import { configure, shallow, mount } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import { ToggleFullScreen } from '../toggle-fullscreen.jsx'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconMaximize } from 'Assets/Footer'; +import Icon from 'Assets/icon.jsx'; configure({ adapter: new Adapter() }); spy(ToggleFullScreen.prototype, 'componentDidMount'); @@ -16,7 +15,7 @@ describe('ToggleFullScreen', () => { expect(wrapper).to.have.length(1); }); it('should call componentWillMount', () => { - mount(); + shallow(); expect(ToggleFullScreen.prototype.componentDidMount).to.have.property('called', true); }); it('should have .ic-fullscreen', () => { @@ -32,22 +31,22 @@ describe('ToggleFullScreen', () => { wrapper.setState({ is_full_screen: true }); expect(wrapper.find('.ic-fullscreen--active').exists()).to.be.true; }); - it('should contain ', () => { + it('should contain ', () => { const wrapper = shallow(); - expect(wrapper.contains()).to.be.true; + expect(wrapper.contains()).to.be.true; }); it('should have onclick property as an instance of a Function', () => { const wrapper = shallow(); expect(wrapper.prop('onClick')).to.be.an.instanceof(Function); }); it('should set is_full_screen equal to false in state, after onclick, when is_full_screen is false and there is no browser', () => { - const wrapper = mount(); + const wrapper = shallow(); wrapper.setState({ is_full_screen: false }); wrapper.find('a').prop('onClick')({stopPropagation: () => {}}); expect(wrapper.state().is_full_screen).to.be.false; }); it('should set is_full_screen equal to false in state, after onclick, when is_full_screen is true and there is no browser', () => { - const wrapper = mount(); + const wrapper = shallow(); wrapper.setState({ is_full_screen: true }); wrapper.find('a').prop('onClick')({stopPropagation: () => {}}); expect(wrapper.state().is_full_screen).to.be.false; diff --git a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-positions.spec.js b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-positions.spec.js index 3ea9d1e6d6a7..325898659bea 100644 --- a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-positions.spec.js +++ b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-positions.spec.js @@ -4,8 +4,7 @@ import { fake } from 'sinon'; import { configure, shallow } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import { TogglePositions } from '../toggle-positions.jsx'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconPositions } from 'Assets/Footer'; +import Icon from 'Assets/icon.jsx'; configure({ adapter: new Adapter() }); @@ -22,11 +21,11 @@ describe('TogglePositions', () => { const wrapper = shallow(); expect(wrapper.find('.ic-positions--active').exists()).to.be.false; }); - it('should contain ', () => { + it('should contain ', () => { const wrapper = shallow(); - expect(wrapper.contains()).to.be.true; + expect(wrapper.contains()).to.be.true; }); - it('should call togglePositionsDrawer passed onClick', () => { + it('should call twDrawer passed onClick', () => { const callback = fake(); const wrapper = shallow(); wrapper.prop('onClick')(); diff --git a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-settings.spec.js b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-settings.spec.js index 83ba3f4f5df8..542980228d04 100644 --- a/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-settings.spec.js +++ b/src/javascript/app/App/Components/Layout/Footer/__tests__/toggle-settings.spec.js @@ -3,8 +3,7 @@ import { expect } from 'chai'; import { configure, shallow } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import { ToggleSettings } from '../toggle-settings.jsx'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconSettings } from 'Assets/Footer'; +import Icon from 'Assets/icon.jsx'; import { SettingsDialog } from '../../../Elements/SettingsDialog/settings-dialog.jsx'; import { CSSTransition } from 'react-transition-group'; @@ -20,9 +19,9 @@ describe('ToggleSettings', () => { const wrapper = shallow(); expect(wrapper.find('.ic-settings--active').exists()).to.be.false; }); - it('should contain ', () => { + it('should contain ', () => { const wrapper = shallow(); - expect(wrapper.contains()).to.be.true; + expect(wrapper.contains()).to.be.true; }); it('should have CSSTransition', () => { const wrapper = shallow(); diff --git a/src/javascript/app/App/Components/Layout/Footer/toggle-fullscreen.jsx b/src/javascript/app/App/Components/Layout/Footer/toggle-fullscreen.jsx index 3e24bbb6d4a6..9f75a6a6ad9a 100644 --- a/src/javascript/app/App/Components/Layout/Footer/toggle-fullscreen.jsx +++ b/src/javascript/app/App/Components/Layout/Footer/toggle-fullscreen.jsx @@ -1,7 +1,6 @@ -import classNames from 'classnames'; -import React from 'react'; -import { Icon } from 'Assets/Common'; -import { IconMaximize } from 'Assets/Footer'; +import classNames from 'classnames'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; class ToggleFullScreen extends React.Component { constructor(props) { @@ -53,7 +52,7 @@ class ToggleFullScreen extends React.Component { className={full_screen_icon_class} onClick={this.toggleFullScreen} > - + ); } diff --git a/src/javascript/app/App/Components/Layout/Footer/toggle-positions.jsx b/src/javascript/app/App/Components/Layout/Footer/toggle-positions.jsx index 6f83171520e6..7ce91fe82ee7 100644 --- a/src/javascript/app/App/Components/Layout/Footer/toggle-positions.jsx +++ b/src/javascript/app/App/Components/Layout/Footer/toggle-positions.jsx @@ -1,8 +1,7 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common'; -import { IconPositions } from 'Assets/Footer'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; const TogglePositions = ({ positions_count, @@ -23,7 +22,7 @@ const TogglePositions = ({ onClick={togglePositionsDrawer} data-count={positions_count} > - + ); }; diff --git a/src/javascript/app/App/Components/Layout/Footer/toggle-settings.jsx b/src/javascript/app/App/Components/Layout/Footer/toggle-settings.jsx index 5f71f72c545c..02b812724d69 100644 --- a/src/javascript/app/App/Components/Layout/Footer/toggle-settings.jsx +++ b/src/javascript/app/App/Components/Layout/Footer/toggle-settings.jsx @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { CSSTransition } from 'react-transition-group'; import { SettingsDialog } from 'App/Components/Elements/SettingsDialog/settings-dialog.jsx'; -import { Icon } from 'Assets/Common'; -import { IconSettings } from 'Assets/Footer'; +import Icon from 'Assets/icon.jsx'; const ToggleSettings = ({ hideFullBlur, @@ -24,7 +23,7 @@ const ToggleSettings = ({ onClick={toggleSettings} className={toggle_settings_class} > - + { const wrapper = shallow(); expect(wrapper.contains(

12345 

)).to.be.true; }); - it('should have ', () => { + it('should have ', () => { const wrapper = shallow(); - expect(wrapper.contains()).to.be.true; + expect(wrapper.contains()).to.be.true; }); it('should contain and children', () => { const wrapper = shallow( } - +
( } + icon={} icon_class='header__menu-toggle' > diff --git a/src/javascript/app/App/Components/Layout/Header/toggle-notifications-drawer.jsx b/src/javascript/app/App/Components/Layout/Header/toggle-notifications-drawer.jsx index 129f89f35eb1..0c85e64b60a6 100644 --- a/src/javascript/app/App/Components/Layout/Header/toggle-notifications-drawer.jsx +++ b/src/javascript/app/App/Components/Layout/Header/toggle-notifications-drawer.jsx @@ -1,13 +1,12 @@ import React from 'react'; -import { Icon } from 'Assets/Common'; -import { IconBell } from 'Assets/Header/NavBar'; +import Icon from 'Assets/icon.jsx'; import { ToggleDrawer } from '../../Elements/Drawer'; import { Notifications } from '../../Elements/Notifications'; const ToggleNotificationsDrawer = () => ( } + icon={} icon_class='notify-toggle' > diff --git a/src/javascript/app/App/Components/Routes/__tests__/button-link.spec.js b/src/javascript/app/App/Components/Routes/__tests__/button-link.spec.js index 3332461dbdf0..a823ceea7fc2 100644 --- a/src/javascript/app/App/Components/Routes/__tests__/button-link.spec.js +++ b/src/javascript/app/App/Components/Routes/__tests__/button-link.spec.js @@ -10,21 +10,21 @@ configure({ adapter: new Adapter() }); describe('', () => { it('should render one component', () => { - const wrapper = shallow(); + const wrapper = shallow(); expect(wrapper).to.have.length(1); }); it('should render children when passed in', () => { - testChildren(); + testChildren(); }) it('should render one ', () => { const wrapper = shallow( - + ); expect(wrapper.find(Link)).to.have.length(1); }); it('should render component with className if any given', () => { const wrapper = shallow( - + ); expect(wrapper.find('.a-cool-classname').exists()); }); diff --git a/src/javascript/app/App/Constants/header-links.js b/src/javascript/app/App/Constants/header-links.js index 196f2bb9d3fa..fb1fe7079ace 100644 --- a/src/javascript/app/App/Constants/header-links.js +++ b/src/javascript/app/App/Constants/header-links.js @@ -1,19 +1,16 @@ import React from 'react'; import { localize } from '_common/localize'; -import { Icon } from 'Assets/Common'; -import { - IconReports, - IconDeriv } from 'Assets/Header/NavBar/index'; +import Icon from 'Assets/icon.jsx'; import { routes } from 'Constants/index'; const header_links = [ { logo :
{localize('BETA')}
, - image : , + image : , link_to: routes.trade, }, { - icon : , + icon : , text : localize('Reports'), link_to : routes.reports, login_only: true, diff --git a/src/javascript/app/App/Constants/routes-config.js b/src/javascript/app/App/Constants/routes-config.js index 8da06b1abdc5..7ade0e1d6614 100644 --- a/src/javascript/app/App/Constants/routes-config.js +++ b/src/javascript/app/App/Constants/routes-config.js @@ -3,12 +3,8 @@ import { Redirect } from 'react-router-dom'; import { localize } from '_common/localize'; import { routes } from 'Constants'; -import { IconPortfolio } from 'Assets/Header/NavBar'; // import Statement from 'Modules/Statement'; -import { IconProfitTable } from 'Assets/Reports/icon-profit-table.jsx'; -import { IconOpenPositions } from 'Assets/Reports/icon-open-positions.jsx'; -import { IconStatement } from 'Assets/Reports/icon-statement.jsx'; -import Trade from 'Modules/Trading'; +import Trade from 'Modules/Trading'; const ContractDetails = lazy(() => import(/* webpackChunkName: "contract" */ 'Modules/Contract')); const Portfolio = lazy(() => import(/* webpackChunkName: "portfolio" */ 'Modules/Portfolio')); @@ -37,7 +33,7 @@ const Page404 = lazy(() => import(/* webpackChunkName: "404" */ 'Modules/Page404 const initRoutesConfig = () => ([ { path: routes.contract, component: ContractDetails, title: localize('Contract Details'), is_authenticated: true }, { path: routes.index, component: Redirect, title: '', to: '/trade' }, - { path: routes.portfolio, component: Portfolio, title: localize('Portfolio'), is_authenticated: true, icon_component: IconPortfolio }, + { path: routes.portfolio, component: Portfolio, title: localize('Portfolio'), is_authenticated: true, icon_component: 'IconPortfolio' }, { path: routes.root, component: Redirect, title: '', exact: true, to: '/trade' }, { path : routes.reports, @@ -45,9 +41,9 @@ const initRoutesConfig = () => ([ is_authenticated: true, title : localize('Reports'), routes : [ - { path: routes.positions, component: OpenPositions, title: localize('Open Positions'), icon_component: IconOpenPositions, default: true }, - { path: routes.profit, component: ProfitTable, title: localize('Profit Table'), icon_component: IconProfitTable }, - { path: routes.statement, component: Statement, title: localize('Statement'), icon_component: IconStatement }, + { path: routes.positions, component: OpenPositions, title: localize('Open Positions'), icon_component: 'IconOpenPositions', default: true }, + { path: routes.profit, component: ProfitTable, title: localize('Profit Table'), icon_component: 'IconProfitTable' }, + { path: routes.statement, component: Statement, title: localize('Statement'), icon_component: 'IconStatement' }, ], }, { path: routes.trade, component: Trade, title: localize('Trade'), exact: true }, diff --git a/src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx b/src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx index 2a71ca1eee6e..7d9f3c718ea9 100644 --- a/src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx +++ b/src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx @@ -1,14 +1,12 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { localize } from '_common/localize'; -import { urlFor } from '_common/url'; -import { isEmptyObject } from '_common/utility'; -import { Icon } from 'Assets/Common/'; -import { IconAccountsCurrency } from 'Assets/Header/AccountsCurrency'; -import { IconLogout } from 'Assets/Header/Drawer'; -import { requestLogout } from 'Services/index'; -import { connect } from 'Stores/connect'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import { localize } from '_common/localize'; +import { urlFor } from '_common/url'; +import { isEmptyObject } from '_common/utility'; +import Icon from 'Assets/icon.jsx'; +import { requestLogout } from 'Services/index'; +import { connect } from 'Stores/connect'; class AccountSwitcher extends React.Component { setWrapperRef = (node) => { @@ -88,7 +86,7 @@ class AccountSwitcher extends React.Component { > @@ -131,7 +129,7 @@ class AccountSwitcher extends React.Component { }
{localize('Log out')} - +
); diff --git a/src/javascript/app/App/Containers/Drawer/menu-drawer.jsx b/src/javascript/app/App/Containers/Drawer/menu-drawer.jsx index 8bedcb140a46..6002209064bc 100644 --- a/src/javascript/app/App/Containers/Drawer/menu-drawer.jsx +++ b/src/javascript/app/App/Containers/Drawer/menu-drawer.jsx @@ -4,12 +4,7 @@ import { localize } from '_common/localize'; import { DrawerItem, DrawerToggle } from 'App/Components/Elements/Drawer'; -import { Icon } from 'Assets/Common'; -import { IconLogout } from 'Assets/Header/Drawer'; -import { - IconTrade, - IconPortfolio, - IconReports } from 'Assets/Header/NavBar'; +import Icon from 'Assets/icon.jsx'; import routes from 'Constants/routes'; import { requestLogout } from 'Services'; import { connect } from 'Stores/connect'; @@ -32,17 +27,17 @@ const MenuDrawer = ({ } + icon={} link_to={routes.trade} /> } + icon={} link_to={routes.portfolio} /> } + icon={} link_to={routes.statement} />
@@ -68,7 +63,7 @@ const MenuDrawer = ({ {!!(is_logged_in && is_mobile) &&
} + icon={} text={localize('Logout')} custom_action={() => { if (is_positions_drawer_on) { diff --git a/src/javascript/app/App/Containers/Wip/wip.jsx b/src/javascript/app/App/Containers/Wip/wip.jsx index 5059096c7c44..19ecf23e2a18 100644 --- a/src/javascript/app/App/Containers/Wip/wip.jsx +++ b/src/javascript/app/App/Containers/Wip/wip.jsx @@ -4,7 +4,7 @@ import { localize } from '_common/localize'; import { urlFor } from '_common/url'; import Localize from 'App/Components/Elements/localize.jsx'; import Button from 'App/Components/Form/button.jsx'; -import { IconWip } from 'Assets/Common/icon-wip.jsx'; +import Icon from 'Assets/icon.jsx'; import { connect } from 'Stores/connect'; const onClick = () => { @@ -19,7 +19,7 @@ const Wip = ({ is_dark_mode, pushDataLayer }) => { return (
- +
diff --git a/src/javascript/app/Assets/Common/icon-arrow-bold.jsx b/src/javascript/app/Assets/Common/icon-arrow-bold.jsx index f45a213bd827..3b01d965d84a 100644 --- a/src/javascript/app/Assets/Common/icon-arrow-bold.jsx +++ b/src/javascript/app/Assets/Common/icon-arrow-bold.jsx @@ -19,4 +19,4 @@ IconArrowBold.propTypes = { classNamePath: PropTypes.string, }; -export { IconArrowBold }; +export default IconArrowBold; diff --git a/src/javascript/app/Assets/Common/icon-arrow.jsx b/src/javascript/app/Assets/Common/icon-arrow.jsx index 0c7261d16525..c438c72b6e32 100644 --- a/src/javascript/app/Assets/Common/icon-arrow.jsx +++ b/src/javascript/app/Assets/Common/icon-arrow.jsx @@ -18,4 +18,4 @@ IconArrow.propTypes = { classNamePath: PropTypes.string, }; -export { IconArrow }; +export default IconArrow; diff --git a/src/javascript/app/Assets/Common/icon-back.jsx b/src/javascript/app/Assets/Common/icon-back.jsx index 2c4a37b7b2f6..a35ac4e5c299 100644 --- a/src/javascript/app/Assets/Common/icon-back.jsx +++ b/src/javascript/app/Assets/Common/icon-back.jsx @@ -12,4 +12,4 @@ IconBack.propTypes = { className: PropTypes.string, }; -export { IconBack }; +export default IconBack; diff --git a/src/javascript/app/Assets/Common/icon-calendar-today.jsx b/src/javascript/app/Assets/Common/icon-calendar-today.jsx index ff33327affee..23b464923e9c 100644 --- a/src/javascript/app/Assets/Common/icon-calendar-today.jsx +++ b/src/javascript/app/Assets/Common/icon-calendar-today.jsx @@ -19,4 +19,4 @@ IconCalendarToday.propTypes = { onClick : PropTypes.func, }; -export { IconCalendarToday }; +export default IconCalendarToday; diff --git a/src/javascript/app/Assets/Common/icon-calendar.jsx b/src/javascript/app/Assets/Common/icon-calendar.jsx index 6c56debec16b..9c7a9371a8ca 100644 --- a/src/javascript/app/Assets/Common/icon-calendar.jsx +++ b/src/javascript/app/Assets/Common/icon-calendar.jsx @@ -19,4 +19,4 @@ IconCalendar.propTypes = { onClick : PropTypes.func, }; -export { IconCalendar }; +export default IconCalendar; diff --git a/src/javascript/app/Assets/Common/icon-chevron-double-left.jsx b/src/javascript/app/Assets/Common/icon-chevron-double-left.jsx index 7354d80df6a7..d65b5f9e2040 100644 --- a/src/javascript/app/Assets/Common/icon-chevron-double-left.jsx +++ b/src/javascript/app/Assets/Common/icon-chevron-double-left.jsx @@ -13,4 +13,4 @@ IconChevronDoubleLeft.propTypes = { classNamePath: PropTypes.string, }; -export { IconChevronDoubleLeft }; +export default IconChevronDoubleLeft; diff --git a/src/javascript/app/Assets/Common/icon-chevron-double-right.jsx b/src/javascript/app/Assets/Common/icon-chevron-double-right.jsx index 3a14f544c7a7..6aabecacd484 100644 --- a/src/javascript/app/Assets/Common/icon-chevron-double-right.jsx +++ b/src/javascript/app/Assets/Common/icon-chevron-double-right.jsx @@ -13,4 +13,4 @@ IconChevronDoubleRight.propTypes = { classNamePath: PropTypes.string, }; -export { IconChevronDoubleRight }; +export default IconChevronDoubleRight; diff --git a/src/javascript/app/Assets/Common/icon-chevron-left.jsx b/src/javascript/app/Assets/Common/icon-chevron-left.jsx index b97295aaa746..16e0424aaaaa 100644 --- a/src/javascript/app/Assets/Common/icon-chevron-left.jsx +++ b/src/javascript/app/Assets/Common/icon-chevron-left.jsx @@ -13,4 +13,4 @@ IconChevronLeft.propTypes = { classNamePath: PropTypes.string, }; -export { IconChevronLeft }; +export default IconChevronLeft; diff --git a/src/javascript/app/Assets/Common/icon-chevron-right.jsx b/src/javascript/app/Assets/Common/icon-chevron-right.jsx index 5596d9614076..0744909b359a 100644 --- a/src/javascript/app/Assets/Common/icon-chevron-right.jsx +++ b/src/javascript/app/Assets/Common/icon-chevron-right.jsx @@ -13,4 +13,4 @@ IconChevronRight.propTypes = { classNamePath: PropTypes.string, }; -export { IconChevronRight }; +export default IconChevronRight; diff --git a/src/javascript/app/Assets/Common/icon-clear.jsx b/src/javascript/app/Assets/Common/icon-clear.jsx index 1780da64bed0..9ee73a7ef169 100644 --- a/src/javascript/app/Assets/Common/icon-clear.jsx +++ b/src/javascript/app/Assets/Common/icon-clear.jsx @@ -19,4 +19,4 @@ IconClear.propTypes = { onClick : PropTypes.func, }; -export { IconClear }; +export default IconClear; diff --git a/src/javascript/app/Assets/Common/icon-clock.jsx b/src/javascript/app/Assets/Common/icon-clock.jsx index e7401ce30a6f..831083507b67 100644 --- a/src/javascript/app/Assets/Common/icon-clock.jsx +++ b/src/javascript/app/Assets/Common/icon-clock.jsx @@ -29,4 +29,4 @@ IconClock.propTypes = { width : PropTypes.string, }; -export { IconClock }; +export default IconClock; diff --git a/src/javascript/app/Assets/Common/icon-close.jsx b/src/javascript/app/Assets/Common/icon-close.jsx index c920b1e107e9..67af520bd313 100644 --- a/src/javascript/app/Assets/Common/icon-close.jsx +++ b/src/javascript/app/Assets/Common/icon-close.jsx @@ -12,4 +12,4 @@ IconClose.propTypes = { className: PropTypes.string, }; -export { IconClose }; +export default IconClose; diff --git a/src/javascript/app/Assets/Common/icon-country-flag.jsx b/src/javascript/app/Assets/Common/icon-country-flag.jsx index 87dde26119a0..5b3026ecb379 100644 --- a/src/javascript/app/Assets/Common/icon-country-flag.jsx +++ b/src/javascript/app/Assets/Common/icon-country-flag.jsx @@ -244,4 +244,4 @@ IconCountryFlag.propTypes = { type : PropTypes.string, }; -export { IconCountryFlag }; +export default IconCountryFlag; diff --git a/src/javascript/app/Assets/Common/icon-danger.jsx b/src/javascript/app/Assets/Common/icon-danger.jsx index 3df37ba273d7..b3e55cb69597 100644 --- a/src/javascript/app/Assets/Common/icon-danger.jsx +++ b/src/javascript/app/Assets/Common/icon-danger.jsx @@ -9,4 +9,4 @@ const IconDanger = ({ className }) => ( ); -export { IconDanger }; +export default IconDanger; diff --git a/src/javascript/app/Assets/Common/icon-deposit.jsx b/src/javascript/app/Assets/Common/icon-deposit.jsx index 2417060258e7..eae07022d0b7 100644 --- a/src/javascript/app/Assets/Common/icon-deposit.jsx +++ b/src/javascript/app/Assets/Common/icon-deposit.jsx @@ -12,4 +12,4 @@ const IconDeposit = ({ className }) => ( ); -export { IconDeposit }; +export default IconDeposit; diff --git a/src/javascript/app/Assets/Common/icon-exclamation.jsx b/src/javascript/app/Assets/Common/icon-exclamation.jsx index 0c9f5230ad07..cd108ec04d6f 100644 --- a/src/javascript/app/Assets/Common/icon-exclamation.jsx +++ b/src/javascript/app/Assets/Common/icon-exclamation.jsx @@ -16,4 +16,4 @@ IconExclamation.propTypes = { className: PropTypes.string, }; -export { IconExclamation }; +export default IconExclamation; diff --git a/src/javascript/app/Assets/Common/icon-flag.jsx b/src/javascript/app/Assets/Common/icon-flag.jsx index 85f93b48bbbf..dc58631522de 100644 --- a/src/javascript/app/Assets/Common/icon-flag.jsx +++ b/src/javascript/app/Assets/Common/icon-flag.jsx @@ -15,4 +15,4 @@ IconFlag.propTypes = { className: PropTypes.string, }; -export { IconFlag }; +export default IconFlag; diff --git a/src/javascript/app/Assets/Common/icon-info-blue.jsx b/src/javascript/app/Assets/Common/icon-info-blue.jsx index b4f0ea6836b9..2aa94c5e97dd 100644 --- a/src/javascript/app/Assets/Common/icon-info-blue.jsx +++ b/src/javascript/app/Assets/Common/icon-info-blue.jsx @@ -17,4 +17,4 @@ IconInfoBlue.propTypes = { className: PropTypes.string, }; -export { IconInfoBlue }; +export default IconInfoBlue; diff --git a/src/javascript/app/Assets/Common/icon-info-outline.jsx b/src/javascript/app/Assets/Common/icon-info-outline.jsx index 10bd9ec8976b..2aeaab712331 100644 --- a/src/javascript/app/Assets/Common/icon-info-outline.jsx +++ b/src/javascript/app/Assets/Common/icon-info-outline.jsx @@ -20,4 +20,4 @@ IconInfoOutline.propTypes = { className: PropTypes.string, }; -export { IconInfoOutline }; +export default IconInfoOutline; diff --git a/src/javascript/app/Assets/Common/icon-information.jsx b/src/javascript/app/Assets/Common/icon-information.jsx index f3053b477bdb..11bf20ec1faa 100644 --- a/src/javascript/app/Assets/Common/icon-information.jsx +++ b/src/javascript/app/Assets/Common/icon-information.jsx @@ -11,4 +11,4 @@ IconInformation.propTypes = { className: PropTypes.string, }; -export { IconInformation }; +export default IconInformation; diff --git a/src/javascript/app/Assets/Common/icon-minimize.jsx b/src/javascript/app/Assets/Common/icon-minimize.jsx index 38db25004a85..09a047f65fd1 100644 --- a/src/javascript/app/Assets/Common/icon-minimize.jsx +++ b/src/javascript/app/Assets/Common/icon-minimize.jsx @@ -12,4 +12,4 @@ IconMinimize.propTypes = { className: PropTypes.string, }; -export { IconMinimize }; +export default IconMinimize; diff --git a/src/javascript/app/Assets/Common/icon-minus.jsx b/src/javascript/app/Assets/Common/icon-minus.jsx index 0f03a2403fed..66d4f2f4863e 100644 --- a/src/javascript/app/Assets/Common/icon-minus.jsx +++ b/src/javascript/app/Assets/Common/icon-minus.jsx @@ -13,4 +13,4 @@ IconMinus.propTypes = { is_disabled: PropTypes.bool, }; -export { IconMinus }; +export default IconMinus; diff --git a/src/javascript/app/Assets/Common/icon-plus.jsx b/src/javascript/app/Assets/Common/icon-plus.jsx index ba1c7733fb9d..c1e2cd790730 100644 --- a/src/javascript/app/Assets/Common/icon-plus.jsx +++ b/src/javascript/app/Assets/Common/icon-plus.jsx @@ -14,4 +14,4 @@ IconPlus.propTypes = { is_disabled: PropTypes.bool, }; -export { IconPlus }; +export default IconPlus; diff --git a/src/javascript/app/Assets/Common/icon-question.jsx b/src/javascript/app/Assets/Common/icon-question.jsx index ede03e2037dc..cb8a55e59f4f 100644 --- a/src/javascript/app/Assets/Common/icon-question.jsx +++ b/src/javascript/app/Assets/Common/icon-question.jsx @@ -14,4 +14,4 @@ IconQuestion.propTypes = { className: PropTypes.string, }; -export { IconQuestion }; +export default IconQuestion; diff --git a/src/javascript/app/Assets/Common/icon-red-dot.jsx b/src/javascript/app/Assets/Common/icon-red-dot.jsx index aab3af4a3041..6a7cc4059210 100644 --- a/src/javascript/app/Assets/Common/icon-red-dot.jsx +++ b/src/javascript/app/Assets/Common/icon-red-dot.jsx @@ -11,4 +11,4 @@ IconRedDot.propTypes = { className: PropTypes.string, }; -export { IconRedDot }; +export default IconRedDot; diff --git a/src/javascript/app/Assets/Common/icon-success.jsx b/src/javascript/app/Assets/Common/icon-success.jsx index daf0b6cabf44..d508d65ca761 100644 --- a/src/javascript/app/Assets/Common/icon-success.jsx +++ b/src/javascript/app/Assets/Common/icon-success.jsx @@ -14,4 +14,4 @@ IconSuccess.propTypes = { className: PropTypes.string, }; -export { IconSuccess }; +export default IconSuccess; diff --git a/src/javascript/app/Assets/Common/icon-warning.jsx b/src/javascript/app/Assets/Common/icon-warning.jsx index 8bcd67f9bc20..3ec9f9cfec0f 100644 --- a/src/javascript/app/Assets/Common/icon-warning.jsx +++ b/src/javascript/app/Assets/Common/icon-warning.jsx @@ -14,4 +14,4 @@ IconWarning.propTypes = { className: PropTypes.string, }; -export { IconWarning }; +export default IconWarning; diff --git a/src/javascript/app/Assets/Common/icon-wip.jsx b/src/javascript/app/Assets/Common/icon-wip.jsx index 149ca19f2e7d..666afa63b2e5 100644 --- a/src/javascript/app/Assets/Common/icon-wip.jsx +++ b/src/javascript/app/Assets/Common/icon-wip.jsx @@ -45,4 +45,4 @@ IconWip.propTypes = { className: PropTypes.string, }; -export { IconWip }; +export default IconWip; diff --git a/src/javascript/app/Assets/Common/icon-withdrawal.jsx b/src/javascript/app/Assets/Common/icon-withdrawal.jsx index 07269bdb5b20..9b927f31afc9 100644 --- a/src/javascript/app/Assets/Common/icon-withdrawal.jsx +++ b/src/javascript/app/Assets/Common/icon-withdrawal.jsx @@ -12,4 +12,4 @@ const IconWithdrawal = ({ className }) => ( ); -export { IconWithdrawal }; +export default IconWithdrawal; diff --git a/src/javascript/app/Assets/Common/icon.jsx b/src/javascript/app/Assets/Common/icon.jsx deleted file mode 100644 index 7ee9ab93c787..000000000000 --- a/src/javascript/app/Assets/Common/icon.jsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; - -class Icon extends React.PureComponent { - render() { - const options = { - category : this.props.category, - className : this.props.className, - classNamePath: this.props.classNamePath, - classNameRect: this.props.classNameRect, - is_disabled : this.props.is_disabled, - onClick : this.props.onClick, - onMouseEnter : this.props.onMouseEnter, - onMouseLeave : this.props.onMouseLeave, - type : this.props.type, - }; - - return this.props.icon(options); - } -} - -Icon.propTypes = { - category : PropTypes.string, - className : PropTypes.string, - classNamePath: PropTypes.string, - classNameRect: PropTypes.string, - icon : PropTypes.func, - is_disabled : PropTypes.oneOfType([PropTypes.number, PropTypes.bool]), - onClick : PropTypes.func, - type : PropTypes.string, -}; - -export { Icon }; diff --git a/src/javascript/app/Assets/Common/index.js b/src/javascript/app/Assets/Common/index.js deleted file mode 100644 index 72088e449f18..000000000000 --- a/src/javascript/app/Assets/Common/index.js +++ /dev/null @@ -1,27 +0,0 @@ -export * from './icon-arrow.jsx'; -export * from './icon-arrow-bold.jsx'; -export * from './icon-back.jsx'; -export * from './icon-calendar-today.jsx'; -export * from './icon-calendar.jsx'; -export * from './icon-chevron-double-left.jsx'; -export * from './icon-chevron-double-right.jsx'; -export * from './icon-chevron-left.jsx'; -export * from './icon-chevron-right.jsx'; -export * from './icon-country-flag.jsx'; -export * from './icon-clear.jsx'; -export * from './icon-clock.jsx'; -export * from './icon-close.jsx'; -export * from './icon-danger.jsx'; -export * from './icon-exclamation.jsx'; -export * from './icon-info-blue.jsx'; -export * from './icon-info-outline.jsx'; -export * from './icon-information.jsx'; -export * from './icon-flag.jsx'; -export * from './icon-minimize.jsx'; -export * from './icon-minus.jsx'; -export * from './icon-plus.jsx'; -export * from './icon-question.jsx'; -export * from './icon-red-dot.jsx'; -export * from './icon-success.jsx'; -export * from './icon-warning.jsx'; -export * from './icon.jsx'; diff --git a/src/javascript/app/Assets/Contract/icon-contract-close.jsx b/src/javascript/app/Assets/Contract/icon-close.jsx similarity index 87% rename from src/javascript/app/Assets/Contract/icon-contract-close.jsx rename to src/javascript/app/Assets/Contract/icon-close.jsx index 2be34daaf289..3247f508c202 100644 --- a/src/javascript/app/Assets/Contract/icon-contract-close.jsx +++ b/src/javascript/app/Assets/Contract/icon-close.jsx @@ -2,7 +2,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -const IconContractClose = ({ className, classNamePath }) => ( +const IconClose = ({ className, classNamePath }) => ( @@ -10,9 +10,9 @@ const IconContractClose = ({ className, classNamePath }) => ( ); -IconContractClose.propTypes = { +IconClose.propTypes = { className : PropTypes.string, classNamePath: PropTypes.string, }; -export default IconContractClose; +export default IconClose; diff --git a/src/javascript/app/Assets/Contract/icon-end-time.jsx b/src/javascript/app/Assets/Contract/icon-end-time.jsx index 0f354c4678d1..6ff562b183a6 100644 --- a/src/javascript/app/Assets/Contract/icon-end-time.jsx +++ b/src/javascript/app/Assets/Contract/icon-end-time.jsx @@ -1,9 +1,7 @@ -import { observer } from 'mobx-react'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; +import PropTypes from 'prop-types'; +import React from 'react'; -export const IconEndTimeSVG = ({ className, classNamePath }) => ( +export const IconEndTime = ({ className, classNamePath }) => ( @@ -16,12 +14,9 @@ export const IconEndTimeSVG = ({ className, classNamePath }) => ( ); -const IconEndTime = () => ; - IconEndTime.propTypes = { className : PropTypes.string, classNamePath: PropTypes.string, - color : PropTypes.string, }; -export default observer(IconEndTime); +export default IconEndTime; diff --git a/src/javascript/app/Assets/Contract/icon-flag.jsx b/src/javascript/app/Assets/Contract/icon-flag.jsx index 185aa3e82e23..08ef5d021fcf 100644 --- a/src/javascript/app/Assets/Contract/icon-flag.jsx +++ b/src/javascript/app/Assets/Contract/icon-flag.jsx @@ -1,9 +1,6 @@ -import { observer } from 'mobx-react'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; +import React from 'react'; -export const IconFlagSVG = () => ( +export const IconFlag = () => ( @@ -12,12 +9,4 @@ export const IconFlagSVG = () => ( ); -const IconFlag = () => ( - -); - -IconFlag.propTypes = { - color: PropTypes.string, -}; - -export default observer(IconFlag); +export default IconFlag; diff --git a/src/javascript/app/Assets/Contract/icon-start-time.jsx b/src/javascript/app/Assets/Contract/icon-start-time.jsx index b8ea56d768f2..0342bd991b7f 100644 --- a/src/javascript/app/Assets/Contract/icon-start-time.jsx +++ b/src/javascript/app/Assets/Contract/icon-start-time.jsx @@ -1,9 +1,7 @@ -import { observer } from 'mobx-react'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; +import PropTypes from 'prop-types'; +import React from 'react'; -export const IconStartTimeSVG = ({ className, classNamePath }) => ( +export const IconStartTime = ({ className, classNamePath }) => ( ( ); -const IconStartTime = () => ; - IconStartTime.propTypes = { className : PropTypes.string, classNamePath: PropTypes.string, - color : PropTypes.string, }; -export default observer(IconStartTime); +export default IconStartTime; diff --git a/src/javascript/app/Assets/Contract/icon-tick.jsx b/src/javascript/app/Assets/Contract/icon-tick.jsx index 629d56e41dee..1b04fa45fc30 100644 --- a/src/javascript/app/Assets/Contract/icon-tick.jsx +++ b/src/javascript/app/Assets/Contract/icon-tick.jsx @@ -1,9 +1,7 @@ -import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; -export const IconTickSVG = () => ( +export const IconTick = () => ( @@ -12,13 +10,9 @@ export const IconTickSVG = () => ( ); -const IconTick = () => ( - -); - IconTick.propTypes = { circle_color: PropTypes.string, tick_color : PropTypes.string, }; -export default observer(IconTick); +export default IconTick; diff --git a/src/javascript/app/Assets/Footer/icon-maximize.jsx b/src/javascript/app/Assets/Footer/icon-maximize.jsx index 2ff26156fb22..4c974081b47e 100644 --- a/src/javascript/app/Assets/Footer/icon-maximize.jsx +++ b/src/javascript/app/Assets/Footer/icon-maximize.jsx @@ -12,4 +12,4 @@ IconMaximize.propTypes = { className: PropTypes.string, }; -export { IconMaximize }; +export default IconMaximize; diff --git a/src/javascript/app/Assets/Footer/icon-positions.jsx b/src/javascript/app/Assets/Footer/icon-positions.jsx index c0feb1a5cc9c..8cd08de8060f 100644 --- a/src/javascript/app/Assets/Footer/icon-positions.jsx +++ b/src/javascript/app/Assets/Footer/icon-positions.jsx @@ -21,4 +21,4 @@ IconPositions.propTypes = { type : PropTypes.string, }; -export { IconPositions }; +export default IconPositions; diff --git a/src/javascript/app/Assets/Footer/icon-settings.jsx b/src/javascript/app/Assets/Footer/icon-settings.jsx index 2babc3ef909b..b1be6806082a 100644 --- a/src/javascript/app/Assets/Footer/icon-settings.jsx +++ b/src/javascript/app/Assets/Footer/icon-settings.jsx @@ -12,4 +12,4 @@ IconSettings.propTypes = { className: PropTypes.string, }; -export { IconSettings }; +export default IconSettings; diff --git a/src/javascript/app/Assets/Footer/index.js b/src/javascript/app/Assets/Footer/index.js deleted file mode 100644 index 3ae293d7610b..000000000000 --- a/src/javascript/app/Assets/Footer/index.js +++ /dev/null @@ -1,3 +0,0 @@ -export * from './icon-maximize.jsx'; -export * from './icon-positions.jsx'; -export * from './icon-settings.jsx'; diff --git a/src/javascript/app/Assets/Header/AccountsCurrency/icon_accounts_currency.jsx b/src/javascript/app/Assets/Header/AccountsCurrency/icon_accounts_currency.jsx index c3a0aac70602..3896461cc007 100644 --- a/src/javascript/app/Assets/Header/AccountsCurrency/icon_accounts_currency.jsx +++ b/src/javascript/app/Assets/Header/AccountsCurrency/icon_accounts_currency.jsx @@ -140,4 +140,4 @@ IconAccountsCurrency.propTypes = { type : PropTypes.string, }; -export { IconAccountsCurrency }; +export default IconAccountsCurrency; diff --git a/src/javascript/app/Assets/Header/AccountsCurrency/index.js b/src/javascript/app/Assets/Header/AccountsCurrency/index.js deleted file mode 100644 index 60e3b17828f3..000000000000 --- a/src/javascript/app/Assets/Header/AccountsCurrency/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from './icon_accounts_currency.jsx'; diff --git a/src/javascript/app/Assets/Header/Drawer/icon-logout.jsx b/src/javascript/app/Assets/Header/Drawer/icon-logout.jsx index ec9d073a2624..85518dd9752a 100644 --- a/src/javascript/app/Assets/Header/Drawer/icon-logout.jsx +++ b/src/javascript/app/Assets/Header/Drawer/icon-logout.jsx @@ -18,4 +18,4 @@ IconLogout.propTypes = { className: PropTypes.string, }; -export { IconLogout }; +export default IconLogout; diff --git a/src/javascript/app/Assets/Header/Drawer/index.js b/src/javascript/app/Assets/Header/Drawer/index.js deleted file mode 100644 index 6dfd9e903814..000000000000 --- a/src/javascript/app/Assets/Header/Drawer/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from './icon-logout.jsx'; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-bell.jsx b/src/javascript/app/Assets/Header/NavBar/icon-bell.jsx index 8cd9d29c8752..c0c78352ae46 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-bell.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-bell.jsx @@ -15,4 +15,4 @@ IconBell.propTypes = { className: PropTypes.string, }; -export { IconBell }; +export default IconBell; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-cashier.jsx b/src/javascript/app/Assets/Header/NavBar/icon-cashier.jsx index 524cc1fb8108..69b78afa55c7 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-cashier.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-cashier.jsx @@ -28,4 +28,4 @@ IconCashier.propTypes = { className: PropTypes.string, }; -export { IconCashier }; +export default IconCashier; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx b/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx index 9a421ebbfd89..ce02c3928f2c 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-deriv.jsx @@ -17,4 +17,4 @@ IconDeriv.propTypes = { className: PropTypes.string, }; -export { IconDeriv }; +export default IconDeriv; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-hamburger.jsx b/src/javascript/app/Assets/Header/NavBar/icon-hamburger.jsx index 712114317e68..6ecb64905af9 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-hamburger.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-hamburger.jsx @@ -12,4 +12,4 @@ IconHamburger.propTypes = { className: PropTypes.string, }; -export { IconHamburger }; +export default IconHamburger; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-portfolio.jsx b/src/javascript/app/Assets/Header/NavBar/icon-portfolio.jsx index ff10f00765ee..e5a20fe396fc 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-portfolio.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-portfolio.jsx @@ -12,4 +12,4 @@ IconPortfolio.propTypes = { className: PropTypes.string, }; -export { IconPortfolio }; +export default IconPortfolio; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-reports.jsx b/src/javascript/app/Assets/Header/NavBar/icon-reports.jsx index d0cbc299342e..d95f12c24bc6 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-reports.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-reports.jsx @@ -17,4 +17,4 @@ IconReports.propTypes = { className: PropTypes.string, }; -export { IconReports }; +export default IconReports; diff --git a/src/javascript/app/Assets/Header/NavBar/icon-trade.jsx b/src/javascript/app/Assets/Header/NavBar/icon-trade.jsx index 109a54ac3a83..7d4abd7fdc84 100644 --- a/src/javascript/app/Assets/Header/NavBar/icon-trade.jsx +++ b/src/javascript/app/Assets/Header/NavBar/icon-trade.jsx @@ -14,4 +14,4 @@ IconTrade.propTypes = { className: PropTypes.string, }; -export { IconTrade }; +export default IconTrade; diff --git a/src/javascript/app/Assets/Header/NavBar/index.js b/src/javascript/app/Assets/Header/NavBar/index.js deleted file mode 100644 index add56737210d..000000000000 --- a/src/javascript/app/Assets/Header/NavBar/index.js +++ /dev/null @@ -1,7 +0,0 @@ -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'; -export * from './icon-trade.jsx'; diff --git a/src/javascript/app/Assets/Reports/icon-open-positions.jsx b/src/javascript/app/Assets/Reports/icon-open-positions.jsx index b5bc1fa60b68..7c55787f09d1 100644 --- a/src/javascript/app/Assets/Reports/icon-open-positions.jsx +++ b/src/javascript/app/Assets/Reports/icon-open-positions.jsx @@ -12,4 +12,4 @@ IconOpenPositions.propTypes = { className: PropTypes.string, }; -export { IconOpenPositions }; +export default IconOpenPositions; diff --git a/src/javascript/app/Assets/Reports/icon-profit-table.jsx b/src/javascript/app/Assets/Reports/icon-profit-table.jsx index 16833c0dfd66..3b7ae6d0ad71 100644 --- a/src/javascript/app/Assets/Reports/icon-profit-table.jsx +++ b/src/javascript/app/Assets/Reports/icon-profit-table.jsx @@ -12,4 +12,4 @@ IconProfitTable.propTypes = { className: PropTypes.string, }; -export { IconProfitTable }; +export default IconProfitTable; diff --git a/src/javascript/app/Assets/Reports/icon-statement.jsx b/src/javascript/app/Assets/Reports/icon-statement.jsx index 70f8433a5cce..5562f1ef4655 100644 --- a/src/javascript/app/Assets/Reports/icon-statement.jsx +++ b/src/javascript/app/Assets/Reports/icon-statement.jsx @@ -12,4 +12,4 @@ IconStatement.propTypes = { className: PropTypes.string, }; -export { IconStatement }; +export default IconStatement; diff --git a/src/javascript/app/Assets/Settings/icon-charts.jsx b/src/javascript/app/Assets/Settings/icon-charts.jsx index be902ba45f83..fd6625b10585 100644 --- a/src/javascript/app/Assets/Settings/icon-charts.jsx +++ b/src/javascript/app/Assets/Settings/icon-charts.jsx @@ -19,4 +19,4 @@ IconCharts.propTypes = { className: PropTypes.string, }; -export { IconCharts }; +export default IconCharts; diff --git a/src/javascript/app/Assets/Settings/icon-close.jsx b/src/javascript/app/Assets/Settings/icon-close.jsx index 08378ac3d43e..73904969290d 100644 --- a/src/javascript/app/Assets/Settings/icon-close.jsx +++ b/src/javascript/app/Assets/Settings/icon-close.jsx @@ -23,4 +23,4 @@ IconClose.propTypes = { className: PropTypes.string, }; -export { IconClose }; +export default IconClose; diff --git a/src/javascript/app/Assets/Settings/icon-language.jsx b/src/javascript/app/Assets/Settings/icon-language.jsx index 3dcc1bbc5a9a..42e66f5c01e0 100644 --- a/src/javascript/app/Assets/Settings/icon-language.jsx +++ b/src/javascript/app/Assets/Settings/icon-language.jsx @@ -24,4 +24,4 @@ IconLanguage.propTypes = { className: PropTypes.string, }; -export { IconLanguage }; +export default IconLanguage; diff --git a/src/javascript/app/Assets/Settings/icon-purchase.jsx b/src/javascript/app/Assets/Settings/icon-purchase.jsx index 214b881e2cf7..694ee82d7045 100644 --- a/src/javascript/app/Assets/Settings/icon-purchase.jsx +++ b/src/javascript/app/Assets/Settings/icon-purchase.jsx @@ -24,4 +24,4 @@ IconPurchase.propTypes = { className: PropTypes.string, }; -export { IconPurchase }; +export default IconPurchase; diff --git a/src/javascript/app/Assets/Settings/icon-theme.jsx b/src/javascript/app/Assets/Settings/icon-theme.jsx index 1601d5202bb1..ee4b0111e6b0 100644 --- a/src/javascript/app/Assets/Settings/icon-theme.jsx +++ b/src/javascript/app/Assets/Settings/icon-theme.jsx @@ -24,4 +24,4 @@ IconTheme.propTypes = { className: PropTypes.string, }; -export { IconTheme }; +export default IconTheme; diff --git a/src/javascript/app/Assets/Settings/index.js b/src/javascript/app/Assets/Settings/index.js deleted file mode 100644 index ba3ddeb1bb7b..000000000000 --- a/src/javascript/app/Assets/Settings/index.js +++ /dev/null @@ -1,5 +0,0 @@ -export * from './icon-charts.jsx'; -export * from './icon-close.jsx'; -export * from './icon-language.jsx'; -export * from './icon-purchase.jsx'; -export * from './icon-theme.jsx'; diff --git a/src/javascript/app/Assets/Statement/icon-buy.jsx b/src/javascript/app/Assets/Statement/icon-buy.jsx index a5894f77c416..6ab31f85793a 100644 --- a/src/javascript/app/Assets/Statement/icon-buy.jsx +++ b/src/javascript/app/Assets/Statement/icon-buy.jsx @@ -14,4 +14,4 @@ IconBuy.propTypes = { onClick : PropTypes.func, }; -export { IconBuy }; +export default IconBuy; diff --git a/src/javascript/app/Assets/Statement/icon-deposit.jsx b/src/javascript/app/Assets/Statement/icon-deposit.jsx deleted file mode 100644 index 29cf41064d50..000000000000 --- a/src/javascript/app/Assets/Statement/icon-deposit.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; - -const IconDeposit = ({ className }) => ( - - - -); - -IconDeposit.propTypes = { - className : PropTypes.string, - classNamePath: PropTypes.string, - onClick : PropTypes.func, -}; - -export { IconDeposit }; diff --git a/src/javascript/app/Assets/Statement/icon-payout.jsx b/src/javascript/app/Assets/Statement/icon-payout.jsx index fe304344968b..277cb0845682 100644 --- a/src/javascript/app/Assets/Statement/icon-payout.jsx +++ b/src/javascript/app/Assets/Statement/icon-payout.jsx @@ -14,4 +14,4 @@ IconPayout.propTypes = { onClick : PropTypes.func, }; -export { IconPayout }; +export default IconPayout; diff --git a/src/javascript/app/Assets/Statement/icon-sell.jsx b/src/javascript/app/Assets/Statement/icon-sell.jsx index 68be609c8950..0b160fd4584e 100644 --- a/src/javascript/app/Assets/Statement/icon-sell.jsx +++ b/src/javascript/app/Assets/Statement/icon-sell.jsx @@ -14,4 +14,4 @@ IconSell.propTypes = { onClick : PropTypes.func, }; -export { IconSell }; +export default IconSell; diff --git a/src/javascript/app/Assets/Statement/icon-wallet.jsx b/src/javascript/app/Assets/Statement/icon-wallet.jsx index 2580b1613cfc..408ce89cda3f 100644 --- a/src/javascript/app/Assets/Statement/icon-wallet.jsx +++ b/src/javascript/app/Assets/Statement/icon-wallet.jsx @@ -14,4 +14,4 @@ IconWallet.propTypes = { onClick : PropTypes.func, }; -export { IconWallet }; +export default IconWallet; diff --git a/src/javascript/app/Assets/Statement/icon-withdrawal.jsx b/src/javascript/app/Assets/Statement/icon-withdrawal.jsx deleted file mode 100644 index 6c9a38689ab3..000000000000 --- a/src/javascript/app/Assets/Statement/icon-withdrawal.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; - -const IconWithdrawal = ({ className }) => ( - - - -); - -IconWithdrawal.propTypes = { - className : PropTypes.string, - classNamePath: PropTypes.string, - onClick : PropTypes.func, -}; - -export { IconWithdrawal }; diff --git a/src/javascript/app/Assets/Statement/index.js b/src/javascript/app/Assets/Statement/index.js deleted file mode 100644 index 1289b45c148e..000000000000 --- a/src/javascript/app/Assets/Statement/index.js +++ /dev/null @@ -1,6 +0,0 @@ -export * from './icon-buy.jsx'; -export * from './icon-deposit.jsx'; -export * from './icon-payout.jsx'; -export * from './icon-sell.jsx'; -export * from './icon-wallet.jsx'; -export * from './icon-withdrawal.jsx'; diff --git a/src/javascript/app/Assets/Trading/Barriers/icon-barrier-down.jsx b/src/javascript/app/Assets/Trading/Barriers/icon-barrier-down.jsx index 554833a290da..a6fbbf470e45 100644 --- a/src/javascript/app/Assets/Trading/Barriers/icon-barrier-down.jsx +++ b/src/javascript/app/Assets/Trading/Barriers/icon-barrier-down.jsx @@ -16,4 +16,4 @@ IconBarrierDown.propTypes = { className: PropTypes.string, }; -export { IconBarrierDown }; +export default IconBarrierDown; diff --git a/src/javascript/app/Assets/Trading/Barriers/icon-barrier-up.jsx b/src/javascript/app/Assets/Trading/Barriers/icon-barrier-up.jsx index 15eea50cd00a..0d8f45a05f26 100644 --- a/src/javascript/app/Assets/Trading/Barriers/icon-barrier-up.jsx +++ b/src/javascript/app/Assets/Trading/Barriers/icon-barrier-up.jsx @@ -16,4 +16,4 @@ IconBarrierUp.propTypes = { className: PropTypes.string, }; -export { IconBarrierUp }; +export default IconBarrierUp; diff --git a/src/javascript/app/Assets/Trading/Barriers/index.js b/src/javascript/app/Assets/Trading/Barriers/index.js deleted file mode 100644 index 4ffa8b03dd21..000000000000 --- a/src/javascript/app/Assets/Trading/Barriers/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export * from './icon-barrier-up.jsx'; -export * from './icon-barrier-down.jsx'; diff --git a/src/javascript/app/Assets/Trading/Categories/icon-trade-categories.jsx b/src/javascript/app/Assets/Trading/Categories/icon-trade-categories.jsx index 6c10d31ffbd3..b65e817d07e1 100644 --- a/src/javascript/app/Assets/Trading/Categories/icon-trade-categories.jsx +++ b/src/javascript/app/Assets/Trading/Categories/icon-trade-categories.jsx @@ -1,8 +1,7 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconTradeType } from '../Types'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import IconTradeType from 'Assets/Trading/Types/icon-trade-types.jsx'; const IconTradeCategory = ({ category, className }) => { let IconCategory; @@ -12,15 +11,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -32,15 +29,14 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -52,15 +48,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -72,15 +66,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -92,15 +84,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -112,15 +102,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -132,15 +120,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -152,15 +138,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -172,15 +156,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -192,15 +174,13 @@ const IconTradeCategory = ({ category, className }) => { IconCategory = (
-
- @@ -211,8 +191,7 @@ const IconTradeCategory = ({ category, className }) => { case 'lb_call': IconCategory = (
- @@ -222,8 +201,7 @@ const IconTradeCategory = ({ category, className }) => { case 'lb_put': IconCategory = (
- @@ -233,8 +211,7 @@ const IconTradeCategory = ({ category, className }) => { case 'lb_high_low': IconCategory = (
- @@ -244,8 +221,7 @@ const IconTradeCategory = ({ category, className }) => { default: IconCategory = (
- @@ -266,4 +242,4 @@ IconTradeCategory.propTypes = { className: PropTypes.string, }; -export { IconTradeCategory }; +export default IconTradeCategory; diff --git a/src/javascript/app/Assets/Trading/Categories/index.js b/src/javascript/app/Assets/Trading/Categories/index.js deleted file mode 100644 index 4453e967bbf2..000000000000 --- a/src/javascript/app/Assets/Trading/Categories/index.js +++ /dev/null @@ -1,3 +0,0 @@ -export * from './icon-trade-categories.jsx'; -export * from './trade-categories.jsx'; -export * from './trade-categories-gif.jsx'; diff --git a/src/javascript/app/Assets/Trading/Categories/trade-categories-gif.jsx b/src/javascript/app/Assets/Trading/Categories/trade-categories-gif.jsx index d43dceae0aa5..58c9999d8bb6 100644 --- a/src/javascript/app/Assets/Trading/Categories/trade-categories-gif.jsx +++ b/src/javascript/app/Assets/Trading/Categories/trade-categories-gif.jsx @@ -79,4 +79,4 @@ TradeCategoriesGIF.propTypes = { is_dark : PropTypes.bool, }; -export { TradeCategoriesGIF }; +export default TradeCategoriesGIF; diff --git a/src/javascript/app/Assets/Trading/Categories/trade-categories.jsx b/src/javascript/app/Assets/Trading/Categories/trade-categories.jsx index bc82d8b4c45f..bafbc8d2525d 100644 --- a/src/javascript/app/Assets/Trading/Categories/trade-categories.jsx +++ b/src/javascript/app/Assets/Trading/Categories/trade-categories.jsx @@ -112,4 +112,4 @@ TradeCategories.propTypes = { category: PropTypes.string, }; -export { TradeCategories }; +export default TradeCategories; diff --git a/src/javascript/app/Assets/Trading/Types/icon-trade-types.jsx b/src/javascript/app/Assets/Trading/Types/icon-trade-types.jsx index 9aa5ea5167e1..7f691c57608d 100644 --- a/src/javascript/app/Assets/Trading/Types/icon-trade-types.jsx +++ b/src/javascript/app/Assets/Trading/Types/icon-trade-types.jsx @@ -303,4 +303,4 @@ IconTradeType.propTypes = { type : PropTypes.string, }; -export { IconTradeType }; +export default IconTradeType; diff --git a/src/javascript/app/Assets/Trading/Types/index.js b/src/javascript/app/Assets/Trading/Types/index.js deleted file mode 100644 index e9876dc0187c..000000000000 --- a/src/javascript/app/Assets/Trading/Types/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from './icon-trade-types.jsx'; diff --git a/src/javascript/app/Assets/Trading/icon-lock.jsx b/src/javascript/app/Assets/Trading/icon-lock.jsx index 2a81f5c8e49b..bbb3ae5bb4fe 100644 --- a/src/javascript/app/Assets/Trading/icon-lock.jsx +++ b/src/javascript/app/Assets/Trading/icon-lock.jsx @@ -16,4 +16,4 @@ IconLock.propTypes = { className: PropTypes.string, }; -export { IconLock }; +export default IconLock; diff --git a/src/javascript/app/Assets/Trading/icon-price-move.jsx b/src/javascript/app/Assets/Trading/icon-price-move.jsx index d114d4de5b8d..c75d84111e89 100644 --- a/src/javascript/app/Assets/Trading/icon-price-move.jsx +++ b/src/javascript/app/Assets/Trading/icon-price-move.jsx @@ -41,4 +41,4 @@ IconPriceMove.propTypes = { type : PropTypes.string, }; -export { IconPriceMove }; +export default IconPriceMove; diff --git a/src/javascript/app/Assets/icon.jsx b/src/javascript/app/Assets/icon.jsx new file mode 100644 index 000000000000..208f2a90ff3d --- /dev/null +++ b/src/javascript/app/Assets/icon.jsx @@ -0,0 +1,128 @@ +import React from 'react'; +import PropTypes from 'prop-types'; + +class Icon extends React.PureComponent { + constructor(props) { + super(props); + /* When adding a new icon, arrange it by following the ascending file system arrangement */ + this.icons = { + // Common + IconArrowBold : React.lazy(() => import('./Common/icon-arrow-bold.jsx')), + IconArrow : React.lazy(() => import('./Common/icon-arrow.jsx')), + IconBack : React.lazy(() => import('./Common/icon-back.jsx')), + IconCalendarToday : React.lazy(() => import('./Common/icon-calendar-today.jsx')), + IconCalendar : React.lazy(() => import('./Common/icon-calendar.jsx')), + IconChevronDoubleLeft : React.lazy(() => import('./Common/icon-chevron-double-left.jsx')), + IconChevronDoubleRight: React.lazy(() => import('./Common/icon-chevron-double-right.jsx')), + IconChevronLeft : React.lazy(() => import('./Common/icon-chevron-left.jsx')), + IconChevronRight : React.lazy(() => import('./Common/icon-chevron-right.jsx')), + IconClear : React.lazy(() => import('./Common/icon-clear.jsx')), + IconClock : React.lazy(() => import('./Common/icon-clock.jsx')), + IconClose : React.lazy(() => import('./Common/icon-close.jsx')), + IconCountryFlag : React.lazy(() => import('./Common/icon-country-flag.jsx')), + IconDanger : React.lazy(() => import('./Common/icon-danger.jsx')), + IconDeposit : React.lazy(() => import('./Common/icon-deposit.jsx')), + IconExclamation : React.lazy(() => import('./Common/icon-exclamation.jsx')), + IconFlag : React.lazy(() => import('./Common/icon-flag.jsx')), + IconInfoBlue : React.lazy(() => import('./Common/icon-info-blue.jsx')), + IconInfoOutline : React.lazy(() => import('./Common/icon-info-outline.jsx')), + IconInformation : React.lazy(() => import('./Common/icon-information.jsx')), + IconMinimize : React.lazy(() => import('./Common/icon-minimize.jsx')), + IconMinus : React.lazy(() => import('./Common/icon-minus.jsx')), + IconPlus : React.lazy(() => import('./Common/icon-plus.jsx')), + IconQuestion : React.lazy(() => import('./Common/icon-question.jsx')), + IconRedDot : React.lazy(() => import('./Common/icon-red-dot.jsx')), + IconSuccess : React.lazy(() => import('./Common/icon-success.jsx')), + IconWarning : React.lazy(() => import('./Common/icon-warning.jsx')), + IconWip : React.lazy(() => import('./Common/icon-wip.jsx')), + IconWithdrawal : React.lazy(() => import('./Common/icon-withdrawal.jsx')), + + // Contract + ContractIconClose: React.lazy(() => import('./Contract/icon-close.jsx')), + IconEndTime : React.lazy(() => import('./Contract/icon-end-time.jsx')), + ContractIconFlag : React.lazy(() => import('./Contract/icon-flag.jsx')), + IconStartTime : React.lazy(() => import('./Contract/icon-start-time.jsx')), + IconTick : React.lazy(() => import('./Contract/icon-tick.jsx')), + + // Footer + IconMaximize : React.lazy(() => import('./Footer/icon-maximize.jsx')), + IconPositions: React.lazy(() => import('./Footer/icon-positions.jsx')), + IconSettings : React.lazy(() => import('./Footer/icon-settings.jsx')), + + // Header + IconAccountsCurrency: React.lazy(() => import('./Header/AccountsCurrency/icon_accounts_currency.jsx')), + IconLogout : React.lazy(() => import('./Header/Drawer/icon-logout.jsx')), + IconBell : React.lazy(() => import('./Header/NavBar/icon-bell.jsx')), + IconCashier : React.lazy(() => import('./Header/NavBar/icon-cashier.jsx')), + IconDeriv : React.lazy(() => import('./Header/NavBar/icon-deriv.jsx')), + IconHamburger : React.lazy(() => import('./Header/NavBar/icon-hamburger.jsx')), + IconPortfolio : React.lazy(() => import('./Header/NavBar/icon-portfolio.jsx')), + IconReports : React.lazy(() => import('./Header/NavBar/icon-reports.jsx')), + IconTrade : React.lazy(() => import('./Header/NavBar/icon-trade.jsx')), + + // Reports + IconOpenPositions: React.lazy(() => import('./Reports/icon-open-positions.jsx')), + IconProfitTable : React.lazy(() => import('./Reports/icon-profit-table.jsx')), + IconStatement : React.lazy(() => import('./Reports/icon-statement.jsx')), + + // Settings + IconCharts : React.lazy(() => import('./Settings/icon-charts.jsx')), + SettingsIconClose: React.lazy(() => import('./Settings/icon-close.jsx')), + IconLanguage : React.lazy(() => import('./Settings/icon-language.jsx')), + IconPurchase : React.lazy(() => import('./Settings/icon-purchase.jsx')), + IconTheme : React.lazy(() => import('./Settings/icon-theme.jsx')), + + // Statement + IconBuy : React.lazy(() => import('./Statement/icon-buy.jsx')), + IconPayout: React.lazy(() => import('./Statement/icon-payout.jsx')), + IconSell : React.lazy(() => import('./Statement/icon-sell.jsx')), + IconWallet: React.lazy(() => import('./Statement/icon-wallet.jsx')), + + // Trading + IconBarrierDown : React.lazy(() => import('./Trading/Barriers/icon-barrier-down.jsx')), + IconBarrierUp : React.lazy(() => import('./Trading/Barriers/icon-barrier-up.jsx')), + IconTradeCategory : React.lazy(() => import('./Trading/Categories/icon-trade-categories.jsx')), + TradeCategoriesGIF: React.lazy(() => import('./Trading/Categories/trade-categories-gif.jsx')), + TradeCategories : React.lazy(() => import('./Trading/Categories/trade-categories.jsx')), + IconTradeType : React.lazy(() => import('./Trading/Types/icon-trade-types.jsx')), + IconLock : React.lazy(() => import('./Trading/icon-lock.jsx')), + IconPriceMove : React.lazy(() => import('./Trading/icon-price-move.jsx')), + }; + } + + render() { + const options = { + category : this.props.category, + className : this.props.className, + classNamePath: this.props.classNamePath, + classNameRect: this.props.classNameRect, + is_disabled : this.props.is_disabled, + onClick : this.props.onClick, + onMouseEnter : this.props.onMouseEnter, + onMouseLeave : this.props.onMouseLeave, + type : this.props.type, + }; + + const IconLazy = this.icons[this.props.icon]; + if (!IconLazy) return
; + + return ( + }> + + + ); + } +} + +Icon.propTypes = { + category : PropTypes.string, + className : PropTypes.string, + classNamePath: PropTypes.string, + classNameRect: PropTypes.string, + icon : PropTypes.string, + is_disabled : PropTypes.oneOfType([PropTypes.number, PropTypes.bool]), + onClick : PropTypes.func, + type : PropTypes.string, +}; + +export default Icon; diff --git a/src/javascript/app/Constants/contract.js b/src/javascript/app/Constants/contract.js index 0342684e9009..9271274322ea 100644 --- a/src/javascript/app/Constants/contract.js +++ b/src/javascript/app/Constants/contract.js @@ -71,7 +71,7 @@ export const getUnsupportedContracts = () => ({ }, }); -const getContractConfig = is_high_low => ({ +export const getSupportedContracts = is_high_low => ({ CALL: { name : is_high_low ? localize('Higher') : localize('Rise'), position: 'top', @@ -120,6 +120,10 @@ const getContractConfig = is_high_low => ({ name : localize('No Touch'), position: 'bottom', }, +}); + +const getContractConfig = is_high_low => ({ + ...getSupportedContracts(is_high_low), ...getUnsupportedContracts(), }); diff --git a/src/javascript/app/Constants/icons.js b/src/javascript/app/Constants/icons.js deleted file mode 100644 index 091cb6261c73..000000000000 --- a/src/javascript/app/Constants/icons.js +++ /dev/null @@ -1,130 +0,0 @@ -import { IconArrow } from 'Assets/Common/icon-arrow.jsx'; -import { IconArrowBold } from 'Assets/Common/icon-arrow-bold.jsx'; -import { IconBack } from 'Assets/Common/icon-back.jsx'; -import { IconCalendar } from 'Assets/Common/icon-calendar.jsx'; -import { IconCalendarToday } from 'Assets/Common/icon-calendar-today.jsx'; -import { IconChevronDoubleLeft } from 'Assets/Common/icon-chevron-double-left.jsx'; -import { IconChevronDoubleRight } from 'Assets/Common/icon-chevron-double-right.jsx'; -import { IconChevronLeft } from 'Assets/Common/icon-chevron-left.jsx'; -import { IconChevronRight } from 'Assets/Common/icon-chevron-right.jsx'; -import { IconClear } from 'Assets/Common/icon-clear.jsx'; -import { IconClock } from 'Assets/Common/icon-clock.jsx'; -import { IconClose } from 'Assets/Common/icon-close.jsx'; -import { IconCountryFlag } from 'Assets/Common/icon-country-flag.jsx'; -import { IconDanger } from 'Assets/Common/icon-danger.jsx'; -import { IconExclamation } from 'Assets/Common/icon-exclamation.jsx'; -import { IconFlag } from 'Assets/Common/icon-flag.jsx'; -import { IconInfoBlue } from 'Assets/Common/icon-info-blue.jsx'; -import { IconInfoOutline } from 'Assets/Common/icon-info-outline.jsx'; -import { IconInformation } from 'Assets/Common/icon-information.jsx'; -import { IconMinimize } from 'Assets/Common/icon-minimize.jsx'; -import { IconMinus } from 'Assets/Common/icon-minus.jsx'; -import { IconPlus } from 'Assets/Common/icon-plus.jsx'; -import { IconQuestion } from 'Assets/Common/icon-question.jsx'; -import { IconRedDot } from 'Assets/Common/icon-red-dot.jsx'; -import { IconSuccess } from 'Assets/Common/icon-success.jsx'; -import { IconWarning } from 'Assets/Common/icon-warning.jsx'; - -// import { IconEntrySpotSVG } from 'Assets/Contract/icon-entry-spot.jsx'; -import { IconEndTimeSVG } from 'Assets/Contract/icon-end-time.jsx'; -import { IconFlagSVG } from 'Assets/Contract/icon-flag.jsx'; -import { IconStartTimeSVG } from 'Assets/Contract/icon-start-time.jsx'; -import { IconTickSVG } from 'Assets/Contract/icon-tick.jsx'; - -import { IconMaximize } from 'Assets/Footer/icon-maximize.jsx'; -import { IconPositions } from 'Assets/Footer/icon-positions.jsx'; -import { IconSettings } from 'Assets/Footer/icon-settings.jsx'; - -import { IconAccountsCurrency } from 'Assets/Header/AccountsCurrency/icon_accounts_currency.jsx'; -import { IconLogout } from 'Assets/Header/Drawer/icon-logout.jsx'; -import { IconBell } from 'Assets/Header/NavBar/icon-bell.jsx'; -import { IconCashier } from 'Assets/Header/NavBar/icon-cashier.jsx'; -import { IconHamburger } from 'Assets/Header/NavBar/icon-hamburger.jsx'; -import { IconPortfolio } from 'Assets/Header/NavBar/icon-portfolio.jsx'; -import { IconReports } from 'Assets/Header/NavBar/icon-reports.jsx'; -import { IconTrade } from 'Assets/Header/NavBar/icon-trade.jsx'; - -import { IconBuy } from 'Assets/Statement/icon-buy.jsx'; -import { IconDeposit } from 'Assets/Statement/icon-deposit.jsx'; -import { IconPayout } from 'Assets/Statement/icon-payout.jsx'; -import { IconSell } from 'Assets/Statement/icon-sell.jsx'; -import { IconWallet } from 'Assets/Statement/icon-wallet.jsx'; -import { IconWithdrawal } from 'Assets/Statement/icon-withdrawal.jsx'; - -import { IconBarrierDown } from 'Assets/Trading/Barriers/icon-barrier-down.jsx'; -import { IconBarrierUp } from 'Assets/Trading/Barriers/icon-barrier-up.jsx'; -import { IconTradeCategory } from 'Assets/Trading/Categories/icon-trade-categories.jsx'; -import { IconTradeType } from 'Assets/Trading/Types/icon-trade-types.jsx'; -import { IconLock } from 'Assets/Trading/icon-lock.jsx'; -import { IconPriceMove } from 'Assets/Trading/icon-price-move.jsx'; - -const ICONS = { - COMMON: { - ARROW : IconArrow, - ARROW_BOLD : IconArrowBold, - BACK : IconBack, - CALENDAR_TODAY : IconCalendarToday, - CALENDAR : IconCalendar, - CHEVRON_DOUBLE_LEFT : IconChevronDoubleLeft, - CHEVRON_DOUBLE_RIGHT: IconChevronDoubleRight, - CHEVRON_LEFT : IconChevronLeft, - CHEVRON_RIGHT : IconChevronRight, - CLEAR : IconClear, - CLOCK : IconClock, - CLOSE : IconClose, - COUNTRY_FLAG : IconCountryFlag, - DANGER : IconDanger, - EXCLAMATION : IconExclamation, - FLAG : IconFlag, - INFORMATION : IconInformation, - INFO_BLUE : IconInfoBlue, - INFO_OUTLINE : IconInfoOutline, - MINIMIZE : IconMinimize, - MINUS : IconMinus, - PLUS : IconPlus, - QUESTION : IconQuestion, - RED_DOT : IconRedDot, - SUCCESS : IconSuccess, - WARNING : IconWarning, - }, - CONTRACT: { - // ENTRY_SPOT: IconEntrySpotSVG, - END_TIME : IconEndTimeSVG, - FLAG : IconFlagSVG, - START_TIME: IconStartTimeSVG, - TICK : IconTickSVG, - }, - FOOTER: { - MAXIMIZE : IconMaximize, - POSITIONS: IconPositions, - SETTINGS : IconSettings, - }, - HEADER: { - ACCOUNTS_CURRENCY: IconAccountsCurrency, - LOGOUT : IconLogout, - BELL : IconBell, - CASHIER : IconCashier, - HAMBURGER : IconHamburger, - PORTFOLIO : IconPortfolio, - REPORTS : IconReports, - TRADE : IconTrade, - }, - STATEMENT: { - BUY : IconBuy, - DEPOSIT : IconDeposit, - PAYOUT : IconPayout, - SELL : IconSell, - WALLET : IconWallet, - WITHDRAWAL: IconWithdrawal, - }, - TRADING: { - BARRIER_DOWN : IconBarrierDown, - BARRIER_UP : IconBarrierUp, - TRADE_CATEGORY: IconTradeCategory, - TRADE_TYPES : IconTradeType, - LOCK : IconLock, - PRICE_MOVE : IconPriceMove, - }, -}; - -export { ICONS }; diff --git a/src/javascript/app/Constants/index.js b/src/javascript/app/Constants/index.js index 227120929b86..cc269b578bdf 100644 --- a/src/javascript/app/Constants/index.js +++ b/src/javascript/app/Constants/index.js @@ -1,4 +1,3 @@ export * from './contract'; export routes from './routes'; export * from './ui'; -export * from './icons'; diff --git a/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-expired.jsx b/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-expired.jsx index d6145e5903b5..7bc24d74fcef 100644 --- a/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-expired.jsx +++ b/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-expired.jsx @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { localize } from '_common/localize'; import Money from 'App/Components/Elements/money.jsx'; -import Icon from 'Assets/Common/icon.jsx'; -import IconFlag from 'Assets/Contract/icon-flag.jsx'; +import Icon from 'Assets/icon.jsx'; import SellInfo from '../Sell/sell-info.jsx'; const InfoBoxExpired = ({ @@ -27,7 +26,7 @@ const InfoBoxExpired = ({ } { has_flag && - + }
{localize('Profit/Loss')}:
diff --git a/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-longcode.jsx b/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-longcode.jsx index 770ab2c48ec2..210daa74a431 100644 --- a/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-longcode.jsx +++ b/src/javascript/app/Modules/Contract/Components/InfoBox/info-box-longcode.jsx @@ -1,15 +1,13 @@ import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; import React from 'react'; -import { - Icon, - IconFlag } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; const InfoBoxLongcode = ({ contract_info, }) => (
- + {contract_info.longcode}
); diff --git a/src/javascript/app/Modules/Contract/Components/LastDigitPrediction/last-digit-pointer.jsx b/src/javascript/app/Modules/Contract/Components/LastDigitPrediction/last-digit-pointer.jsx index 182dc7296cfa..e332b6b69156 100644 --- a/src/javascript/app/Modules/Contract/Components/LastDigitPrediction/last-digit-pointer.jsx +++ b/src/javascript/app/Modules/Contract/Components/LastDigitPrediction/last-digit-pointer.jsx @@ -1,7 +1,7 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { IconPriceMove } from 'Assets/Trading/icon-price-move.jsx'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; const LastDigitPointer = ({ is_lost, @@ -12,7 +12,8 @@ const LastDigitPointer = ({ className='digits__pointer' style={{ marginLeft: position }} > -
{message}
- +
); diff --git a/src/javascript/app/Modules/Contract/Containers/contract-replay.jsx b/src/javascript/app/Modules/Contract/Containers/contract-replay.jsx index adf55e076ea3..ea2eca350368 100644 --- a/src/javascript/app/Modules/Contract/Containers/contract-replay.jsx +++ b/src/javascript/app/Modules/Contract/Containers/contract-replay.jsx @@ -7,8 +7,7 @@ import ChartLoader from 'App/Components/Elements/chart-loader.jsx'; import ContractDrawer from 'App/Components/Elements/ContractDrawer'; import NotificationMessages from 'App/Containers/notification-messages.jsx'; import { connect } from 'Stores/connect'; -import { Icon } from 'Assets/Common'; -import { IconClose } from 'Assets/Settings'; +import Icon from 'Assets/icon.jsx'; import AppRoutes from 'Constants/routes'; import { localize } from '_common/localize'; import InfoBox from './info-box.jsx'; @@ -53,7 +52,7 @@ class ContractReplay extends React.Component { const action_bar_items = [ { onClick: () => this.props.history.push(AppRoutes.trade), - icon : IconClose, + icon : 'SettingsIconClose', title : localize('Close'), }, ]; diff --git a/src/javascript/app/Modules/Portfolio/Components/contract-type-cell.jsx b/src/javascript/app/Modules/Portfolio/Components/contract-type-cell.jsx index 4a9921c1a52e..64cd6b5a7408 100644 --- a/src/javascript/app/Modules/Portfolio/Components/contract-type-cell.jsx +++ b/src/javascript/app/Modules/Portfolio/Components/contract-type-cell.jsx @@ -1,13 +1,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import { getContractTypeDisplay } from 'Constants/contract'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { IconTradeType } from 'Assets/Trading/Types'; +import Icon from 'Assets/icon.jsx'; const ContractTypeCell = ({ type }) => (
- +
{type && getContractTypeDisplay(type) || ''} diff --git a/src/javascript/app/Modules/Portfolio/Components/empty-portfolio-message.jsx b/src/javascript/app/Modules/Portfolio/Components/empty-portfolio-message.jsx index 3a1c0d25fbcc..c4349746296c 100644 --- a/src/javascript/app/Modules/Portfolio/Components/empty-portfolio-message.jsx +++ b/src/javascript/app/Modules/Portfolio/Components/empty-portfolio-message.jsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { localize } from '_common/localize'; -import { IconPositions } from 'Assets/Footer'; +import React from 'react'; +import { localize } from '_common/localize'; +import Icon from 'Assets/icon.jsx'; const EmptyPortfolioMessage = () => (
- + {localize('No open positions')}
diff --git a/src/javascript/app/Modules/Reports/Components/empty-trade-history-message.jsx b/src/javascript/app/Modules/Reports/Components/empty-trade-history-message.jsx index 5a2ee2ffeeae..96283a1d8c35 100644 --- a/src/javascript/app/Modules/Reports/Components/empty-trade-history-message.jsx +++ b/src/javascript/app/Modules/Reports/Components/empty-trade-history-message.jsx @@ -1,33 +1,30 @@ -import PropTypes from 'prop-types'; -import React from 'react'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; const EmptyTradeHistoryMessage = ({ has_selected_date, component_icon, localized_message, localized_period_message, -}) => { - const ComponentIcon = component_icon; - - return ( - -
- - - { - !has_selected_date ? - localized_message - : - localized_period_message - } - -
- - ); -}; +}) => ( + +
+ + + { + !has_selected_date ? + localized_message + : + localized_period_message + } + +
+ +); EmptyTradeHistoryMessage.propTypes = { - component_icon : PropTypes.func, + component_icon : PropTypes.string, has_selected_date : PropTypes.bool, localized_message : PropTypes.string, localized_period_message: PropTypes.string, diff --git a/src/javascript/app/Modules/Reports/Components/market-symbol-icon-row.jsx b/src/javascript/app/Modules/Reports/Components/market-symbol-icon-row.jsx index 150eb9251be8..ac76df613633 100644 --- a/src/javascript/app/Modules/Reports/Components/market-symbol-icon-row.jsx +++ b/src/javascript/app/Modules/Reports/Components/market-symbol-icon-row.jsx @@ -1,11 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { UnderlyingIcon } from 'App/Components/Elements/underlying-icon.jsx'; -import { Icon } from 'Assets/Common'; -import { IconDeposit } from 'Assets/Common/icon-deposit.jsx'; -import { IconWithdrawal } from 'Assets/Common/icon-withdrawal.jsx'; -import { IconTransfer } from 'Assets/Common/icon-transfer.jsx'; -import { IconTradeType } from 'Assets/Trading/Types'; +import Icon from 'Assets/icon.jsx'; import { getMarketInformation } from '../Helpers/market-underyling'; const MarketSymbolIconRow = ({ payload, show_description }) => { @@ -21,17 +17,21 @@ const MarketSymbolIconRow = ({ payload, show_description }) => {
- + {show_description && market_information.category}
); - } else if (['deposit', 'withdrawal', 'transfer'].includes(payload.action_type)) { + } else if (['deposit', 'withdrawal'].includes(payload.action_type)) { return (
- {payload.action_type === 'deposit' && } - {payload.action_type === 'withdrawal' && } - {payload.action_type === 'transfer' && } + { + payload.action_type === 'deposit' ? ( + + ) : ( + + ) + }
); } diff --git a/src/javascript/app/Modules/Reports/Components/placeholder-component.jsx b/src/javascript/app/Modules/Reports/Components/placeholder-component.jsx index 16b83a1b0612..63fa7ea44aad 100644 --- a/src/javascript/app/Modules/Reports/Components/placeholder-component.jsx +++ b/src/javascript/app/Modules/Reports/Components/placeholder-component.jsx @@ -19,7 +19,7 @@ const PlaceholderComponent = (props) => { }; PlaceholderComponent.propTypes = { - component_icon : PropTypes.func, + component_icon : PropTypes.string, empty_message_component: PropTypes.func, has_selected_date : PropTypes.bool, localized_message : PropTypes.string, diff --git a/src/javascript/app/Modules/Reports/Components/profit-loss-card-content.jsx b/src/javascript/app/Modules/Reports/Components/profit-loss-card-content.jsx index 0764c26efbdd..51771e0e4c67 100644 --- a/src/javascript/app/Modules/Reports/Components/profit-loss-card-content.jsx +++ b/src/javascript/app/Modules/Reports/Components/profit-loss-card-content.jsx @@ -1,9 +1,9 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import Localize from 'App/Components/Elements/localize.jsx'; -import Money from 'App/Components/Elements/money.jsx'; -import { IconPriceMove } from 'Assets/Trading/icon-price-move.jsx'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Localize from 'App/Components/Elements/localize.jsx'; +import Money from 'App/Components/Elements/money.jsx'; +import Icon from 'Assets/icon.jsx'; const ProfitLossCardContent = ({ currency, @@ -30,7 +30,8 @@ const ProfitLossCardContent = ({ }, )} > -
@@ -48,7 +49,8 @@ const ProfitLossCardContent = ({ }, )} > -
diff --git a/src/javascript/app/Modules/Reports/Containers/open-positions.jsx b/src/javascript/app/Modules/Reports/Containers/open-positions.jsx index f904f86ac4c3..087484d9606b 100644 --- a/src/javascript/app/Modules/Reports/Containers/open-positions.jsx +++ b/src/javascript/app/Modules/Reports/Containers/open-positions.jsx @@ -90,7 +90,7 @@ class OpenPositions extends React.Component { OpenPositions.propTypes = { active_positions: MobxPropTypes.arrayOrObservableArray, - component_icon : PropTypes.func, + component_icon : PropTypes.string, currency : PropTypes.string, error : PropTypes.string, history : PropTypes.object, diff --git a/src/javascript/app/Modules/Reports/Containers/profit-table.jsx b/src/javascript/app/Modules/Reports/Containers/profit-table.jsx index 43b55ba29a12..fcd57a730fe6 100644 --- a/src/javascript/app/Modules/Reports/Containers/profit-table.jsx +++ b/src/javascript/app/Modules/Reports/Containers/profit-table.jsx @@ -8,7 +8,7 @@ import { website_name } from 'App/Constants/app-config'; import DataTable from 'App/Components/Elements/DataTable'; import Localize from 'App/Components/Elements/localize.jsx'; import { getContractPath } from 'App/Components/Routes/helpers'; -import { getUnsupportedContracts } from 'Constants'; +import { getSupportedContracts } from 'Constants'; import { connect } from 'Stores/connect'; import EmptyTradeHistoryMessage from '../Components/empty-trade-history-message.jsx'; import PlaceholderComponent from '../Components/placeholder-component.jsx'; @@ -26,8 +26,9 @@ class ProfitTable extends React.Component { } getRowAction = (row_obj) => ( - getUnsupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ? - { + getSupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ? + getContractPath(row_obj.contract_id) + : { component: ( ), } - : getContractPath(row_obj.contract_id) ); render () { @@ -94,7 +94,7 @@ class ProfitTable extends React.Component { } ProfitTable.propTypes = { - component_icon : PropTypes.func, + component_icon : PropTypes.string, currency : PropTypes.string, data : MobxPropTypes.arrayOrObservableArray, error : PropTypes.string, diff --git a/src/javascript/app/Modules/Reports/Containers/reports.jsx b/src/javascript/app/Modules/Reports/Containers/reports.jsx index 0a927660bfee..2f50bf6205b9 100644 --- a/src/javascript/app/Modules/Reports/Containers/reports.jsx +++ b/src/javascript/app/Modules/Reports/Containers/reports.jsx @@ -5,7 +5,6 @@ import { localize } from '_common/localize'; import { connect } from 'Stores/connect'; import { FadeWrapper } from 'App/Components/Animations'; import VerticalTab from 'App/Components/Elements/VerticalTabs/vertical-tab.jsx'; -import { IconClose } from 'Assets/Settings'; import AppRoutes from 'Constants/routes'; import WalletInformation from './wallet-information.jsx'; @@ -59,7 +58,7 @@ class Reports extends React.Component { this.props.history.push(AppRoutes.trade); this.props.toggleReports(false); }, - icon : IconClose, + icon : 'SettingsIconClose', title: localize('Close'), }, { diff --git a/src/javascript/app/Modules/Reports/Containers/statement.jsx b/src/javascript/app/Modules/Reports/Containers/statement.jsx index c4d279d12664..6fecf1f4fcd4 100644 --- a/src/javascript/app/Modules/Reports/Containers/statement.jsx +++ b/src/javascript/app/Modules/Reports/Containers/statement.jsx @@ -8,7 +8,7 @@ import DataTable from 'App/Components/Elements/DataTa import Localize from 'App/Components/Elements/localize.jsx'; import { getContractPath } from 'App/Components/Routes/helpers'; import { website_name } from 'App/Constants/app-config'; -import { getUnsupportedContracts } from 'Constants'; +import { getSupportedContracts } from 'Constants'; import { connect } from 'Stores/connect'; import { getStatementTableColumnsTemplate } from '../Constants/data-table-constants'; import PlaceholderComponent from '../Components/placeholder-component.jsx'; @@ -29,8 +29,9 @@ class Statement extends React.Component { let action; if (row_obj.id && ['buy', 'sell'].includes(row_obj.action_type)) { - action = getUnsupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ? - { + action = getSupportedContracts()[getMarketInformation(row_obj).category.toUpperCase()] ? + getContractPath(row_obj.id) + : { component: ( ), - } - : getContractPath(row_obj.id); - } else if (['deposit', 'withdrawal', 'transfer'].includes(row_obj.action_type)) { + }; + } else if (['deposit', 'withdrawal'].includes(row_obj.action_type)) { action = { message: row_obj.desc, }; @@ -103,7 +103,7 @@ class Statement extends React.Component { } Statement.propTypes = { - component_icon : PropTypes.func, + component_icon : PropTypes.string, data : MobxPropTypes.arrayOrObservableArray, error : PropTypes.string, handleScroll : PropTypes.func, diff --git a/src/javascript/app/Modules/Reports/Helpers/market-underyling.js b/src/javascript/app/Modules/Reports/Helpers/market-underyling.js index c7dd2b065c59..c34988a411fe 100644 --- a/src/javascript/app/Modules/Reports/Helpers/market-underyling.js +++ b/src/javascript/app/Modules/Reports/Helpers/market-underyling.js @@ -1,11 +1,15 @@ export const getMarketInformation = (payload) => { + const market_info = { + category : '', + underlying: '', + }; + const pattern = new RegExp('^([A-Z]+)_((OTC_[A-Z0-9]+)|R_[\\d]{2,3}|[A-Z]+)_'); // Used to get market name from shortcode const extracted = pattern.exec(payload.shortcode); if (extracted !== null) { - return { - category : extracted[1].toLowerCase(), - underlying: extracted[2], - }; + market_info.category = extracted[1].toLowerCase(); + market_info.underlying = extracted[2]; } - return null; + + return market_info; }; diff --git a/src/javascript/app/Modules/SmartChart/Components/Markers/marker-line.jsx b/src/javascript/app/Modules/SmartChart/Components/Markers/marker-line.jsx index 44eb283959e7..28300e651be9 100644 --- a/src/javascript/app/Modules/SmartChart/Components/Markers/marker-line.jsx +++ b/src/javascript/app/Modules/SmartChart/Components/Markers/marker-line.jsx @@ -1,10 +1,8 @@ import classNames from 'classnames'; -import { observer } from 'mobx-react'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common'; -import { IconEndTimeSVG } from 'Assets/Contract/icon-end-time.jsx'; -import { IconStartTimeSVG } from 'Assets/Contract/icon-start-time.jsx'; +import { observer } from 'mobx-react'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; const MarkerLine = ({ label, @@ -18,7 +16,7 @@ const MarkerLine = ({
{ label === marker_config.LINE_END.content_config.label &&
- +

{toMoment(+this.props.spot_epoch).format('HH:mm:ss')}

-
diff --git a/src/javascript/app/Modules/Statement/Components/empty-statement-message.jsx b/src/javascript/app/Modules/Statement/Components/empty-statement-message.jsx index 2b5af49b7385..2020dbc81729 100644 --- a/src/javascript/app/Modules/Statement/Components/empty-statement-message.jsx +++ b/src/javascript/app/Modules/Statement/Components/empty-statement-message.jsx @@ -1,15 +1,14 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import { localize } from '_common/localize'; -import { Icon } from 'Assets/Common'; -import { IconReports } from 'Assets/Header/NavBar'; -import { routes } from 'Constants/index'; -import { ButtonLink } from 'App/Components/Routes'; +import PropTypes from 'prop-types'; +import React from 'react'; +import { localize } from '_common/localize'; +import Icon from 'Assets/icon.jsx'; +import { routes } from 'Constants/index'; +import { ButtonLink } from 'App/Components/Routes'; const EmptyStatementMessage = ({ has_selected_date }) => (
- + { !has_selected_date ? diff --git a/src/javascript/app/Modules/Statement/Components/statement-card.jsx b/src/javascript/app/Modules/Statement/Components/statement-card.jsx index cb718a4ba28d..95cb6bd681b9 100644 --- a/src/javascript/app/Modules/Statement/Components/statement-card.jsx +++ b/src/javascript/app/Modules/Statement/Components/statement-card.jsx @@ -2,14 +2,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import { NavLink } from 'react-router-dom'; -import { Icon } from 'Assets/Common'; -import { - IconBuy, - IconDeposit, - IconSell, - IconPayout, - IconWallet, - IconWithdrawal } from 'Assets/Statement'; +import Icon from 'Assets/icon.jsx'; import { getContractPath } from 'App/Components/Routes/helpers'; const StatementCard = ({ @@ -37,22 +30,22 @@ const StatementCard = ({
{desc}
- {icon === 'sell' && } - {icon === 'buy' && } - {icon === 'deposit' && } - {icon === 'withdrawal' && } + {icon === 'sell' && } + {icon === 'buy' && } + {icon === 'deposit' && } + {icon === 'withdrawal' && } {amount}
- + {payout}
- + {balance} diff --git a/src/javascript/app/Modules/Trading/Components/Elements/full-screen-dialog.jsx b/src/javascript/app/Modules/Trading/Components/Elements/full-screen-dialog.jsx index 106927d80cc5..e6805aeb0e66 100644 --- a/src/javascript/app/Modules/Trading/Components/Elements/full-screen-dialog.jsx +++ b/src/javascript/app/Modules/Trading/Components/Elements/full-screen-dialog.jsx @@ -1,9 +1,7 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { - Icon, - IconClose } from 'Assets/Common'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; const FullScreenDialog = (props) => { const { title, visible, children, wrapperClassName } = props; @@ -57,7 +55,7 @@ const FullScreenDialog = (props) => { className='icons btn-close fullscreen-dialog__close-btn' onClick={props.onClose} > - +
diff --git a/src/javascript/app/Modules/Trading/Components/Elements/purchase-button.jsx b/src/javascript/app/Modules/Trading/Components/Elements/purchase-button.jsx index 0963a5e38f38..9c5a048f0a6b 100644 --- a/src/javascript/app/Modules/Trading/Components/Elements/purchase-button.jsx +++ b/src/javascript/app/Modules/Trading/Components/Elements/purchase-button.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { localize } from '_common/localize'; import Button from 'App/Components/Form/button.jsx'; -import { IconTradeType } from 'Assets/Trading/Types'; +import Icon from 'Assets/icon.jsx'; import { getContractTypeDisplay } from 'Constants/contract'; const PurchaseButton = ({ @@ -38,7 +38,8 @@ const PurchaseButton = ({
- diff --git a/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-item.spec.js b/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-item.spec.js index b46aab67d356..fba8c781506f 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-item.spec.js +++ b/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-item.spec.js @@ -13,6 +13,6 @@ describe('ContractTypeItem', () => { { value:'high_low', text:'Higher/Lower' }, ]; const wrapper = shallow(); - expect(wrapper).to.have.length(1); + expect(wrapper).to.have.length(2); }); }); diff --git a/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-list.spec.js b/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-list.spec.js index 9c8eca7d4c82..aa62cfe1af24 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-list.spec.js +++ b/src/javascript/app/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-list.spec.js @@ -18,6 +18,6 @@ describe('ContractTypeList', () => { }; it('should render one component', () => { const wrapper = shallow(); - expect(wrapper).to.have.length(1); + expect(wrapper).to.have.length(2); }); }); diff --git a/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-item.jsx b/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-item.jsx index 8103773b29af..7060ed912f9c 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-item.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-item.jsx @@ -2,8 +2,7 @@ import { PropTypes as MobxPropTypes } from 'mobx-react'; import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; -import { Icon, IconInfoOutline } from 'Assets/Common'; -import { IconTradeCategory } from 'Assets/Trading/Categories'; +import Icon from 'Assets/icon.jsx'; const ContractTypeItem = ({ contracts, @@ -24,12 +23,12 @@ const ContractTypeItem = ({ value={contract.value} onClick={(e) => handleSelect(contract, e)} > - + {contract.text}
handleInfoClick(contract)}> - +
)) diff --git a/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx b/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx index 36bc26f9aafd..fcc2927c53ce 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/ContractType/contract-type-widget.jsx @@ -1,12 +1,11 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { IconArrow } from 'Assets/Common'; -import { IconTradeCategory } from 'Assets/Trading/Categories'; -import ContractTypeDialog from './contract-type-dialog.jsx'; -import ContractTypeList from './contract-type-list.jsx'; -import TradeTypeInfoDialog from '../TradeTypeInfo/trade-type-info-dialog.jsx'; -import TradeTypeInfoItem from '../TradeTypeInfo/trade-type-info-item.jsx'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; +import ContractTypeDialog from './contract-type-dialog.jsx'; +import ContractTypeList from './contract-type-list.jsx'; +import TradeTypeInfoDialog from '../TradeTypeInfo/trade-type-info-dialog.jsx'; +import TradeTypeInfoItem from '../TradeTypeInfo/trade-type-info-item.jsx'; class ContractTypeWidget extends React.PureComponent { state = { @@ -148,14 +147,17 @@ class ContractTypeWidget extends React.PureComponent { })} onClick={this.onWidgetClick} > - {this.getDisplayText()} - diff --git a/src/javascript/app/Modules/Trading/Components/Form/Purchase/contract-info.jsx b/src/javascript/app/Modules/Trading/Components/Form/Purchase/contract-info.jsx index 2a46ff79a43e..1d1d59df0552 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/Purchase/contract-info.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/Purchase/contract-info.jsx @@ -5,7 +5,7 @@ import { getLocalizedBasis } from 'Stores/Modules/Trading/Constants/contract'; import { localize } from '_common/localize'; import Money from 'App/Components/Elements/money.jsx'; import { Popover } from 'App/Components/Elements/Popover'; -import { IconPriceMove } from 'Assets/Trading/icon-price-move.jsx'; +import Icon from 'Assets/icon.jsx'; const ContractInfo = ({ basis, @@ -53,7 +53,7 @@ const ContractInfo = ({ {is_visible &&
{(!has_error_or_not_loaded && has_increased !== null) && - + }
} diff --git a/src/javascript/app/Modules/Trading/Components/Form/TradeParams/Duration/duration-toggle.jsx b/src/javascript/app/Modules/Trading/Components/Form/TradeParams/Duration/duration-toggle.jsx index e8dbf59de830..25f6ea723288 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/TradeParams/Duration/duration-toggle.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/TradeParams/Duration/duration-toggle.jsx @@ -1,9 +1,7 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import React, { Fragment } from 'react'; -import { - Icon, - IconArrow } from 'Assets/Common'; +import Icon from 'Assets/icon.jsx'; const DurationToggle = ({ name, @@ -21,7 +19,7 @@ const DurationToggle = ({ return ( ); }; diff --git a/src/javascript/app/Modules/Trading/Components/Form/TradeParams/barrier.jsx b/src/javascript/app/Modules/Trading/Components/Form/TradeParams/barrier.jsx index 183e918d1af2..5dccdd972ced 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/TradeParams/barrier.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/TradeParams/barrier.jsx @@ -1,14 +1,11 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Icon } from 'Assets/Common/icon.jsx'; -import { - IconBarrierUp, - IconBarrierDown } from 'Assets/Trading/Barriers'; -import Fieldset from 'App/Components/Form/fieldset.jsx'; -import InputField from 'App/Components/Form/InputField'; -import { connect } from 'Stores/connect'; -import { localize } from '_common/localize'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import Icon from 'Assets/icon.jsx'; +import Fieldset from 'App/Components/Form/fieldset.jsx'; +import InputField from 'App/Components/Form/InputField'; +import { connect } from 'Stores/connect'; +import { localize } from '_common/localize'; const Barrier = ({ barrier_1, @@ -70,8 +67,8 @@ const Barrier = ({ is_float is_signed /> - - + + }
diff --git a/src/javascript/app/Modules/Trading/Components/Form/TradeTypeInfo/trade-type-info-item.jsx b/src/javascript/app/Modules/Trading/Components/Form/TradeTypeInfo/trade-type-info-item.jsx index 21fb52a568f8..3d52a255da24 100644 --- a/src/javascript/app/Modules/Trading/Components/Form/TradeTypeInfo/trade-type-info-item.jsx +++ b/src/javascript/app/Modules/Trading/Components/Form/TradeTypeInfo/trade-type-info-item.jsx @@ -1,16 +1,10 @@ -import classNames from 'classnames'; -import PropTypes from 'prop-types'; -import React from 'react'; -import { Scrollbars } from 'tt-react-custom-scrollbars'; -import { - Icon, - IconBack } from 'Assets/Common'; -import { IconChevronLeft } from 'Assets/Common/icon-chevron-left.jsx'; -import { IconChevronRight } from 'Assets/Common/icon-chevron-right.jsx'; -import { TradeCategories, - TradeCategoriesGIF } from 'Assets/Trading/Categories'; -import Button from 'App/Components/Form/button.jsx'; -import { localize } from '_common/localize'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; +import React from 'react'; +import { Scrollbars } from 'tt-react-custom-scrollbars'; +import Icon from 'Assets/icon.jsx'; +import Button from 'App/Components/Form/button.jsx'; +import { localize } from '_common/localize'; const TradeTypeInfoItem = ({ handleNavigationClick, @@ -28,7 +22,7 @@ const TradeTypeInfoItem = ({ {!is_mobile &&
onBackButtonClick()}> - + {item.text}
@@ -43,7 +37,8 @@ const TradeTypeInfoItem = ({ itemList.map((type, idx) => (
- - +
@@ -71,7 +66,7 @@ const TradeTypeInfoItem = ({
handlePrevClick(itemList)} > - +
handleNextClick(itemList)} > - +
diff --git a/src/javascript/app/Stores/Modules/Contract/Constants/ui.js b/src/javascript/app/Stores/Modules/Contract/Constants/ui.js index db48a18b0c18..2a5e1050c32c 100644 --- a/src/javascript/app/Stores/Modules/Contract/Constants/ui.js +++ b/src/javascript/app/Stores/Modules/Contract/Constants/ui.js @@ -1,10 +1,9 @@ import React from 'react'; import { localize } from '_common/localize'; -import IconFlag from 'Assets/Contract/icon-flag.jsx'; -import IconTick from 'Assets/Contract/icon-tick.jsx'; +import Icon from 'Assets/icon.jsx'; export const getHeaderConfig = () => ({ - purchased: { title: localize('Contract Purchased'), icon: }, - won : { title: localize('Contract Won'), icon: }, - lost : { title: localize('Contract Lost'), icon: }, + purchased: { title: localize('Contract Purchased'), icon: }, + won : { title: localize('Contract Won'), icon: }, + lost : { title: localize('Contract Lost'), icon: }, }); diff --git a/src/javascript/app/Stores/Modules/Trading/Helpers/end-time.js b/src/javascript/app/Stores/Modules/Trading/Helpers/end-time.js index ce479a4a2396..1277bc7ac24a 100644 --- a/src/javascript/app/Stores/Modules/Trading/Helpers/end-time.js +++ b/src/javascript/app/Stores/Modules/Trading/Helpers/end-time.js @@ -8,14 +8,14 @@ export const getSelectedTime = ( selected_time, market_open_time, ) => { - let value = selected_time.isBefore(market_open_time) - ? market_open_time.isBefore(server_time) - ? server_time - : market_open_time - : selected_time; + if (selected_time.isAfter(market_open_time)) { + return getClosestTime(selected_time, 5).format('HH:mm'); + } + if (market_open_time.isAfter(server_time)) { + return getClosestTime(market_open_time, 5).format('HH:mm'); + } - value = getClosestTime(value, 5); - return value.format('HH:mm'); + return getClosestTime(server_time, 5).format('HH:mm'); }; export const getBoundaries = ( diff --git a/src/sass/app/_common/components/calendar.scss b/src/sass/app/_common/components/calendar.scss index a99f87bdf58b..c50d14360752 100644 --- a/src/sass/app/_common/components/calendar.scss +++ b/src/sass/app/_common/components/calendar.scss @@ -256,12 +256,16 @@ height: 0; top: 0; justify-content: center; - width: 60%; + width: 100%; &-icon { margin-top: 0.1em; display: inherit; } } + &-date { + width: 100%; + text-align: center; + } } }