Merge branch 'master' of github.com:binary-com/deriv-app into suisin/…

…DIEL_flow_change

.github/workflows/test.yml

@@ -3,6 +3,9 @@ on:
   pull_request:
     branches:
     - master
+  push:
+    branches:
+      - master
 jobs:
   build_and_test:
     name: Build And Test
@@ -15,6 +18,9 @@ jobs:
       uses: "./.github/actions/setup_node"
     - name: Install dependencies
       uses: "./.github/actions/npm_install_from_cache"
+    - name: Invalidate NPM Cache
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      uses: "./.github/actions/invalidate_npm_cache"
     - name: Build
       uses: "./.github/actions/build"
     - name: Check TypeScript for @deriv/api

packages/cfd/src/Components/__tests__/cfd-download-container.spec.js

@@ -52,7 +52,7 @@ describe('CFDDownloadContainer', () => {
         render(<CFDDownloadContainer {...mock_props} />);
         expect(screen.getByText(/IcInstallationWindows/i).closest('a')).toHaveAttribute(
             'href',
-            'https://download.mql5.com/cdn/web/deriv.holdings.guernsey/mt5/deriv5setup.exe'
+            'https://download.mql5.com/cdn/web/deriv.com.limited/mt5/deriv5setup.exe'
         );
         expect(screen.getByText(/IcInstallationMacos/i).closest('a')).toHaveAttribute(
             'href',

packages/cfd/src/Containers/dmt5-trade-modal.tsx

@@ -101,7 +101,7 @@ const DMT5TradeModal = ({
             <div className='cfd-trade-modal__login-specs'>
                 <div className='cfd-trade-modal__login-specs-item'>
                     <Text className='cfd-trade-modal--paragraph'>{localize('Broker')}</Text>
-                    <SpecBox is_bold is_broker value={'Deriv Holdings (Guernsey) Limited'} />
+                    <SpecBox is_bold is_broker value={'Deriv.com Limited'} />
                 </div>
                 <div className='cfd-trade-modal__login-specs-item'>
                     <Text className='cfd-trade-modal--paragraph'>{localize('Server')}</Text>

packages/cfd/src/Helpers/constants.ts

@@ -52,7 +52,7 @@ const DXTRADE_HUAWEI_APP_URL = 'https://appgallery.huawei.com/app/C104633219';
 const CTRADER_IOS_APP_URL = 'https://apps.apple.com/cy/app/ctrader/id767428811';
 const CTRADER_ANDROID_APP_URL = 'https://play.google.com/store/apps/details?id=com.deriv.ct';
 
-const getBrokerName = () => 'Deriv Holdings (Guernsey) Limited';
+const getBrokerName = () => 'Deriv.com Limited';
 
 const getTopUpConfig = () => {
     return {
@@ -103,7 +103,7 @@ const getPlatformCTraderDownloadLink = (platform: TMobilePlatforms) => {
 const getPlatformMt5DownloadLink = (platform: string | undefined = undefined) => {
     switch (platform || OSDetect()) {
         case 'windows':
-            return 'https://download.mql5.com/cdn/web/deriv.holdings.guernsey/mt5/deriv5setup.exe';
+            return 'https://download.mql5.com/cdn/web/deriv.com.limited/mt5/deriv5setup.exe';
         case 'linux':
             return 'https://www.metatrader5.com/en/terminal/help/start_advanced/install_linux';
         case 'ios':

packages/core/src/Services/socket-general.js

@@ -16,7 +16,15 @@ const BinarySocketGeneral = (() => {
         common_store.setIsSocketOpened(false);
     };
 
+    let responseTimeoutErrorTimer = null;
     const onOpen = is_ready => {
+        responseTimeoutErrorTimer = setTimeout(() => {
+            const error = new Error('deriv-api: no message received after 30s');
+            error.userId = client_store?.loginid;
+            /* eslint-disable no-console */
+            console.error(error);
+        }, 30000);
+
         if (is_ready) {
             if (!client_store.is_valid_login) {
                 client_store.logout();
@@ -39,6 +47,7 @@ const BinarySocketGeneral = (() => {
     };
 
     const onMessage = response => {
+        clearTimeout(responseTimeoutErrorTimer);
         handleError(response);
         // Header.hideNotification('CONNECTION_ERROR');
         switch (response.msg_type) {

packages/translations/src/translations/ach.json

@@ -38,7 +38,6 @@
     "54185751": "crwdns1259007:0crwdne1259007:0",
     "55340304": "crwdns1259009:0crwdne1259009:0",
     "55916349": "crwdns1259011:0crwdne1259011:0",
-    "56764670": "crwdns2301431:0crwdne2301431:0",
     "57362642": "crwdns3286938:0crwdne3286938:0",
     "58254854": "crwdns1259013:0crwdne1259013:0",
     "59169515": "crwdns1259015:0crwdne1259015:0",
@@ -832,6 +831,7 @@
     "909272635": "crwdns2886857:0crwdne2886857:0",
     "910888293": "crwdns1260303:0crwdne1260303:0",
     "911048905": "crwdns2886897:0crwdne2886897:0",
+    "912257733": "crwdns3298178:0crwdne3298178:0",
     "912406629": "crwdns2101769:0crwdne2101769:0",
     "912967164": "crwdns2101771:0crwdne2101771:0",
     "915735109": "crwdns1260305:0{{platform_name}}crwdne1260305:0",

packages/translations/src/translations/ar.json

@@ -38,7 +38,6 @@
     "54185751": "أقل من 100 ألف دولار",
     "55340304": "حافظ على عقدك الحالي؟",
     "55916349": "الكل",
-    "56764670": "لن يستمر Deriv Bot في أي صفقات جديدة. سيتم إكمال أي صفقات جارية بواسطة نظامنا. سيتم فقدان أي تغييرات غير محفوظة. <0>ملاحظة: يرجى مراجعة كشف الحساب الخاص بك لعرض المعاملات المكتملة</0>.",
     "57362642": "مغلق",
     "58254854": "النطاقات",
     "59169515": "إذا اخترت «Asian Rise»، فستفوز بالعائد إذا كانت العلامة الأخيرة أعلى من متوسط العلامات.",
@@ -832,6 +831,7 @@
     "909272635": "الشؤون المالية - SVG",
     "910888293": "محاولات كثيرة جدًا",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "اتبع هذه الخطوات:",
     "912967164": "<strong>الاستيراد من جهاز الكمبيوتر الخاص بك</strong>",
     "915735109": "العودة إلى {{platform_name}}",

packages/translations/src/translations/bn.json

@@ -38,7 +38,6 @@
     "54185751": "১০০,০০০ ডলারেরও কম",
     "55340304": "আপনার বর্তমান চুক্তি রাখা?",
     "55916349": "সব",
-    "56764670": "Deriv Bot কোনও নতুন ট্রেডের সাথে এগিয়ে যাবে না। যে কোন চলমান ট্রেড আমাদের সিস্টেম দ্বারা সম্পন্ন হবে। কোন অসংরক্ষিত পরিবর্তন হারিয়ে যাবে। <0>দ্রষ্টব্য: সম্পন্ন লেনদেন দেখতে অনুগ্রহ করে আপনার বিবৃতি পরীক্ষা করুন।</0>",
     "57362642": "বন্ধ",
     "58254854": "স্কোপ",
     "59169515": "আপনি যদি “এশিয়ান রাইজ” নির্বাচন করেন, তাহলে শেষ টিক টিকটিকের গড় থেকে বেশি হলে আপনি পেউটি জিতবেন।",
@@ -832,6 +831,7 @@
     "909272635": "আর্থিক - SVG",
     "910888293": "অনেক চেষ্টা",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "এই পদক্ষেপগুলি অনুসরণ করুন:",
     "912967164": "<strong>আপনার কম্পিউটার থেকে আমদানি করুন</strong>",
     "915735109": "{{platform_name}}এ ফিরে যান",

packages/translations/src/translations/de.json

@@ -38,7 +38,6 @@
     "54185751": "Weniger als 100.000$",
     "55340304": "Behalten Sie Ihren aktuellen Vertrag?",
     "55916349": "Alles",
-    "56764670": "Deriv Bot wird keine neuen Geschäfte tätigen. Alle laufenden Transaktionen werden von unserem System abgeschlossen. Alle nicht gespeicherten Änderungen gehen verloren<0>.Hinweis: Bitte prüfen Sie Ihren Kontoauszug, um abgeschlossene Transaktionen zu sehen.</0>",
     "57362642": "Geschlossen",
     "58254854": "Geltungsbereiche",
     "59169515": "Wenn Sie „Asian Rise“ wählen, gewinnen Sie die Auszahlung, wenn der letzte Tick höher ist als der Durchschnitt der Ticks.",
@@ -832,6 +831,7 @@
     "909272635": "Finanziell - SVG",
     "910888293": "Zu viele Versuche",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "Der Arbeitsbereich wird auf die Standardstrategie zurückgesetzt und alle nicht gespeicherten Änderungen gehen verloren. <0>Hinweis: Ihr laufender Bot wird dadurch nicht beeinträchtigt.</0>",
     "912406629": "Folgen Sie diesen Schritten:",
     "912967164": "<strong>Von Ihrem Computer importieren</strong>",
     "915735109": "Zurück zu {{platform_name}}",

packages/translations/src/translations/es.json

@@ -38,7 +38,6 @@
     "54185751": "Menos de 100.000 $",
     "55340304": "¿Mantener su contrato actual?",
     "55916349": "Todo",
-    "56764670": "El Bot Deriv no procederá con ninguna nueva operación. Cualquier operación en curso será completada por nuestro sistema. Cualquier cambio no guardado se perderá.<0>Nota: Por favor revise su estado de cuenta para ver las transacciones completadas.</0>",
     "57362642": "Cerrado",
     "58254854": "Finalidad",
     "59169515": "Si selecciona \"Asiáticas - Alza\", ganará el pago si el último intervalo es más superior a la media de los ticks.",
@@ -832,6 +831,7 @@
     "909272635": "Financiera - SVG",
     "910888293": "Demasiados intentos",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "Siga los siguientes pasos:",
     "912967164": "<strong>Importar desde el ordenador</strong>",
     "915735109": "Volver a {{platform_name}}",

packages/translations/src/translations/fr.json

@@ -38,7 +38,6 @@
     "54185751": "Moins de $100 000",
     "55340304": "Garder votre contrat actuel?",
     "55916349": "Tout",
-    "56764670": "Deriv Bot ne procédera à aucune nouvelle transaction. Toutes les transactions en cours seront effectuées par notre système. Toute modification non enregistrée sera perdue<0>.Note : Veuillez consulter votre relevé de compte pour voir les transactions effectuées</0>.",
     "57362642": "Fermé",
     "58254854": "Périmètre",
     "59169515": "Si vous sélectionnez « Asiatique/hausse », vous gagnez si le dernier tick est supérieur à la moyenne des ticks.",
@@ -832,6 +831,7 @@
     "909272635": "Financier - SVG",
     "910888293": "Trop de tentatives",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "Suivez les étapes suivantes :",
     "912967164": "<strong>Importer depuis votre ordinateur</strong>",
     "915735109": "Retour à {{platform_name}}",

packages/translations/src/translations/it.json

@@ -38,7 +38,6 @@
     "54185751": "Meno di 100.000 $",
     "55340304": "Mantenere contratto corrente?",
     "55916349": "Tutto",
-    "56764670": "Deriv Bot non procederà con nuove operazioni. Tutte le operazioni in corso saranno completate dal nostro sistema. Tutte le modifiche non salvate andranno perse<0>.Nota: controlli il suo estratto conto per visualizzare le transazioni completate.</0>",
     "57362642": "Chiuso",
     "58254854": "Ambiti",
     "59169515": "Se selezioni \"Rialzo asiatiche\", vincerai il payout se l'ultimo tick è superiore alla media dei tick.",
@@ -832,6 +831,7 @@
     "909272635": "Finanziario - SVG",
     "910888293": "Troppi tentativi",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "Segui questi passaggi:",
     "912967164": "<strong>Importa dal tuo computer</strong>",
     "915735109": "Torna su {{platform_name}}",

packages/translations/src/translations/ko.json

@@ -38,7 +38,6 @@
     "54185751": "$100,000 미만",
     "55340304": "귀하의 현재 계약을 유지하시겠습니까?",
     "55916349": "전체",
-    "56764670": "파생 봇은 새로운 거래를 진행하지 않습니다. 진행 중인 모든 거래는 당사 시스템에서 완료됩니다. 저장되지 않은 변경 사항은 모두 손실됩니다.<0>참고: 완료된 거래를 보려면 명세서를 확인하시기 바랍니다</0>.",
     "57362642": "종료",
     "58254854": "범위",
     "59169515": "귀하께서 \"Asian Rise\"를 선택하시면, 마지막에 해당되는 틱이 틱 평균보다 더 높을 경우 귀하께서는 지불금을 받으시게 됩니다.",
@@ -832,6 +831,7 @@
     "909272635": "파이낸셜 - SVG",
     "910888293": "너무 많은 시도가 있습니다",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "다음의 단계를 따르세요:",
     "912967164": "<strong>컴퓨터에서 가져오기</strong>",
     "915735109": "{{platform_name}}으로 되돌아가기",

packages/translations/src/translations/pl.json

@@ -38,7 +38,6 @@
     "54185751": "Mniej niż 100 000 $",
     "55340304": "Utrzymać obecną kontrakt?",
     "55916349": "Wszystko",
-    "56764670": "Deriv Bot nie będzie kontynuował żadnych nowych transakcji. Wszelkie trwające transakcje zostaną zakończone przez nasz system. Wszelkie niezapisane zmiany zostaną utracone<0>. Uwaga: Proszę sprawdzić swój wyciąg, aby zobaczyć zakończone transakcje</0>.",
     "57362642": "Zamknięte",
     "58254854": "Zakresy",
     "59169515": "Jeśli wybierzesz zakład „Azjatycki - wzrośnie”, zdobędziesz wypłatę, gdy ostatni najmniejszy przyrost ceny będzie wyższy niż średnia najmniejszych przyrostów ceny.",
@@ -832,6 +831,7 @@
     "909272635": "Finansowe - SVG",
     "910888293": "Zbyt wiele prób",
     "911048905": "(BTCUSD, ETHUSD)",
+    "912257733": "The workspace will be reset to the default strategy and any unsaved changes will be lost. <0>Note: This will not affect your running bot.</0>",
     "912406629": "Wykonaj następujące kroki:",
     "912967164": "<strong>Importuj z komputera</strong>",
     "915735109": "Powrót do {{platform_name}}",