From 14da24db8a302b4cd86e18135f00628a1ccbc927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 12:28:43 +0300
Subject: [PATCH 1/7] replace svg + text + add new data and eu check
---
src/components/elements/symbols.js | 30 ++-
src/images/svg/symbols/algorand.svg | 1 +
src/images/svg/symbols/amzn.svg | 2 +-
src/images/svg/symbols/bat.svg | 4 +
src/images/svg/symbols/binance_coin_flag.svg | 9 +-
src/images/svg/symbols/bitcoin_flag.svg | 5 +-
src/images/svg/symbols/btc_cash_flag.svg | 5 +-
src/images/svg/symbols/cardano.svg | 1 +
src/images/svg/symbols/chainlink.svg | 4 +
src/images/svg/symbols/dash_flag.svg | 5 +-
src/images/svg/symbols/dogecoin.svg | 126 ++++++++++++
src/images/svg/symbols/eos_flag.svg | 5 +-
src/images/svg/symbols/eth_flag.svg | 10 +-
src/images/svg/symbols/filecoin.svg | 4 +
src/images/svg/symbols/gold-eur.svg | 2 +-
src/images/svg/symbols/iota_flag.png | Bin 3423 -> 0 bytes
src/images/svg/symbols/iota_flag.svg | 57 ++++++
src/images/svg/symbols/ltc_flag.svg | 5 +-
src/images/svg/symbols/maker.svg | 10 +
src/images/svg/symbols/monero_flag.svg | 6 +-
src/images/svg/symbols/neo_flag.svg | 6 +-
src/images/svg/symbols/omg_flag.svg | 2 +-
src/images/svg/symbols/omise-go.svg | 1 +
src/images/svg/symbols/polkadot.svg | 4 +
src/images/svg/symbols/polygon.svg | 4 +
src/images/svg/symbols/ripple_flag.svg | 6 +-
src/images/svg/symbols/silver-eur.svg | 2 +-
src/images/svg/symbols/solana.svg | 10 +
src/images/svg/symbols/stellar_flag.svg | 6 +-
src/images/svg/symbols/tron_flag.svg | 5 +-
src/images/svg/symbols/uniswap.svg | 19 ++
src/images/svg/symbols/volatility-eu-200.svg | 2 +-
src/images/svg/symbols/xtz.svg | 4 +
src/images/svg/symbols/z_cash_flag.svg | 6 +-
.../components/markets/_cryptocurrencies.js | 4 +-
.../sections/_market_instruments.js | 2 +-
.../markets/instruments/_market-symbols.js | 92 ++++++---
.../markets/static/style/_markets-style.js | 3 +-
.../affiliate-ib/_deriv-ib-programme.js | 185 +++++++++++++++++-
39 files changed, 605 insertions(+), 49 deletions(-)
create mode 100644 src/images/svg/symbols/algorand.svg
create mode 100644 src/images/svg/symbols/bat.svg
create mode 100644 src/images/svg/symbols/cardano.svg
create mode 100644 src/images/svg/symbols/chainlink.svg
create mode 100644 src/images/svg/symbols/dogecoin.svg
create mode 100644 src/images/svg/symbols/filecoin.svg
delete mode 100644 src/images/svg/symbols/iota_flag.png
create mode 100644 src/images/svg/symbols/iota_flag.svg
create mode 100644 src/images/svg/symbols/maker.svg
create mode 100644 src/images/svg/symbols/omise-go.svg
create mode 100644 src/images/svg/symbols/polkadot.svg
create mode 100644 src/images/svg/symbols/polygon.svg
create mode 100644 src/images/svg/symbols/solana.svg
create mode 100644 src/images/svg/symbols/uniswap.svg
create mode 100644 src/images/svg/symbols/xtz.svg
diff --git a/src/components/elements/symbols.js b/src/components/elements/symbols.js
index 92fddd56d5f..74da5dbf8f0 100644
--- a/src/components/elements/symbols.js
+++ b/src/components/elements/symbols.js
@@ -3,6 +3,7 @@ import AAPL from 'images/svg/symbols/aapl.svg'
import ABNB from 'images/svg/symbols/abnb.svg'
import ADS from 'images/svg/symbols/ads.svg'
import AIG from 'images/svg/symbols/aig.svg'
+import ALGORAND from 'images/svg/symbols/algorand.svg'
import ALUMINIUMUSD from 'images/svg/symbols/aluminium-usd.svg'
import AMZN from 'images/svg/symbols/amzn.svg'
import AUDCAD from 'images/svg/symbols/aud-cad.svg'
@@ -16,6 +17,7 @@ import AUS200 from 'images/svg/symbols/aus-200.svg'
import BA from 'images/svg/symbols/ba.svg'
import BABA from 'images/svg/symbols/baba.svg'
import BAC from 'images/svg/symbols/bac.svg'
+import BAT from 'images/svg/symbols/bat.svg'
import BAY from 'images/svg/symbols/bay.svg'
import BCHUSD from 'images/svg/symbols/bch-usd.svg'
import BIIB from 'images/svg/symbols/biib.svg'
@@ -28,6 +30,8 @@ import BTCUSD from 'images/svg/symbols/btc-usd.svg'
import C from 'images/svg/symbols/c.svg'
import CADCHF from 'images/svg/symbols/cad-chf.svg'
import CADJPY from 'images/svg/symbols/cad-jpy.svg'
+import CARDANO from 'images/svg/symbols/cardano.svg'
+import CHAINLINK from 'images/svg/symbols/chainlink.svg'
import CHFJPY from 'images/svg/symbols/chf-jpy.svg'
import CLBRENT from 'images/svg/symbols/cl-brent.svg'
import COPPERUSD from 'images/svg/symbols/copper-usd.svg'
@@ -39,6 +43,7 @@ import DAL from 'images/svg/symbols/dal.svg'
import DAX30 from 'images/svg/symbols/dax-30.svg'
import DBK from 'images/svg/symbols/dbk.svg'
import DIS from 'images/svg/symbols/dis.svg'
+import DOGECOIN from 'images/svg/symbols/dogecoin.svg'
import DSHUSD from 'images/svg/symbols/dsh-usd.svg'
import EBAY from 'images/svg/symbols/ebay.svg'
import EOSUSD from 'images/svg/symbols/eos-usd.svg'
@@ -60,6 +65,7 @@ import EURTRY from 'images/svg/symbols/eur-try.svg'
import EURUSD from 'images/svg/symbols/eur-usd.svg'
import EURZAR from 'images/svg/symbols/eur-zar.svg'
import FB from 'images/svg/symbols/fb.svg'
+import FILECOIN from 'images/svg/symbols/filecoin.svg'
import FDX from 'images/svg/symbols/fdx.svg'
import FRA40 from 'images/svg/symbols/fra-40.svg'
import GBPAUD from 'images/svg/symbols/gbp-aud.svg'
@@ -104,6 +110,7 @@ import KO from 'images/svg/symbols/ko.svg'
import LEADUSD from 'images/svg/symbols/lead-usd.svg'
import LTCUSD from 'images/svg/symbols/lct-usd.svg'
import MA from 'images/svg/symbols/ma.svg'
+import MAKER from 'images/svg/symbols/maker.svg'
import MARKETBEAR from 'images/svg/symbols/marketbear.svg'
import MARKETBULL from 'images/svg/symbols/marketbull.svg'
import MCD from 'images/svg/symbols/mcd.svg'
@@ -135,6 +142,8 @@ import OTCWALLSTREET from 'images/svg/symbols/otcwallstreet.svg'
import PALLADIUMUSD from 'images/svg/symbols/palladium-usd.svg'
import PFE from 'images/svg/symbols/pfe.svg'
import PG from 'images/svg/symbols/pg.svg'
+import POLKADOT from 'images/svg/symbols/polkadot.svg'
+import POLYGON from 'images/svg/symbols/polygon.svg'
import PLATINUMUSD from 'images/svg/symbols/platinum-usd.svg'
import PYPL from 'images/svg/symbols/pypl.svg'
import RANGEBREAK100 from 'images/svg/symbols/rb-100.svg'
@@ -147,6 +156,7 @@ import TSLA from 'images/svg/symbols/tsla.svg'
import TWTR from 'images/svg/symbols/twtr.svg'
import UBER from 'images/svg/symbols/uber.svg'
import UK100 from 'images/svg/symbols/uk-100.svg'
+import UNISWAP from 'images/svg/symbols/uniswap.svg'
import US100 from 'images/svg/symbols/us-100.svg'
import US30 from 'images/svg/symbols/us-30.svg'
import US500 from 'images/svg/symbols/us-500.svg'
@@ -169,8 +179,10 @@ import V from 'images/svg/symbols/v.svg'
import VOLATILITY300EU from 'images/svg/symbols/volatility-eu-300.svg'
import VOLATILITY200EU from 'images/svg/symbols/volatility-eu-200.svg'
import WMT from 'images/svg/symbols/wmt.svg'
+import XTZ from 'images/svg/symbols/xtz.svg'
import XRPUSD from 'images/svg/symbols/xrp-usd.svg'
import SILVEREUR from 'images/svg/symbols/silver-eur.svg'
+import SOLANA from 'images/svg/symbols/solana.svg'
import STOCKSUS500 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-500.svg'
import STOCKSUSTECH100 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-tech-100.svg'
import STOCKSWALLSTREET30 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/wall-street-30.svg'
@@ -239,15 +251,15 @@ import BCH from 'images/svg/symbols/btc_cash_flag.svg'
import DASH from 'images/svg/symbols/dash_flag.svg'
import EOS from 'images/svg/symbols/eos_flag.svg'
import ETH from 'images/svg/symbols/eth_flag.svg'
-import IOTA from 'images/svg/symbols/iota_flag.png'
+import IOTA from 'images/svg/symbols/iota_flag.svg'
import LTC from 'images/svg/symbols/ltc_flag.svg'
import NEO from 'images/svg/symbols/neo_flag.svg'
-import OMG from 'images/svg/symbols/omg_flag.svg'
import XRP from 'images/svg/symbols/ripple_flag.svg'
import XLM from 'images/svg/symbols/stellar_flag.svg'
import TRX from 'images/svg/symbols/tron_flag.svg'
import ZEC from 'images/svg/symbols/z_cash_flag.svg'
import MNR from 'images/svg/symbols/monero_flag.svg'
+import OMICEGO from 'images/svg/symbols/omise-go.svg'
import VBOOMIC300 from 'images/svg/symbols/volatility-boom-ic-300.svg'
import VCRASHIC300 from 'images/svg/symbols/volatility-crash-ic-300.svg'
import VINDEXIC200 from 'images/svg/symbols/volatility-index-ic-200.svg'
@@ -259,6 +271,7 @@ export {
ABNB,
ADS,
AIG,
+ ALGORAND,
ALUMINIUMUSD,
AMZN,
AUDCAD,
@@ -272,6 +285,7 @@ export {
BA,
BABA,
BAC,
+ BAT,
BAY,
BCHUSD,
BIIB,
@@ -282,8 +296,10 @@ export {
CRASH300EU,
BTCUSD,
C,
+ CARDANO,
CADCHF,
CADJPY,
+ CHAINLINK,
CHFJPY,
CLBRENT,
COPPERUSD,
@@ -295,6 +311,7 @@ export {
DAX30,
DBK,
DIS,
+ DOGECOIN,
DSHUSD,
EBAY,
EOSUSD,
@@ -317,6 +334,7 @@ export {
EURZAR,
FB,
FDX,
+ FILECOIN,
FRA40,
GBPAUD,
GBPCAD,
@@ -360,6 +378,7 @@ export {
LEADUSD,
LTCUSD,
MA,
+ MAKER,
MARKETBEAR,
MARKETBULL,
MCD,
@@ -377,6 +396,7 @@ export {
NZDSGD,
NZDUSD,
OILUSD,
+ OMICEGO,
OTCAUSTRALIAN,
OTCDUTCH,
OTCFRENCH,
@@ -391,18 +411,22 @@ export {
PALLADIUMUSD,
PFE,
PG,
+ POLKADOT,
+ POLYGON,
PLATINUMUSD,
PYPL,
RANGEBREAK100,
RANGEBREAK200,
SGDJPY,
SILVERUSD,
+ SOLANA,
STEPINDICES,
TEVA,
TSLA,
TWTR,
UBER,
UK100,
+ UNISWAP,
US100,
US30,
US500,
@@ -425,6 +449,7 @@ export {
VOLATILITY200EU,
VOLATILITY300EU,
WMT,
+ XTZ,
XRPUSD,
SILVEREUR,
STOCKSUS500,
@@ -498,7 +523,6 @@ export {
IOTA,
LTC,
NEO,
- OMG,
XRP,
XLM,
TRX,
diff --git a/src/images/svg/symbols/algorand.svg b/src/images/svg/symbols/algorand.svg
new file mode 100644
index 00000000000..cfe4a0d96e7
--- /dev/null
+++ b/src/images/svg/symbols/algorand.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/amzn.svg b/src/images/svg/symbols/amzn.svg
index 0458e044451..7ab3d992442 100644
--- a/src/images/svg/symbols/amzn.svg
+++ b/src/images/svg/symbols/amzn.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/bat.svg b/src/images/svg/symbols/bat.svg
new file mode 100644
index 00000000000..7f035370f4b
--- /dev/null
+++ b/src/images/svg/symbols/bat.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/binance_coin_flag.svg b/src/images/svg/symbols/binance_coin_flag.svg
index 8cda0e42f0f..a5a766d2747 100644
--- a/src/images/svg/symbols/binance_coin_flag.svg
+++ b/src/images/svg/symbols/binance_coin_flag.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/bitcoin_flag.svg b/src/images/svg/symbols/bitcoin_flag.svg
index 86b1b2e647a..a36e53332e4 100644
--- a/src/images/svg/symbols/bitcoin_flag.svg
+++ b/src/images/svg/symbols/bitcoin_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/btc_cash_flag.svg b/src/images/svg/symbols/btc_cash_flag.svg
index b1f88ea1ebc..5fa8729fb3c 100644
--- a/src/images/svg/symbols/btc_cash_flag.svg
+++ b/src/images/svg/symbols/btc_cash_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/cardano.svg b/src/images/svg/symbols/cardano.svg
new file mode 100644
index 00000000000..e50f4cc3e38
--- /dev/null
+++ b/src/images/svg/symbols/cardano.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/chainlink.svg b/src/images/svg/symbols/chainlink.svg
new file mode 100644
index 00000000000..5ca6db7f466
--- /dev/null
+++ b/src/images/svg/symbols/chainlink.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/dash_flag.svg b/src/images/svg/symbols/dash_flag.svg
index d1aec1eb6e3..9f3daa2acd0 100644
--- a/src/images/svg/symbols/dash_flag.svg
+++ b/src/images/svg/symbols/dash_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/dogecoin.svg b/src/images/svg/symbols/dogecoin.svg
new file mode 100644
index 00000000000..03b5012ebbc
--- /dev/null
+++ b/src/images/svg/symbols/dogecoin.svg
@@ -0,0 +1,126 @@
+
diff --git a/src/images/svg/symbols/eos_flag.svg b/src/images/svg/symbols/eos_flag.svg
index 46d34ef03c1..40bd9d7a32d 100644
--- a/src/images/svg/symbols/eos_flag.svg
+++ b/src/images/svg/symbols/eos_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/eth_flag.svg b/src/images/svg/symbols/eth_flag.svg
index 3f990da721f..5174c727cd5 100644
--- a/src/images/svg/symbols/eth_flag.svg
+++ b/src/images/svg/symbols/eth_flag.svg
@@ -1 +1,9 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/filecoin.svg b/src/images/svg/symbols/filecoin.svg
new file mode 100644
index 00000000000..24ec5a0a014
--- /dev/null
+++ b/src/images/svg/symbols/filecoin.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/gold-eur.svg b/src/images/svg/symbols/gold-eur.svg
index 9776334eee8..f7cdc80d95a 100644
--- a/src/images/svg/symbols/gold-eur.svg
+++ b/src/images/svg/symbols/gold-eur.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/iota_flag.png b/src/images/svg/symbols/iota_flag.png
deleted file mode 100644
index 8c2312db08370a82570e1668123d13fc56cbcf7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3423
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/images/svg/symbols/ltc_flag.svg b/src/images/svg/symbols/ltc_flag.svg
index 1662f310297..1c70d7a933e 100644
--- a/src/images/svg/symbols/ltc_flag.svg
+++ b/src/images/svg/symbols/ltc_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/maker.svg b/src/images/svg/symbols/maker.svg
new file mode 100644
index 00000000000..4eddf27e701
--- /dev/null
+++ b/src/images/svg/symbols/maker.svg
@@ -0,0 +1,10 @@
+
diff --git a/src/images/svg/symbols/monero_flag.svg b/src/images/svg/symbols/monero_flag.svg
index 9280002f9bd..7df0e201ec7 100644
--- a/src/images/svg/symbols/monero_flag.svg
+++ b/src/images/svg/symbols/monero_flag.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/neo_flag.svg b/src/images/svg/symbols/neo_flag.svg
index 479bf798666..975aa4b11b1 100644
--- a/src/images/svg/symbols/neo_flag.svg
+++ b/src/images/svg/symbols/neo_flag.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/omg_flag.svg b/src/images/svg/symbols/omg_flag.svg
index 6187f1771ee..df493d7d3e2 100644
--- a/src/images/svg/symbols/omg_flag.svg
+++ b/src/images/svg/symbols/omg_flag.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/omise-go.svg b/src/images/svg/symbols/omise-go.svg
new file mode 100644
index 00000000000..1e357043c11
--- /dev/null
+++ b/src/images/svg/symbols/omise-go.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/polkadot.svg b/src/images/svg/symbols/polkadot.svg
new file mode 100644
index 00000000000..4cfcd5d2fea
--- /dev/null
+++ b/src/images/svg/symbols/polkadot.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/polygon.svg b/src/images/svg/symbols/polygon.svg
new file mode 100644
index 00000000000..83a49f69658
--- /dev/null
+++ b/src/images/svg/symbols/polygon.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/ripple_flag.svg b/src/images/svg/symbols/ripple_flag.svg
index 3ad6ed4c3f2..10eac530fa6 100644
--- a/src/images/svg/symbols/ripple_flag.svg
+++ b/src/images/svg/symbols/ripple_flag.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/silver-eur.svg b/src/images/svg/symbols/silver-eur.svg
index 5963338a850..abf94d62695 100644
--- a/src/images/svg/symbols/silver-eur.svg
+++ b/src/images/svg/symbols/silver-eur.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/solana.svg b/src/images/svg/symbols/solana.svg
new file mode 100644
index 00000000000..50322d50bdd
--- /dev/null
+++ b/src/images/svg/symbols/solana.svg
@@ -0,0 +1,10 @@
+
diff --git a/src/images/svg/symbols/stellar_flag.svg b/src/images/svg/symbols/stellar_flag.svg
index e6746cfb03b..8fa8c10d813 100644
--- a/src/images/svg/symbols/stellar_flag.svg
+++ b/src/images/svg/symbols/stellar_flag.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/tron_flag.svg b/src/images/svg/symbols/tron_flag.svg
index 75a4dfea0c4..45c9cfdeb0c 100644
--- a/src/images/svg/symbols/tron_flag.svg
+++ b/src/images/svg/symbols/tron_flag.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/images/svg/symbols/uniswap.svg b/src/images/svg/symbols/uniswap.svg
new file mode 100644
index 00000000000..18bd554be5a
--- /dev/null
+++ b/src/images/svg/symbols/uniswap.svg
@@ -0,0 +1,19 @@
+
diff --git a/src/images/svg/symbols/volatility-eu-200.svg b/src/images/svg/symbols/volatility-eu-200.svg
index 55b2d36c597..3b7b2d5b350 100644
--- a/src/images/svg/symbols/volatility-eu-200.svg
+++ b/src/images/svg/symbols/volatility-eu-200.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/xtz.svg b/src/images/svg/symbols/xtz.svg
new file mode 100644
index 00000000000..d69b4694f9f
--- /dev/null
+++ b/src/images/svg/symbols/xtz.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/images/svg/symbols/z_cash_flag.svg b/src/images/svg/symbols/z_cash_flag.svg
index dbdb01db9ce..5f26af2a561 100644
--- a/src/images/svg/symbols/z_cash_flag.svg
+++ b/src/images/svg/symbols/z_cash_flag.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+
diff --git a/src/pages/markets/components/markets/_cryptocurrencies.js b/src/pages/markets/components/markets/_cryptocurrencies.js
index 74a42641c10..e749786314c 100644
--- a/src/pages/markets/components/markets/_cryptocurrencies.js
+++ b/src/pages/markets/components/markets/_cryptocurrencies.js
@@ -26,7 +26,7 @@ const Cryptocurrencies = ({ simple_step_content }) => {
text: is_eu_country ? (
) : (
-
+
),
},
{
@@ -35,7 +35,7 @@ const Cryptocurrencies = ({ simple_step_content }) => {
},
{
src: CryptoPairs,
- text: ,
+ text: ,
},
{
src: ZeroCommission,
diff --git a/src/pages/markets/components/sections/_market_instruments.js b/src/pages/markets/components/sections/_market_instruments.js
index f8d03f429ab..0ea62dd5efa 100644
--- a/src/pages/markets/components/sections/_market_instruments.js
+++ b/src/pages/markets/components/sections/_market_instruments.js
@@ -86,7 +86,7 @@ const MarketInstruments = ({ market_content }) => {
{content.component}
) : (
-
+
{content.component}
)}
diff --git a/src/pages/markets/instruments/_market-symbols.js b/src/pages/markets/instruments/_market-symbols.js
index 5b60019a492..dbc74ef0c60 100644
--- a/src/pages/markets/instruments/_market-symbols.js
+++ b/src/pages/markets/instruments/_market-symbols.js
@@ -736,6 +736,18 @@ export const cryptocurrencies_trade_type = [
]
export const cryptocurrencies_cfds = [
+ {
+ src: icons.ALGORAND,
+ text: ,
+ },
+ {
+ src: icons.BAT,
+ text: ,
+ },
+ {
+ src: icons.BNB,
+ text: ,
+ },
{
src: icons.BTC,
text: ,
@@ -745,56 +757,92 @@ export const cryptocurrencies_cfds = [
text: ,
},
{
- src: icons.ETH,
- text: ,
+ src: icons.CARDANO,
+ text: ,
},
{
- src: icons.LTC,
- text: ,
+ src: icons.CHAINLINK,
+ text: ,
},
{
- src: icons.TRX,
- text: ,
+ src: icons.DASH,
+ text: ,
},
{
- src: icons.BNB,
- text: ,
+ src: icons.DOGECOIN,
+ text: ,
},
{
- src: icons.DASH,
- text: ,
+ src: icons.EOS,
+ text: ,
},
{
- src: icons.XRP,
- text: ,
+ src: icons.ETH,
+ text: ,
+ },
+ {
+ src: icons.FILECOIN,
+ text: ,
+ },
+ {
+ src: icons.IOTA,
+ text: ,
+ },
+ {
+ src: icons.LTC,
+ text: ,
+ },
+ {
+ src: icons.MAKER,
+ text: ,
},
{
src: icons.MNR,
text: ,
},
{
- src: icons.ZEC,
- text: ,
+ src: icons.NEO,
+ text: ,
},
{
- src: icons.EOS,
- text: ,
+ src: icons.OMICEGO,
+ text: ,
},
{
- src: icons.IOTA,
- text: ,
+ src: icons.POLKADOT,
+ text: ,
+ },
+ {
+ src: icons.POLYGON,
+ text: ,
},
{
- src: icons.OMG,
- text: ,
+ src: icons.XRP,
+ text: ,
+ },
+ {
+ src: icons.SOLANA,
+ text: ,
},
{
src: icons.XLM,
text: ,
},
{
- src: icons.NEO,
- text: ,
+ src: icons.TRX,
+ text: ,
+ },
+ {
+ src: icons.UNISWAP,
+ text: ,
+ },
+ {
+ src: icons.XTZ,
+ text: ,
+ },
+ {
+ src: icons.ZEC,
+ text: ,
},
]
diff --git a/src/pages/markets/static/style/_markets-style.js b/src/pages/markets/static/style/_markets-style.js
index 161927adffb..5afa14fe9d3 100644
--- a/src/pages/markets/static/style/_markets-style.js
+++ b/src/pages/markets/static/style/_markets-style.js
@@ -76,9 +76,10 @@ export const MarketsList = styled(CssGrid)`
grid-template-columns: ${({ col }) => `repeat(${col ?? 4}, 1fr)`};
width: 100%;
padding: 24px;
- gap: 10px;
+ gap: ${({ gap }) => (gap ? gap : '10px')};
@media ${device.tabletL} {
+ gap: 10px;
grid-template-columns: ${({ tablet_col }) => `repeat(${tablet_col ?? 2}, 1fr)`};
}
diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
index 6d873871408..b7c0d7cd537 100644
--- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
+++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
@@ -6,6 +6,7 @@ import { SectionContainer, Container, Flex } from 'components/containers'
import { Header } from 'components/elements/typography'
import { localize, Localize } from 'components/localization'
import { LinkButton } from 'components/form'
+import { DerivStore } from 'store'
import device from 'themes/device'
const TitleWrapper = styled.div`
@@ -110,6 +111,7 @@ const SubtitleHeader = styled(Header)`
`
const DerivIBProgramme = () => {
+ const { is_eu_country } = React.useContext(DerivStore)
return (
@@ -132,8 +134,14 @@ const DerivIBProgramme = () => {
-
-
+
+
,
+ description: (
+
+ ),
+ type: [
+ {
+ title: ,
+ headerHeight: '8.0rem',
+ assets: [
+ {
+ title: ,
+ list: [
+ ,
+ ,
+ ],
+ },
+ {
+ title: ,
+ list: [
+ ,
+ ,
+ ],
+ },
+ ],
+ },
+ {
+ title: ,
+ headerHeight: '6.4rem',
+ assets: [
+ {
+ title: ,
+ list: [
+ ,
+ ,
+ ],
+ },
+ {
+ title: ,
+ list: [
+ ,
+ ,
+ ],
+ },
+ ],
+ },
+ {
+ title: ,
+ headerHeight: '6.4rem',
+ assets: [
+ {
+ title: ,
+ list: [],
+ },
+ {
+ title: ,
+ list: [],
+ },
+ ],
+ },
+ ],
+ countDetails: [
+ {
+ title: ,
+ list: [
+ {
+ details: (
+
+ ),
+ icon: 'dmt5_financial_calculator_one',
+ iconAlt: ,
+ },
+ {
+ details: (
+
+ ),
+ icon: 'dmt5_financial_calculator_two',
+ iconAlt: ,
+ },
+ ],
+ notes: [
+ {
+ title: ,
+ desc: {
+ firstText: (
+
+ ),
+ secondText: (
+
+ ),
+ },
+ },
+ ],
+ },
+ ],
+}
+
const ib_dmt5_financialSTP = {
name: ,
description: (
@@ -548,4 +653,80 @@ const ib_dmt5_financialSTP = {
},
],
}
+
+const ib_dmt5_financialSTP_non_eu = {
+ name: ,
+ description: (
+
+ ),
+ type: [
+ {
+ title: ,
+ headerHeight: '8.0rem',
+ assets: [
+ {
+ title: ,
+ list: [],
+ },
+ {
+ title: (
+
+ ),
+ list: [],
+ },
+ ],
+ },
+ {
+ title: ,
+ headerHeight: '6.4rem',
+ assets: [
+ {
+ title: ,
+ list: [],
+ },
+ {
+ title: ,
+ list: [],
+ },
+ ],
+ },
+ ],
+ countDetails: [
+ {
+ title: ,
+ list: [
+ {
+ details: (
+
+ ),
+ icon: 'dmt5_financial_stp_calculator_one',
+ iconAlt: ,
+ },
+ {
+ details: (
+
+ ),
+ icon: 'dmt5_financial_stp_calculator_two',
+ iconAlt: ,
+ },
+ ],
+ notes: [
+ {
+ title: ,
+ desc: {
+ firstText: (
+
+ ),
+ secondText: (
+
+ ),
+ },
+ },
+ ],
+ },
+ ],
+}
export default DerivIBProgramme
From 408684df777b29c2877a23d664a35e0c05a7e032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 13:26:26 +0300
Subject: [PATCH 2/7] refactor $ svgo
---
src/images/svg/symbols/bat.svg | 5 +-
src/images/svg/symbols/binance_coin_flag.svg | 9 +-
src/images/svg/symbols/bitcoin_flag.svg | 5 +-
src/images/svg/symbols/btc_cash_flag.svg | 5 +-
src/images/svg/symbols/chainlink.svg | 5 +-
src/images/svg/symbols/dash_flag.svg | 5 +-
src/images/svg/symbols/dogecoin.svg | 127 +-----------------
src/images/svg/symbols/eos_flag.svg | 5 +-
src/images/svg/symbols/eth_flag.svg | 10 +-
src/images/svg/symbols/filecoin.svg | 5 +-
src/images/svg/symbols/iota_flag.svg | 58 +-------
src/images/svg/symbols/ltc_flag.svg | 5 +-
src/images/svg/symbols/maker.svg | 11 +-
src/images/svg/symbols/monero_flag.svg | 6 +-
src/images/svg/symbols/neo_flag.svg | 6 +-
src/images/svg/symbols/polkadot.svg | 5 +-
src/images/svg/symbols/polygon.svg | 5 +-
src/images/svg/symbols/ripple_flag.svg | 6 +-
src/images/svg/symbols/solana.svg | 11 +-
src/images/svg/symbols/stellar_flag.svg | 6 +-
src/images/svg/symbols/tron_flag.svg | 5 +-
src/images/svg/symbols/uniswap.svg | 20 +--
src/images/svg/symbols/xtz.svg | 5 +-
src/images/svg/symbols/z_cash_flag.svg | 6 +-
.../affiliate-ib/_deriv-ib-programme.js | 78 +----------
25 files changed, 26 insertions(+), 388 deletions(-)
diff --git a/src/images/svg/symbols/bat.svg b/src/images/svg/symbols/bat.svg
index 7f035370f4b..be421eea433 100644
--- a/src/images/svg/symbols/bat.svg
+++ b/src/images/svg/symbols/bat.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/binance_coin_flag.svg b/src/images/svg/symbols/binance_coin_flag.svg
index a5a766d2747..ded8c152685 100644
--- a/src/images/svg/symbols/binance_coin_flag.svg
+++ b/src/images/svg/symbols/binance_coin_flag.svg
@@ -1,8 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/bitcoin_flag.svg b/src/images/svg/symbols/bitcoin_flag.svg
index a36e53332e4..6c52525c86e 100644
--- a/src/images/svg/symbols/bitcoin_flag.svg
+++ b/src/images/svg/symbols/bitcoin_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/btc_cash_flag.svg b/src/images/svg/symbols/btc_cash_flag.svg
index 5fa8729fb3c..ef7645e8cc4 100644
--- a/src/images/svg/symbols/btc_cash_flag.svg
+++ b/src/images/svg/symbols/btc_cash_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/chainlink.svg b/src/images/svg/symbols/chainlink.svg
index 5ca6db7f466..fc9a167f48d 100644
--- a/src/images/svg/symbols/chainlink.svg
+++ b/src/images/svg/symbols/chainlink.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/dash_flag.svg b/src/images/svg/symbols/dash_flag.svg
index 9f3daa2acd0..d476b143dcf 100644
--- a/src/images/svg/symbols/dash_flag.svg
+++ b/src/images/svg/symbols/dash_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/dogecoin.svg b/src/images/svg/symbols/dogecoin.svg
index 03b5012ebbc..92315cba8f8 100644
--- a/src/images/svg/symbols/dogecoin.svg
+++ b/src/images/svg/symbols/dogecoin.svg
@@ -1,126 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/eos_flag.svg b/src/images/svg/symbols/eos_flag.svg
index 40bd9d7a32d..530a94d90ad 100644
--- a/src/images/svg/symbols/eos_flag.svg
+++ b/src/images/svg/symbols/eos_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/eth_flag.svg b/src/images/svg/symbols/eth_flag.svg
index 5174c727cd5..f3921055329 100644
--- a/src/images/svg/symbols/eth_flag.svg
+++ b/src/images/svg/symbols/eth_flag.svg
@@ -1,9 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/filecoin.svg b/src/images/svg/symbols/filecoin.svg
index 24ec5a0a014..c9ed3f30c2d 100644
--- a/src/images/svg/symbols/filecoin.svg
+++ b/src/images/svg/symbols/filecoin.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/iota_flag.svg b/src/images/svg/symbols/iota_flag.svg
index 5804741de06..c5004a1505f 100644
--- a/src/images/svg/symbols/iota_flag.svg
+++ b/src/images/svg/symbols/iota_flag.svg
@@ -1,57 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/ltc_flag.svg b/src/images/svg/symbols/ltc_flag.svg
index 1c70d7a933e..9ae94c0be4b 100644
--- a/src/images/svg/symbols/ltc_flag.svg
+++ b/src/images/svg/symbols/ltc_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/maker.svg b/src/images/svg/symbols/maker.svg
index 4eddf27e701..db6a4ba3acc 100644
--- a/src/images/svg/symbols/maker.svg
+++ b/src/images/svg/symbols/maker.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/monero_flag.svg b/src/images/svg/symbols/monero_flag.svg
index 7df0e201ec7..a5edb571def 100644
--- a/src/images/svg/symbols/monero_flag.svg
+++ b/src/images/svg/symbols/monero_flag.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/neo_flag.svg b/src/images/svg/symbols/neo_flag.svg
index 975aa4b11b1..ff3f0dd42b9 100644
--- a/src/images/svg/symbols/neo_flag.svg
+++ b/src/images/svg/symbols/neo_flag.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/polkadot.svg b/src/images/svg/symbols/polkadot.svg
index 4cfcd5d2fea..e83538dfc5b 100644
--- a/src/images/svg/symbols/polkadot.svg
+++ b/src/images/svg/symbols/polkadot.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/polygon.svg b/src/images/svg/symbols/polygon.svg
index 83a49f69658..02389b092e9 100644
--- a/src/images/svg/symbols/polygon.svg
+++ b/src/images/svg/symbols/polygon.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/ripple_flag.svg b/src/images/svg/symbols/ripple_flag.svg
index 10eac530fa6..57f2f6963a4 100644
--- a/src/images/svg/symbols/ripple_flag.svg
+++ b/src/images/svg/symbols/ripple_flag.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/solana.svg b/src/images/svg/symbols/solana.svg
index 50322d50bdd..a435bf7fd42 100644
--- a/src/images/svg/symbols/solana.svg
+++ b/src/images/svg/symbols/solana.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/stellar_flag.svg b/src/images/svg/symbols/stellar_flag.svg
index 8fa8c10d813..013eb239038 100644
--- a/src/images/svg/symbols/stellar_flag.svg
+++ b/src/images/svg/symbols/stellar_flag.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/tron_flag.svg b/src/images/svg/symbols/tron_flag.svg
index 45c9cfdeb0c..1b2781930ca 100644
--- a/src/images/svg/symbols/tron_flag.svg
+++ b/src/images/svg/symbols/tron_flag.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/uniswap.svg b/src/images/svg/symbols/uniswap.svg
index 18bd554be5a..b2a4ae0430b 100644
--- a/src/images/svg/symbols/uniswap.svg
+++ b/src/images/svg/symbols/uniswap.svg
@@ -1,19 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/xtz.svg b/src/images/svg/symbols/xtz.svg
index d69b4694f9f..68c148ddf92 100644
--- a/src/images/svg/symbols/xtz.svg
+++ b/src/images/svg/symbols/xtz.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/src/images/svg/symbols/z_cash_flag.svg b/src/images/svg/symbols/z_cash_flag.svg
index 5f26af2a561..e6a519092df 100644
--- a/src/images/svg/symbols/z_cash_flag.svg
+++ b/src/images/svg/symbols/z_cash_flag.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
index b7c0d7cd537..ebd27514cf8 100644
--- a/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
+++ b/src/pages/partners/affiliate-ib/_deriv-ib-programme.js
@@ -442,10 +442,7 @@ const ib_dmt5_financial = {
}
const ib_dmt5_financial_non_eu = {
- name: ,
- description: (
-
- ),
+ ...ib_dmt5_financial,
type: [
{
title: ,
@@ -502,40 +499,6 @@ const ib_dmt5_financial_non_eu = {
],
},
],
- countDetails: [
- {
- title: ,
- list: [
- {
- details: (
-
- ),
- icon: 'dmt5_financial_calculator_one',
- iconAlt: ,
- },
- {
- details: (
-
- ),
- icon: 'dmt5_financial_calculator_two',
- iconAlt: ,
- },
- ],
- notes: [
- {
- title: ,
- desc: {
- firstText: (
-
- ),
- secondText: (
-
- ),
- },
- },
- ],
- },
- ],
}
const ib_dmt5_financialSTP = {
@@ -655,10 +618,7 @@ const ib_dmt5_financialSTP = {
}
const ib_dmt5_financialSTP_non_eu = {
- name: ,
- description: (
-
- ),
+ ...ib_dmt5_financialSTP,
type: [
{
title: ,
@@ -694,39 +654,5 @@ const ib_dmt5_financialSTP_non_eu = {
],
},
],
- countDetails: [
- {
- title: ,
- list: [
- {
- details: (
-
- ),
- icon: 'dmt5_financial_stp_calculator_one',
- iconAlt: ,
- },
- {
- details: (
-
- ),
- icon: 'dmt5_financial_stp_calculator_two',
- iconAlt: ,
- },
- ],
- notes: [
- {
- title: ,
- desc: {
- firstText: (
-
- ),
- secondText: (
-
- ),
- },
- },
- ],
- },
- ],
}
export default DerivIBProgramme
From f75fde4cb4e69750e613431f0b320dabe4a845ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 15:02:20 +0300
Subject: [PATCH 3/7] fix nav
---
src/components/custom/other-platforms.js | 2 +-
src/components/elements/off-canvas-menu.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js
index 77dbc54abc2..3e78aa9c499 100644
--- a/src/components/custom/other-platforms.js
+++ b/src/components/custom/other-platforms.js
@@ -357,7 +357,7 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
/>
{!is_eu_country && (
}
content={
diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js
index ab64799ef88..2f7aa789dea 100644
--- a/src/components/elements/off-canvas-menu.js
+++ b/src/components/elements/off-canvas-menu.js
@@ -243,7 +243,7 @@ export const OffCanvasMenuWrapper = (props) => {
{!is_eu_country && (
}
content={
From 40140bb4bd2fbabbe9d9192585fed5b816c0816a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 15:30:45 +0300
Subject: [PATCH 4/7] fix nav
---
src/components/custom/other-platforms.js | 2 +-
src/components/elements/off-canvas-menu.js | 2 +-
src/components/layout/footer/main-links.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js
index 3e78aa9c499..0d880c34dfd 100644
--- a/src/components/custom/other-platforms.js
+++ b/src/components/custom/other-platforms.js
@@ -362,7 +362,7 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
content={
}
- title={}
+ title={}
onClick={onClick}
to="/landing/deriv-go/"
/>
diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js
index 2f7aa789dea..d78ea08bd72 100644
--- a/src/components/elements/off-canvas-menu.js
+++ b/src/components/elements/off-canvas-menu.js
@@ -248,7 +248,7 @@ export const OffCanvasMenuWrapper = (props) => {
content={
}
- title={}
+ title={}
onClick={handleArrowClick}
to="/landing/deriv-go/"
/>
diff --git a/src/components/layout/footer/main-links.js b/src/components/layout/footer/main-links.js
index 319f44f06e9..7fbe029be62 100644
--- a/src/components/layout/footer/main-links.js
+++ b/src/components/layout/footer/main-links.js
@@ -42,7 +42,7 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
{!is_eu_country && (
- {localize('Deriv GO')}
+ {localize('Deriv Go')}
)}
From d2e2a1413fa95e013ef0cc9a26788183340bde53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 15:41:31 +0300
Subject: [PATCH 5/7] deriv go chages for check removed
---
src/components/custom/other-platforms.js | 4 ++--
src/components/elements/off-canvas-menu.js | 4 ++--
src/components/layout/footer/main-links.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js
index 0d880c34dfd..77dbc54abc2 100644
--- a/src/components/custom/other-platforms.js
+++ b/src/components/custom/other-platforms.js
@@ -357,12 +357,12 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
/>
{!is_eu_country && (
}
content={
}
- title={}
+ title={}
onClick={onClick}
to="/landing/deriv-go/"
/>
diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js
index d78ea08bd72..ab64799ef88 100644
--- a/src/components/elements/off-canvas-menu.js
+++ b/src/components/elements/off-canvas-menu.js
@@ -243,12 +243,12 @@ export const OffCanvasMenuWrapper = (props) => {
{!is_eu_country && (
}
content={
}
- title={}
+ title={}
onClick={handleArrowClick}
to="/landing/deriv-go/"
/>
diff --git a/src/components/layout/footer/main-links.js b/src/components/layout/footer/main-links.js
index 7fbe029be62..319f44f06e9 100644
--- a/src/components/layout/footer/main-links.js
+++ b/src/components/layout/footer/main-links.js
@@ -42,7 +42,7 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
{!is_eu_country && (
- {localize('Deriv Go')}
+ {localize('Deriv GO')}
)}
From 496fb895bec52043337249472ea5995004e6a492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Tue, 18 Jan 2022 16:54:13 +0300
Subject: [PATCH 6/7] ako changes
---
src/common/utility.js | 7 +++++++
src/components/layout/nav.js | 36 +++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/common/utility.js b/src/common/utility.js
index d9107cb68c3..4531dd9963f 100644
--- a/src/common/utility.js
+++ b/src/common/utility.js
@@ -347,3 +347,10 @@ export const slugify = (text) =>
.replace(/\s+/g, '-') // Replace spaces with -
.replace(/[^\w-]+/g, '') // Remove all non-word chars
.replace(/--+/g, '-') // Replace multiple - with single -
+
+export const getBaseRef = (ref) => {
+ // this is intended to solve a problem of preact that
+ // in some cases element api's are in the ref.current.base and
+ // in other cases they are in ref.current
+ return ref?.current?.base?.style ? ref?.current?.base : ref?.current
+}
diff --git a/src/components/layout/nav.js b/src/components/layout/nav.js
index cf085db3320..cc140578941 100644
--- a/src/components/layout/nav.js
+++ b/src/components/layout/nav.js
@@ -25,6 +25,7 @@ import {
getLanguage,
getDerivAppLocalizedURL,
redirectToTradingPlatform,
+ getBaseRef,
} from 'common/utility'
// Icons
import Logo from 'images/svg/layout/logo-deriv.svg'
@@ -213,18 +214,20 @@ const NavRight = styled.div`
}};
transform: translateX(
${(props) => {
+ const ref_base = getBaseRef(props.button_ref)
+
if (props.hide_signup_login) {
return 0
} else if (props.move && !props.hide_signup_login) {
- if (props.button_ref.current && props.mounted) {
- props.button_ref.current.style.opacity = 1
+ if (ref_base && props.mounted) {
+ ref_base.style.opacity = 1
}
return 0
} else {
- if (props.button_ref.current && props.mounted) {
- props.button_ref.current.style.opacity = 0
+ if (ref_base && props.mounted) {
+ ref_base.style.opacity = 0
- const calculation = props.button_ref.current.offsetWidth + 2
+ const calculation = ref_base.offsetWidth + 2
return `${calculation}px`
}
return '300px'
@@ -294,7 +297,6 @@ const LinkSignupButton = styled(LinkButton)`
const HamburgerMenu = styled.img`
cursor: pointer;
display: none;
- width: 16px;
@media (max-width: 1060px) {
display: block;
cursor: pointer;
@@ -313,8 +315,6 @@ const HamburgerMenuPartners = styled.img`
const CloseMenu = styled.img`
cursor: pointer;
display: none;
- width: 16px;
-
@media (max-width: 1060px) {
display: block;
cursor: pointer;
@@ -425,9 +425,14 @@ const NavMobile = ({
return (
{is_canvas_menu_open ? (
-
+
) : (
-
+
)}
@@ -841,16 +846,17 @@ const StyledNavRight = styled(NavRight)`
margin-left: auto;
transform: translateX(
${(props) => {
+ const ref_base = getBaseRef(props.button_ref)
if (props.move) {
- if (props.button_ref.current && props.mounted) {
- props.button_ref.current.style.opacity = 1
+ if (ref_base && props.mounted) {
+ ref_base.style.opacity = 1
}
return '50px'
} else {
- if (props.button_ref.current && props.mounted) {
- props.button_ref.current.style.opacity = 0
+ if (ref_base && props.mounted) {
+ ref_base.style.opacity = 0
- const calculation = props.button_ref.current.offsetWidth + 50
+ const calculation = ref_base.offsetWidth + 50
return `${calculation}px`
}
return '225px'
From 516917b1adf69ffa6ccbec8a6a9b91e8e1a3510c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cpavel-latyshou-deriv=E2=80=9D?=
<“pavel.latyshou@regentmarkets.com”>
Date: Wed, 19 Jan 2022 11:54:38 +0300
Subject: [PATCH 7/7] replace nav from master
---
src/components/layout/nav.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/components/layout/nav.js b/src/components/layout/nav.js
index cc140578941..05f6ef65bdc 100644
--- a/src/components/layout/nav.js
+++ b/src/components/layout/nav.js
@@ -297,6 +297,7 @@ const LinkSignupButton = styled(LinkButton)`
const HamburgerMenu = styled.img`
cursor: pointer;
display: none;
+ width: 16px;
@media (max-width: 1060px) {
display: block;
cursor: pointer;
@@ -315,6 +316,8 @@ const HamburgerMenuPartners = styled.img`
const CloseMenu = styled.img`
cursor: pointer;
display: none;
+ width: 16px;
+
@media (max-width: 1060px) {
display: block;
cursor: pointer;
@@ -425,14 +428,9 @@ const NavMobile = ({
return (
{is_canvas_menu_open ? (
-
+
) : (
-
+
)}