Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hirad - Shon Tzu/Feature: Branding/87860 #7583

Merged
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
8365f7b
Merge branch 'master' of https://github.com/binary-com/deriv-app
hirad-deriv Feb 12, 2023
9ee24df
fix: initializing
hirad-deriv Feb 12, 2023
710d996
fix: added the necessary icons
hirad-deriv Feb 12, 2023
7afcaea
fix: rebranding of traders-hub and onboarding
hirad-deriv Feb 12, 2023
ffba07d
fix: changed deriv logo in header
hirad-deriv Feb 12, 2023
085143c
fix: made changes according to recommendations
hirad-deriv Feb 13, 2023
47efa4d
Merge pull request #4 from hirad-rewok/Hirad/87866/rebranding-onboard…
hirad-deriv Feb 13, 2023
0010b64
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Feb 13, 2023
5709aaa
fix: changed cfds and modals icons
hirad-deriv Feb 13, 2023
6130e55
fix: added new icons for menu
hirad-deriv Feb 13, 2023
544eab6
Merge branch 'feature-rebranding/87860' of github.com:hirad-rewok/der…
shontzu-deriv Feb 21, 2023
318e3df
fix: fixing the prop types error
shontzu-deriv Feb 21, 2023
43fdd47
Revert "fix: transfer_to_cashier_error (#7547)"
shontzu-deriv Feb 21, 2023
60056cc
fix: cleaner rebranding attempt
shontzu-deriv Feb 21, 2023
315acd0
fix: trader hub header logo
shontzu-deriv Feb 21, 2023
41fa728
fix: dark mode in traders hub
shontzu-deriv Feb 21, 2023
83d8578
fix: made logo size in headers consistent
shontzu-deriv Feb 21, 2023
45ecc67
fix: revert link_to back to href in platform-config that broke the na…
shontzu-deriv Feb 21, 2023
32fc09e
fix: remove unnecesary code in platform-config
shontzu-deriv Feb 22, 2023
71c00f5
fix: one line
shontzu-deriv Feb 22, 2023
a77c033
fix: changed icon naming for dark and light mode and added PropTypes …
shontzu-deriv Feb 22, 2023
00a6ac1
fix: pulled from main branch
hirad-deriv Feb 22, 2023
73e472d
Merge pull request #5 from hirad-rewok/Hirad/87862/CFDs-rebranding
hirad-deriv Feb 22, 2023
fded575
refactor: update the color using var keyword in the svg file to autom…
shontzu-deriv Feb 22, 2023
8335e37
fix: invisible icon text, use currentColor instead of var in svg
shontzu-deriv Feb 22, 2023
7e52d7e
revert: reverted last 2 commits that cause icon issues
shontzu-deriv Feb 23, 2023
ae451eb
fix: pulled from the main branch and resolved the conflicts
shontzu-deriv Feb 23, 2023
f2a5fc6
Merge pull request #8 from shontzu-deriv/shontzu/87863/deriv-navigati…
hirad-deriv Feb 23, 2023
76acb67
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
hirad-deriv Feb 23, 2023
f3a3fa5
Merge branch 'master' into feature-rebranding/87860
hirad-deriv Feb 23, 2023
dbaf04e
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Feb 23, 2023
c0c0cdd
fix: testing the branch
shontzu-deriv Feb 23, 2023
587ef0f
fix: removed the redundant smart trader
shontzu-deriv Feb 23, 2023
e892aec
fix: replacing the redundant icons
shontzu-deriv Feb 23, 2023
4d7bd29
Merge branch 'master' of github.com:binary-com/deriv-app into Hirad-S…
shontzu-deriv Feb 24, 2023
cbcada2
fix: fixed all of the issues with rebranding icons
shontzu-deriv Feb 24, 2023
88c4d52
Merge branch 'master' into Hirad-Shontzu/89199/Rebranding-improvements
shontzu-deriv Feb 24, 2023
9affd61
Merge branch 'master' into feature-rebranding/87860
hirad-deriv Feb 24, 2023
b34dcc2
Merge branch 'feature-rebranding/87860' of github.com:hirad-rewok/der…
shontzu-deriv Feb 24, 2023
b189a2b
fix: removed the duplicate icons
shontzu-deriv Feb 24, 2023
63733b7
fix: removed dark mode icons and used one icon for both light and dar…
shontzu-deriv Feb 24, 2023
af32c45
fix: pulled from master
Feb 27, 2023
770c234
Merge branch 'feature-rebranding/87860' of github.com:hirad-rewok/der…
shontzu-deriv Feb 27, 2023
7cb6bff
fix: fixed the circle ci issues
shontzu-deriv Feb 27, 2023
363feda
Merge pull request #11 from shontzu-deriv/Hirad-Shontzu/89199/Rebrand…
hirad-deriv Feb 28, 2023
977d56e
fix: change D initials to Deriv and swap colors for real and demo in …
shontzu-deriv Mar 1, 2023
34895b1
refactor: change the wallet balance color based on account type(demo/…
shontzu-deriv Mar 2, 2023
25a22f7
refactor: removed unused code
shontzu-deriv Mar 2, 2023
1371c58
fix: made changes based on reviews
shontzu-deriv Mar 2, 2023
25d8c12
refactor: removed unnecesary !important property
shontzu-deriv Mar 2, 2023
6b56a91
Merge pull request #12 from shontzu-deriv/shontzu/89711/update-name-a…
hirad-deriv Mar 2, 2023
8fb3e9d
fix: fixed conflicts with the main branch
hirad-deriv Mar 3, 2023
ab4a115
fix: fixed all of the conflicts
hirad-deriv Mar 3, 2023
13e4f1b
fix: made changes according to the recommendations
hirad-deriv Mar 6, 2023
add9c6f
refactor: fixed dark mode handling for icons
shontzu-deriv Mar 6, 2023
66742bd
fix: removed all of the redundant icons
hirad-deriv Mar 6, 2023
e7c594a
fix: removed the redundant test case
hirad-deriv Mar 6, 2023
09876a4
fix: made changes to dxtrade icon
hirad-deriv Mar 6, 2023
2b57425
revert: reverted the test case for dark mode that was deleted
shontzu-deriv Mar 6, 2023
c8a27c9
fix: changed the color of cross icon in the onboarding page
hirad-deriv Mar 6, 2023
b23dcee
Merge pull request #13 from hirad-rewok/Hirad/89900/fixing-rebranding…
hirad-deriv Mar 6, 2023
52782e7
Merge branch 'feature-rebranding/87860' of github.com:hirad-rewok/der…
shontzu-deriv Mar 6, 2023
97b17fd
fix: pulled from main branch and rebuilt project
shontzu-deriv Mar 6, 2023
30dce1e
fix: remove unused is_dark_mode props
shontzu-deriv Mar 6, 2023
0fd05d7
fix: remove mock connect store and props from test cases
shontzu-deriv Mar 7, 2023
b955c28
Merge pull request #15 from shontzu-deriv/shontzu/89899/refactor-dark…
hirad-deriv Mar 7, 2023
06bb054
Merge branch 'master' of https://github.com/hirad-rewok/deriv-app int…
hirad-deriv Mar 7, 2023
e15341b
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Mar 7, 2023
de29324
fix: fixed the code smell related to the cashier provider store
hirad-deriv Mar 7, 2023
e680fb2
fix: removed deriv-apps redundant icon
hirad-deriv Mar 7, 2023
3a149c4
fix: added description tags in icons for screenreader
shontzu-deriv Mar 7, 2023
d60b894
refactor: refactor based on review
shontzu-deriv Mar 7, 2023
25ceeda
refactor: added comments on the purpose of the <desc> tag
shontzu-deriv Mar 7, 2023
9c877ed
fix: forgot to change prop name
shontzu-deriv Mar 7, 2023
fc7e52e
fix: minified one icon
shontzu-deriv Mar 7, 2023
8119359
fix: remove unnecesary curly braces
shontzu-deriv Mar 7, 2023
60bc9ed
Round-up patches based on review
shontzu-deriv Mar 7, 2023
2ed304d
Merge branch 'shontzu/89899/refactor-dark-mode-handling' of github.co…
shontzu-deriv Mar 7, 2023
6643df4
fix: fix wrong colors in demo and real
shontzu-deriv Mar 7, 2023
96e7090
Merge pull request #16 from shontzu-deriv/shontzu/89899/refactor-dark…
hirad-deriv Mar 8, 2023
71d78d7
Merge branch 'master' into feature-rebranding/87860
matin-deriv Mar 8, 2023
462a744
Merge branch 'master' of https://github.com/hirad-rewok/deriv-app int…
hirad-deriv Mar 14, 2023
826aff2
Merge branch 'master' into feature-rebranding/87860
hirad-deriv Mar 14, 2023
450c8df
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Mar 14, 2023
98a2787
Merge branch 'master' of https://github.com/hirad-rewok/deriv-app int…
hirad-deriv Mar 15, 2023
572e2b0
fix: fixed the alignment issue if deriv logo in traders-hub dashboard
hirad-deriv Mar 15, 2023
f213fe1
fix: update deriv icon in footer
shontzu-deriv Mar 15, 2023
7bf37e7
fix: update DerivX icon
shontzu-deriv Mar 15, 2023
e5f92a0
fix: added new icons to transfer page of cashier
hirad-deriv Mar 15, 2023
d5f4110
fix: udpate test cases
shontzu-deriv Mar 15, 2023
d893e3a
Merge pull request #20 from hirad-rewok/Hirad/90841/deriv-icon-alignment
hirad-deriv Mar 15, 2023
a2ae751
fix: remove redundatnt test case
shontzu-deriv Mar 16, 2023
6c15536
fix: change account_type to all in test case
shontzu-deriv Mar 16, 2023
80fc8f8
Merge pull request #21 from shontzu-deriv/shontzu/90842/update-deriv-…
hirad-deriv Mar 16, 2023
516cb5d
fix: resolved the conflicts
hirad-deriv Mar 16, 2023
017de2b
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Mar 16, 2023
86956de
fix: increased the floatPrecision of svg-loader
hirad-deriv Mar 16, 2023
a041dac
Merge pull request #22 from shontzu-deriv/shontzu/90837/update-derivx…
hirad-deriv Mar 16, 2023
b2f35b7
Merge branch 'master' into feature-rebranding/87860
hirad-deriv Mar 16, 2023
95f93a4
fix: changed the icon of cashier transfer page for derivx
hirad-deriv Mar 16, 2023
ad81b8e
fix: fix unit test in cfd-download-container
shontzu-deriv Mar 17, 2023
1c8bd59
Merge pull request #23 from shontzu-deriv/feature-rebranding
hirad-deriv Mar 17, 2023
39e76c9
feat: new branding for email and passwords page
shontzu-deriv Mar 17, 2023
941ddaf
fix: pulled from master and resolved the conflicts
hirad-deriv Mar 20, 2023
51d7421
Merge branch 'feature-rebranding/87860' of https://github.com/hirad-r…
hirad-deriv Mar 20, 2023
28f5d08
fix: update favicon
shontzu-deriv Mar 21, 2023
7cdc6e5
fix: updated favicons in core
shontzu-deriv Mar 21, 2023
deb4a36
fix: updated favicons in trader and cfd packages
shontzu-deriv Mar 21, 2023
8924b36
fix: remove -copy suffix from icon names
shontzu-deriv Mar 21, 2023
842ac57
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
hirad-deriv Mar 23, 2023
d297a97
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
hirad-deriv Mar 24, 2023
cb246a9
revert: revert to old DerivX icon for non-tradershub pages
shontzu-deriv Mar 24, 2023
4ead796
fix: fixed the white line issue of icons by adding the new ones
hirad-deriv Mar 24, 2023
c32d2d9
Merge pull request #24 from shontzu-deriv/shontzu/91144/new-branding-…
hirad-deriv Mar 24, 2023
d096144
revert: undo favicon changes in cfd and trader packages
shontzu-deriv Mar 24, 2023
3648fb4
Merge pull request #25 from shontzu-deriv/shontzu/91366/update-favico…
hirad-deriv Mar 24, 2023
13f499a
Merge branch 'master' into feature-rebranding/87860
hirad-deriv Mar 24, 2023
8c4d12a
fix: Resolved conflicts
hirad-deriv Mar 31, 2023
f7819f6
fix: fixed the icon size of deriv logo in trader's hub
hirad-deriv Apr 4, 2023
0c22196
fix: pulled from main branch
hirad-deriv Apr 4, 2023
e508c8f
fix: alignment of deriv logo in onboarding page
shontzu-deriv Apr 5, 2023
9d3afca
remove comment
shontzu-deriv Apr 5, 2023
522f82f
style: use rem instead of %
shontzu-deriv Apr 6, 2023
2369c86
fix: fixed the conflicts
hirad-deriv Apr 6, 2023
3367889
Merge pull request #29 from shontzu-deriv/shontzu/92652/deriv-logo-ov…
hirad-deriv Apr 6, 2023
a3b8961
fix: update derivx logo in cashier page and trade modal
shontzu-deriv Apr 6, 2023
b5b9be0
Merge pull request #30 from shontzu-deriv/shontzu/92638/update-derivx…
hirad-deriv Apr 6, 2023
d5f09bb
fix: derivx icon in trade terminal
shontzu-deriv Apr 11, 2023
5ecc4a4
fix: localize icon description
shontzu-deriv Apr 11, 2023
ce40849
Merge pull request #31 from shontzu-deriv/shontzu/93021/derivX-web-te…
hirad-deriv Apr 11, 2023
868060f
fix: deriv logo alignment in onboarding page
shontzu-deriv Apr 12, 2023
c81d521
Merge pull request #32 from shontzu-deriv/shontzu/93107/deriv-logo-al…
hirad-deriv Apr 12, 2023
69ae866
fix: fixed aliasing in smarttrader and binarybot icons
shontzu-deriv Apr 13, 2023
24f21cf
fix: aliased icons in email-and-passwords page
shontzu-deriv Apr 13, 2023
77be875
fix: options icon dark and light mode
shontzu-deriv Apr 13, 2023
1dc82ab
Merge pull request #33 from shontzu-deriv/shontzu/93111/smarttrader-a…
hirad-deriv Apr 14, 2023
77553e8
fix: pulled from master
hirad-deriv Apr 14, 2023
63419fa
fix: fixing merge conflicts
hirad-deriv Apr 14, 2023
0c78bc0
fix: derivx logo in trade modal, transfer modal, and cashier
shontzu-deriv Apr 14, 2023
d373ec7
fix: minify icon
shontzu-deriv Apr 14, 2023
13c8314
Merge pull request #34 from shontzu-deriv/shontzu/derivx-logo-in-cash…
hirad-deriv Apr 14, 2023
48658c2
fix: scaled down deriv logo in onboarding page
shontzu-deriv Apr 19, 2023
2e962da
Merge pull request #35 from shontzu-deriv/shontzu/93107/deriv-logo-al…
hirad-deriv Apr 19, 2023
611d96a
fix: made latest changes for rebranding
hirad-deriv Apr 20, 2023
8085acd
fix: pulled the latest changes
hirad-deriv Apr 20, 2023
176ab7a
fix: finishing the improvement cards for rebranding
hirad-deriv Apr 25, 2023
0063448
fix: changed font colors
hirad-deriv Apr 25, 2023
84852c4
fix: added the demo content to our label
hirad-deriv Apr 25, 2023
a17662f
fix: removed the demo from deriv platforms
hirad-deriv Apr 25, 2023
fed5898
fix: pulled from master
hirad-deriv Apr 25, 2023
e8d68a1
fix: replaced account type and currency in the currency switcher
hirad-deriv Apr 26, 2023
b81542e
Merge branch 'master' into feature-rebranding/87860
matin-deriv Apr 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('<SelfExclusionArticleContent />', () => {
let mock_context = {};
const descr_text = 'About trading limits and self-exclusion';
const eu_item =
'When you set your limits or self-exclusion, they will be aggregated across all your account types in DTrader and DBot. For example, the losses made on both platforms will add up and be counted towards the loss limit you set.';
'When you set your limits or self-exclusion, they will be aggregated across all your account types in Deriv Trader and Deriv Bot. For example, the losses made on both platforms will add up and be counted towards the loss limit you set.';
const eu_uk_item =
'These trading limits are optional, and you can strengthen them at any time. If you don’t wish to set a specific limit, leave the field blank. If you live in the United Kingdom, Customer Support can only remove or weaken your trading limits after 24 hours of receiving the request. If you live in the Isle of Man, Customer Support can only remove or weaken your trading limits after your trading limit period has expired.';
const not_app_settings_eu_descr =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('<SelfExclusionArticle />', () => {
const eu_item =
/these trading limits and self-exclusion help you control the amount of money and time you spend on deriv.com and exercise/i;
const non_eu_item =
/these self-exclusion limits help you control the amount of money and time you spend trading on dtrader, dbot, smarttrader and binary bot on deriv. the limits you set here will help you exercise/i;
/these self-exclusion limits help you control the amount of money and time you spend trading on deriv trader, deriv bot, smarttrader and binary bot on deriv. the limits you set here will help you exercise/i;

beforeEach(() => {
mock_platform_context = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const PasswordsPlatform = ({ email, has_dxtrade_accounts, has_mt5_accounts }) =>
</Text>
<div className='passwords-platform__content'>
<Popover alignment='bottom' message='Deriv MT5'>
<Icon icon='IcBrandDmt5' size={32} />
<Icon icon='IcRebrandingDmt5' size={32} />
</Popover>
<Button
className='account__passwords-footer-btn'
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading