Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries #1888

mahdiyeh-deriv · 2021-07-07T08:37:01Z

Changes:

...

Type of change

vercel · 2021-07-07T08:37:05Z

@mahdiyeh-fs is attempting to deploy a commit to the Deriv Team on Vercel.

A member of the Team first needs to authorize it.

vercel · 2021-07-07T10:09:02Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/deriv/deriv-com/6haFacNyR7wssBsYPUyo8g4ik862
✅ Preview: https://deriv-com-git-fork-mahdiyeh-fs-fixcomparemt5accoutscontent.binary.sx

github-actions · 2021-07-07T10:21:37Z

⚡️ Lighthouse report for the changes in this PR:

Category	Score
🟠 Performance	50
🟢 Accessibility	98
🟢 Best practices	93
🟠 SEO	85
🟠 PWA	75

Lighthouse ran on https://deriv-com-git-fork-mahdiyeh-fs-fixcomparemt5accoutscontent.binary.sx/

ghost · 2021-07-09T07:06:27Z

src/pages/dmt5/_flexibility.js

                    return (
-                        <ClientCard key={idx}>
+                        <ClientCard key={idx} style={{display : show_content ? 'block' : 'none'}}>


Please pass the styles in as props into the styled component ClientCard on line 61 instead of inline styling.

ghost · 2021-07-09T07:08:55Z

src/pages/dmt5/_flexibility.js

+                    let show_content = false
+
+                    if (item.show_eu !== undefined) {
+                        if(is_eu_country) {
+                            show_content = item.show_eu
+                        } else {
+                            show_content = !item.show_eu
+                        }
+                    } else {
+                        show_content = true
+                    }
+


Instead of this doing nested logic here. Can we just do conditional checks such that is_eu_country ? <RenderOurEuComponent /> : <RenderOurNonEuComponent />?

ghost · 2021-07-09T07:10:06Z

Any text changes that require translations will need to be branched of Crowdin branch. You can rebase this branch to Crowdin.

ghost

Rest LGTM 👍

ghost · 2021-07-12T02:13:05Z

src/pages/dmt5/_flexibility.js

    },
    {
        header: <Localize translate_text="Financial" />,
        text: (
-            <Localize translate_text="Trade major (standard and micro-lots) and minor currency pairs, commodities, cryptocurrencies, and stocks & indices with high leverage." />
+            <Localize translate_text=" Trade major (standard and micro-lots) and minor currency pairs, stocks, stock indices, commodities, and cryptocurrencies." />


Suggested change

<Localize translate_text=" Trade major (standard and micro-lots) and minor currency pairs, stocks, stock indices, commodities, and cryptocurrencies." />

<Localize translate_text="Trade major (standard and micro-lots) and minor currency pairs, stocks, stock indices, commodities, and cryptocurrencies." />

Might have been a typo here.

right, fixed

…1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo

* Kevin/update stock indices to stocks and indices on header, footer, and market (#1826) * update stock indices to stocks and indices on header, footer, and market * add dev comments * Nuri/Feat : Deriv x seo changes (#1875) * p added seo for Deriv X pages * added back h2 to what is deriv x text * Suthesh/add-jump-indices (#1856) * added new metals, energy and jump indices * minimised svg * fiona / Change margin to CFDs (#1841) * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * triger deployment * trigger deployment * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * remove unused import * delete margin folder Co-authored-by: fiona-deriv <[email protected]> * Amina/Footer update (#1910) * pass_variables_to_footer_text * messages.json-extract * Revert "messages.json-extract" This reverts commit 1bb1e61. revert messages.json * suthesh/update-translations-crowdin (#1911) * added new strings for translations * added strings from Amina's PR * downloaded latest translations (incomplete) * Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries (#1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo * Al-amin/35136/Deriv p2p landing page update (#1906) * updating Deriv P2P landing page * added Deriv P2P articles on Help centre * address PR comment * addressed QA comments * handle youtube video mobile view * updated P2P numbers card * updated the iframe mobile view * addressed PR comment * nikolai.berestevich/text/update numbers on story page (#1917) Co-authored-by: Nikolai Berestevich <[email protected]> * change sentences (#1916) * added comma and updated crowdin platform (#1983) * replace bet with speculate (#1977) * enable derivx cfd in non eu country (#1970) * Kevin/DMT5 Signal change text content (#1951) * change text content * fix typo * Revert "Kevin/DMT5 Signal change text content (#1951)" (#1989) This reverts commit d30b025. * update hyperlink with second branch (#1941) * Revert "update hyperlink with second branch (#1941)" (#1991) This reverts commit f7c542f. * downloaded latest translations (#1999) * Suthesh/update crowdin hotfix (#2002) * extracted and uploaded * downloaded latest translations * removed space (#2006) * downloaded latest translations (#2012) * Suthesh/crowdin hotfix text (#2020) * edited text, extracted and uploaded * updated ach * downloaded latest translations Co-authored-by: Suthesan <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: njazuli-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: amina-deriv <[email protected]> Co-authored-by: mahdiyeh-fs <[email protected]> Co-authored-by: Al-amin Abdulkareem <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Habib Binary <[email protected]> Co-authored-by: behnaz-fs <[email protected]> Co-authored-by: Suthesan <[email protected]>

…1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo

* Kevin/update stock indices to stocks and indices on header, footer, and market (binary-com#1826) * update stock indices to stocks and indices on header, footer, and market * add dev comments * Nuri/Feat : Deriv x seo changes (binary-com#1875) * p added seo for Deriv X pages * added back h2 to what is deriv x text * Suthesh/add-jump-indices (binary-com#1856) * added new metals, energy and jump indices * minimised svg * fiona / Change margin to CFDs (binary-com#1841) * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * triger deployment * trigger deployment * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * remove unused import * delete margin folder Co-authored-by: fiona-deriv <[email protected]> * Amina/Footer update (binary-com#1910) * pass_variables_to_footer_text * messages.json-extract * Revert "messages.json-extract" This reverts commit 1bb1e61. revert messages.json * suthesh/update-translations-crowdin (binary-com#1911) * added new strings for translations * added strings from Amina's PR * downloaded latest translations (incomplete) * Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries (binary-com#1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo * Al-amin/35136/Deriv p2p landing page update (binary-com#1906) * updating Deriv P2P landing page * added Deriv P2P articles on Help centre * address PR comment * addressed QA comments * handle youtube video mobile view * updated P2P numbers card * updated the iframe mobile view * addressed PR comment * nikolai.berestevich/text/update numbers on story page (binary-com#1917) Co-authored-by: Nikolai Berestevich <[email protected]> * change sentences (binary-com#1916) * added comma and updated crowdin platform (binary-com#1983) * replace bet with speculate (binary-com#1977) * enable derivx cfd in non eu country (binary-com#1970) * Kevin/DMT5 Signal change text content (binary-com#1951) * change text content * fix typo * Revert "Kevin/DMT5 Signal change text content (binary-com#1951)" (binary-com#1989) This reverts commit d30b025. * update hyperlink with second branch (binary-com#1941) * Revert "update hyperlink with second branch (binary-com#1941)" (binary-com#1991) This reverts commit f7c542f. * downloaded latest translations (binary-com#1999) * Suthesh/update crowdin hotfix (binary-com#2002) * extracted and uploaded * downloaded latest translations * removed space (binary-com#2006) * downloaded latest translations (binary-com#2012) * Suthesh/crowdin hotfix text (binary-com#2020) * edited text, extracted and uploaded * updated ach * downloaded latest translations Co-authored-by: Suthesan <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: njazuli-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: amina-deriv <[email protected]> Co-authored-by: mahdiyeh-fs <[email protected]> Co-authored-by: Al-amin Abdulkareem <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Habib Binary <[email protected]> Co-authored-by: behnaz-fs <[email protected]> Co-authored-by: Suthesan <[email protected]>

mahdiyeh-deriv changed the title ~~fix_compare_accounts_content_for_eu_conuntries~~ Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries Jul 7, 2021

vercel bot deployed to Preview July 7, 2021 10:09 View deployment

ghost suggested changes Jul 9, 2021

View reviewed changes

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from 550b905 to f2f938a Compare July 11, 2021 06:14

vercel bot deployed to Preview July 11, 2021 06:14 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from f2f938a to 098704c Compare July 11, 2021 06:22

vercel bot deployed to Preview July 11, 2021 06:28 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from 098704c to c1a47e3 Compare July 11, 2021 06:32

vercel bot deployed to Preview July 11, 2021 06:40 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch 2 times, most recently from 0b3a8c5 to ac0164b Compare July 11, 2021 06:54

vercel bot deployed to Preview July 11, 2021 06:55 View deployment

vercel bot deployed to Preview July 11, 2021 07:09 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from 7ef34d9 to 85b8650 Compare July 11, 2021 07:45

vercel bot deployed to Preview July 11, 2021 07:46 View deployment

vercel bot deployed to Preview July 11, 2021 08:08 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from de1dc01 to 3d212db Compare July 11, 2021 08:11

vercel bot deployed to Preview July 11, 2021 08:20 View deployment

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from 3d212db to 57343f0 Compare July 11, 2021 08:35

vercel bot deployed to Preview July 11, 2021 08:35 View deployment

fix compare mt5 accounts content for eu and non_eu clients

fce78c7

mahdiyeh-deriv changed the base branch from master to crowdin July 11, 2021 08:45

mahdiyeh-deriv requested a review from a user July 11, 2021 08:48

ghost reviewed Jul 12, 2021

View reviewed changes

fix typo

e7a4438

mahdiyeh-deriv force-pushed the fix_compare_mt5_accouts_content_ branch from 57343f0 to e7a4438 Compare July 12, 2021 05:39

vercel bot deployed to Preview July 12, 2021 05:39 View deployment

ghost approved these changes Jul 12, 2021

View reviewed changes

suthesank merged commit fd9d1d5 into binary-com:crowdin Jul 16, 2021

njazuli-deriv pushed a commit to njazuli-deriv/deriv-com that referenced this pull request Jul 22, 2021

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries (binary-com#…

d7e7456

…1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo

suthesank pushed a commit to suthesank/deriv-com that referenced this pull request Aug 25, 2021

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries (binary-com#…

ceba335

…1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries #1888

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries #1888

Uh oh!

mahdiyeh-deriv commented Jul 7, 2021

Uh oh!

vercel bot commented Jul 7, 2021

Uh oh!

vercel bot commented Jul 7, 2021 •

edited

Loading

Uh oh!

github-actions bot commented Jul 7, 2021 •

edited

Loading

Uh oh!

ghost Jul 9, 2021

Uh oh!

ghost Jul 9, 2021

Uh oh!

mahdiyeh-deriv Jul 11, 2021

Uh oh!

ghost commented Jul 9, 2021

Uh oh!

ghost left a comment

Uh oh!

ghost Jul 12, 2021

Uh oh!

ghost Jul 12, 2021

Uh oh!

mahdiyeh-deriv Jul 12, 2021

Uh oh!

Uh oh!

	<Localize translate_text=" Trade major (standard and micro-lots) and minor currency pairs, stocks, stock indices, commodities, and cryptocurrencies." />
	<Localize translate_text="Trade major (standard and micro-lots) and minor currency pairs, stocks, stock indices, commodities, and cryptocurrencies." />

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries #1888

Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries #1888

Uh oh!

Conversation

mahdiyeh-deriv commented Jul 7, 2021

Type of change

Uh oh!

vercel bot commented Jul 7, 2021

Uh oh!

vercel bot commented Jul 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost Jul 9, 2021

Choose a reason for hiding this comment

Uh oh!

ghost Jul 9, 2021

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Jul 11, 2021

Choose a reason for hiding this comment

Uh oh!

ghost commented Jul 9, 2021

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ghost Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

ghost Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

mahdiyeh-deriv Jul 12, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vercel bot commented Jul 7, 2021 •

edited

Loading

github-actions bot commented Jul 7, 2021 •

edited

Loading