Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Hasan/WEBREL-2601/fixed deriv prime minified error #7349

Merged
merged 7 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"71535160": "Calculate the overnight fees for holding any open positions. The fees can be positive or negative depending on your swap rate.",
"71630191": "Do not share your account information and other personal details with anyone via Telegram.",
"71650838": "Speak simply and plainly, and not hide behind ambiguity",
"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:",
"73765361": "Chief Audit Executive",
"74138086": "Take control of your trades on Deriv MT5",
"74593350": "3. Select Real account or Demo account.",
Expand Down Expand Up @@ -347,6 +346,7 @@
"334005764": "What is Deriv Trader?",
"334011253": "1999",
"335040248": "About us",
"337431163": "24/7 trading on synthetics indices",
"337900732": "Denmark",
"339084000": "LEGAL",
"339879944": "GBP/USD",
Expand Down Expand Up @@ -1021,6 +1021,7 @@
"953170529": "Enjoy zero commission trading on all assets.",
"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.",
"955451911": "Take advantage of high leverage and tight spreads on Deriv’s CFD trading platforms.",
"957496593": "We got you covered",
"958430760": "In/Out",
"958956881": "A chart illustrating a losing Low Ticks trade type contract",
"959971586": "We'll email you instructions to reset your password.",
Expand Down Expand Up @@ -1561,6 +1562,7 @@
"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.",
"1479399998": "Find your role with us by browsing Deriv job opportunities in Kigali, Rwanda.",
"1481797714": "Go to DTrader",
"1482377321": "Rated ‘Excellent’ on Trustpilot",
"1482484637": "Contact us via live chat",
"1484774405": "0.25",
"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.",
Expand Down Expand Up @@ -3449,6 +3451,11 @@
"-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.",
"-2032112598": "Be responsible",
"-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.",
"-1354825404": "New to trading?",
"-1571360471": "Tailored learning resources",
"-1307122236": "Multilingual support anytime",
"-1943952619": "Regulated and licensed globally",
"-1863275344": "250+ tradeable financial and derived assests",
"-2125275828": "Unique trade types. Hundreds of instruments. Financial and derived markets.",
"-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.",
"-1957784093": "Easy And Free Sign Up | Online Trading | Deriv.com",
Expand Down Expand Up @@ -3542,7 +3549,6 @@
"-11775922": "Trading Volatility 100 Index on Deriv GO",
"-1429891690": "Better risk management",
"-789090463": "Risk management on Deriv GO",
"-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.",
"-324582954": "Trade forex, synthetics, and cryptocurrencies with our app — Deriv GO.",
"-1956694920": "Get trading with Deriv X",
"-1499489324": "Deriv X demo account signup page",
Expand Down Expand Up @@ -4326,7 +4332,6 @@
"-1678516609": "Deriv operates and offers its products and services under the Deriv Group, which has several subsidiary companies licensed in their respective jurisdictions.",
"-1937167246": "Return to log in",
"-2054653788": "Forgot your Deriv password? Want to reset your password? Send us your email address and we’ll email you the instructions.",
"-1354825404": "New to trading?",
"-669896084": "Strong password",
"-1511869631": "Use strong and varied passwords. Make them as difficult as possible for anyone to guess.",
"-1973397639": "Secured login details",
Expand Down Expand Up @@ -4724,6 +4729,7 @@
"-1520902282": "No credit card needed",
"-2022759357": "Make trading accessible to anyone, anywhere",
"-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.",
"-1321496264": "In a journey spanning 25 years, we have grown to over 2.5 million customers worldwide. But our mission has remained the same:",
"-554746075": "Integrity",
"-1917169640": "We serve our customers with fairness and transparency. We settle all contracts by the book and speak plainly and truthfully.",
"-1679427554": "Customer focus",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo } from 'react'
import React, { useEffect, useMemo, useState } from 'react'
import { get_in_touch_form_container, get_in_touch_form } from './get-in-touch.module.scss'
import Flex from 'features/components/atoms/flex-box'
import Typography from 'features/components/atoms/typography'
Expand All @@ -8,9 +8,15 @@ import Input from 'features/components/atoms/input'
import { TString } from 'types/generics'
import useContactForm from 'features/hooks/use-contact-form'
import { TTypographyColor } from 'features/types'
import { usePageLoaded } from 'components/hooks/use-page-loaded'

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

const {
register,
Expand All @@ -20,7 +26,7 @@ const ContactFormGetInTouch = () => {
handleSubmit,
} = contact_us_form

const get_form_bottom_message = useMemo(() => {
useEffect(() => {
const { is_submission_fail, is_submitted } = form_state
let text_values: { color: TTypographyColor; text: TString }
if (!is_submission_fail && !is_submitted)
Expand All @@ -38,9 +44,11 @@ const ContactFormGetInTouch = () => {
color: 'brand',
text: '_t_Form submission error. Please submit the form again._t_',
}
return text_values
setTextValues(text_values)
}, [form_state])

if (!is_mounted) return null

return (
<Flex.Box direction="col" basis="5-12" className={get_in_touch_form_container}>
<Flex.Box
Expand Down Expand Up @@ -140,17 +148,17 @@ const ContactFormGetInTouch = () => {
<Typography.Paragraph
className={'at-visible-phone-only'}
size={'xs'}
textcolor={get_form_bottom_message?.color}
textcolor={text_values?.color}
>
<Localize translate_text={get_form_bottom_message?.text} />
<Localize translate_text={text_values?.text} />
</Typography.Paragraph>

<Typography.Paragraph
className={'at-visible-larger-than-phone'}
size={'small'}
textcolor={get_form_bottom_message?.color}
textcolor={text_values?.color}
>
<Localize translate_text={get_form_bottom_message?.text} />
<Localize translate_text={text_values?.text} />
</Typography.Paragraph>
</Flex.Item>
</Flex.Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { localize } from 'components/localization'

export const expo_cards: ExpoCardTypes[] = [
{
id: 1,
title: 'iFX Expo Latam',
date: '_t_9-11 April 2024_t_',
image: (
Expand All @@ -20,6 +21,7 @@ export const expo_cards: ExpoCardTypes[] = [
link: 'https://latam2024.ifxexpo.com/',
},
{
id: 2,
title: 'iFX Expo Cyprus',
date: '_t_18-20 June 2024_t_',
image: (
Expand All @@ -34,6 +36,7 @@ export const expo_cards: ExpoCardTypes[] = [
link: 'https://ifxexpo.com/',
},
{
id: 3,
title: 'Forex Expo Dubai',
date: '_t_7-8 October 2024_t_',
image: (
Expand Down
67 changes: 33 additions & 34 deletions src/features/pages/partners/deriv-prime/meet-us-there/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,46 +35,45 @@ const MeetUsThere = () => {
>
{expo_cards.map((card) => {
return (
<>
<Link
style={{ textDecoration: 'none', flex: 1 }}
url={{
type: 'non-company',
href: `${card.link}`,
target: '_blank',
}}
<Link
style={{ textDecoration: 'none', flex: 1 }}
url={{
type: 'non-company',
href: `${card.link}`,
target: '_blank',
}}
key={card.id}
>
<FlexBox.Box
key={card.title}
className={styles.styled_card}
direction={'col'}
justify={'start'}
align={'start'}
radius={'8x'}
mt={'12x'}
md={{ mt: '0x' }}
>
{card.image}
<FlexBox.Box
key={card.title}
className={styles.styled_card}
padding="8x"
direction={'col'}
justify={'start'}
align={'start'}
radius={'8x'}
mt={'12x'}
md={{ mt: '0x' }}
md={{ padding: '12x' }}
>
{card.image}
<FlexBox.Box
padding="8x"
direction={'col'}
md={{ padding: '12x' }}
<Typography.Paragraph
size={'xlarge'}
weight={'bold'}
mb={'4x'}
font_family="UBUNTU"
>
<Typography.Paragraph
size={'xlarge'}
weight={'bold'}
mb={'4x'}
font_family="UBUNTU"
>
<Localize translate_text={card.title} />
</Typography.Paragraph>
<Typography.Paragraph size="small">
<Localize translate_text={card.date} />
</Typography.Paragraph>
</FlexBox.Box>
{card.title}
</Typography.Paragraph>
<Typography.Paragraph size="small">
<Localize translate_text={card.date} />
</Typography.Paragraph>
</FlexBox.Box>
</Link>
</>
</FlexBox.Box>
</Link>
)
})}
</FlexBox.Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { ReactElement } from 'react'
import { TString } from 'types/generics'

export type ExpoCardTypes = {
title?: TString
id: number
title?: string
image?: ReactElement
date?: TString
link?: string
Expand Down
2 changes: 1 addition & 1 deletion src/translations/ach.json
Original file line number Diff line number Diff line change
Expand Up @@ -4731,4 +4731,4 @@
"-1773685845": "crwdns4730380:0crwdne4730380:0",
"-661813412": "crwdns4730382:0crwdne4730382:0",
"-1520902282": "crwdns4730384:0crwdne4730384:0"
}
}
2 changes: 1 addition & 1 deletion src/translations/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -4785,4 +4785,4 @@
"-1773685845": "جميع الأسواق والمنصات",
"-661813412": "استمتع بالوصول الكامل إلى جميع أسواقنا ومنصاتنا.",
"-1520902282": "لا حاجة لبطاقة ائتمان"
}
}
2 changes: 1 addition & 1 deletion src/translations/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4783,4 +4783,4 @@
"-1773685845": "সকল মার্কেটস এবং প্লাটফর্ম",
"-661813412": "আমাদের সকল মার্কেটস এবং প্ল্যাটফর্মে পূর্ণ প্রবেশাধিকার উপভোগ করুন।",
"-1520902282": "কোনো ক্রেডিট কার্ডের প্রয়োজন নেই"
}
}
2 changes: 1 addition & 1 deletion src/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -4793,4 +4793,4 @@
"-1773685845": "Alle Märkte und Plattformen",
"-661813412": "Genießen Sie vollen Zugang zu allen unseren Märkten und Plattformen.",
"-1520902282": "Keine Kreditkarte erforderlich"
}
}
2 changes: 1 addition & 1 deletion src/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -4784,4 +4784,4 @@
"-1773685845": "Todos los mercados y plataformas",
"-661813412": "Disfrute del acceso completo a todos nuestros mercados y plataformas.",
"-1520902282": "No se necesita tarjeta de crédito"
}
}
2 changes: 1 addition & 1 deletion src/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -4785,4 +4785,4 @@
"-1773685845": "Tous les marchés et plateformes",
"-661813412": "Profitez d'un accès complet à tous nos marchés et plateformes.\n",
"-1520902282": "Aucune carte de crédit requise"
}
}
2 changes: 1 addition & 1 deletion src/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -4785,4 +4785,4 @@
"-1773685845": "Tutti i mercati e le piattaforme",
"-661813412": "Sfrutta l'accesso completo a tutti i mercati e tutte le piattaforme.",
"-1520902282": "Carta di credito non necessaria"
}
}
2 changes: 1 addition & 1 deletion src/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -4785,4 +4785,4 @@
"-1773685845": "모든 시장 및 플랫폼",
"-661813412": "우리의 모든 시장 및 플랫폼으로의 전체 접근권한을 누리세요.",
"-1520902282": "신용카드가 필요하지 않습니다"
}
}
2 changes: 1 addition & 1 deletion src/translations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -4787,4 +4787,4 @@
"-1773685845": "Wszystkie rynki i platformy",
"-661813412": "Ciesz się pełnym dostępem do naszych rynków i platform.",
"-1520902282": "Karta kredytowa nie jest wymagana"
}
}
2 changes: 1 addition & 1 deletion src/translations/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -4786,4 +4786,4 @@
"-1773685845": "Todos os mercados e plataformas",
"-661813412": "Desfrute de acesso total a todos os nossos mercados e plataformas.",
"-1520902282": "Não é necessário cartão de crédito"
}
}
2 changes: 1 addition & 1 deletion src/translations/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -4785,4 +4785,4 @@
"-1773685845": "Все рынки и платформы",
"-661813412": "У вас будет полный доступ ко всем нашим рынкам и платформам.",
"-1520902282": "Никаких кредитных карт"
}
}
2 changes: 1 addition & 1 deletion src/translations/si.json
Original file line number Diff line number Diff line change
Expand Up @@ -4797,4 +4797,4 @@
"-1773685845": "සියලුම වෙළඳපල සහ වේදිකා",
"-661813412": "අපගේ සියලුම වෙළඳපලවල් සහ වේදිකා වෙත පූර්ණ ප්‍රවේශය බුක්ති විඳින්න.",
"-1520902282": "ණය කාඩ්පත​ අවශ්‍ය නැත"
}
}
2 changes: 1 addition & 1 deletion src/translations/sw.json
Original file line number Diff line number Diff line change
Expand Up @@ -4753,4 +4753,4 @@
"-1773685845": "Masoko yote na majukwaa",
"-661813412": "Furahia ufikiaji kamili wa masoko na majukwaa yetu yote.",
"-1520902282": "Hakuna credit kadi inayohitajika"
}
}
2 changes: 1 addition & 1 deletion src/translations/th.json
Original file line number Diff line number Diff line change
Expand Up @@ -4801,4 +4801,4 @@
"-1773685845": "ตลาดและแพลตฟอร์มทั้งหมด",
"-661813412": "สนุกกับการเข้าถึงตลาดและแพลตฟอร์มทั้งหมดของเราได้อย่างเต็มที่",
"-1520902282": "ไม่ต้องใช้บัตรเครดิต"
}
}
2 changes: 1 addition & 1 deletion src/translations/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -4802,4 +4802,4 @@
"-1773685845": "Tüm piyasalar ve platformlar",
"-661813412": "Tüm piyasalarımıza ve platformlarımıza tam erişimin keyfini çıkarın.",
"-1520902282": "Kredi kartı gerekmez"
}
}
2 changes: 1 addition & 1 deletion src/translations/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -4780,4 +4780,4 @@
"-1773685845": "Mọi loại thị trường và nền tảng",
"-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.",
"-1520902282": "Không cần thẻ tín dụng"
}
}
2 changes: 1 addition & 1 deletion src/translations/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4754,4 +4754,4 @@
"-1773685845": "所有市场和平台",
"-661813412": "享有访问我们所有市场和平台的权限。",
"-1520902282": "不需要信用卡"
}
}
2 changes: 1 addition & 1 deletion src/translations/zh_tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -4748,4 +4748,4 @@
"-1773685845": "所有市場和平台",
"-661813412": "享有存取我們所有市場和平台的權限。",
"-1520902282": "不需要信用卡"
}
}
Loading