Skip to content

Commit d1d74ae

Browse files
authored
Hasan/WEBREL-2601/fixed deriv prime minified error (binary-com#7349)
* chore: fixed deriv prime minified error * chore: fixed type error * chore: test * chore: fixed contact us error
1 parent 8f2a91c commit d1d74ae

File tree

23 files changed

+80
-63
lines changed

23 files changed

+80
-63
lines changed

crowdin/messages.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
"71535160": "Calculate the overnight fees for holding any open positions. The fees can be positive or negative depending on your swap rate.",
8484
"71630191": "Do not share your account information and other personal details with anyone via Telegram.",
8585
"71650838": "Speak simply and plainly, and not hide behind ambiguity",
86-
"71755468": "In a journey spanning more than 23 years, we have grown to over 2.5 million customers worldwide. But our mission has remained the same:",
8786
"73765361": "Chief Audit Executive",
8887
"74138086": "Take control of your trades on Deriv MT5",
8988
"74593350": "3. Select Real account or Demo account.",
@@ -347,6 +346,7 @@
347346
"334005764": "What is Deriv Trader?",
348347
"334011253": "1999",
349348
"335040248": "About us",
349+
"337431163": "24/7 trading on synthetics indices",
350350
"337900732": "Denmark",
351351
"339084000": "LEGAL",
352352
"339879944": "GBP/USD",
@@ -1021,6 +1021,7 @@
10211021
"953170529": "Enjoy zero commission trading on all assets.",
10221022
"954358534": "Rating a great experience lets you show your appreciation towards your trade partners. They’ll be encouraged to maintain their excellent standards upon receiving your positive ratings. Your ratings and recommendations will also help other Deriv P2P users find reliable trade partners.",
10231023
"955451911": "Take advantage of high leverage and tight spreads on Deriv’s CFD trading platforms.",
1024+
"957496593": "We got you covered",
10241025
"958430760": "In/Out",
10251026
"958956881": "A chart illustrating a losing Low Ticks trade type contract",
10261027
"959971586": "We'll email you instructions to reset your password.",
@@ -1561,6 +1562,7 @@
15611562
"1478423964": "Deriv's proprietary synthetics are free of market and liquidity risks. Enjoy 24/7 synthetic trading on Deriv MT5, DTrader, and our other platforms.",
15621563
"1479399998": "Find your role with us by browsing Deriv job opportunities in Kigali, Rwanda.",
15631564
"1481797714": "Go to DTrader",
1565+
"1482377321": "Rated ‘Excellent’ on Trustpilot",
15641566
"1482484637": "Contact us via live chat",
15651567
"1484774405": "0.25",
15661568
"1485059739": "This formula also applies to <0>metals</0> & <0>basket indices</0>. Commission rates, contract sizes, and deal prices depend on the individual asset.",
@@ -3449,6 +3451,11 @@
34493451
"-955173076": "We provide clear, accessible information about our platforms and processes so we can build trust and strong client relationships. Through detailed product descriptions and open communication, we aim to make it easier for you to make informed trading decisions.",
34503452
"-2032112598": "Be responsible",
34513453
"-35673135": "We build our services and platforms on a foundation of trust, honesty, and ethical practices. By proactively implementing policies and controls to prevent unlawful activities, we ensure a fair and secure environment for our trading community.",
3454+
"-1354825404": "New to trading?",
3455+
"-1571360471": "Tailored learning resources",
3456+
"-1307122236": "Multilingual support anytime",
3457+
"-1943952619": "Regulated and licensed globally",
3458+
"-1863275344": "250+ tradeable financial and derived assests",
34523459
"-2125275828": "Unique trade types. Hundreds of instruments. Financial and derived markets.",
34533460
"-154889447": "Ready to join over 2.5 million traders who have chosen Deriv as their trusted broker? Enter your email address to create a free demo account.",
34543461
"-1957784093": "Easy And Free Sign Up | Online Trading | Deriv.com",
@@ -3542,7 +3549,6 @@
35423549
"-11775922": "Trading Volatility 100 Index on Deriv GO",
35433550
"-1429891690": "Better risk management",
35443551
"-789090463": "Risk management on Deriv GO",
3545-
"-1313766935": "Take a look at Deriv GO’s product roadmap, give us your feedback on what we’re building and suggestions on what to build next.",
35463552
"-324582954": "Trade forex, synthetics, and cryptocurrencies with our app — Deriv GO.",
35473553
"-1956694920": "Get trading with Deriv X",
35483554
"-1499489324": "Deriv X demo account signup page",
@@ -4326,7 +4332,6 @@
43264332
"-1678516609": "Deriv operates and offers its products and services under the Deriv Group, which has several subsidiary companies licensed in their respective jurisdictions.",
43274333
"-1937167246": "Return to log in",
43284334
"-2054653788": "Forgot your Deriv password? Want to reset your password? Send us your email address and we’ll email you the instructions.",
4329-
"-1354825404": "New to trading?",
43304335
"-669896084": "Strong password",
43314336
"-1511869631": "Use strong and varied passwords. Make them as difficult as possible for anyone to guess.",
43324337
"-1973397639": "Secured login details",
@@ -4724,6 +4729,7 @@
47244729
"-1520902282": "No credit card needed",
47254730
"-2022759357": "Make trading accessible to anyone, anywhere",
47264731
"-77779780": "From inception, our goal was to break free of the high commissions and clunky products offered by traditional brokers. Also, we aim to deliver a first-class experience to digitally inclined traders, regardless of the size of their accounts.",
4732+
"-1321496264": "In a journey spanning 25 years, we have grown to over 2.5 million customers worldwide. But our mission has remained the same:",
47274733
"-554746075": "Integrity",
47284734
"-1917169640": "We serve our customers with fairness and transparency. We settle all contracts by the book and speak plainly and truthfully.",
47294735
"-1679427554": "Customer focus",

src/features/pages/partners/deriv-prime/get-in-touch/contact-form.tsx

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useMemo } from 'react'
1+
import React, { useEffect, useMemo, useState } from 'react'
22
import { get_in_touch_form_container, get_in_touch_form } from './get-in-touch.module.scss'
33
import Flex from 'features/components/atoms/flex-box'
44
import Typography from 'features/components/atoms/typography'
@@ -8,9 +8,15 @@ import Input from 'features/components/atoms/input'
88
import { TString } from 'types/generics'
99
import useContactForm from 'features/hooks/use-contact-form'
1010
import { TTypographyColor } from 'features/types'
11+
import { usePageLoaded } from 'components/hooks/use-page-loaded'
1112

1213
const ContactFormGetInTouch = () => {
14+
const [is_mounted] = usePageLoaded()
1315
const { contact_us_form, on_submit, form_state } = useContactForm()
16+
const [text_values, setTextValues] = useState<{ color: TTypographyColor; text: TString }>({
17+
color: 'gray-shade',
18+
text: '_t_By clicking "Submit", you give your consent to be contacted by Deriv by email and telephone for marketing purposes._t_',
19+
})
1420

1521
const {
1622
register,
@@ -20,7 +26,7 @@ const ContactFormGetInTouch = () => {
2026
handleSubmit,
2127
} = contact_us_form
2228

23-
const get_form_bottom_message = useMemo(() => {
29+
useEffect(() => {
2430
const { is_submission_fail, is_submitted } = form_state
2531
let text_values: { color: TTypographyColor; text: TString }
2632
if (!is_submission_fail && !is_submitted)
@@ -38,9 +44,11 @@ const ContactFormGetInTouch = () => {
3844
color: 'brand',
3945
text: '_t_Form submission error. Please submit the form again._t_',
4046
}
41-
return text_values
47+
setTextValues(text_values)
4248
}, [form_state])
4349

50+
if (!is_mounted) return null
51+
4452
return (
4553
<Flex.Box direction="col" basis="5-12" className={get_in_touch_form_container}>
4654
<Flex.Box
@@ -140,17 +148,17 @@ const ContactFormGetInTouch = () => {
140148
<Typography.Paragraph
141149
className={'at-visible-phone-only'}
142150
size={'xs'}
143-
textcolor={get_form_bottom_message?.color}
151+
textcolor={text_values?.color}
144152
>
145-
<Localize translate_text={get_form_bottom_message?.text} />
153+
<Localize translate_text={text_values?.text} />
146154
</Typography.Paragraph>
147155

148156
<Typography.Paragraph
149157
className={'at-visible-larger-than-phone'}
150158
size={'small'}
151-
textcolor={get_form_bottom_message?.color}
159+
textcolor={text_values?.color}
152160
>
153-
<Localize translate_text={get_form_bottom_message?.text} />
161+
<Localize translate_text={text_values?.text} />
154162
</Typography.Paragraph>
155163
</Flex.Item>
156164
</Flex.Box>

src/features/pages/partners/deriv-prime/meet-us-there/data.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { localize } from 'components/localization'
66

77
export const expo_cards: ExpoCardTypes[] = [
88
{
9+
id: 1,
910
title: 'iFX Expo Latam',
1011
date: '_t_9-11 April 2024_t_',
1112
image: (
@@ -20,6 +21,7 @@ export const expo_cards: ExpoCardTypes[] = [
2021
link: 'https://latam2024.ifxexpo.com/',
2122
},
2223
{
24+
id: 2,
2325
title: 'iFX Expo Cyprus',
2426
date: '_t_18-20 June 2024_t_',
2527
image: (
@@ -34,6 +36,7 @@ export const expo_cards: ExpoCardTypes[] = [
3436
link: 'https://ifxexpo.com/',
3537
},
3638
{
39+
id: 3,
3740
title: 'Forex Expo Dubai',
3841
date: '_t_7-8 October 2024_t_',
3942
image: (

src/features/pages/partners/deriv-prime/meet-us-there/index.tsx

+33-34
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,45 @@ const MeetUsThere = () => {
3535
>
3636
{expo_cards.map((card) => {
3737
return (
38-
<>
39-
<Link
40-
style={{ textDecoration: 'none', flex: 1 }}
41-
url={{
42-
type: 'non-company',
43-
href: `${card.link}`,
44-
target: '_blank',
45-
}}
38+
<Link
39+
style={{ textDecoration: 'none', flex: 1 }}
40+
url={{
41+
type: 'non-company',
42+
href: `${card.link}`,
43+
target: '_blank',
44+
}}
45+
key={card.id}
46+
>
47+
<FlexBox.Box
48+
key={card.title}
49+
className={styles.styled_card}
50+
direction={'col'}
51+
justify={'start'}
52+
align={'start'}
53+
radius={'8x'}
54+
mt={'12x'}
55+
md={{ mt: '0x' }}
4656
>
57+
{card.image}
4758
<FlexBox.Box
48-
key={card.title}
49-
className={styles.styled_card}
59+
padding="8x"
5060
direction={'col'}
51-
justify={'start'}
52-
align={'start'}
53-
radius={'8x'}
54-
mt={'12x'}
55-
md={{ mt: '0x' }}
61+
md={{ padding: '12x' }}
5662
>
57-
{card.image}
58-
<FlexBox.Box
59-
padding="8x"
60-
direction={'col'}
61-
md={{ padding: '12x' }}
63+
<Typography.Paragraph
64+
size={'xlarge'}
65+
weight={'bold'}
66+
mb={'4x'}
67+
font_family="UBUNTU"
6268
>
63-
<Typography.Paragraph
64-
size={'xlarge'}
65-
weight={'bold'}
66-
mb={'4x'}
67-
font_family="UBUNTU"
68-
>
69-
<Localize translate_text={card.title} />
70-
</Typography.Paragraph>
71-
<Typography.Paragraph size="small">
72-
<Localize translate_text={card.date} />
73-
</Typography.Paragraph>
74-
</FlexBox.Box>
69+
{card.title}
70+
</Typography.Paragraph>
71+
<Typography.Paragraph size="small">
72+
<Localize translate_text={card.date} />
73+
</Typography.Paragraph>
7574
</FlexBox.Box>
76-
</Link>
77-
</>
75+
</FlexBox.Box>
76+
</Link>
7877
)
7978
})}
8079
</FlexBox.Box>

src/features/pages/partners/deriv-prime/meet-us-there/types.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { ReactElement } from 'react'
22
import { TString } from 'types/generics'
33

44
export type ExpoCardTypes = {
5-
title?: TString
5+
id: number
6+
title?: string
67
image?: ReactElement
78
date?: TString
89
link?: string

src/translations/ach.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4731,4 +4731,4 @@
47314731
"-1773685845": "crwdns4730380:0crwdne4730380:0",
47324732
"-661813412": "crwdns4730382:0crwdne4730382:0",
47334733
"-1520902282": "crwdns4730384:0crwdne4730384:0"
4734-
}
4734+
}

src/translations/ar.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,4 +4785,4 @@
47854785
"-1773685845": "جميع الأسواق والمنصات",
47864786
"-661813412": "استمتع بالوصول الكامل إلى جميع أسواقنا ومنصاتنا.",
47874787
"-1520902282": "لا حاجة لبطاقة ائتمان"
4788-
}
4788+
}

src/translations/bn.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4783,4 +4783,4 @@
47834783
"-1773685845": "সকল মার্কেটস এবং প্লাটফর্ম",
47844784
"-661813412": "আমাদের সকল মার্কেটস এবং প্ল্যাটফর্মে পূর্ণ প্রবেশাধিকার উপভোগ করুন।",
47854785
"-1520902282": "কোনো ক্রেডিট কার্ডের প্রয়োজন নেই"
4786-
}
4786+
}

src/translations/de.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4793,4 +4793,4 @@
47934793
"-1773685845": "Alle Märkte und Plattformen",
47944794
"-661813412": "Genießen Sie vollen Zugang zu allen unseren Märkten und Plattformen.",
47954795
"-1520902282": "Keine Kreditkarte erforderlich"
4796-
}
4796+
}

src/translations/es.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4784,4 +4784,4 @@
47844784
"-1773685845": "Todos los mercados y plataformas",
47854785
"-661813412": "Disfrute del acceso completo a todos nuestros mercados y plataformas.",
47864786
"-1520902282": "No se necesita tarjeta de crédito"
4787-
}
4787+
}

src/translations/fr.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,4 +4785,4 @@
47854785
"-1773685845": "Tous les marchés et plateformes",
47864786
"-661813412": "Profitez d'un accès complet à tous nos marchés et plateformes.\n",
47874787
"-1520902282": "Aucune carte de crédit requise"
4788-
}
4788+
}

src/translations/it.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,4 +4785,4 @@
47854785
"-1773685845": "Tutti i mercati e le piattaforme",
47864786
"-661813412": "Sfrutta l'accesso completo a tutti i mercati e tutte le piattaforme.",
47874787
"-1520902282": "Carta di credito non necessaria"
4788-
}
4788+
}

src/translations/ko.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,4 +4785,4 @@
47854785
"-1773685845": "모든 시장 및 플랫폼",
47864786
"-661813412": "우리의 모든 시장 및 플랫폼으로의 전체 접근권한을 누리세요.",
47874787
"-1520902282": "신용카드가 필요하지 않습니다"
4788-
}
4788+
}

src/translations/pl.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4787,4 +4787,4 @@
47874787
"-1773685845": "Wszystkie rynki i platformy",
47884788
"-661813412": "Ciesz się pełnym dostępem do naszych rynków i platform.",
47894789
"-1520902282": "Karta kredytowa nie jest wymagana"
4790-
}
4790+
}

src/translations/pt.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4786,4 +4786,4 @@
47864786
"-1773685845": "Todos os mercados e plataformas",
47874787
"-661813412": "Desfrute de acesso total a todos os nossos mercados e plataformas.",
47884788
"-1520902282": "Não é necessário cartão de crédito"
4789-
}
4789+
}

src/translations/ru.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4785,4 +4785,4 @@
47854785
"-1773685845": "Все рынки и платформы",
47864786
"-661813412": "У вас будет полный доступ ко всем нашим рынкам и платформам.",
47874787
"-1520902282": "Никаких кредитных карт"
4788-
}
4788+
}

src/translations/si.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4797,4 +4797,4 @@
47974797
"-1773685845": "සියලුම වෙළඳපල සහ වේදිකා",
47984798
"-661813412": "අපගේ සියලුම වෙළඳපලවල් සහ වේදිකා වෙත පූර්ණ ප්‍රවේශය බුක්ති විඳින්න.",
47994799
"-1520902282": "ණය කාඩ්පත​ අවශ්‍ය නැත"
4800-
}
4800+
}

src/translations/sw.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4753,4 +4753,4 @@
47534753
"-1773685845": "Masoko yote na majukwaa",
47544754
"-661813412": "Furahia ufikiaji kamili wa masoko na majukwaa yetu yote.",
47554755
"-1520902282": "Hakuna credit kadi inayohitajika"
4756-
}
4756+
}

src/translations/th.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4801,4 +4801,4 @@
48014801
"-1773685845": "ตลาดและแพลตฟอร์มทั้งหมด",
48024802
"-661813412": "สนุกกับการเข้าถึงตลาดและแพลตฟอร์มทั้งหมดของเราได้อย่างเต็มที่",
48034803
"-1520902282": "ไม่ต้องใช้บัตรเครดิต"
4804-
}
4804+
}

src/translations/tr.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4802,4 +4802,4 @@
48024802
"-1773685845": "Tüm piyasalar ve platformlar",
48034803
"-661813412": "Tüm piyasalarımıza ve platformlarımıza tam erişimin keyfini çıkarın.",
48044804
"-1520902282": "Kredi kartı gerekmez"
4805-
}
4805+
}

src/translations/vi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4780,4 +4780,4 @@
47804780
"-1773685845": "Mọi loại thị trường và nền tảng",
47814781
"-661813412": "Tận hưởng quyền truy cập đầy đủ vào tất cả thị trường và nền tảng của chúng tôi.",
47824782
"-1520902282": "Không cần thẻ tín dụng"
4783-
}
4783+
}

src/translations/zh_cn.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4754,4 +4754,4 @@
47544754
"-1773685845": "所有市场和平台",
47554755
"-661813412": "享有访问我们所有市场和平台的权限。",
47564756
"-1520902282": "不需要信用卡"
4757-
}
4757+
}

src/translations/zh_tw.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4748,4 +4748,4 @@
47484748
"-1773685845": "所有市場和平台",
47494749
"-661813412": "享有存取我們所有市場和平台的權限。",
47504750
"-1520902282": "不需要信用卡"
4751-
}
4751+
}

0 commit comments

Comments
 (0)