From 7afcaea2f133bc6b71a1646cd44df4a04917055d Mon Sep 17 00:00:00 2001 From: Hirad Date: Sun, 12 Feb 2023 17:18:47 +0330 Subject: [PATCH 1/3] fix: rebranding of traders-hub and onboarding --- .../ic-branding-binarybot-dashboard.svg | 1 + .../branding/ic-branding-dbot-dashboard.svg | 1 + .../branding/ic-branding-deriv-logo.svg | 1 + .../ic-branding-derivgo-dashboard.svg | 1 + .../branding/ic-branding-derivx-dashboard.svg | 1 + .../ic-branding-dtrader-dashboard.svg | 1 + .../ic-branding-mt5-derived-dashboard.svg | 1 + .../ic-branding-mt5-financial-dashboard.svg | 1 + .../ic-branding-smarttrader-dashboard.svg | 1 + .../ic-branding-binarybot-onboarding.svg | 1 + .../ic-branding-dbot-onboarding.svg | 1 + .../onboarding/ic-branding-deriv-logo.svg | 1 + .../ic-branding-derivgo-onboarding.svg | 1 + .../ic-branding-dtrader-onboarding.svg | 1 + .../ic-branding-smarttrader-onboarding.svg | 1 + .../trading-platform/ic-brand-mt5-derived.svg | 1 + .../ic-brand-mt5-financial.svg | 1 + .../assets/svgs/trading-platform/index.tsx | 36 ++++++++++++++----- .../onboarding-new/static-dashboard.tsx | 12 +++---- .../src/modules/onboarding/onboarding.scss | 2 +- .../components/src/components/icon/icons.js | 8 +++++ packages/components/stories/icon/icons.js | 10 ++++++ 22 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-binarybot-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dbot-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-deriv-logo.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivgo-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivx-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dtrader-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-derived-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-financial-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-smarttrader-dashboard.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-binarybot-onboarding.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dbot-onboarding.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-deriv-logo.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-derivgo-onboarding.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dtrader-onboarding.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-smarttrader-onboarding.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-derived.svg create mode 100644 packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-financial.svg diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-binarybot-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-binarybot-dashboard.svg new file mode 100644 index 000000000000..a555382f5c45 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-binarybot-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dbot-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dbot-dashboard.svg new file mode 100644 index 000000000000..3f1e576c6825 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dbot-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-deriv-logo.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-deriv-logo.svg new file mode 100644 index 000000000000..203ed122a5a3 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-deriv-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivgo-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivgo-dashboard.svg new file mode 100644 index 000000000000..ef06cab7645a --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivgo-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivx-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivx-dashboard.svg new file mode 100644 index 000000000000..31089aa73a31 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-derivx-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dtrader-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dtrader-dashboard.svg new file mode 100644 index 000000000000..6c989793697c --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-dtrader-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-derived-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-derived-dashboard.svg new file mode 100644 index 000000000000..5ecf30a73e73 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-derived-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-financial-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-financial-dashboard.svg new file mode 100644 index 000000000000..c64623098b64 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-mt5-financial-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-smarttrader-dashboard.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-smarttrader-dashboard.svg new file mode 100644 index 000000000000..e10f9f56fc3b --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/ic-branding-smarttrader-dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-binarybot-onboarding.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-binarybot-onboarding.svg new file mode 100644 index 000000000000..5478774babb3 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-binarybot-onboarding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dbot-onboarding.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dbot-onboarding.svg new file mode 100644 index 000000000000..e1ecd68c45e9 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dbot-onboarding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-deriv-logo.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-deriv-logo.svg new file mode 100644 index 000000000000..b157b4362f0c --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-deriv-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-derivgo-onboarding.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-derivgo-onboarding.svg new file mode 100644 index 000000000000..ace8575f974e --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-derivgo-onboarding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dtrader-onboarding.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dtrader-onboarding.svg new file mode 100644 index 000000000000..faf106fc354a --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-dtrader-onboarding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-smarttrader-onboarding.svg b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-smarttrader-onboarding.svg new file mode 100644 index 000000000000..666b9698a0bc --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/branding/onboarding/ic-branding-smarttrader-onboarding.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-derived.svg b/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-derived.svg new file mode 100644 index 000000000000..a0ed028c8e84 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-derived.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-financial.svg b/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-financial.svg new file mode 100644 index 000000000000..7fc4246450e9 --- /dev/null +++ b/packages/appstore/src/assets/svgs/trading-platform/ic-brand-mt5-financial.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/appstore/src/assets/svgs/trading-platform/index.tsx b/packages/appstore/src/assets/svgs/trading-platform/index.tsx index c8f3c02b54dc..3a44744e6050 100644 --- a/packages/appstore/src/assets/svgs/trading-platform/index.tsx +++ b/packages/appstore/src/assets/svgs/trading-platform/index.tsx @@ -1,21 +1,30 @@ import React from 'react'; -import BinaryBot from 'Assets/svgs/trading-platform/ic-brand-binarybot.svg'; +import BinaryBot from 'Assets/svgs/trading-platform/branding/ic-branding-binarybot-dashboard.svg'; import BinaryBotBlue from 'Assets/svgs/trading-platform/ic-appstore-binarybot-blue.svg'; -import DBot from 'Assets/svgs/trading-platform/ic-brand-dbot.svg'; +import DBot from 'Assets/svgs/trading-platform/branding/ic-branding-dbot-dashboard.svg'; import Demo from 'Assets/svgs/trading-platform/ic-brand-demo.svg'; -import Derived from 'Assets/svgs/trading-platform/ic-appstore-derived.svg'; -import DerivGo from 'Assets/svgs/trading-platform/ic-brand-derivgo.svg'; +import Derived from 'Assets/svgs/trading-platform/branding/ic-branding-mt5-derived-dashboard.svg'; +import DerivGo from 'Assets/svgs/trading-platform/branding/ic-branding-derivgo-dashboard.svg'; import DerivGoBlack from 'Assets/svgs/trading-platform/ic-appstore-derivgo-black.svg'; -import DerivLogo from 'Assets/svgs/trading-platform/ic-appstore-deriv-logo.svg'; +import DerivLogo from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-deriv-logo.svg'; import DerivTradingLogo from 'Assets/svgs/trading-platform/ic-appstore-deriv-trading-logo.svg'; -import DerivX from 'Assets/svgs/trading-platform/ic-appstore-derivx.svg'; +import DerivX from 'Assets/svgs/trading-platform/branding/ic-branding-derivx-dashboard.svg'; import DropDown from 'Assets/svgs/trading-platform/drop-down.svg'; -import DTrader from 'Assets/svgs/trading-platform/ic-brand-dtrader.svg'; -import Financial from 'Assets/svgs/trading-platform/ic-appstore-financial.svg'; +import DTrader from 'Assets/svgs/trading-platform/branding/ic-branding-dtrader-dashboard.svg'; +import Financial from 'Assets/svgs/trading-platform/branding/ic-branding-mt5-financial-dashboard.svg'; import Options from 'Assets/svgs/trading-platform/ic-appstore-options.svg'; -import SmartTrader from 'Assets/svgs/trading-platform/ic-brand-smarttrader.svg'; +import SmartTrader from 'Assets/svgs/trading-platform/branding/ic-branding-smarttrader-dashboard.svg'; import SmartTraderBlue from 'Assets/svgs/trading-platform/ic-appstore-smarttrader-blue.svg'; import CFDs from 'Assets/svgs/trading-platform/ic-appstore-cfds.svg'; +import DBotRebranding from 'Assets/svgs/trading-platform/ic-brand-dbot.svg'; +import DerivGoRebranding from 'Assets/svgs/trading-platform/ic-brand-derivgo.svg'; +import MT5DerivedRebranding from 'Assets/svgs/trading-platform/ic-brand-mt5-derived.svg'; +import MT5FinancialRebranding from 'Assets/svgs/trading-platform/ic-brand-mt5-financial.svg'; +import DTraderOnboarding from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-dtrader-onboarding.svg'; +import BinaryBotOnboarding from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-binarybot-onboarding.svg'; +import DBotOnboarding from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-dbot-onboarding.svg'; +import DerivGoOnboarding from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-derivgo-onboarding.svg'; +import SmartTraderOnboarding from 'Assets/svgs/trading-platform/branding/onboarding/ic-branding-smarttrader-onboarding.svg'; import { IconProps } from '../icon-types'; export const PlatformIcons = { @@ -36,6 +45,15 @@ export const PlatformIcons = { SmartTrader, SmartTraderBlue, CFDs, + DBotRebranding, + DerivGoRebranding, + MT5DerivedRebranding, + MT5FinancialRebranding, + DTraderOnboarding, + BinaryBotOnboarding, + DBotOnboarding, + DerivGoOnboarding, + SmartTraderOnboarding, }; const TradingPlatformIcon = ({ icon, className, size, onClick }: IconProps) => { diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.tsx b/packages/appstore/src/components/onboarding-new/static-dashboard.tsx index 862c26bcd9d6..c7c116daeec9 100644 --- a/packages/appstore/src/components/onboarding-new/static-dashboard.tsx +++ b/packages/appstore/src/components/onboarding-new/static-dashboard.tsx @@ -259,7 +259,7 @@ const StaticDashboard = ({ {eu_user ? (
Date: Sun, 12 Feb 2023 17:48:05 +0330 Subject: [PATCH 2/3] fix: changed deriv logo in header --- .../src/App/Containers/Layout/header/trading-hub-header.jsx | 5 +++-- .../SvgComponents/header/deriv-rebranding-logo-dark.svg | 1 + .../Assets/SvgComponents/header/deriv-rebranding-logo.svg | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg create mode 100644 packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo.svg diff --git a/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx b/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx index 3b259040ce00..de8f7b37b972 100644 --- a/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx +++ b/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx @@ -10,8 +10,9 @@ import platform_config from 'App/Constants/platform-config'; import ToggleMenuDrawer from 'App/Components/Layout/Header/toggle-menu-drawer.jsx'; import { connect } from 'Stores/connect'; import { BinaryLink } from 'App/Components/Routes'; -import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-brand-logo.svg'; -import DerivBrandLogoDark from 'Assets/SvgComponents/header/deriv-brand-logo-dark.svg'; +// import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-brand-logo.svg'; +import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-rebranding-logo.svg'; +import DerivBrandLogoDark from 'Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg'; import RealAccountSignup from 'App/Containers/RealAccountSignup'; import CurrencySelectionModal from '../../CurrencySelectionModal'; diff --git a/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg b/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg new file mode 100644 index 000000000000..bd3155613231 --- /dev/null +++ b/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo.svg b/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo.svg new file mode 100644 index 000000000000..bd3155613231 --- /dev/null +++ b/packages/core/src/Assets/SvgComponents/header/deriv-rebranding-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file From 085143c5caebf54199aae66c09a6688d530701ec Mon Sep 17 00:00:00 2001 From: Hirad Date: Mon, 13 Feb 2023 11:30:50 +0330 Subject: [PATCH 3/3] fix: made changes according to recommendations --- packages/appstore/src/modules/onboarding/onboarding.scss | 2 +- .../src/App/Containers/Layout/header/trading-hub-header.jsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/appstore/src/modules/onboarding/onboarding.scss b/packages/appstore/src/modules/onboarding/onboarding.scss index d08670370ed9..7a7b8e3273d5 100644 --- a/packages/appstore/src/modules/onboarding/onboarding.scss +++ b/packages/appstore/src/modules/onboarding/onboarding.scss @@ -1,7 +1,7 @@ .onboarding-wrapper { display: flex; flex-direction: column; - background-color: $color-grey-4; + background-color: var(--general-hover); height: inherit; .onboarding-header { display: flex; diff --git a/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx b/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx index de8f7b37b972..382af39b377f 100644 --- a/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx +++ b/packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx @@ -10,7 +10,6 @@ import platform_config from 'App/Constants/platform-config'; import ToggleMenuDrawer from 'App/Components/Layout/Header/toggle-menu-drawer.jsx'; import { connect } from 'Stores/connect'; import { BinaryLink } from 'App/Components/Routes'; -// import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-brand-logo.svg'; import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-rebranding-logo.svg'; import DerivBrandLogoDark from 'Assets/SvgComponents/header/deriv-rebranding-logo-dark.svg'; import RealAccountSignup from 'App/Containers/RealAccountSignup';