Merge branch 'master' of https://github.com/binary-com/deriv-com into…

… new_homepage
binary-com · habib-deriv · Jan 27, 2022 · Nov 23, 2021 · Nov 23, 2021 · Nov 23, 2021
commit 1da82a2e4b23eee352afd81cec46f281e7dca998
@@ -321,46 +321,34 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
                     onClick={onClick}
                     to={is_ppc_redirect ? '/landing/dmt5/' : '/dmt5/'}
                 />
-                {!is_eu_country && (
-                    <NavCard
-                        aria_label="Derivx"
-                        icon={() => <img src={DerivX} alt="" width="32" height="32" />}
-                        content={
-                            <Localize translate_text="Trade CFDs on a customisable, easy-to-use trading platform." />
-                        }
-                        title={<Localize translate_text="Deriv X" />}
-                        onClick={onClick}
-                        to="/derivx/"
-                    />
-                )}
-
-                <NavCard
-                    aria_label="SmartTrader"
-                    icon={() => <img src={Smarttrader} alt="" width="32" height="32" />}
-                    content={
-                        <Localize translate_text="Trade the world’s markets with our popular user-friendly platform." />
-                    }
-                    title={<Localize translate_text="SmartTrader" />}
-                    to="https://smarttrader.deriv.com/en/trading.html"
-                    rel="noopener noreferrer"
-                    type="smart_trader"
-                    target="_blank"
-                    onClick={onClick}
-                />
-                {is_eu_country && (
-                    <NavCard
-                        aria_label="Binary Bot"
-                        icon={() => <img src={BinaryBot} alt="" width="32" height="32" />}
-                        content={
-                            <Localize translate_text="Our classic &ldquo;drag-and-drop&rdquo; tool for creating trading bots, featuring pop-up trading charts, for advanced users." />
-                        }
-                        title={<Localize translate_text="Binary Bot" />}
-                        to="https://bot.deriv.com/"
-                        rel="noopener noreferrer"
-                        target="_blank"
-                        onClick={onClick}
-                    />
-                )}
+                <NonEU>
+                    <>
+                        <NavCard
+                            aria_label="Derivx"
+                            icon={() => <img src={DerivX} alt="" width="32" height="32" />}
+                            content={
+                                <Localize translate_text="Trade FX and CFDs on a customisable, easy-to-use trading platform." />
+                            }
+                            title={<Localize translate_text="Deriv X" />}
+                            onClick={onClick}
+                            to="/derivx/"
+                        />
+                        <NavCard
+                            aria_label="SmartTrader"
+                            icon={() => <img src={Smarttrader} alt="" width="32" height="32" />}
+                            content={
+                                <Localize translate_text="Trade the world’s markets with our popular user-friendly platform." />
+                            }
+                            title={<Localize translate_text="SmartTrader" />}
+                            to="trading"
+                            type="smart_trader"
+                            external="true"
+                            target="_blank"
+                            onClick={onClick}
+                            otherLinkProps={{ rel: 'noopener noreferrer' }}
+                        />
+                    </>
+                </NonEU>
             </Flex>
             <Flex direction="column" wrap="wrap" jc="flex-start">
                 <EmptySpace />
@@ -374,44 +362,43 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
                     onClick={onClick}
                     to="/dtrader/"
                 />
-                {!is_eu_country && (
-                    <NavCard
-                        aria_label="Deriv GO"
-                        icon={() => <img src={DerivGo} alt="" width="32" height="32" />}
-                        content={
-                            <Localize translate_text="Trade multipliers on forex, cryptocurrencies, and synthetic indices with our mobile app." />
-                        }
-                        title={<Localize translate_text="Deriv GO" />}
-                        onClick={onClick}
-                        to="/landing/deriv-go/"
-                    />
-                )}
-                <NavCard
-                    aria_label="DBot"
-                    icon={() => <img src={DBot} alt="" width="32" height="32" />}
-                    content={
-                        <Localize translate_text="Automated trading at your fingertips. No coding needed." />
-                    }
-                    title={<Localize translate_text="DBot" />}
-                    onClick={onClick}
-                    to="/dbot/"
-                />
-                {!is_eu_country && (
-                    <NavCard
-                        aria_label="Binary Bot"
-                        icon={() => <img src={BinaryBot} alt="" width="32" height="32" />}
-                        content={
-                            <Localize
-                                translate_text={`Our classic "drag-and-drop" tool for creating trading bots, featuring pop-up trading charts, for advanced users.`}
-                            />
-                        }
-                        title={<Localize translate_text="Binary Bot" />}
-                        to="https://bot.deriv.com/"
-                        rel="noopener noreferrer"
-                        target="_blank"
-                        onClick={onClick}
-                    />
-                )}
+                <NonEU>
+                    <>
+                        <NavCard
+                            aria_label="Deriv GO"
+                            icon={() => <img src={DerivGo} alt="" width="32" height="32" />}
+                            content={
+                                <Localize translate_text="Trade multipliers on forex, cryptocurrencies, and synthetic indices with our mobile app." />
+                            }
+                            title={<Localize translate_text="Deriv GO" />}
+                            onClick={onClick}
+                            to="/landing/deriv-go/"
+                        />
+                        <NavCard
+                            aria_label="DBot"
+                            icon={() => <img src={DBot} alt="" width="32" height="32" />}
+                            content={
+                                <Localize translate_text="Automated trading at your fingertips. No coding needed." />
+                            }
+                            title={<Localize translate_text="DBot" />}
+                            onClick={onClick}
+                            to="/dbot/"
+                        />
+                        <NavCard
+                            aria_label="Binary Bot"
+                            icon={() => <img src={BinaryBot} alt="" width="32" height="32" />}
+                            content={
+                                <Localize translate_text="Our classic &ldquo;drag-and-drop&rdquo; tool for creating trading bots, featuring pop-up trading charts, for advanced users." />
+                            }
+                            title={<Localize translate_text="Binary Bot" />}
+                            to="https://bot.deriv.com/"
+                            external="true"
+                            target="_blank"
+                            onClick={onClick}
+                            otherLinkProps={{ rel: 'noopener noreferrer' }}
+                        />
+                    </>
+                </NonEU>
             </Flex>
         </Flex>
     )

@@ -233,65 +233,73 @@ export const OffCanvasMenuWrapper = (props) => {
                                 to="/dtrader/"
                             />
                         </Flex>
-                        {!is_eu_country && (
-                            <Flex mb="2rem">
-                                <NavCard
-                                    aria_label="Deriv GO"
-                                    icon={() => <img src={DerivGo} alt="" width="32" height="32" />}
-                                    content={
-                                        <Localize translate_text="Trade multipliers on forex, cryptocurrencies, and synthetic indices with our mobile app." />
-                                    }
-                                    title={<Localize translate_text="Deriv GO" />}
-                                    onClick={handleArrowClick}
-                                    to="/landing/deriv-go/"
-                                />
-                            </Flex>
-                        )}
-                        <Flex mb="2rem">
-                            <NavCard
-                                aria_label="SmartTrader"
-                                icon={() => <img src={Smarttrader} alt="" width="32" height="32" />}
-                                content={
-                                    <Localize translate_text="Trade the world’s markets with our popular user-friendly platform." />
-                                }
-                                title={<Localize translate_text="SmartTrader" />}
-                                onClick={handleArrowClick}
-                                to="trading"
-                                rel="noopener noreferrer"
-                                type="smart_trader"
-                                external="true"
-                                target="_blank"
-                            />
-                        </Flex>
-                        <Flex mb="2rem">
-                            <NavCard
-                                aria_label="DBot"
-                                icon={() => <img src={DBot} alt="" width="32" height="32" />}
-                                content={
-                                    <Localize translate_text="Automated trading at your fingertips. No coding needed." />
-                                }
-                                title={<Localize translate_text="DBot" />}
-                                onClick={handleArrowClick}
-                                to="/dbot/"
-                            />
-                        </Flex>
-                        <Flex mb="2rem">
-                            <NavCard
-                                aria_label="Binary Bot"
-                                icon={() => <img src={BinaryBot} alt="" width="32" height="32" />}
-                                content={
-                                    <Localize
-                                        translate_text={`Our classic "drag-and-drop" tool for creating trading bots, featuring pop-up trading charts, for advanced users.`}
+                        <NonEU>
+                            <>
+                                <Flex mb="2rem">
+                                    <NavCard
+                                        aria_label="Deriv GO"
+                                        icon={() => (
+                                            <img src={DerivGo} alt="" width="32" height="32" />
+                                        )}
+                                        content={
+                                            <Localize translate_text="Trade multipliers on forex, cryptocurrencies, and synthetic indices with our mobile app." />
+                                        }
+                                        title={<Localize translate_text="Deriv GO" />}
+                                        onClick={handleArrowClick}
+                                        to="/landing/deriv-go/"
                                     />
-                                }
-                                title={<Localize translate_text="Binary Bot" />}
-                                onClick={handleArrowClick}
-                                to="https://bot.deriv.com/"
-                                rel="noopener noreferrer"
-                                external="true"
-                                target="_blank"
-                            />
-                        </Flex>
+                                </Flex>
+                                <Flex mb="2rem">
+                                    <NavCard
+                                        aria_label="SmartTrader"
+                                        icon={() => (
+                                            <img src={Smarttrader} alt="" width="32" height="32" />
+                                        )}
+                                        content={
+                                            <Localize translate_text="Trade the world’s markets with our popular user-friendly platform." />
+                                        }
+                                        title={<Localize translate_text="SmartTrader" />}
+                                        onClick={handleArrowClick}
+                                        to="trading"
+                                        type="smart_trader"
+                                        external="true"
+                                        target="_blank"
+                                        otherLinkProps={{ rel: 'noopener noreferrer' }}
+                                    />
+                                </Flex>
+                                <Flex mb="2rem">
+                                    <NavCard
+                                        aria_label="DBot"
+                                        icon={() => (
+                                            <img src={DBot} alt="" width="32" height="32" />
+                                        )}
+                                        content={
+                                            <Localize translate_text="Automated trading at your fingertips. No coding needed." />
+                                        }
+                                        title={<Localize translate_text="DBot" />}
+                                        onClick={handleArrowClick}
+                                        to="/dbot/"
+                                    />
+                                </Flex>
+                                <Flex mb="2rem">
+                                    <NavCard
+                                        aria_label="BinaryBot"
+                                        icon={() => (
+                                            <img src={BinaryBot} alt="" width="32" height="32" />
+                                        )}
+                                        content={
+                                            <Localize translate_text="Our classic &ldquo;drag-and-drop&rdquo; tool for creating trading bots, featuring pop-up trading charts, for advanced users." />
+                                        }
+                                        title={<Localize translate_text="BinaryBot" />}
+                                        onClick={handleArrowClick}
+                                        to="https://bot.deriv.com/"
+                                        external="true"
+                                        target="_blank"
+                                        otherLinkProps={{ rel: 'noopener noreferrer' }}
+                                    />
+                                </Flex>
+                            </>
+                        </NonEU>
                     </AccordionItem>
                     <AccordionItem
                         header="Markets"

@@ -30,6 +30,53 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect }) => {
                             <Link to="/careers/">{localize('Careers')}</Link>
                         </LinkWrapper>
                     </LinksCol>
+                    <LinksCol>
+                        <LinkWrapper>
+                            <Title>{localize('TRADE')}</Title>
+                        </LinkWrapper>
+                        <LinkWrapper first_child="true">
+                            <Link to="/dtrader/">{localize('DTrader')}</Link>
+                        </LinkWrapper>
+                        <Show.NonEU>
+                            <LinkWrapper>
+                                <Link to="/landing/deriv-go/">{localize('Deriv GO')}</Link>
+                            </LinkWrapper>
+                            <LinkWrapper>
+                                <Link to="/dbot/">{localize('DBot')}</Link>
+                            </LinkWrapper>
+                        </Show.NonEU>
+                        <LinkWrapper>
+                            <Link to={is_ppc_redirect ? '/landing/dmt5/' : '/dmt5/'}>
+                                {localize('DMT5')}
+                            </Link>
+                        </LinkWrapper>
+                        <Show.NonEU>
+                            <LinkWrapper>
+                                <Link to="/derivx/">{localize('Deriv X')}</Link>
+                            </LinkWrapper>
+                            <LinkWrapper>
+                                <Link
+                                    to="trading"
+                                    type="smart_trader"
+                                    external="true"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    {localize('SmartTrader')}
+                                </Link>
+                            </LinkWrapper>
+                            <LinkWrapper>
+                                <Link
+                                    to="https://bot.deriv.com"
+                                    external="true"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    {localize('Binary Bot')}
+                                </Link>
+                            </LinkWrapper>
+                        </Show.NonEU>
+                    </LinksCol>
                     {!is_ppc && (
                         <LinksCol>
                             <LinkWrapper>
@@ -83,11 +130,6 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect }) => {
                                 {localize('Deriv MT5')}
                             </Link>
                         </LinkWrapper>
-                        {!is_eu_country && (
-                            <LinkWrapper>
-                                <Link to="/derivx/">{localize('Deriv X')}</Link>
-                            </LinkWrapper>
-                        )}
                         <LinkWrapper>
                             <Link to="/dtrader/">{localize('DTrader')}</Link>
                         </LinkWrapper>