Kevin/fix hotfixes (#2681)

virtualpowwa · web-flow · commit 4ada3fb57b10 · 2022-02-24T16:45:45.000+08:00
* fix hotfixes

* fix ocmments
diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js
@@ -415,7 +415,7 @@ NavPlatform.propTypes = {
 }
 
 export const NavMarket = ({ onClick, is_ppc }) => {
-    const { is_not_uk } = getCountryRule()
+    const { is_non_uk } = getCountryRule()
 
     return (
         <Flex direction="column" wrap="wrap" jc="flex-start">
@@ -429,7 +429,7 @@ export const NavMarket = ({ onClick, is_ppc }) => {
                 onClick={onClick}
                 to="/markets/forex/"
             />
-            {!is_ppc && is_not_uk && (
+            {!is_ppc && is_non_uk && (
                 <NavCard
                     aria_label="Synthetic indices"
                     icon={() => <img src={SyntheticIndices} alt="" width="32" height="32" />}
@@ -451,7 +451,7 @@ export const NavMarket = ({ onClick, is_ppc }) => {
                 onClick={onClick}
                 to="/markets/stock/"
             />
-            {is_not_uk && (
+            {is_non_uk && (
                 <NavCard
                     aria_label="Cryptocurrencies"
                     icon={() => <img src={Cryptocurrencies} alt="" width="32" height="32" />}
diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js
@@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from 'react'
 import styled from 'styled-components'
 import PropTypes from 'prop-types'
 import { useOutsideClick } from 'components/hooks/use-outside-click'
-import { Flex, NonEU } from 'components/containers'
+import { Flex, ROW } from 'components/containers'
 import { DerivStore } from 'store'
 import { LocalizedLink, localize, Localize } from 'components/localization'
 import { Accordion, AccordionItem, NavCard, Text, Divider } from 'components/elements'
@@ -159,7 +159,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                         to="/trade-types/cfds/"
                                     />
                                 </Flex>
-                                <NonEU>
+                                <ROW>
                                     <Flex mb="2rem">
                                         <NavCard
                                             aria_label="Options"
@@ -174,7 +174,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                             to="/trade-types/options/"
                                         />
                                     </Flex>
-                                </NonEU>
+                                </ROW>
                                 <Flex mb="2rem">
                                     <NavCard
                                         aria_label="Multipliers"
@@ -209,7 +209,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                 to={props.is_ppc_redirect ? '/landing/dmt5/' : '/dmt5/'}
                             />
                         </Flex>
-                        <NonEU>
+                        <ROW>
                             <Flex mb="2rem">
                                 <NavCard
                                     aria_label="Derivx"
@@ -222,7 +222,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                     to="/derivx/"
                                 />
                             </Flex>
-                        </NonEU>
+                        </ROW>
 
                         <Flex mb="2rem">
                             <NavCard
@@ -236,7 +236,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                 to="/dtrader/"
                             />
                         </Flex>
-                        <NonEU>
+                        <ROW>
                             <>
                                 <Flex mb="2rem">
                                     <NavCard
@@ -302,7 +302,7 @@ export const OffCanvasMenuWrapper = (props) => {
                                     />
                                 </Flex>
                             </>
-                        </NonEU>
+                        </ROW>
                     </AccordionItem>
                     <AccordionItem
                         header="Markets"
diff --git a/src/pages/markets/components/markets/_forex.js b/src/pages/markets/components/markets/_forex.js
@@ -19,7 +19,7 @@ const SimpleSteps = Loadable(() => import('components/custom/_simple-steps'))
 const OtherMarkets = Loadable(() => import('../sections/_other-markets.js'))
 
 const Forex = ({ simple_step_content }) => {
-    const { is_row, is_eu } = getCountryRule()
+    const { is_row, is_eu_uk } = getCountryRule()
     return (
         <>
             <WhyTrade
@@ -28,7 +28,7 @@ const Forex = ({ simple_step_content }) => {
                     <Localize translate_text="Benefit from round-the-clock trading hours (Monday to Friday), high liquidity, low barriers to entry, a wide range of offerings, and opportunities to trade on world events." />
                 }
             >
-                {(is_eu ? forex_content_eu : forex_content).map((content, index) => (
+                {(is_eu_uk ? forex_content_eu : forex_content).map((content, index) => (
                     <div key={index} text={content.text} icon={<img src={content.src} alt="" />} />
                 ))}
             </WhyTrade>
@@ -52,7 +52,9 @@ const Forex = ({ simple_step_content }) => {
                     )
                 }
                 Multipliers={
-                    <Multipliers market_content={is_eu ? forex_multiplier_eu : forex_multiplier} />
+                    <Multipliers
+                        market_content={is_eu_uk ? forex_multiplier_eu : forex_multiplier}
+                    />
                 }
                 name="Forex"
                 display_title={<Localize translate_text="Forex trades available on Deriv" />}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const SimpleSteps = Loadable(() => import('components/custom/_simple-steps'))`
`19`	`19`	`const OtherMarkets = Loadable(() => import('../sections/_other-markets.js'))`
`20`	`20`
`21`	`21`	`const Forex = ({ simple_step_content }) => {`
`22`		`- const { is_row, is_eu } = getCountryRule()`
	`22`	`+ const { is_row, is_eu_uk } = getCountryRule()`
`23`	`23`	`return (`
`24`	`24`	`<>`
`25`	`25`	`<WhyTrade`
`@@ -28,7 +28,7 @@ const Forex = ({ simple_step_content }) => {`
`28`	`28`	`<Localize translate_text="Benefit from round-the-clock trading hours (Monday to Friday), high liquidity, low barriers to entry, a wide range of offerings, and opportunities to trade on world events." />`
`29`	`29`	`}`
`30`	`30`	`>`
`31`		`- {(is_eu ? forex_content_eu : forex_content).map((content, index) => (`
	`31`	`+ {(is_eu_uk ? forex_content_eu : forex_content).map((content, index) => (`
`32`	`32`	`<div key={index} text={content.text} icon={<img src={content.src} alt="" />} />`
`33`	`33`	`))}`
`34`	`34`	`</WhyTrade>`
`@@ -52,7 +52,9 @@ const Forex = ({ simple_step_content }) => {`
`52`	`52`	`)`
`53`	`53`	`}`
`54`	`54`	`Multipliers={`
`55`		`- <Multipliers market_content={is_eu ? forex_multiplier_eu : forex_multiplier} />`
	`55`	`+ <Multipliers`
	`56`	`+ market_content={is_eu_uk ? forex_multiplier_eu : forex_multiplier}`
	`57`	`+ />`
`56`	`58`	`}`
`57`	`59`	`name="Forex"`
`58`	`60`	`display_title={<Localize translate_text="Forex trades available on Deriv" />}`