This repository was archived by the owner on May 20, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 183
fiona / Change margin to CFDs #1841
Merged
Merged
Changes from all commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
71ddee0
add markets available for CFD trading
9e02ed5
add start trading CFDs on deriv section
8349fdc
add styling for cfd page sections
c588c13
add more CFDs page sections
5d933c0
add cfd page
f445598
change margin to cfd
cc78b5e
update margin to cfds
9a06d4c
minify svg file
4df4237
fix: missing s and currencies
91137ae
triger deployment
70f9936
trigger deployment
71be709
update margin-calculator link
948bbc5
fix: spacing on title
e17e70d
align checklist icon with titles in responsive mode
b3caa1e
remove real Deriv X
398daf4
update text
53afadf
remove extra space
1501d78
change margin and swap calculator
193ec64
implement pr changes
6fc3c1a
delete fragment
e06090b
add redirect to cfds page
85683c3
redirect margin to cfds
854afc1
add markets available for CFD trading
2361b78
add start trading CFDs on deriv section
a2e50ca
add styling for cfd page sections
9c7a873
add more CFDs page sections
7920bea
add cfd page
6708f31
change margin to cfd
9c23013
update margin to cfds
d616656
minify svg file
438b5e7
fix: missing s and currencies
680bedb
update margin-calculator link
e4d617c
fix: spacing on title
3aff213
align checklist icon with titles in responsive mode
3a7e8e9
remove real Deriv X
5f17f70
update text
2ce156e
remove extra space
eba370c
change margin and swap calculator
c7e888d
implement pr changes
4e2c33f
delete fragment
c8fa78d
add redirect to cfds page
7914c13
redirect margin to cfds
bb08c2f
remove unused import
e942dc5
resolve conflicts
4824bde
resolve conflicts
290b665
delete margin folder
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ import DTrader from 'images/svg/dtrader-icon.svg' | |
import Forex from 'images/svg/forex-nav.svg' | ||
import Help from 'images/svg/menu/help-center.svg' | ||
import Leadership from 'images/svg/menu/leadership.svg' | ||
import MarginTrading from 'images/svg/margin-trading-nav.svg' | ||
import CFD from 'images/svg/margin-trading-nav.svg' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The image name and Variable name is not similar. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as here... |
||
import Multipliers from 'images/svg/multipliers-nav.svg' | ||
import Options from 'images/svg/options-nav.svg' | ||
import Partner from 'images/svg/menu/partner.svg' | ||
|
@@ -151,21 +151,16 @@ export const OffCanvasMenuWrapper = (props) => { | |
</Text> | ||
<Flex mb="2rem"> | ||
<NavCard | ||
aria_label="Margin trading" | ||
aria_label="CFDs" | ||
icon={() => ( | ||
<img | ||
src={MarginTrading} | ||
alt="MarginTrading" | ||
width="32" | ||
height="32" | ||
/> | ||
<img src={CFD} alt="CFDs" width="32" height="32" /> | ||
)} | ||
content={ | ||
<Localize translate_text="Trade with leverage and low spreads for better returns on successful trades." /> | ||
<Localize translate_text="Trade with leverage and tight spreads for better returns on successful trades." /> | ||
} | ||
title={<Localize translate_text="Margin trading" />} | ||
title={<Localize translate_text="CFDs" />} | ||
onClick={handleArrowClick} | ||
to="/trade-types/margin/" | ||
to="/trade-types/cfds/" | ||
/> | ||
</Flex> | ||
{!is_eu_country && ( | ||
|
@@ -201,7 +196,7 @@ export const OffCanvasMenuWrapper = (props) => { | |
/> | ||
)} | ||
content={ | ||
<Localize translate_text="Combine the upside of margin trading with the simplicity of options." /> | ||
<Localize translate_text="Combine the upside of CFDs with the simplicity of options." /> | ||
} | ||
title={<Localize translate_text="Multipliers" />} | ||
onClick={handleArrowClick} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The image name and Variable name is not similar.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Omitted this since I was resolving the same in the image house-keeping task