Skip to content

Commit

Permalink
Merge pull request #46 from suisin-deriv/suisin/DIEL_flow_change
Browse files Browse the repository at this point in the history
Suisin/diel flow change
  • Loading branch information
shaheer-deriv committed Jun 23, 2023
2 parents 34d0c04 + 26c5192 commit 319eafe
Show file tree
Hide file tree
Showing 36 changed files with 321 additions and 330 deletions.
2 changes: 1 addition & 1 deletion packages/appstore/src/components/cfds-listing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const CFDsListing = () => {

<div className='cfd-full-row'>
<Text line_height='m' weight='bold' color='prominent'>
{localize('Other CFDs')}
{localize('Other CFD Platforms')}
</Text>
</div>
</React.Fragment>
Expand Down
13 changes: 11 additions & 2 deletions packages/cfd/src/Containers/trade-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ type TTradeModalProps = {
platform: TCFDsPlatformType;
};

const PlatformIconsAndDescriptions = (platform: TCFDsPlatformType, is_demo: string) => {
const PlatformIconsAndDescriptions = (
platform: TCFDsPlatformType,
is_demo: string,
mt5_trade_account: Required<DetailsOfEachMT5Loginid>
) => {
return (
<React.Fragment>
<Icon icon={`IcRebranding${platform.charAt(0).toUpperCase()}${platform.slice(1)}Dashboard`} size={24} />
Expand All @@ -40,6 +44,11 @@ const PlatformIconsAndDescriptions = (platform: TCFDsPlatformType, is_demo: stri
}}
/>
</Text>
{(mt5_trade_account as TTradingPlatformAccounts)?.display_login && (
<Text color='less-prominent' size='xxxs' line_height='xxxs'>
{(mt5_trade_account as TTradingPlatformAccounts)?.display_login}
</Text>
)}
</div>
</React.Fragment>
);
Expand Down Expand Up @@ -143,7 +152,7 @@ const TradeModal = ({
return (
<div className='cfd-trade-modal-container'>
<div className='cfd-trade-modal'>
{PlatformIconsAndDescriptions(platform, is_demo)}
{PlatformIconsAndDescriptions(platform, is_demo, mt5_trade_account)}
{mt5_trade_account?.display_balance && (
<Text size='xs' color='profit-success' className='cfd-trade-modal__desc-balance' weight='bold'>
<Money
Expand Down
14 changes: 7 additions & 7 deletions packages/p2p/src/translations/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "تفاصيل البنك",
"842911528": "لا تعرض هذه الرسالة مرة أخرى.",
"846659545": "Your ad is not listed on <0>Buy/Sell</0> because the amount exceeds your daily limit of {{limit}} {{currency}}.\n <1 /><1 />You can still see your ad on <0>My ads</0>. If you’d like to increase your daily limit, please contact us via <2>live chat</2>.",
"847028402": "Check your email",
"847028402": "تحقق من بريدك الإلكتروني",
"858027714": "نشط منذ {{ duration }} دقيقة",
"873437248": "تعليمات (اختيارية)",
"876086855": "أكمل نموذج التقييم المالي",
Expand Down Expand Up @@ -148,7 +148,7 @@
"1587250288": "معرف الإعلان {{advert_id}} ",
"1607051458": "البحث عن طريق الاسم المستعار",
"1615530713": "هناك شيء غير صحيح",
"1620858613": "You're editing an ad to sell <0>{{ target_amount }} {{ target_currency }}</0> for <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"1620858613": "أنت تقوم بتحرير إعلان لبيع <0>{{ target_amount }} {{ target_currency }}</0> مقابل <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"1623916605": "لم أتمكن من تسديد المبلغ بالكامل.",
"1654365787": "غير معروف",
"1660278694": "قام المعلن بتغيير السعر قبل تأكيد الطلب.",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "لا يمكن حذف طريقة الدفع هذه",
"-1088454544": "احصل على رابط جديد",
"-2124584325": "لقد تحققنا من طلبك",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "اضغط على الرابط في البريد الإلكتروني الذي أرسلناه لك للسماح بهذه المعاملة.",
"-1238182882": "ستنتهي صلاحية الرابط خلال 10 دقائق.",
"-142727028": "البريد الإلكتروني موجود في مجلد الرسائل غير المرغوب فيها (أحيانًا تضيع الأشياء هناك).",
"-227512949": "تحقق من التهجئة أو استخدم مصطلحًا مختلفًا.",
"-1554938377": "ابحث عن طريقة الدفع",
Expand Down Expand Up @@ -326,13 +326,13 @@
"-379708059": "الحد الأدنى للطلب",
"-1459289144": "ستكون هذه المعلومات مرئية للجميع.",
"-207756259": "يمكنك النقر واختيار ما يصل إلى 3.",
"-1282343703": "You're creating an ad to buy <0>{{ target_amount }} {{ target_currency }}</0> for <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-2139632895": "You're creating an ad to sell <0>{{ target_amount }} {{ target_currency }}</0> for <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-1282343703": "أنت بصدد إنشاء إعلان لشراء <0>{{ target_amount }} {{ target_currency }}</0> مقابل <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-2139632895": "أنت بصدد إنشاء إعلان لبيع <0>{{ target_amount }} {{ target_currency }}</0> مقابل <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-40669120": "أنت بصدد إنشاء إعلان لبيع <0>{{ target_amount }} {{ target_currency }}</0>...",
"-514789442": "أنت بصدد إنشاء إعلان للشراء...",
"-1179827369": "إنشاء إعلان جديد",
"-230677679": "{{text}}",
"-1914431773": "You're editing an ad to buy <0>{{ target_amount }} {{ target_currency }}</0> for <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-1914431773": "أنت تقوم بتحرير إعلان لشراء <0>{{ target_amount }} {{ target_currency }}</0> مقابل <0>{{ local_amount }} {{ local_currency }}</0> <1>({{ price_rate }} {{local_currency}}/{{ target_currency }})</1>",
"-107996509": "أنت تقوم بتحرير إعلان لشراء <0>{{ target_amount }} {{ target_currency }}</0>...",
"-863580260": "أنت تقوم بتحرير إعلان للشراء...",
"-1396464057": "أنت تقوم بتحرير إعلان للبيع...",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "ব্যাংকের বিস্তারিত বিবরণ",
"842911528": "এই বার্তাটি পুনরায় প্রদর্শন করা হবে না।",
"846659545": "আপনার বিজ্ঞাপন <0>ক্রয়/বিক্রয় তালিকাভুক্ত</0> করা হয় না কারণ পরিমাণ আপনার দৈনিক সীমা {{limit}} {{currency}}ছাড়িয়ে গেছে।\n ।<1 /><1 /> আপনি এখনও <0>আমার বিজ্ঞাপনে আপনার বিজ্ঞাপন</0> দেখতে পারেন। আপনি যদি আপনার দৈনিক সীমা বৃদ্ধি করতে চান, তাহলে <2>লাইভ চ্যাটের</2> মাধ্যমে আমাদের সাথে যোগাযোগ করুন।",
"847028402": "Check your email",
"847028402": "আপনার ইমেইল চেক করুন",
"858027714": "Seen {{ duration }} minutes ago",
"873437248": "নির্দেশাবলী (ঐচ্ছিক)",
"876086855": "আর্থিক মূল্যায়ন ফর্মটি সম্পূর্ণ করুন",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "যে পেমেন্ট পদ্ধতি মুছে ফেলা যাবে না",
"-1088454544": "নতুন লিংক পান",
"-2124584325": "আমরা আপনার অর্ডার যাচাই করেছি",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "এই লেনদেন অনুমোদন করার জন্য আমরা আপনাকে পাঠানো ইমেলের লিঙ্কটি হিট করুন।",
"-1238182882": "লিঙ্কটি 10 মিনিটের মধ্যে মেয়াদ শেষ হবে।",
"-142727028": "ইমেলটি আপনার স্প্যাম ফোল্ডারে রয়েছে (কখনও কখনও জিনিসগুলি সেখানে হারিয়ে যায়)।",
"-227512949": "আপনার বানান পরীক্ষা করুন অথবা একটি ভিন্ন শব্দ ব্যবহার করুন।",
"-1554938377": "পেমেন্ট পদ্ধতি অনুসন্ধান করুন",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "Bankdaten",
"842911528": "Diese Nachricht nicht noch einmal anzeigen.",
"846659545": "Ihre Anzeige ist nicht auf <0>Kaufen/Verkaufen</0> gelistet, weil der Betrag Ihr Tageslimit von {{limit}} {{currency}} überschreitet. <1 /><1 />Sie können Ihre Anzeige trotzdem auf <0>Meine Anzeigen</0>sehen. Wenn Sie Ihr Tageslimit erhöhen möchten, kontaktieren Sie uns bitte über <2>live chat</2>.",
"847028402": "Check your email",
"847028402": "Überprüfe deine E-Mails",
"858027714": "Vor {{ duration }} Minuten gesehen",
"873437248": "Anweisungen (optional)",
"876086855": "Füllen Sie das Formular zur finanziellen Bewertung aus",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "Diese Zahlungsmethode kann nicht gelöscht werden",
"-1088454544": "Holen Sie sich einen neuen Link",
"-2124584325": "Wir haben deine Bestellung verifiziert",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "Klicken Sie auf den Link in der E-Mail, die wir Ihnen gesendet haben, um diese Transaktion zu autorisieren.",
"-1238182882": "Der Link läuft in 10 Minuten ab.",
"-142727028": "Die E-Mail befindet sich in Ihrem Spam-Ordner (manchmal gehen dort Dinge verloren).",
"-227512949": "Überprüfe deine Rechtschreibung oder verwende einen anderen Begriff.",
"-1554938377": "Zahlungsmethode suchen",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "Detalles del banco",
"842911528": "No mostrar este mensaje de nuevo.",
"846659545": "Tu anuncio no aparece en la sección <0>Comprar/Vender</0> porque el importe supera tu límite diario de {{limit}} a {{currency}}.\n <1 /><1 /> Puedes seguir viendo tu anuncio en <0>Mis anuncios</0>. Si quieres aumentar tu límite diario, ponte en contacto con nosotros a través del <2>chat en vivo</2>.",
"847028402": "Check your email",
"847028402": "Revise su correo electrónico",
"858027714": "Visto hace {{ duration }} minutos",
"873437248": "Instrucciones (opcional)",
"876086855": "Complete el formulario de evaluación financiera",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "No se puede eliminar ese método de pago",
"-1088454544": "Obtener nuevo enlace",
"-2124584325": "Hemos verificado su pedido",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "Haz clic en el enlace del correo electrónico que te enviamos para autorizar esta transacción.",
"-1238182882": "El enlace caducará en 10 minutos.",
"-142727028": "El correo electrónico está en su bandeja de spam (a veces las cosas se pierden allí).",
"-227512949": "Revise su ortografía o utilice un término diferente.",
"-1554938377": "Buscar método de pago",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "Coordonnées bancaires",
"842911528": "Ne pas montrer de nouveau ce message.",
"846659545": "Votre annonce n'est pas répertoriée sur <0>Achat/Vente</0> car le montant dépasse votre limite quotidienne de {{limit}} {{currency}}.\n <1 /><1 /> Vous pouvez toujours voir votre annonce sur <0>Mes annonces</0>. Si vous souhaitez augmenter votre limite quotidienne, veuillez nous contacter via le <2>chat en direct</2>.",
"847028402": "Check your email",
"847028402": "Vérifiez votre e-mail",
"858027714": "Vu il y a {{ duration }} minutes",
"873437248": "Instructions (facultatif)",
"876086855": "Remplissez le formulaire d'évaluation financière",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "Ce mode de paiement ne peut pas être supprimé",
"-1088454544": "Obtenir un nouveau lien",
"-2124584325": "Nous avons vérifié votre commande",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "Cliquez sur le lien contenu dans l'e-mail que nous vous avons envoyé pour autoriser cette transaction.",
"-1238182882": "Le lien expirera dans 10 minutes.",
"-142727028": "L'email se trouve dans votre dossier spam (parfois des choses s'y perdent).",
"-227512949": "Vérifiez votre orthographe ou utilisez un terme différent.",
"-1554938377": "Rechercher un mode de paiement",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "Detail bank",
"842911528": "Jangan tampilkan pesan ini lagi.",
"846659545": "Iklan Anda tidak tercantum di <0>Beli/Jual</0> karena jumlahnya melebihi batas harian Anda sebesar {{limit}} {{currency}}.\n <1 /><1 /> Anda masih dapat melihat iklan Anda di <0>iklan Saya</0>. Jika Anda ingin meningkatkan batas harian Anda, silakan hubungi kami melalui <2>live chat</2>.",
"847028402": "Check your email",
"847028402": "Periksa email Anda",
"858027714": "Terlihat {{ duration }} menit yang lalu",
"873437248": "Instruksi (opsional)",
"876086855": "Lengkapi formulir penilaian keuangan",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "Metode pembayaran itu tidak dapat dihapus",
"-1088454544": "Dapatkan tautan baru",
"-2124584325": "Kami telah memverifikasi order Anda",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "Klik tautan di email yang kami kirimkan untuk mengotorisasi transaksi ini.",
"-1238182882": "Tautan akan berakhir dalam 10 menit.",
"-142727028": "Email masuk ke dalam folder spam Anda (terkadang email masuk kesana).",
"-227512949": "Cek ejaan atau gunakan istilah yang berbeda.",
"-1554938377": "Cari metode pembayaran",
Expand Down
6 changes: 3 additions & 3 deletions packages/p2p/src/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"838024160": "Dettagli bancari",
"842911528": "Non mostrare più questo messaggio.",
"846659545": "Il tuo annuncio non è elencato nella <0>sezione Compra/Vendi</0> perché l'importo supera il limite giornaliero di {{limit}} {{currency}}.\n <1 /><1 /> Puoi ancora vedere il tuo annuncio nella sezione <0>I miei annunci</0>. Se desideri aumentare il limite giornaliero, contattaci tramite <2>chat live</2>.",
"847028402": "Check your email",
"847028402": "Controlla la tua casella di posta",
"858027714": "Visto {{ duration }} minuti fa",
"873437248": "Istruzioni (opzionali)",
"876086855": "Completa il modulo della valutazione finanziaria",
Expand Down Expand Up @@ -292,8 +292,8 @@
"-1422779483": "Quel metodo di pagamento non può essere eliminato",
"-1088454544": "Ricevi un nuovo link",
"-2124584325": "Abbiamo verificato l'ordine",
"-848068683": "Hit the link in the email we sent you to authorise this transaction.",
"-1238182882": "The link will expire in 10 minutes.",
"-848068683": "Clicchi sul link contenuto nell'e-mail che le abbiamo inviato per autorizzare la transazione.",
"-1238182882": "Il link scadrà tra 10 minuti.",
"-142727028": "L' e-mail è nella cartella spam (dove alle volte si perdono i messaggi).",
"-227512949": "Correggi eventuali errori ortografici o usa un termine diverso.",
"-1554938377": "Cerca modalità di pagamento",
Expand Down
Loading

0 comments on commit 319eafe

Please sign in to comment.