From 1b382e9f2d34ba5b25a38258cdc57ba88d4babbe Mon Sep 17 00:00:00 2001 From: David Walsh Date: Tue, 21 Feb 2023 11:19:37 -0600 Subject: [PATCH] Remove CancelTransaction modal (#17819) * Remove CancelTransaction modal * Remove old locales * Remove dead test --- app/_locales/am/messages.json | 12 --- app/_locales/ar/messages.json | 12 --- app/_locales/bg/messages.json | 12 --- app/_locales/bn/messages.json | 12 --- app/_locales/ca/messages.json | 12 --- app/_locales/da/messages.json | 12 --- app/_locales/de/messages.json | 12 --- app/_locales/el/messages.json | 12 --- app/_locales/en/messages.json | 12 --- app/_locales/es/messages.json | 12 --- app/_locales/es_419/messages.json | 12 --- app/_locales/et/messages.json | 12 --- app/_locales/fa/messages.json | 12 --- app/_locales/fi/messages.json | 12 --- app/_locales/fil/messages.json | 12 --- app/_locales/fr/messages.json | 12 --- app/_locales/he/messages.json | 12 --- app/_locales/hi/messages.json | 12 --- app/_locales/hr/messages.json | 12 --- app/_locales/ht/messages.json | 12 --- app/_locales/hu/messages.json | 12 --- app/_locales/id/messages.json | 12 --- app/_locales/it/messages.json | 12 --- app/_locales/ja/messages.json | 12 --- app/_locales/kn/messages.json | 12 --- app/_locales/ko/messages.json | 12 --- app/_locales/lt/messages.json | 12 --- app/_locales/lv/messages.json | 12 --- app/_locales/ms/messages.json | 12 --- app/_locales/no/messages.json | 12 --- app/_locales/ph/messages.json | 12 --- app/_locales/pl/messages.json | 12 --- app/_locales/pt/messages.json | 12 --- app/_locales/pt_BR/messages.json | 12 --- app/_locales/ro/messages.json | 12 --- app/_locales/ru/messages.json | 12 --- app/_locales/sk/messages.json | 12 --- app/_locales/sl/messages.json | 12 --- app/_locales/sr/messages.json | 12 --- app/_locales/sv/messages.json | 12 --- app/_locales/sw/messages.json | 12 --- app/_locales/th/messages.json | 3 - app/_locales/tl/messages.json | 12 --- app/_locales/tr/messages.json | 12 --- app/_locales/uk/messages.json | 12 --- app/_locales/vi/messages.json | 12 --- app/_locales/zh_CN/messages.json | 12 --- app/_locales/zh_TW/messages.json | 12 --- .../cancel-transaction.component.test.js.snap | 101 ------------------ .../cancel-transaction.component.js | 74 ------------- .../cancel-transaction.component.test.js | 90 ---------------- .../cancel-transaction.container.js | 53 --------- .../app/modals/cancel-transaction/index.js | 1 - ui/components/app/modals/modal.js | 14 --- 54 files changed, 900 deletions(-) delete mode 100644 ui/components/app/modals/cancel-transaction/__snapshots__/cancel-transaction.component.test.js.snap delete mode 100644 ui/components/app/modals/cancel-transaction/cancel-transaction.component.js delete mode 100644 ui/components/app/modals/cancel-transaction/cancel-transaction.component.test.js delete mode 100644 ui/components/app/modals/cancel-transaction/cancel-transaction.container.js delete mode 100644 ui/components/app/modals/cancel-transaction/index.js diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index fd0a80961..3497daaf4 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -69,12 +69,6 @@ "asset": { "message": "ሐብት" }, - "attemptToCancel": { - "message": "ለመሰረዝ ይሞክራሉ?" - }, - "attemptToCancelDescription": { - "message": "ይህን ሙከራ ማቅረብ የመጀመሪያው ግብይትዎ እንደሚሰረዝ ዋስትና አይሰጥም። የመሰረዝ ሙከራው ከተሳካ፣ ከላይ የተጠቀሰውን የግብይት ክፍያ እንዲከፍሉ ይደረጋሉ።" - }, "attemptingConnect": { "message": "ከ blockchain ጋር ለመገናኘት መሞከር።" }, @@ -136,9 +130,6 @@ "cancel": { "message": "ሰርዝ" }, - "cancellationGasFee": { - "message": "የስረዛ ነዳጅ ወጪ" - }, "cancelled": { "message": "ተሰርዟል" }, @@ -908,9 +899,6 @@ "welcomeBack": { "message": "እንኳን በደህና ተመለሱ" }, - "yesLetsTry": { - "message": "አዎ፣ እንሞክር" - }, "youNeedToAllowCameraAccess": { "message": "ይህን ባህርይ ለመጠቀም የካሜራን መድረስ መፍቀድ አለብዎት።" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index 70384c11c..06ba0766e 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -79,12 +79,6 @@ "asset": { "message": "الأصل" }, - "attemptToCancel": { - "message": "هل تحاول الإلغاء؟" - }, - "attemptToCancelDescription": { - "message": "تقديم هذه المحاولة لا يضمن أنه سيتم إلغاء معاملتك الأصلية. إذا نجحت محاولة الإلغاء ، فسيتم فرض رسوم المعاملة المذكورة أعلاه." - }, "attemptingConnect": { "message": "محاولة الاتصال بسلسلة الكتل." }, @@ -146,9 +140,6 @@ "cancel": { "message": "إلغاء" }, - "cancellationGasFee": { - "message": "رسوم الإلغاء بعملة جاس" - }, "cancelled": { "message": "تم الإلغاء" }, @@ -920,9 +911,6 @@ "welcomeBack": { "message": "نرحب بعودتك!" }, - "yesLetsTry": { - "message": "نعم، دعنا نجرب" - }, "youNeedToAllowCameraAccess": { "message": "أنت بحاجة إلى السماح بالوصول إلى الكاميرا لاستخدام هذه الميزة." }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index ef7558aa8..87af188c7 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Актив" }, - "attemptToCancel": { - "message": "Опит за отказ?" - }, - "attemptToCancelDescription": { - "message": "Подаването на този опит не гарантира, че първоначалната транзакция ще бъде анулирана. Ако опитът за анулиране е успешен, ще ви бъде начислена таксата за транзакцията по-горе." - }, "attemptingConnect": { "message": "Опит за свързване с blockchain." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Отказ" }, - "cancellationGasFee": { - "message": "Такса в газ за анулиране " - }, "cancelled": { "message": "Отменен" }, @@ -919,9 +910,6 @@ "welcomeBack": { "message": "Добре дошли отново!" }, - "yesLetsTry": { - "message": "Да, нека опитаме" - }, "youNeedToAllowCameraAccess": { "message": "Трябва да разрешите достъпа на камерата, за да използвате тази функция." }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index b8f728bcf..b5fb80176 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "সম্পদ" }, - "attemptToCancel": { - "message": "বাতিল করার চেষ্টা করছেন?" - }, - "attemptToCancelDescription": { - "message": "এই প্রচেষ্টাটি জমা দেওয়া আপনার প্রকৃত লেনদেনটি বাতিল হয়ে যাবে এমন নিশ্চয়তা দেয় না। বাতিল করার প্রচেষ্টাটি সফল হলে, আপনাকে উপরের লেনদেন ফী চার্জ করা হবে।" - }, "attemptingConnect": { "message": "ব্লকচেনে সংযোগ করার চেষ্টা করছে।" }, @@ -142,9 +136,6 @@ "cancel": { "message": "বাতিল করুন" }, - "cancellationGasFee": { - "message": "বাতিল করার গ্যাস ফী" - }, "cancelled": { "message": "বাতিল করা হয়েছে" }, @@ -923,9 +914,6 @@ "welcomeBack": { "message": "পুনরায় স্বাগত!" }, - "yesLetsTry": { - "message": "হ্যাঁ, চেষ্টা করা যাক" - }, "youNeedToAllowCameraAccess": { "message": "এই বৈশিষ্ট্যটি ব্যবহার করতে আপনাকে ক্যামেরা অ্যাক্সেস করার অনুমতি দিতে হবে।" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 1fec171b6..1a285a375 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Actius" }, - "attemptToCancel": { - "message": "Estàs provant de cancel·lar?" - }, - "attemptToCancelDescription": { - "message": "Enviar aquesta temptativa no garanteix que la teva transacció original sigui cancel·lada. Si la temptativa de cancel·lació té èxit, se't carregarà la tarifa de transacció de més amunt." - }, "attemptingConnect": { "message": "Intentant conectar a blockchain." }, @@ -139,9 +133,6 @@ "cancel": { "message": "Cancel·la" }, - "cancellationGasFee": { - "message": "Preu de cancel·lació del gas" - }, "cancelled": { "message": "Cancel·lat" }, @@ -892,9 +883,6 @@ "welcomeBack": { "message": "Benvingut de nou!" }, - "yesLetsTry": { - "message": "Sí, provem" - }, "youNeedToAllowCameraAccess": { "message": "Has de permetre l'accés a la càmera per fer servir aquesta característica." }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index defb3f703..c5d56db6d 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Aktiv" }, - "attemptToCancel": { - "message": "Forsøg på Annullering?" - }, - "attemptToCancelDescription": { - "message": "Indsendelse af dette forsøg garanterer ikke, at din originale transaktion annulleres. Hvis annulleringsforsøget lykkes, vil du blive opkrævet ovenstående transaktionsgebyr." - }, "attemptingConnect": { "message": "Forsøger at oprette forbindelse til blokkæden." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Afbryd" }, - "cancellationGasFee": { - "message": "Gebyr for brændstofannullering" - }, "cancelled": { "message": "Annulleret" }, @@ -892,9 +883,6 @@ "welcomeBack": { "message": "Velkommen tilbage!" }, - "yesLetsTry": { - "message": "Ja, lad os prøve" - }, "youNeedToAllowCameraAccess": { "message": "Du skal tillade kameraadgang for at bruge denne funktion." }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index c755e9593..8ee89befa 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Wenn Sie versuchen, Assets direkt von einem Netzwerk in ein anderes zu senden, kann dies zu einem dauerhaften Asset-Verlust führen. Verwenden Sie unbedingt eine Bridge." }, - "attemptToCancel": { - "message": "Stornierung versuchen?" - }, - "attemptToCancelDescription": { - "message": "Dieser Versuch garantiert nicht, dass Ihre ursprüngliche Transaktion storniert wird. Bei Erfolg des Stornierungsversuchs wird Ihnen die oben genannte Transaktionsgebühr in Rechnung gestellt." - }, "attemptingConnect": { "message": "Versuch mit der Blockchain zu verbinden." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Tausch kostenlos abbrechen" }, - "cancellationGasFee": { - "message": "Stornierungs-Gasgebühr" - }, "cancelled": { "message": "Abgebrochen" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Ja" }, - "yesLetsTry": { - "message": "Ja, versuchen wir es" - }, "youHaveAddedAll": { "message": "Sie haben alle beliebten Netzwerke hinzugefügt. Sie können weitere Netzwerke entdecken $1 oder Sie können $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index afcb3b7f5..2923e1b2e 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Εάν επιχειρήσετε να στείλετε περιουσιακά στοιχεία απευθείας από ένα δίκτυο σε ένα άλλο, αυτό ενδέχεται να οδηγήσει σε μόνιμη απώλεια περιουσιακών στοιχείων. Βεβαιωθείτε ότι χρησιμοποιείτε μια διασύνδεση." }, - "attemptToCancel": { - "message": "Προσπάθεια Ακύρωσης;" - }, - "attemptToCancelDescription": { - "message": "Η υποβολή αυτής της προσπάθειας δεν εγγυάται ότι η αρχική σας συναλλαγή θα ακυρωθεί. Αν η προσπάθεια ακύρωσης είναι επιτυχής, θα χρεωθείτε με το παραπάνω τέλος συναλλαγής." - }, "attemptingConnect": { "message": "Προσπάθεια σύνδεσης στην αλυσίδα μπλοκ." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Ακυρώστε τη συναλλαγή δωρεάν" }, - "cancellationGasFee": { - "message": "Ακύρωση Χρέωσης Αερίου" - }, "cancelled": { "message": "Ακυρώθηκε" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Ναι" }, - "yesLetsTry": { - "message": "Ναι, ας δοκιμάσουμε" - }, "youHaveAddedAll": { "message": "Προσθέσατε όλα τα δημοφιλή δίκτυα. Μπορείτε να ανακαλύψετε περισσότερα δίκτυα $1 Ή μπορείτε να \n $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index c87ec1ac1..5e35df6f1 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -403,12 +403,6 @@ "attemptSendingAssets": { "message": "If you attempt to send assets directly from one network to another, this may result in permanent asset loss. Make sure to use a bridge." }, - "attemptToCancel": { - "message": "Attempt to cancel?" - }, - "attemptToCancelDescription": { - "message": "Submitting this attempt does not guarantee your original transaction will be cancelled. If the cancellation attempt is successful, you will be charged the transaction fee above." - }, "attemptingConnect": { "message": "Attempting to connect to blockchain." }, @@ -601,9 +595,6 @@ "cancelSwapForFree": { "message": "Cancel swap for free" }, - "cancellationGasFee": { - "message": "Cancellation gas fee" - }, "cancelled": { "message": "Cancelled" }, @@ -4494,9 +4485,6 @@ "yes": { "message": "Yes" }, - "yesLetsTry": { - "message": "Yes, let's try" - }, "youHaveAddedAll": { "message": "You've added all the popular networks. You can discover more networks $1 Or you can $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 4d4a89d97..88a2dc7bd 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Si intenta enviar activos directamente de una red a otra, esto puede provocar la pérdida permanente de activos. Asegúrese de utilizar un puente." }, - "attemptToCancel": { - "message": "¿Intentar cancelar?" - }, - "attemptToCancelDescription": { - "message": "Enviar este intento no garantiza que se cancelará la transacción original. Si el intento de cancelación se completa correctamente, se le cobrará la cuota de transacción anterior." - }, "attemptingConnect": { "message": "Intentando una conexión a la cadena de bloques." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Cancelar el swap gratuitamente" }, - "cancellationGasFee": { - "message": "Cuota de gas por cancelación" - }, "cancelled": { "message": "Cancelado" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Sí" }, - "yesLetsTry": { - "message": "Sí, intentémoslo" - }, "youHaveAddedAll": { "message": "Ha agregado todas las redes populares. Puede descubrir más redes $1 o puede $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 6d0aea31e..403feee73 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -235,12 +235,6 @@ "assets": { "message": "Activos" }, - "attemptToCancel": { - "message": "¿Intentar cancelar?" - }, - "attemptToCancelDescription": { - "message": "Enviar este intento no garantiza que se cancelará la transacción original. Si el intento de cancelación se realiza correctamente, se le cobrará la tarifa de transacción anterior." - }, "attemptingConnect": { "message": "Intentando una conexión a la cadena de bloques." }, @@ -358,9 +352,6 @@ "message": "Para $1 una transacción, la tarifa de gas debe aumentar al menos un 10% para que sea reconocida por la red.", "description": "$1 is string 'cancel' or 'speed up'" }, - "cancellationGasFee": { - "message": "Tarifa de gas por cancelación" - }, "cancelled": { "message": "Cancelado" }, @@ -3023,9 +3014,6 @@ "message": "$1 de $2 están pendientes", "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total" }, - "yesLetsTry": { - "message": "Sí, intentémoslo" - }, "youNeedToAllowCameraAccess": { "message": "Necesita permitir el acceso a la cámara para usar esta función." }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 66fb981e9..401cf7956 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Vara" }, - "attemptToCancel": { - "message": "Tühistamiskatse?" - }, - "attemptToCancelDescription": { - "message": "Selle katse esitamine ei taga teie originaaltehingu tühistamist. Kui tühistamiskatse on edukas, võetakse teilt ülaltoodud tehingutasu." - }, "attemptingConnect": { "message": "Plokiahelaga ühenduse loomise katse." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Tühista" }, - "cancellationGasFee": { - "message": "Tühistamise gaasitasu" - }, "cancelled": { "message": "Tühistatud" }, @@ -913,9 +904,6 @@ "welcomeBack": { "message": "Tere tulemast tagasi!" }, - "yesLetsTry": { - "message": "Jah, proovime" - }, "youNeedToAllowCameraAccess": { "message": "Selle funktsiooni kasutamiseks peate lubaga kaamera ligipääsu." }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 89b2c9e60..c8522b810 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "سرمایه" }, - "attemptToCancel": { - "message": "تلاش یا لغو؟" - }, - "attemptToCancelDescription": { - "message": "تسلیم این تلاش لغو معامله اصلی تان را تضمین نمیکند. در صورتیکه تلاش لغو موفق باشد، بر شما فیس معامله فوق الذکر چارج خواهد شد." - }, "attemptingConnect": { "message": "در حال تلاش برای اتصال با زنجیره بلوکی" }, @@ -142,9 +136,6 @@ "cancel": { "message": "لغو" }, - "cancellationGasFee": { - "message": "لغو فیس گاز" - }, "cancelled": { "message": "لغو شد" }, @@ -923,9 +914,6 @@ "welcomeBack": { "message": "بازگشت شما را خوش‌آمد می‌گوییم!" }, - "yesLetsTry": { - "message": "بلی، بیایید امتحان کنیم" - }, "youNeedToAllowCameraAccess": { "message": "لازم است تا شما جهت استفاده از این مشخصه، به کمره اجازه دسترسی بدهید." }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index b17d37b6a..b7f560918 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Omaisuuserä" }, - "attemptToCancel": { - "message": "Yritetäänkö peruuttaa?" - }, - "attemptToCancelDescription": { - "message": "Tämän yrityksen lähettäminen ei takaa, että alkuperäinen tapahtuma peruutettaisiin. Mikäli peruutusyritys onnistuu, sinulta veloitetaan yllä mainittu tapahtumamaksu." - }, "attemptingConnect": { "message": "Yritetään yhdistää lohkoketjuun." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Peruuta" }, - "cancellationGasFee": { - "message": "Peruutuksen gas-maksu" - }, "cancelled": { "message": "Peruttu" }, @@ -920,9 +911,6 @@ "welcomeBack": { "message": "Tervetuloa takaisin!" }, - "yesLetsTry": { - "message": "Kyllä, kokeillaan" - }, "youNeedToAllowCameraAccess": { "message": "Käyttääksesi tätä ominaisuutta sinun tarvitsee antaa kameralle käyttöoikeudet." }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index 2bdf29437..8193ed852 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -66,12 +66,6 @@ "approved": { "message": "Inaprubahan" }, - "attemptToCancel": { - "message": "Subukang Kanselahin?" - }, - "attemptToCancelDescription": { - "message": "Ang pagsusumite sa pagtangkang ito ay hindi makakagarantiya na nakansela ang iyong orihinal na transaksyon. Kung matagumpay ang pagtangkang magkansela, sisingilin sa iyo ang bayarin sa transaksyon sa itaas." - }, "attemptingConnect": { "message": "Sinusubukang kumonekta sa blockchain." }, @@ -124,9 +118,6 @@ "cancel": { "message": "Kanselahin" }, - "cancellationGasFee": { - "message": "Gas Fee sa Pagkansela" - }, "cancelled": { "message": "Nakansela" }, @@ -832,9 +823,6 @@ "welcomeBack": { "message": "Welcome Ulit!" }, - "yesLetsTry": { - "message": "Oo, subukan natin" - }, "youNeedToAllowCameraAccess": { "message": "Kailangan mong payagan ang access sa camera para magamit ang feature na ito." }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 0ffc16025..ac8e3d591 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Si vous essayez d’envoyer des actifs directement d’un réseau à un autre, une perte permanente des actifs pourrait en résulter. Assurez-vous d’utiliser une passerelle." }, - "attemptToCancel": { - "message": "Tenter d’annuler ?" - }, - "attemptToCancelDescription": { - "message": "Faire une demande d’annulation ne garantit pas que votre transaction originale sera bien annulée. Dans le cas où l’annulation réussit, vous payerez les frais de transaction indiqués ci-dessus." - }, "attemptingConnect": { "message": "Tentative de connexion au réseau" }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Annuler le swap gratuitement" }, - "cancellationGasFee": { - "message": "Frais d’annulation de la transaction" - }, "cancelled": { "message": "Annulé" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Oui" }, - "yesLetsTry": { - "message": "Oui, essayons" - }, "youHaveAddedAll": { "message": "Vous avez ajouté tous les réseaux populaires. Vous pouvez découvrir d’autres réseaux $1 ou $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 547a360a8..67e88b498 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "נכס" }, - "attemptToCancel": { - "message": "לנסות לבטל?" - }, - "attemptToCancelDescription": { - "message": "הגשת ניסיון זה אינה מבטיחה כי העסקה המקורית שלך תבוטל. אם ניסיון הביטול יצליח, תחויב/י בעמלת העסקה המופיעה מעלה." - }, "attemptingConnect": { "message": "מנסה להתחבר לבלוקצ'יין." }, @@ -142,9 +136,6 @@ "cancel": { "message": "ביטול" }, - "cancellationGasFee": { - "message": "עמלת דלק עבור ביטול" - }, "cancelled": { "message": "מבוטל" }, @@ -920,9 +911,6 @@ "welcomeBack": { "message": "ברוך שובך!" }, - "yesLetsTry": { - "message": "כן, בוא ננסה" - }, "youNeedToAllowCameraAccess": { "message": "עליך לאפשר גישה למצלמה כדי להשתמש בתכונה זו." }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index b9b6f1f62..9f15739aa 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "यदि आप ऐसेट्स को सीधे एक नेटवर्क से दूसरे नेटवर्क पर भेजने का प्रयास करते हैं, तो इसके परिणामस्वरूप स्थायी ऐसेट्स का नुकसान हो सकता है। ब्रिज का उपयोग करना सुनिश्चित करें।" }, - "attemptToCancel": { - "message": "रद्द करने का प्रयास?" - }, - "attemptToCancelDescription": { - "message": "इस प्रयास को सबमिट करने से आपके मूल लेनदेन को रद्द करने की गारंटी नहीं होगी। यदि रद्दीकरण का प्रयास सफल होता है, तो आपसे ऊपर दिया गया लेनदेन शुल्क लिया जाएगा।" - }, "attemptingConnect": { "message": "ब्लॉकचेन से कनेक्ट करने का प्रयास कर रहे हैं।" }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "मुफ्त में स्वैप रद्द करें" }, - "cancellationGasFee": { - "message": "रद्दीकरण गैस शुल्क" - }, "cancelled": { "message": "रद्द किया गया" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "हां" }, - "yesLetsTry": { - "message": "हां, आइए आजमाते हैं" - }, "youHaveAddedAll": { "message": "आपने सभी लोकप्रिय नेटवर्क जोड़ लिए हैं। आप अधिक नेटवर्क खोज सकते हैं $1 या आप $2 कर सकते हैं", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 408d54f7a..5aa70285d 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Imovina" }, - "attemptToCancel": { - "message": "Pokušati otkazati?" - }, - "attemptToCancelDescription": { - "message": "Slanjem ovog pokušaja ne jamči se da će se vaša izvorna transakcija otkazati. Ako je pokušaj otkazivanja uspješan, naplaćuje vam se prethodno navedena naknada za prijenos." - }, "attemptingConnect": { "message": "Pokušaj povezivanja na podatkovni blok." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Odustani" }, - "cancellationGasFee": { - "message": "Otkazivanje naknade za gorivo" - }, "cancelled": { "message": "Otkazano" }, @@ -913,9 +904,6 @@ "welcomeBack": { "message": "Dobro došli natrag!" }, - "yesLetsTry": { - "message": "Da, isprobajmo" - }, "youNeedToAllowCameraAccess": { "message": "Trebate dopustiti pristupanje kameri za korištenje ovom funkcijom." }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index abb03ab08..89f56b1aa 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -60,12 +60,6 @@ "approved": { "message": "Apwouve" }, - "attemptToCancel": { - "message": "Eseye anile?" - }, - "attemptToCancelDescription": { - "message": "Soumèt tantativ sa a pa garanti ke yo pral anile tranzaksyon ou anile. Si tantativ anile an gen siksè, ou pral chaje frè yo tranzaksyon pi wo a." - }, "attemptingConnect": { "message": "Eseye konekte nan blockchain." }, @@ -84,9 +78,6 @@ "cancel": { "message": "Anile" }, - "cancellationGasFee": { - "message": "Anilasyon Gaz Chaj" - }, "chromeRequiredForHardwareWallets": { "message": "Ou bezwen sèvi ak MetaMask sou Google Chrome yo nan lòd yo konekte sou Hardware Wallet." }, @@ -637,9 +628,6 @@ "welcomeBack": { "message": "Bon Retou!" }, - "yesLetsTry": { - "message": "Wi, ann eseye" - }, "youNeedToAllowCameraAccess": { "message": "Ou bezwen bay kamera aksè pou sèvi ak fonksyon sa." }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 49e928122..d33d01639 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Eszköz" }, - "attemptToCancel": { - "message": "Megpróbálja törölni?" - }, - "attemptToCancelDescription": { - "message": "A próbálkozás elküldése nem garantálja, hogy az eredeti tranzakció törlésre kerül. Ha a törlési kísérlet sikeres, akkor a fenti tranzakciós díjat számítjuk fel önnek." - }, "attemptingConnect": { "message": "Próbálunk csatlakozni a blokklánchoz." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Mégse" }, - "cancellationGasFee": { - "message": "A törlés gázára" - }, "cancelled": { "message": "Megszakítva" }, @@ -913,9 +904,6 @@ "welcomeBack": { "message": "Üdvözöljük újra!" }, - "yesLetsTry": { - "message": "Igen, próbáljuk ki!" - }, "youNeedToAllowCameraAccess": { "message": "Ennek a funkciónak a használatához engedélyeznie kell a kamerához való hozzáférést." }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index d0ae9698b..72d9305d8 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Jika Anda mencoba untuk mengirim aset secara langsung dari satu jaringan ke jaringan lain, aset Anda berpotensi hilang secara permanen. Pastikan untuk menggunakan penghubung." }, - "attemptToCancel": { - "message": "Coba membatalkan?" - }, - "attemptToCancelDescription": { - "message": "Mengupayakan hal ini tidak menjamin transaksi asli Anda akan dibatalkan. Jika upaya pembatalan berhasil, Anda akan dikenakan biaya transaksi di atas." - }, "attemptingConnect": { "message": "Mencoba terhubung ke blockchain." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Batalkan swap gratis" }, - "cancellationGasFee": { - "message": "Biaya gas pembatalan" - }, "cancelled": { "message": "Dibatalkan" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Ya" }, - "yesLetsTry": { - "message": "Ya, mari kita coba" - }, "youHaveAddedAll": { "message": "Anda telah menambahkan semua jaringan populer. Anda dapat menemukan lebih banyak jaringan $1 atau dapat $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index d02f57450..30144c026 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -324,12 +324,6 @@ "attemptSendingAssets": { "message": "Se si tenta di inviare risorse direttamente da una rete all'altra, ciò potrebbe comportare una perdita permanente della risorca coinvolta. Assicurati di usare un bridge." }, - "attemptToCancel": { - "message": "Tentativo di Annullamento?" - }, - "attemptToCancelDescription": { - "message": "Tentare di annullare non garantisce che la transazione verrà annullata. Se annullata, è comunque richiesto pagare alla rete la commissione sulla transazione." - }, "attemptingConnect": { "message": "Tentativo di connessione alla blockchain." }, @@ -476,9 +470,6 @@ "cancelSwapForFree": { "message": "Annulla scambio gratuitamente" }, - "cancellationGasFee": { - "message": "Costo di Annullamento in Gas" - }, "cancelled": { "message": "Annullata" }, @@ -2080,9 +2071,6 @@ "message": "$1 di $2", "description": "$1 and $2 are intended to be two numbers, where $2 is a total, and $1 is a count towards that total" }, - "yesLetsTry": { - "message": "Si, proviamo" - }, "youNeedToAllowCameraAccess": { "message": "Devi consentire l'accesso alla fotocamera per usare questa funzionalità." }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index ecf70b1a9..608943fac 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "1 つのネットワークから別のネットワークに直接アセットを送ろうとすると、アセットが永久に失われる可能性があります。必ずブリッジを使用してください。" }, - "attemptToCancel": { - "message": "キャンセルを試みますか?" - }, - "attemptToCancelDescription": { - "message": "この試みを送信しても、元のトランザクションのキャンセルは保証されません。キャンセルの試みが成功した場合、上記のトランザクション手数料が課金されます。" - }, "attemptingConnect": { "message": "ブロックチェーンへの接続を試みています。" }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "無料でスワップをキャンセル" }, - "cancellationGasFee": { - "message": "キャンセルのガス代" - }, "cancelled": { "message": "キャンセル済み" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "はい" }, - "yesLetsTry": { - "message": "はい、やってみます" - }, "youHaveAddedAll": { "message": "すべての人気ネットワークを追加しました。$1で他のネットワークを発見するか、$2できます。", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 91f32c61c..08eeb00a5 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "ಆಸ್ತಿ" }, - "attemptToCancel": { - "message": "ರದ್ದುಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವಿರಾ?" - }, - "attemptToCancelDescription": { - "message": "ಈ ಪ್ರಯತ್ನವನ್ನು ಸಲ್ಲಿಸುವುದರಿಂದ ನಿಮ್ಮ ಮೂಲ ವಹಿವಾಟು ರದ್ದುಗೊಳ್ಳುತ್ತದೆ ಎಂಬುದಾಗಿ ಖಾತ್ರಿಪಡಿಸಲಾಗುವುದಿಲ್ಲ. ರದ್ದು ಮಾಡುವ ಪ್ರಯತ್ನವು ಯಶಸ್ವಿಯಾದರೆ, ಮೇಲಿನ ವಹಿವಾಟು ಶುಲ್ಕವನ್ನು ನಿಮಗೆ ವಿಧಿಸಲಾಗುತ್ತದೆ." - }, "attemptingConnect": { "message": "ಬ್ಲಾಕ್‌ಚೈನ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ." }, @@ -142,9 +136,6 @@ "cancel": { "message": "ರದ್ದುಮಾಡಿ" }, - "cancellationGasFee": { - "message": "ರದ್ದುಗೊಳಿಸುವ ಗ್ಯಾಸ್ ಶುಲ್ಕ" - }, "cancelled": { "message": "ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ" }, @@ -923,9 +914,6 @@ "welcomeBack": { "message": "ಮರಳಿ ಸ್ವಾಗತ!" }, - "yesLetsTry": { - "message": "ಹೌದು, ಪ್ರಯತ್ನಿಸೋಣ" - }, "youNeedToAllowCameraAccess": { "message": "ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು ನೀವು ಕ್ಯಾಮರಾ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಬೇಕಾಗುತ್ತದೆ." }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index cbc5c40f7..10fd7877f 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "한 네트워크에서 다른 네트워크로 자산을 직접 전송하면 자산이 영구적으로 손실될 수 있습니다. 반드시 브릿지를 이용하세요." }, - "attemptToCancel": { - "message": "취소할까요?" - }, - "attemptToCancelDescription": { - "message": "이 시도를 제출한다고 해서 원래 거래가 반드시 취소되지는 않습니다. 취소 시도가 성공하면 위의 거래 수수료가 부과됩니다." - }, "attemptingConnect": { "message": "블록체인에 연결 중입니다." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "무료로 스왑 취소" }, - "cancellationGasFee": { - "message": "가스 수수료 취소" - }, "cancelled": { "message": "취소됨" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "예" }, - "yesLetsTry": { - "message": "예, 시도하겠습니다." - }, "youHaveAddedAll": { "message": "모든 인기 네트워크를 추가했습니다. $1에서 더 많은 네트워크를 확인하거나 $2을(를) 할 수 있습니다.", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index db7329a28..c078c6fd4 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Turtas" }, - "attemptToCancel": { - "message": "Mėginti atšaukti?" - }, - "attemptToCancelDescription": { - "message": "Šis mėginimas negarantuoja, kad jūsų pradinė operacija bus atšaukta. Jeigu mėginimas atšaukti yra sėkmingas, jums bus taikomas pirmiau minėtas operacijos mokestis." - }, "attemptingConnect": { "message": "Mėginama prisijungti prie „blockchain“." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Atšaukti" }, - "cancellationGasFee": { - "message": "Dujų mokesčio atšaukimas" - }, "cancelled": { "message": "Atšaukta" }, @@ -923,9 +914,6 @@ "welcomeBack": { "message": "Sveiki sugrįžę!" }, - "yesLetsTry": { - "message": "Taip, mėginkime" - }, "youNeedToAllowCameraAccess": { "message": "Norint naudotis šia funkcija, reikia leisti prieigą prie kameros.." }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index 6ec04c251..fe0c24411 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Aktīvs" }, - "attemptToCancel": { - "message": "Vai mēģināt atcelt?" - }, - "attemptToCancelDescription": { - "message": "Šī mēģinājuma iesniegšana negarantē sākotnējā darījuma atcelšanu. Ja atcelšanas mēģinājums izdosies, no jums tiks pieprasīta iepriekš norādītā darījuma nodeva." - }, "attemptingConnect": { "message": "Mēģina izveidot savienojumu ar bloku ķēdi." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Atcelt" }, - "cancellationGasFee": { - "message": "Atcelšanas maksājums par Gas" - }, "cancelled": { "message": "Atcelts" }, @@ -919,9 +910,6 @@ "welcomeBack": { "message": "Ar atgriešanos!" }, - "yesLetsTry": { - "message": "Jā, pamēģināsim" - }, "youNeedToAllowCameraAccess": { "message": "Lai lietotu šo funkciju, jādod piekļuve kamerai." }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index 11ab1947e..a223c3111 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Aset" }, - "attemptToCancel": { - "message": "Cuba untuk Batalkan?" - }, - "attemptToCancelDescription": { - "message": "Menghantar percubaan ini tidak akan menjamin transaksi asal anda dibatalkan. Jika percubaan pembatalan berjaya, anda akan dikenakan yuran transaksi di atas." - }, "attemptingConnect": { "message": "Sedang cuba menyambungkan kepada rantaian blok." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Batal" }, - "cancellationGasFee": { - "message": "Fi Gas Pembatalan" - }, "cancelled": { "message": "Dibatalkan" }, @@ -900,9 +891,6 @@ "welcomeBack": { "message": "Selamat Kembali!" }, - "yesLetsTry": { - "message": "Ya, mari cuba" - }, "youNeedToAllowCameraAccess": { "message": "Anda perlu membenarkan akses kamera untuk menggunakan ciri ini." }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 0aff5029e..94c417469 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Ressurs" }, - "attemptToCancel": { - "message": "Forsøk å avbryte" - }, - "attemptToCancelDescription": { - "message": "Å sende inn dette forsøket garanterer ikke at den opprinnelige transaksjonen blir kansellert. Hvis kanselleringsforsøket lykkes, vil du bli belastet transaksjonsgebyret ovenfor." - }, "attemptingConnect": { "message": "Prøver å opprette forbindelse med blokkjede" }, @@ -139,9 +133,6 @@ "cancel": { "message": "Avbryt" }, - "cancellationGasFee": { - "message": "Kansellering gassavgift" - }, "cancelled": { "message": "Avbrutt" }, @@ -901,9 +892,6 @@ "welcomeBack": { "message": "Velkommen tilbake!" }, - "yesLetsTry": { - "message": "Ja, la oss prøve" - }, "youNeedToAllowCameraAccess": { "message": "Du må gi kameratilgang for å bruke denne funksjonen." }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index c1f48526c..b138578fe 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -146,12 +146,6 @@ "assets": { "message": "Mga Asset" }, - "attemptToCancel": { - "message": "Subukang Kanselahin?" - }, - "attemptToCancelDescription": { - "message": "Kapag isinumite ang pagsubok na ito, hindi nito magagarantiyang makakansela ang iyong orihinal na transaksyon. Kung magiging matagumpay ang pagsubok na magkansela, sisingilin ka para sa bayarin sa transaksyon sa itaas." - }, "attemptingConnect": { "message": "Sinusubukang kumonekta sa blockchain." }, @@ -228,9 +222,6 @@ "cancel": { "message": "Kanselahin" }, - "cancellationGasFee": { - "message": "Bayarin sa Gas para sa Pagkansela" - }, "cancelled": { "message": "Nakansela" }, @@ -2011,9 +2002,6 @@ "message": "$1 sa $2 ang nakabinbin", "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total" }, - "yesLetsTry": { - "message": "Oo, subukan natin" - }, "youNeedToAllowCameraAccess": { "message": "Kailangan mong payagan ang pag-access sa camera para magamit ang feature na ito." }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 2da4f2873..6ce027426 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Składnik aktywów" }, - "attemptToCancel": { - "message": "Podjąć próbę anulowania?" - }, - "attemptToCancelDescription": { - "message": "Wykonanie tego działania nie gwarantuje, że pierwotna transakcja zostanie anulowana. Jeśli próba anulowania się powiedzie, zostaniesz obciążony opłatą transakcyjną wskazaną powyżej." - }, "attemptingConnect": { "message": "Próba połączenia z blockchainem." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Anuluj" }, - "cancellationGasFee": { - "message": "Opłata za gaz za anulowanie" - }, "cancelled": { "message": "Anulowano" }, @@ -911,9 +902,6 @@ "welcomeBack": { "message": "Witaj z powrotem!" }, - "yesLetsTry": { - "message": "Tak, spróbuj" - }, "youNeedToAllowCameraAccess": { "message": "Żeby użyć tej opcji należy podłączyć kamerę" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 4c6487a20..2c029a38a 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Se você tentar enviar ativos diretamente de uma rede para outra, isso poderá resultar na perda permanente deles. Certifique-se de usar uma ponte." }, - "attemptToCancel": { - "message": "Tentar cancelar?" - }, - "attemptToCancelDescription": { - "message": "Enviar essa tentativa não garante que sua transação original será cancelada. Caso a tentativa de cancelamento seja bem-sucedida, será cobrada a taxa de transação acima." - }, "attemptingConnect": { "message": "A tentar ligar à blockchain." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Cancelar swap gratuitamente" }, - "cancellationGasFee": { - "message": "Taxa de gás por cancelamento" - }, "cancelled": { "message": "Cancelada" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Sim" }, - "yesLetsTry": { - "message": "Sim, vamos tentar" - }, "youHaveAddedAll": { "message": "Você adicionou todas as redes populares. Você pode descobrir mais redes $1 Ou você pode $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 77c52eca8..137edd2ef 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -235,12 +235,6 @@ "assets": { "message": "Ativos" }, - "attemptToCancel": { - "message": "Tentar cancelar?" - }, - "attemptToCancelDescription": { - "message": "Enviar essa tentativa não garante que a transação original será cancelada. Se a tentativa de cancelamento tiver sucesso, será cobrada a taxa de transação acima." - }, "attemptingConnect": { "message": "Tentando conexão com o blockchain." }, @@ -358,9 +352,6 @@ "message": "Para $1 uma transação, a taxa de gás deve ser aumentada em pelo menos 10% para que seja reconhecida pela rede.", "description": "$1 is string 'cancel' or 'speed up'" }, - "cancellationGasFee": { - "message": "Taxa de gás por cancelamento" - }, "cancelled": { "message": "Cancelado" }, @@ -3023,9 +3014,6 @@ "message": "$1 de $2 pendente", "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total" }, - "yesLetsTry": { - "message": "Sim, vamos tentar" - }, "youNeedToAllowCameraAccess": { "message": "Você precisa permitir o acesso à câmera para usar esse recurso." }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index 9ea69c8bf..6d2a7055b 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Activ" }, - "attemptToCancel": { - "message": "Încercați să anulați?" - }, - "attemptToCancelDescription": { - "message": "Trimiterea acestei încercări nu garantează că tranzacția dvs. originală va fi anulată. Dacă încercarea de anulare va reuși, vi se va percepe taxa tranzacției de mai sus." - }, "attemptingConnect": { "message": "Se încearcă conectarea la blockchain." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Anulare" }, - "cancellationGasFee": { - "message": "Taxă de anulare în gaz" - }, "cancelled": { "message": "Anulat" }, @@ -904,9 +895,6 @@ "welcomeBack": { "message": "Bine ai revenit!" }, - "yesLetsTry": { - "message": "Da, să încercăm" - }, "youNeedToAllowCameraAccess": { "message": "Trebuie să permiteți accesul la cameră pentru a folosi această funcție." }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 8caeefc15..cc5b2f88f 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Попытка отправки активов напрямую из одной сети в другую может привести к необратимой потере активов. Следует использовать мост." }, - "attemptToCancel": { - "message": "Пытаетесь отменить?" - }, - "attemptToCancelDescription": { - "message": "Эта попытка не гарантирует, что ваша первоначальная транзакция будет отменена. Если попытка отмены окажется успешной, с вас будет удержана вышеуказанная комиссия за транзакцию." - }, "attemptingConnect": { "message": "Попытка подключения к блокчейну..." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Отменить обмен бесплатно" }, - "cancellationGasFee": { - "message": "Плата за газ при отмене" - }, "cancelled": { "message": "Отменено" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Да" }, - "yesLetsTry": { - "message": "Да, давайте попробуем" - }, "youHaveAddedAll": { "message": "Вы добавили все популярные сети. Вы можете открыть для себя больше сетей $1 или можете $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 379a4c8e0..447cc23df 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -72,12 +72,6 @@ "approved": { "message": "Schváleno" }, - "attemptToCancel": { - "message": "Pokus o zrušenie?" - }, - "attemptToCancelDescription": { - "message": "Odoslanie tohto pokusu nezaručuje, že vaša pôvodná transakcia bude zrušená. Ak je pokus o zrušenie úspešný, naúčtujeme vám vyššie uvedený transakčný poplatok." - }, "attemptingConnect": { "message": "Pokouším se připojit k blockchainu." }, @@ -136,9 +130,6 @@ "cancel": { "message": "Zrušit" }, - "cancellationGasFee": { - "message": "Storno poplatok za GAS" - }, "cancelled": { "message": "Zrušený" }, @@ -889,9 +880,6 @@ "welcomeBack": { "message": "Vitajte späť!" }, - "yesLetsTry": { - "message": "Áno, skúsme to" - }, "youNeedToAllowCameraAccess": { "message": "Ak chcete používať túto funkciu, musíte povoliť prístup k fotoaparátu." }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 96045cf19..d5c4c23f9 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Sredstva" }, - "attemptToCancel": { - "message": "Želite preklicati?" - }, - "attemptToCancelDescription": { - "message": "Če pošljete ta poskus, ne boste zagotovili, da bo vaša prvotna transakcija preklicana. Če bo poskus preklica uspešen, se bo zaračunala zgornja transakcija." - }, "attemptingConnect": { "message": "Povezovanje z verigo blokov ..." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Prekliči" }, - "cancellationGasFee": { - "message": "Preklicani znesek gas" - }, "cancelled": { "message": "Preklicano" }, @@ -911,9 +902,6 @@ "welcomeBack": { "message": "Dobrodošli nazaj!" }, - "yesLetsTry": { - "message": "Pa poskusimo" - }, "youNeedToAllowCameraAccess": { "message": "Za uporabo te funkcije boste potrebovali dostop do kamere." }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index 381e6ccb4..824c77e2c 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Sredstva" }, - "attemptToCancel": { - "message": "Pokušavate da otkažete?" - }, - "attemptToCancelDescription": { - "message": "Slanje ovog pokušaja ne garantuje da će prvobitna transakcija biti otkazana. Ako je pokušaj otkazivanja uspešan, biće vam naplaćena provizija koja je navedena gore." - }, "attemptingConnect": { "message": "Pokušava da se poveže na lanac blokova" }, @@ -142,9 +136,6 @@ "cancel": { "message": "Otkaži" }, - "cancellationGasFee": { - "message": "Otkazivanje gas naknade" - }, "cancelled": { "message": "Otkazano" }, @@ -908,9 +899,6 @@ "welcomeBack": { "message": "Dobro došli nazad!" }, - "yesLetsTry": { - "message": "Da, pokušajmo." - }, "youNeedToAllowCameraAccess": { "message": "Za upotrebu ove funkcije morate omogućiti pristup kameri." }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 5635ca008..dbacb38d4 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Tillgång" }, - "attemptToCancel": { - "message": "Vill du försöka att avbryta?" - }, - "attemptToCancelDescription": { - "message": "Att godkänna detta avbrytningsförsök garanterar inte att din ursprungliga överföring avbryts. Om avbrytningsförsöket lyckas kommer du att debiteras överföringsavgiften som nämns ovan." - }, "attemptingConnect": { "message": "Försöker ansluta till blockkedja." }, @@ -139,9 +133,6 @@ "cancel": { "message": "Avbryt" }, - "cancellationGasFee": { - "message": "Gasavgift för avbrytning" - }, "cancelled": { "message": "Avbruten" }, @@ -898,9 +889,6 @@ "welcomeBack": { "message": "Välkommen tillbaka!" }, - "yesLetsTry": { - "message": "Ja, låt oss försöka" - }, "youNeedToAllowCameraAccess": { "message": "Du måste tillåta åtkomst till kameran för att använda den här funktionen." }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 113065384..1377cae31 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Rasilimali" }, - "attemptToCancel": { - "message": "Unajaribu Kubatilisha?" - }, - "attemptToCancelDescription": { - "message": "Kuwasilisha jaribio hili hakukuhakikishii muamala wako wa awali utabatilishwa. Ikiwa jaribio la kuffuta litafanikiwa, utatozwa ada ya muamala hapo juu." - }, "attemptingConnect": { "message": "Inajaribu kuunganisha kwenye blockchain." }, @@ -136,9 +130,6 @@ "cancel": { "message": "Ghairi" }, - "cancellationGasFee": { - "message": "Ada ya Kubatilisha Gesi" - }, "cancelled": { "message": "Imebatilishwa" }, @@ -901,9 +892,6 @@ "welcomeBack": { "message": "Karibu Tena!" }, - "yesLetsTry": { - "message": "Ndiyo, ngoja tujaribu" - }, "youNeedToAllowCameraAccess": { "message": "Unapaswa kuruhusu kamera ili utumie kipengele hiki." }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 7e35b9887..37d721407 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -57,9 +57,6 @@ "cancel": { "message": "ยกเลิก" }, - "cancellationGasFee": { - "message": "ค่าธรรมเนียม Gas การยกเลิก" - }, "chromeRequiredForHardwareWallets": { "message": "คุณต้องใช้ MetaMask บน Google Chrome เพื่อเชื่อมต่อกับ Hardware Wallet ของคุณ" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 634d98acd..d7158e5c5 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Kung tatangkain mong magpadala ng mga asset nang direkta mula sa isang network papunta sa isa pa, maaari itong magresulta sa permanenteng pagkawala ng asset. Siguraduhing gumamit ng tulay." }, - "attemptToCancel": { - "message": "Subukang Kanselahin?" - }, - "attemptToCancelDescription": { - "message": "Kapag isinumite ang pagsubok na ito, hindi nito magagarantiyang makakansela ang iyong orihinal na transaksyon. Kung magiging matagumpay ang pagsubok na magkansela, sisingilin ka para sa bayarin sa transaksyon sa itaas." - }, "attemptingConnect": { "message": "Sinusubukang kumonekta sa blockchain." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Kanselahin ang swap nang libre" }, - "cancellationGasFee": { - "message": "Bayarin sa Gasolina para sa Pagkansela" - }, "cancelled": { "message": "Nakansela" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Oo" }, - "yesLetsTry": { - "message": "Oo, subukan natin" - }, "youHaveAddedAll": { "message": "Idinagdag mo ang lahat ng sikat na network. Maaari kang makatuklas ng higit pang mga network $1 O maaari kang", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 5ee4f7d5c..aeee7ac0b 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Varlıkları doğrudan bir ağdan diğerine göndermeye çalışırsanız bu durum kalıcı varlık kaybına neden olabilir. Bir köprü kullandığınızdan emin olun." }, - "attemptToCancel": { - "message": "İptal etmeyi Dene?" - }, - "attemptToCancelDescription": { - "message": "Bu denemenin gönderilmesi asıl işleminizin iptal edileceğini garanti etmez. İptal etme denemesi başarılı olursa sizden yukarıdaki ücret tahsil edilir." - }, "attemptingConnect": { "message": "Blockzincire bağlanmaya çalışılıyor." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Swap işlemini ücretsiz iptal edin" }, - "cancellationGasFee": { - "message": "İptal İşlemi Gaz Ücreti" - }, "cancelled": { "message": "İptal edildi" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Evet" }, - "yesLetsTry": { - "message": "Evet, deneyelim" - }, "youHaveAddedAll": { "message": "Tüm popüler ağları eklediniz. $1 daha fazla ağ gekşefedebilir veya $2 seçeneğini seçebilirsiniz", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 837dde933..d3c716ff2 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -75,12 +75,6 @@ "asset": { "message": "Актив" }, - "attemptToCancel": { - "message": "Спробувати скасувати?" - }, - "attemptToCancelDescription": { - "message": "Виконання цієї спроби не гарантує скасування початкової транзакції. Якщо спроба скасування вдасться, з вас буде стягнуто зазначену вище комісію." - }, "attemptingConnect": { "message": "Спроба підключення до розподіленої бази даних." }, @@ -142,9 +136,6 @@ "cancel": { "message": "Скасувати" }, - "cancellationGasFee": { - "message": "Вартість пального за скасування" - }, "cancelled": { "message": "Скасовано" }, @@ -923,9 +914,6 @@ "welcomeBack": { "message": "З поверненням!" }, - "yesLetsTry": { - "message": "Так, давайте спробуємо" - }, "youNeedToAllowCameraAccess": { "message": "Вам потрібно дозволити доступ до камери, щоб користуватись цією функцією." }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index fc8e7bb2f..d1f59efda 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "Nếu bạn cố gắng gửi tài sản trực tiếp từ mạng này sang mạng khác, bạn có thể bị mất tài sản vĩnh viễn. Hãy nhớ sử dụng cầu nối." }, - "attemptToCancel": { - "message": "Cố gắng hủy?" - }, - "attemptToCancelDescription": { - "message": "Việc gửi lần thử này không đảm bảo rằng giao dịch gốc của bạn sẽ được hủy. Nếu lần hủy này thành công, bạn sẽ chịu phí giao dịch nêu ở trên." - }, "attemptingConnect": { "message": "Đang cố gắng kết nối với chuỗi khối." }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "Hủy hoán đổi miễn phí" }, - "cancellationGasFee": { - "message": "Phí gas hủy" - }, "cancelled": { "message": "Đã hủy" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "Có" }, - "yesLetsTry": { - "message": "Có, hãy thử" - }, "youHaveAddedAll": { "message": "Bạn đã thêm tất cả các mạng phổ biến. Bạn có thể khám phá thêm nhiều mạng khác $1 Hoặc bạn có thể $2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 742fa46b3..5d5f8146f 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -399,12 +399,6 @@ "attemptSendingAssets": { "message": "如果您试图将资产从一个网络直接发送到另一个网络，这可能会导致永久的资产损失。必须使用桥来进行。" }, - "attemptToCancel": { - "message": "尝试取消吗？" - }, - "attemptToCancelDescription": { - "message": "提交此尝试不能保证将会取消您的初始交易。如果取消尝试成功，将向您收取以上交易费。" - }, "attemptingConnect": { "message": "正在尝试连接到区块链。" }, @@ -597,9 +591,6 @@ "cancelSwapForFree": { "message": "免费取消兑换" }, - "cancellationGasFee": { - "message": "取消燃料费" - }, "cancelled": { "message": "已取消" }, @@ -4346,9 +4337,6 @@ "yes": { "message": "是" }, - "yesLetsTry": { - "message": "是的，我们试一下" - }, "youHaveAddedAll": { "message": "您已经添加了所有热门网络。您可以探索更多网络$1，或者您可以$2", "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'" diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 86438bf02..811be212c 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -145,12 +145,6 @@ "assets": { "message": "資產" }, - "attemptToCancel": { - "message": "嘗試取消？" - }, - "attemptToCancelDescription": { - "message": "送出取消請求並不保證您原本的交易一定會被取消。若取消成功，將會收取上方顯示交易費用。" - }, "attemptingConnect": { "message": "正在嘗試連結區塊鏈。" }, @@ -230,9 +224,6 @@ "cancelSpeedUp": { "message": "cancel or speed up a tranaction." }, - "cancellationGasFee": { - "message": "需要的手續費" - }, "cancelled": { "message": "已取消" }, @@ -1673,9 +1664,6 @@ "message": "$1 之 $2 等待中", "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total" }, - "yesLetsTry": { - "message": "了解，試試看" - }, "youNeedToAllowCameraAccess": { "message": "需要准許存取攝影鏡頭才能啟用此功能" }, diff --git a/ui/components/app/modals/cancel-transaction/__snapshots__/cancel-transaction.component.test.js.snap b/ui/components/app/modals/cancel-transaction/__snapshots__/cancel-transaction.component.test.js.snap deleted file mode 100644 index 36fa47d54..000000000 --- a/ui/components/app/modals/cancel-transaction/__snapshots__/cancel-transaction.component.test.js.snap +++ /dev/null @@ -1,101 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`CancelTransaction Component should match snapshot 1`] = ` -
-
-
-
- Attempt to cancel? -
-
-
-
-
-
- Cancellation gas fee -
-
-
-
- - - 0.000021 - - - ETH - -
-
- - - 0.000021 - - - ETH - -
-
-
-
- Submitting this attempt does not guarantee your original transaction will be cancelled. If the cancellation attempt is successful, you will be charged the transaction fee above. -
-
-
-
- - -
-
-
-`; diff --git a/ui/components/app/modals/cancel-transaction/cancel-transaction.component.js b/ui/components/app/modals/cancel-transaction/cancel-transaction.component.js deleted file mode 100644 index 13c2b943b..000000000 --- a/ui/components/app/modals/cancel-transaction/cancel-transaction.component.js +++ /dev/null @@ -1,74 +0,0 @@ -import React, { PureComponent } from 'react'; -import PropTypes from 'prop-types'; -import Modal from '../../modal'; -import { TransactionStatus } from '../../../../../shared/constants/transaction'; -import CancelTransactionGasFee from './cancel-transaction-gas-fee'; - -export default class CancelTransaction extends PureComponent { - static contextTypes = { - t: PropTypes.func, - }; - - static propTypes = { - createCancelTransaction: PropTypes.func, - hideModal: PropTypes.func, - showTransactionConfirmedModal: PropTypes.func, - transactionStatus: PropTypes.string, - newGasFee: PropTypes.string, - }; - - state = { - busy: false, - }; - - componentDidUpdate() { - const { transactionStatus, showTransactionConfirmedModal } = this.props; - - if (transactionStatus !== TransactionStatus.submitted) { - showTransactionConfirmedModal(); - } - } - - handleSubmit = async () => { - const { createCancelTransaction, hideModal } = this.props; - - this.setState({ busy: true }); - - await createCancelTransaction(); - this.setState({ busy: false }, () => hideModal()); - }; - - handleCancel = () => { - this.props.hideModal(); - }; - - render() { - const { t } = this.context; - const { newGasFee } = this.props; - const { busy } = this.state; - - return ( - -
-
- {t('cancellationGasFee')} -
-
- -
-
- {t('attemptToCancelDescription')} -
-
- - ); - } -} diff --git a/ui/components/app/modals/cancel-transaction/cancel-transaction.component.test.js b/ui/components/app/modals/cancel-transaction/cancel-transaction.component.test.js deleted file mode 100644 index f5e746c98..000000000 --- a/ui/components/app/modals/cancel-transaction/cancel-transaction.component.test.js +++ /dev/null @@ -1,90 +0,0 @@ -import React from 'react'; -import configureMockStore from 'redux-mock-store'; -import { fireEvent, waitFor } from '@testing-library/react'; -import thunk from 'redux-thunk'; -import { renderWithProvider } from '../../../../../test/lib/render-helpers'; -import mockState from '../../../../../test/data/mock-state.json'; -import { - yesLetsTry, - nevermind, -} from '../../../../../app/_locales/en/messages.json'; -import CancelTransaction from '.'; - -const mockCreateCancelTransaction = jest.fn(); -const mockShowModal = jest.fn(); -const mockHideModal = jest.fn(); - -jest.mock('../../../../store/actions.ts', () => { - return { - createCancelTransaction: () => mockCreateCancelTransaction, - showModal: () => mockShowModal, - hideModal: () => mockHideModal, - }; -}); - -describe('CancelTransaction Component', () => { - afterEach(() => { - mockCreateCancelTransaction.mockClear(); - mockShowModal.mockClear(); - mockHideModal.mockClear(); - }); - - const props = { - newGasFee: '0x1319718a5000', // 21000000000000 - }; - - it('should match snapshot', () => { - const mockStore = configureMockStore()(mockState); - - const { container } = renderWithProvider( - , - mockStore, - ); - - expect(container).toMatchSnapshot(); - }); - - it('should call create cancel transaction and hide modal', async () => { - const mockStore = configureMockStore([thunk])(mockState); - - const { queryByText } = renderWithProvider( - , - mockStore, - ); - - fireEvent.click(queryByText(yesLetsTry.message)); - - await waitFor(() => { - expect(mockCreateCancelTransaction).toHaveBeenCalled(); - expect(mockHideModal).toHaveBeenCalled(); - }); - }); - - it('should hide modal when clicking "Nevermind" button', () => { - const mockStore = configureMockStore([thunk])(mockState); - - const { queryByText } = renderWithProvider( - , - mockStore, - ); - - fireEvent.click(queryByText(nevermind.message)); - - expect(mockCreateCancelTransaction).not.toHaveBeenCalled(); - expect(mockHideModal).toHaveBeenCalled(); - }); - - it('should hide modal when closing from header', () => { - const mockStore = configureMockStore([thunk])(mockState); - - const { queryByTestId } = renderWithProvider( - , - mockStore, - ); - - fireEvent.click(queryByTestId('modal-header-close')); - - expect(mockCreateCancelTransaction).not.toHaveBeenCalled(); - expect(mockHideModal).toHaveBeenCalled(); - }); -}); diff --git a/ui/components/app/modals/cancel-transaction/cancel-transaction.container.js b/ui/components/app/modals/cancel-transaction/cancel-transaction.container.js deleted file mode 100644 index 3145a6f15..000000000 --- a/ui/components/app/modals/cancel-transaction/cancel-transaction.container.js +++ /dev/null @@ -1,53 +0,0 @@ -import { connect } from 'react-redux'; -import { compose } from 'redux'; -import withModalProps from '../../../../helpers/higher-order-components/with-modal-props'; -import { showModal, createCancelTransaction } from '../../../../store/actions'; -import CancelTransaction from './cancel-transaction.component'; - -const mapStateToProps = (state, ownProps) => { - const { metamask } = state; - const { transactionId, originalGasPrice, newGasFee, customGasSettings } = - ownProps; - const { currentNetworkTxList } = metamask; - const transaction = currentNetworkTxList.find( - ({ id }) => id === transactionId, - ); - const transactionStatus = transaction ? transaction.status : ''; - - return { - transactionId, - transactionStatus, - originalGasPrice, - customGasSettings, - newGasFee, - }; -}; - -const mapDispatchToProps = (dispatch) => { - return { - createCancelTransaction: (txId, customGasSettings) => { - return dispatch(createCancelTransaction(txId, customGasSettings)); - }, - showTransactionConfirmedModal: () => - dispatch(showModal({ name: 'TRANSACTION_CONFIRMED' })), - }; -}; - -const mergeProps = (stateProps, dispatchProps, ownProps) => { - const { transactionId, customGasSettings, ...restStateProps } = stateProps; - // eslint-disable-next-line no-shadow - const { createCancelTransaction, ...restDispatchProps } = dispatchProps; - - return { - ...restStateProps, - ...restDispatchProps, - ...ownProps, - createCancelTransaction: () => - createCancelTransaction(transactionId, customGasSettings), - }; -}; - -export default compose( - withModalProps, - connect(mapStateToProps, mapDispatchToProps, mergeProps), -)(CancelTransaction); diff --git a/ui/components/app/modals/cancel-transaction/index.js b/ui/components/app/modals/cancel-transaction/index.js deleted file mode 100644 index 1c428a0a6..000000000 --- a/ui/components/app/modals/cancel-transaction/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './cancel-transaction.container'; diff --git a/ui/components/app/modals/modal.js b/ui/components/app/modals/modal.js index fa7c0c1c2..955d2ac30 100644 --- a/ui/components/app/modals/modal.js +++ b/ui/components/app/modals/modal.js @@ -18,7 +18,6 @@ import HoldToRevealModal from './hold-to-reveal-modal'; import ConfirmRemoveAccount from './confirm-remove-account'; import ConfirmResetAccount from './confirm-reset-account'; import TransactionConfirmed from './transaction-confirmed'; -import CancelTransaction from './cancel-transaction'; import FadeModal from './fade-modal'; import MetaMetricsOptInModal from './metametrics-opt-in-modal'; @@ -270,19 +269,6 @@ const MODALS = { }, }, - CANCEL_TRANSACTION: { - contents: , - mobileModalStyle: { - ...modalContainerMobileStyle, - }, - laptopModalStyle: { - ...modalContainerLaptopStyle, - }, - contentStyle: { - borderRadius: '8px', - }, - }, - REJECT_TRANSACTIONS: { contents: , mobileModalStyle: {