Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Translation 1819 translations mt5 ib #5702

Merged
merged 76 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
68981ec
chore: empty commit
eduard-deriv Sep 27, 2023
e82205e
mt5 card
eduard-deriv Sep 27, 2023
2d3c8d4
chore: empty commit
eduard-deriv Sep 27, 2023
3945c60
chore: empty commit
eduard-deriv Sep 27, 2023
703cf17
chore: empty commit
eduard-deriv Sep 27, 2023
1a690dd
chore: empty commit
eduard-deriv Sep 27, 2023
076f8d6
chore: empty commit
eduard-deriv Sep 27, 2023
be83736
fix
eduard-deriv Sep 27, 2023
8a621c9
chore: empty commit
eduard-deriv Sep 27, 2023
e814804
chore: empty commit
eduard-deriv Sep 27, 2023
f21e853
chore: empty commit
eduard-deriv Sep 27, 2023
1bb10f6
4 items like on design
eduard-deriv Sep 28, 2023
48c1541
4 items like on design
eduard-deriv Sep 28, 2023
ec7f8cc
fix
eduard-deriv Sep 28, 2023
e8ad988
auto-pull-translation
eduard-deriv Sep 28, 2023
d5abae8
fix
eduard-deriv Sep 28, 2023
c255486
resolve conflicts
eduard-deriv Sep 28, 2023
0a1917b
auto-pull-translation
eduard-deriv Sep 28, 2023
0181e67
auto-pull-translation
eduard-deriv Sep 28, 2023
9c0b161
translation: 📚 sync translations from crowdin feature branch
DerivFE Sep 28, 2023
ef98eab
chore: empty commit
eduard-deriv Sep 28, 2023
a2c9c8c
chore: empty commit
eduard-deriv Sep 28, 2023
1fbe850
auto-pull-translation
eduard-deriv Sep 28, 2023
1d98c76
translation: 📚 sync translations from crowdin feature branch
DerivFE Sep 28, 2023
ea176f1
auto-pull-translation
eduard-deriv Sep 28, 2023
46e26c6
auto-pull-translation
eduard-deriv Sep 28, 2023
e5388bc
Merge branch 'translation-1819-translations-mt5-ib' of github.com:edu…
eduard-deriv Sep 28, 2023
a78c1d0
auto-pull-translation
eduard-deriv Sep 29, 2023
8b1e4a7
resolve conflicts
eduard-deriv Sep 29, 2023
e162c4a
auto-pull-translation
eduard-deriv Sep 29, 2023
04b3f61
auto-pull-translation
eduard-deriv Sep 29, 2023
687930e
auto-pull-translation
eduard-deriv Sep 29, 2023
50d3cb8
auto-pull-translation
eduard-deriv Sep 29, 2023
be27878
chore: empty commit
eduard-deriv Sep 29, 2023
244aaee
chore: empty commit
eduard-deriv Sep 29, 2023
7b877e6
chore: empty commit
eduard-deriv Sep 29, 2023
bee8026
chore: empty commit
eduard-deriv Sep 29, 2023
c999cac
auto-pull-translation
eduard-deriv Sep 29, 2023
2c8e2de
auto-pull-translation
eduard-deriv Sep 29, 2023
ddb7cf7
translation: 📚 sync translations from crowdin feature branch
DerivFE Sep 29, 2023
7133510
auto-pull-translation
eduard-deriv Sep 29, 2023
5f35578
Merge branch 'translation-1819-translations-mt5-ib' of github.com:edu…
eduard-deriv Sep 29, 2023
081ee44
auto-pull-translation
eduard-deriv Sep 29, 2023
f70a810
auto-pull-translation
eduard-deriv Sep 29, 2023
487409a
auto-pull-translation
eduard-deriv Sep 29, 2023
9bb05ec
resolve
eduard-deriv Sep 29, 2023
3004e79
auto-pull-translation
eduard-deriv Oct 2, 2023
57c6f7e
auto-pull-translation
eduard-deriv Oct 2, 2023
f799438
resolve conflicts
eduard-deriv Oct 2, 2023
1e252dd
chore: empty commit
eduard-deriv Oct 2, 2023
748549f
chore: empty commit
eduard-deriv Oct 2, 2023
ed57005
auto-pull-translation
eduard-deriv Oct 2, 2023
bb8d718
translation: 📚 sync translations from crowdin feature branch
DerivFE Oct 2, 2023
c35c84e
chore: empty commit
eduard-deriv Oct 2, 2023
39fdbaf
auto-pull-translation
eduard-deriv Oct 2, 2023
bb367b2
resolve conflicts
eduard-deriv Oct 3, 2023
f9def1e
fix
eduard-deriv Oct 3, 2023
bf4383a
fix
eduard-deriv Oct 3, 2023
59d6239
fix descr
eduard-deriv Oct 10, 2023
111f3aa
chore: empty commit
eduard-deriv Oct 10, 2023
19b9f81
chore: empty commit
eduard-deriv Oct 10, 2023
7993fb5
chore: empty commit
eduard-deriv Oct 10, 2023
fc40505
fixed content inside boxes
eduard-deriv Oct 10, 2023
6393adb
chore: empty commit
eduard-deriv Oct 10, 2023
3be214a
chore: empty commit
eduard-deriv Oct 10, 2023
776957c
chore: empty commit
eduard-deriv Oct 10, 2023
27e8701
chore: empty commit
eduard-deriv Oct 10, 2023
c0cbdc5
chore: empty commit
eduard-deriv Oct 10, 2023
dc164cd
chore: empty commit
eduard-deriv Oct 10, 2023
9904b09
auto-pull-translation
eduard-deriv Oct 10, 2023
36286dd
auto-pull-translation
eduard-deriv Oct 10, 2023
0994ee5
auto-pull-translation
eduard-deriv Oct 10, 2023
1b9c4ba
fix
eduard-deriv Oct 11, 2023
9c85d07
resolve conflicts
eduard-deriv Oct 11, 2023
8323864
chore: empty commit
eduard-deriv Oct 11, 2023
66ab18d
fix
eduard-deriv Oct 11, 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
64 changes: 32 additions & 32 deletions crowdin/messages.json

Large diffs are not rendered by default.

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.
Binary file added src/images/common/affiliate-and-ib/fin_oil.png
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.
Binary file added src/images/common/affiliate-and-ib/mt5_oil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/common/affiliate-and-ib/mt5_step.png
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.
437 changes: 363 additions & 74 deletions src/pages/partners/affiliate-ib/_deriv-ib-programme.tsx

Large diffs are not rendered by default.

129 changes: 78 additions & 51 deletions src/pages/partners/affiliate-ib/_dmt5-cards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,33 +76,76 @@ const query = graphql`
deriv_x_vol: file(relativePath: { eq: "affiliate-and-ib/deriv_x_vol.png" }) {
...fadeIn
}
mt5_forex: file(relativePath: { eq: "affiliate-and-ib/mt5_forex.png" }) {
...fadeIn
}
mt5_metal: file(relativePath: { eq: "affiliate-and-ib/mt5_metal.png" }) {
...fadeIn
}
mt5_oil: file(relativePath: { eq: "affiliate-and-ib/mt5_oil.png" }) {
...fadeIn
}
mt5_crypto: file(relativePath: { eq: "affiliate-and-ib/mt5_crypto.png" }) {
...fadeIn
}
mt5_stocks: file(relativePath: { eq: "affiliate-and-ib/mt5_stocks.png" }) {
...fadeIn
}
mt5_stock_indices: file(relativePath: { eq: "affiliate-and-ib/mt5_stock_indices.png" }) {
...fadeIn
}
mt5_volatility: file(relativePath: { eq: "affiliate-and-ib/mt5_volatility.png" }) {
...fadeIn
}
mt5_step: file(relativePath: { eq: "affiliate-and-ib/mt5_step.png" }) {
...fadeIn
}
derived_crash: file(relativePath: { eq: "affiliate-and-ib/derived_crash.png" }) {
...fadeIn
}
derived_jump: file(relativePath: { eq: "affiliate-and-ib/derived_jump.png" }) {
...fadeIn
}
derived_step: file(relativePath: { eq: "affiliate-and-ib/derived_step.png" }) {
...fadeIn
}
derived_volatility: file(relativePath: { eq: "affiliate-and-ib/derived_volatility.png" }) {
...fadeIn
}
fin_crypto: file(relativePath: { eq: "affiliate-and-ib/fin_crypto.png" }) {
...fadeIn
}
fin_forex: file(relativePath: { eq: "affiliate-and-ib/fin_forex.png" }) {
...fadeIn
}
fin_metal: file(relativePath: { eq: "affiliate-and-ib/fin_metal.png" }) {
...fadeIn
}
fin_oil: file(relativePath: { eq: "affiliate-and-ib/fin_oil.png" }) {
...fadeIn
}
fin_stock: file(relativePath: { eq: "affiliate-and-ib/fin_stock.png" }) {
...fadeIn
}
stp_forex: file(relativePath: { eq: "affiliate-and-ib/stp_forex.png" }) {
...fadeIn
}
stp_crypto: file(relativePath: { eq: "affiliate-and-ib/stp_crypto.png" }) {
...fadeIn
}
}
`

const StyledCard = styled(Card)`
min-height: 42.6rem;
height: 100%;
min-block-size: 42.6rem;
block-size: fit-content;
inline-size: 38.4rem;
position: relative;
border-radius: 0.8rem;
min-width: calc((100% - 4.8rem) / 3);
width: calc((100% - 4.8rem) / 3);
justify-content: flex-start;

:nth-child(2) {
margin: 1.6rem 2.4rem 0;

@media ${device.tabletL} {
margin: 2.4rem 0;
}
}

@media ${device.laptopM} {
min-width: 38.4rem;
width: 38.4rem;
}

@media ${device.tabletL} {
min-width: 32.8rem;
min-inline-size: 32.8rem;
padding: 1.6rem 1.6rem 0;
${(props) => props.tabletHeight && 'height:' + props.tabletHeight};

Expand All @@ -112,11 +155,12 @@ const StyledCard = styled(Card)`
}

@media ${device.mobileM} {
min-width: unset;
width: 100%;
min-inline-size: unset;
inline-size: 100%;
eduard-deriv marked this conversation as resolved.
Show resolved Hide resolved
${(props) => props.mobileHeight && 'height:' + props.mobileHeight};
}
`

const CardWrappers = styled(Flex)`
min-height: 33.8rem;
flex-direction: column;
Expand All @@ -131,7 +175,7 @@ const CardText = styled(Text)`
`
const AccordionWrapper = styled.div`
max-width: 99.6rem;
width: fit-content;
width: 100%;
eduard-deriv marked this conversation as resolved.
Show resolved Hide resolved
margin: 0 auto;
position: relative;
z-index: 2;
Expand Down Expand Up @@ -285,36 +329,19 @@ const DMT5Cards = ({ data }: DMT5Props) => {
))}
</Accordion>
</AccordionWrapper>
{data.countDetails.map((valueCalc, indexCalc) => (
<Flex key={indexCalc} direction="column" ai="flex-start" height="auto">
{valueCalc.disclaimer &&
valueCalc.disclaimer.map((valueNotes, notesIndex) => (
<Flex
direction="column"
ai="flex-start"
height="auto"
style={{
borderTop: '0.1rem solid var(--color-grey-21)',
}}
key={notesIndex}
>
<Header
type="main-paragraph"
as="p"
mt="1.4rem"
mb="0.8rem"
>
<Localize translate_text={valueNotes.title} />
</Header>
<Header type="main-paragraph" as="p" mb="0.8rem">
<Localize
translate_text={valueNotes.desc.firstText}
/>
</Header>
</Flex>
))}
</Flex>
))}
<Flex
style={{ borderTop: '0.1rem solid var(--color-grey-21)' }}
direction="column"
ai="flex-start"
height="auto"
>
<Header type="main-paragraph" as="p" mt="1.4rem" mb="0.8rem">
<Localize translate_text="_t_Disclaimer:_t_" />
</Header>
<Header type="main-paragraph" as="p" mb="0.8rem">
<Localize translate_text="_t_This plan is not available for IBs who promote to clients residing in the EU._t_" />
</Header>
</Flex>
</CardWrappers>
<HowItsCalculate>
<StyledButton flat onClick={toggleCalculated} className="calculated">
Expand Down
Loading
Loading