From bace02ad020660c0985d5b92b0e9ec1265ea231f Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 24 Apr 2020 12:33:24 -0300 Subject: [PATCH] Remove unused ShapeShift components (#8402) The `shift-list-item` component for displaying ShapeShift transactions has been removed, along with three other components that were used solely by that component (`copyButton`, `eth-balance`, and `fiat-value`). This component hasn't been used in some time, as ShapeShift transactions no longer exist to display. The controller that ShapeShift transactions originated from was removed in #8118, and it became impossible to create new ShapeShift transactions from within MetaMask in #6746 --- app/_locales/am/messages.json | 19 -- app/_locales/ar/messages.json | 19 -- app/_locales/bg/messages.json | 19 -- app/_locales/bn/messages.json | 19 -- app/_locales/ca/messages.json | 19 -- app/_locales/cs/messages.json | 19 -- app/_locales/da/messages.json | 19 -- app/_locales/de/messages.json | 19 -- app/_locales/el/messages.json | 19 -- app/_locales/en/messages.json | 19 -- app/_locales/es/messages.json | 19 -- app/_locales/es_419/messages.json | 19 -- app/_locales/et/messages.json | 19 -- app/_locales/fa/messages.json | 19 -- app/_locales/fi/messages.json | 19 -- app/_locales/fil/messages.json | 19 -- app/_locales/fr/messages.json | 19 -- app/_locales/he/messages.json | 19 -- app/_locales/hi/messages.json | 19 -- app/_locales/hn/messages.json | 19 -- app/_locales/hr/messages.json | 19 -- app/_locales/ht/messages.json | 19 -- app/_locales/hu/messages.json | 19 -- app/_locales/id/messages.json | 19 -- app/_locales/it/messages.json | 19 -- app/_locales/ja/messages.json | 19 -- app/_locales/kn/messages.json | 19 -- app/_locales/ko/messages.json | 19 -- app/_locales/lt/messages.json | 19 -- app/_locales/lv/messages.json | 19 -- app/_locales/ms/messages.json | 19 -- app/_locales/nl/messages.json | 19 -- app/_locales/no/messages.json | 19 -- app/_locales/ph/messages.json | 19 -- app/_locales/pl/messages.json | 19 -- app/_locales/pt/messages.json | 19 -- app/_locales/pt_BR/messages.json | 19 -- app/_locales/ro/messages.json | 19 -- app/_locales/ru/messages.json | 19 -- app/_locales/sk/messages.json | 19 -- app/_locales/sl/messages.json | 19 -- app/_locales/sr/messages.json | 19 -- app/_locales/sv/messages.json | 19 -- app/_locales/sw/messages.json | 19 -- app/_locales/ta/messages.json | 19 -- app/_locales/th/messages.json | 19 -- app/_locales/tr/messages.json | 19 -- app/_locales/uk/messages.json | 19 -- app/_locales/vi/messages.json | 19 -- app/_locales/zh_CN/messages.json | 19 -- app/_locales/zh_TW/messages.json | 19 -- app/scripts/background.js | 1 - development/states/confirm-sig-requests.json | 1 - development/states/currency-localization.json | 1 - development/states/tx-list-items.json | 1 - test/data/2-state.json | 1 - .../components/app/shift-list-item/index.js | 1 - .../shift-list-item.component.js | 222 ------------------ .../shift-list-item.container.js | 12 - .../transaction-list.component.js | 33 +-- ui/app/components/ui/copyButton.js | 63 ----- .../ui/eth-balance/eth-balance.component.js | 135 ----------- .../ui/eth-balance/eth-balance.container.js | 10 - ui/app/components/ui/eth-balance/index.js | 1 - ui/app/components/ui/fiat-value.js | 74 ------ ui/app/css/itcss/components/modal.scss | 4 - ui/app/css/itcss/components/sections.scss | 10 - .../itcss/components/transaction-list.scss | 8 - ui/app/css/itcss/tools/utilities.scss | 15 -- ui/app/helpers/constants/transactions.js | 2 - .../send/tests/send-selectors-test-data.js | 5 - ui/app/selectors/tests/selectors-test-data.js | 5 - ui/app/selectors/tests/transactions.test.js | 93 -------- ui/app/selectors/transactions.js | 28 +-- 74 files changed, 19 insertions(+), 1676 deletions(-) delete mode 100644 ui/app/components/app/shift-list-item/index.js delete mode 100644 ui/app/components/app/shift-list-item/shift-list-item.component.js delete mode 100644 ui/app/components/app/shift-list-item/shift-list-item.container.js delete mode 100644 ui/app/components/ui/copyButton.js delete mode 100644 ui/app/components/ui/eth-balance/eth-balance.component.js delete mode 100644 ui/app/components/ui/eth-balance/eth-balance.container.js delete mode 100644 ui/app/components/ui/eth-balance/index.js delete mode 100644 ui/app/components/ui/fiat-value.js diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index 0b58b5d86..9d8f0017c 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "የኮንትራት ስምሪት" }, - "conversionProgress": { - "message": "ልወጣ በመካሄድ ላይ ነው" - }, - "copiedButton": { - "message": "የተቀዳ" - }, "copiedExclamation": { "message": "ተቀድቷል" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "ወደ ቅንጥብ ሰሌዳ ገልብጥ" }, - "copyButton": { - "message": "ቅዳ" - }, "copyPrivateKey": { "message": "የግል ቁልፍዎ ይህ ነው (ለመቅዳት ጠቅ ያድርጉ)" }, @@ -454,9 +445,6 @@ "from": { "message": "ከ" }, - "fromShapeShift": { - "message": "ከ ShapeShift " - }, "functionType": { "message": "የተግባር ዓይነት" }, @@ -761,9 +749,6 @@ "noAddressForName": { "message": "በዚህ ስም የተሞላ አድራሻ የለም።" }, - "noDeposits": { - "message": "ገቢ የሆነ ተቀማጭ የለም" - }, "noConversionRateAvailable": { "message": "ምንም የልወጣ ተመን አይገኝም" }, @@ -1165,10 +1150,6 @@ "to": { "message": "ለ" }, - "toETHviaShapeShift": { - "message": "$1ወደ ETH በ ShapeShift በኩል", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "ተለዋጭ ስም" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index 05cc5ddb0..1b1e987f3 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "نشر العقد" }, - "conversionProgress": { - "message": "جارِ التحويل" - }, - "copiedButton": { - "message": "تم النسخ" - }, "copiedExclamation": { "message": "تم النسخ." }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "نسخ إلى الحافظة" }, - "copyButton": { - "message": "نسخ" - }, "copyPrivateKey": { "message": "هذا هو مفتاحك الخاص (انقر للنسخ)" }, @@ -450,9 +441,6 @@ "from": { "message": "من" }, - "fromShapeShift": { - "message": "من ShapeShift" - }, "functionType": { "message": "نوع الوظيفة" }, @@ -757,9 +745,6 @@ "noAddressForName": { "message": "لم يتم تعيين عنوان لهذا الاسم." }, - "noDeposits": { - "message": "لم يتم استلام أي ودائع" - }, "noConversionRateAvailable": { "message": "لا يوجد معدل تحويل متاح" }, @@ -1161,10 +1146,6 @@ "to": { "message": "إلى" }, - "toETHviaShapeShift": { - "message": "تحويل $1 إلى ETH عبر ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "عملة رمزية" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index d4c72149f..657b1d8fa 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Разгръщане на договор" }, - "conversionProgress": { - "message": "Извършва се конвертиране" - }, - "copiedButton": { - "message": "Копирано" - }, "copiedExclamation": { "message": "Копирано!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Копиране в буферната памет" }, - "copyButton": { - "message": "Копиране" - }, "copyPrivateKey": { "message": "Това е Вашият личен ключ (кликнете, за да го копирате)" }, @@ -450,9 +441,6 @@ "from": { "message": "От" }, - "fromShapeShift": { - "message": "От ShapeShift" - }, "functionType": { "message": "Тип функция" }, @@ -760,9 +748,6 @@ "noAddressForName": { "message": "За това име не е зададен адрес." }, - "noDeposits": { - "message": "Не са получени депозити" - }, "noConversionRateAvailable": { "message": "Няма наличен процент на преобръщане" }, @@ -1164,10 +1149,6 @@ "to": { "message": "На" }, - "toETHviaShapeShift": { - "message": "$1 до ETH чрез ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Жетон" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 5b2c67291..b10527c63 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "কন্ট্র্যাক্ট নিয়োজন" }, - "conversionProgress": { - "message": "বিনিময় চলছে" - }, - "copiedButton": { - "message": "কপি করা হয়েছে" - }, "copiedExclamation": { "message": "কপি করা হয়েছে!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "ক্লিপবোর্ডে কপি করুন" }, - "copyButton": { - "message": "কপি করুন" - }, "copyPrivateKey": { "message": "এটি হল আপনার গোপন কী (কপি করতে ক্লিক করুন)" }, @@ -454,9 +445,6 @@ "from": { "message": "থেকে" }, - "fromShapeShift": { - "message": "ShapeShift থেকে" - }, "functionType": { "message": "কার্যকারিতার ধরণ" }, @@ -764,9 +752,6 @@ "noAddressForName": { "message": "এই নামের জন্য কোনো ঠিকানা সেট করা হয় নি।" }, - "noDeposits": { - "message": "কোনো ডিপোজিট পাওয়া যায় নি" - }, "noConversionRateAvailable": { "message": "কোনো বিনিময় হার উপলভ্য নয়" }, @@ -1168,10 +1153,6 @@ "to": { "message": "প্রতি" }, - "toETHviaShapeShift": { - "message": "ShapeShift এর মাধ্যমে ETH এ $1", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "টোকেন" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 42849f804..587d38834 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Desplegament de Contracte" }, - "conversionProgress": { - "message": "Conversió en curs" - }, - "copiedButton": { - "message": "Copiat" - }, "copiedExclamation": { "message": "S'ha copiat!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Copia al porta-retalls" }, - "copyButton": { - "message": "Copiar" - }, "copyPrivateKey": { "message": "Aquesta és la teva clau privada (fes clic per a copiar)" }, @@ -447,9 +438,6 @@ "from": { "message": "Des de" }, - "fromShapeShift": { - "message": "De ShapeShift" - }, "functionType": { "message": "Tipus de Funció" }, @@ -748,9 +736,6 @@ "noAddressForName": { "message": "No existeix cap adreça amb aquest nom." }, - "noDeposits": { - "message": "Cap dipòsit rebut" - }, "noConversionRateAvailable": { "message": "No hi ha cap tarifa de conversió disponible" }, @@ -1143,10 +1128,6 @@ "to": { "message": "A" }, - "toETHviaShapeShift": { - "message": "$1 a ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "El token ja s'ha afegit." }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index b153e7439..36bdeb957 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -88,21 +88,12 @@ "contractDeployment": { "message": "Nasazení kontraktu" }, - "conversionProgress": { - "message": "Provádí se převod" - }, - "copiedButton": { - "message": "Zkopírováno" - }, "copiedExclamation": { "message": "Zkopírováno!" }, "copyToClipboard": { "message": "Kopírovat do schránky" }, - "copyButton": { - "message": " Kopírovat " - }, "copyPrivateKey": { "message": "Toto je váš privátní klíč (kliknutím zkopírujte)" }, @@ -183,9 +174,6 @@ "from": { "message": "Od" }, - "fromShapeShift": { - "message": "Z ShapeShift" - }, "gasLimit": { "message": "Limit paliva" }, @@ -318,9 +306,6 @@ "noAddressForName": { "message": "Pro toto jméno nebyla nastavena žádná adresa." }, - "noDeposits": { - "message": "Žádný vklad" - }, "noTransactions": { "message": "Žádné transakce" }, @@ -452,10 +437,6 @@ "to": { "message": "Komu" }, - "toETHviaShapeShift": { - "message": "$1 na ETH přes ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token byl už přidán." }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index 9294d37be..24e090b7b 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Kontraktanvendelse" }, - "conversionProgress": { - "message": "Konvertering pågår" - }, - "copiedButton": { - "message": "Kopieret" - }, "copiedExclamation": { "message": "Kopieret!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopiér til udklipsholderen" }, - "copyButton": { - "message": "Kopiér" - }, "copyPrivateKey": { "message": "Dette er din private nøgle (klik for at kopiere)" }, @@ -450,9 +441,6 @@ "from": { "message": "Fra" }, - "fromShapeShift": { - "message": "Fra ShapeShift" - }, "functionType": { "message": "Funktionstype" }, @@ -748,9 +736,6 @@ "noAddressForName": { "message": "Ingen adresse indstillet for dette navn." }, - "noDeposits": { - "message": "Ingen modtagne indskud" - }, "noConversionRateAvailable": { "message": "Ingen tilgængelig omregningskurs" }, @@ -1143,10 +1128,6 @@ "to": { "message": "Til" }, - "toETHviaShapeShift": { - "message": "$1 til ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token er allerede blevet tilføjet." }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index abbbbb949..9ee94993f 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -245,12 +245,6 @@ "contractDeployment": { "message": "Smart Contract Ausführung" }, - "conversionProgress": { - "message": "Umtausch in Arbeit" - }, - "copiedButton": { - "message": "Kopiert" - }, "copiedExclamation": { "message": "Kopiert!" }, @@ -266,9 +260,6 @@ "copyToClipboard": { "message": "In die Zwischenablage kopieren" }, - "copyButton": { - "message": " Kopieren " - }, "copyPrivateKey": { "message": "Das ist Ihr Private Key (klicken um zu kopieren)" }, @@ -439,9 +430,6 @@ "from": { "message": "Von" }, - "fromShapeShift": { - "message": "Von ShapeShift" - }, "functionType": { "message": "Funktionstyp" }, @@ -734,9 +722,6 @@ "noAddressForName": { "message": "Für den angegebene Namen wurde keine Adresse eingegeben." }, - "noDeposits": { - "message": "Keine Einzahlung erhalten" - }, "noConversionRateAvailable": { "message": "Kein Umrechnungskurs verfügbar" }, @@ -1131,10 +1116,6 @@ "to": { "message": "An" }, - "toETHviaShapeShift": { - "message": "$1 an ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Der Token wurde bereits hinzugefügt." }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 8dc15f54d..59279bfc8 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Ανάπτυξη Συμβολαίου" }, - "conversionProgress": { - "message": "Μετατροπή σε εξέλιξη" - }, - "copiedButton": { - "message": "Αντιγράφηκε" - }, "copiedExclamation": { "message": "Έγινε αντιγραφή!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Αντιγραφή στο πρόχειρο" }, - "copyButton": { - "message": "Αντιγραφή" - }, "copyPrivateKey": { "message": "Αυτό είναι το ιδιωτικό σας κλειδί (κάντε κλικ για αντιγραφή)" }, @@ -451,9 +442,6 @@ "from": { "message": "Από " }, - "fromShapeShift": { - "message": "Από το ShapeShift" - }, "functionType": { "message": "Τύπος Λειτουργίας" }, @@ -761,9 +749,6 @@ "noAddressForName": { "message": "Δεν έχει ορισθεί καμιά διεύθυνση γ' αυτό το όνομα." }, - "noDeposits": { - "message": "Δεν λήφθηκε καμία κατάθεση" - }, "noConversionRateAvailable": { "message": "Δεν Υπάρχει Διαθέσιμη Ισοτιμία Μετατροπής" }, @@ -1162,10 +1147,6 @@ "to": { "message": "Προς" }, - "toETHviaShapeShift": { - "message": "$1 στο ETH μέσω ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Διακριτικό" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 36e0ceddc..5ef186a8f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -369,12 +369,6 @@ "contractDeployment": { "message": "Contract Deployment" }, - "conversionProgress": { - "message": "Conversion in progress" - }, - "copiedButton": { - "message": "Copied" - }, "copiedExclamation": { "message": "Copied!" }, @@ -390,9 +384,6 @@ "copyToClipboard": { "message": "Copy to clipboard" }, - "copyButton": { - "message": " Copy " - }, "copyPrivateKey": { "message": "This is your private key (click to copy)" }, @@ -629,9 +620,6 @@ "from": { "message": "From" }, - "fromShapeShift": { - "message": "From ShapeShift" - }, "functionApprove": { "message": "Function: Approve" }, @@ -987,9 +975,6 @@ "noAddressForName": { "message": "No address has been set for this name." }, - "noDeposits": { - "message": "No deposits received" - }, "noConversionRateAvailable": { "message": "No Conversion Rate Available" }, @@ -1471,10 +1456,6 @@ "toWithColon": { "message": "To:" }, - "toETHviaShapeShift": { - "message": "$1 to ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Token" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 33b5f88ad..c76af937c 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -214,12 +214,6 @@ "contractDeployment": { "message": "Desplegar (Deploy) contrato" }, - "conversionProgress": { - "message": "Conversión en progreso" - }, - "copiedButton": { - "message": "Copiado" - }, "copiedExclamation": { "message": "¡Copiado!" }, @@ -235,9 +229,6 @@ "copyToClipboard": { "message": "Copiar al portapapeles" }, - "copyButton": { - "message": " Copiar " - }, "copyPrivateKey": { "message": "Ésta es tu clave privada (haz click para copiar)" }, @@ -372,9 +363,6 @@ "from": { "message": "De:" }, - "fromShapeShift": { - "message": "De ShapeShift" - }, "functionType": { "message": "Tipo de función" }, @@ -604,9 +592,6 @@ "noAddressForName": { "message": "No se ha establecido ninguna dirección para este nombre" }, - "noDeposits": { - "message": "No hay depósitos recibidos" - }, "noConversionRateAvailable": { "message": "No hay tasa de conversión" }, @@ -924,10 +909,6 @@ "to": { "message": "Para" }, - "toETHviaShapeShift": { - "message": "$1 a ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "El token está actualmente agregado" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 104963908..8d3845f11 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Despliegue de contratos" }, - "conversionProgress": { - "message": "Conversión en curso" - }, - "copiedButton": { - "message": "Copiado" - }, "copiedExclamation": { "message": "Copiado" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Copiar al portapapeles" }, - "copyButton": { - "message": "Copiar" - }, "copyPrivateKey": { "message": "Esta es tu clave privada (haz clic para copiar)" }, @@ -451,9 +442,6 @@ "from": { "message": "De" }, - "fromShapeShift": { - "message": "De ShapeShift" - }, "functionType": { "message": "Tipo de función" }, @@ -749,9 +737,6 @@ "noAddressForName": { "message": "No se ha establecido ninguna dirección para este nombre." }, - "noDeposits": { - "message": "No se han recibido depósitos" - }, "noConversionRateAvailable": { "message": "No hay ninguna tasa de conversión disponible" }, @@ -1153,10 +1138,6 @@ "to": { "message": "A" }, - "toETHviaShapeShift": { - "message": "$1 a ETH a través de ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "El token ya se ha agregado." }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 2b54919f0..573aec5a5 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Lepingu juurutamine" }, - "conversionProgress": { - "message": "Teisendamine on pooleli" - }, - "copiedButton": { - "message": "Kopeeritud" - }, "copiedExclamation": { "message": "Kopeeritud!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopeeri lõikelauale" }, - "copyButton": { - "message": "Kopeeri" - }, "copyPrivateKey": { "message": "See on teie privaatne võti (klõpsake kopeerimiseks)" }, @@ -450,9 +441,6 @@ "from": { "message": "Saatja" }, - "fromShapeShift": { - "message": "ShapeShiftist" - }, "functionType": { "message": "Funktsiooni tüüp" }, @@ -754,9 +742,6 @@ "noAddressForName": { "message": "Sellele nimele pole registreeritud ühtegi aadressi." }, - "noDeposits": { - "message": "Sissemakseid pole laekunud" - }, "noConversionRateAvailable": { "message": "Ühtegi vahetuskurssi pole saadaval" }, @@ -1158,10 +1143,6 @@ "to": { "message": "Saaja" }, - "toETHviaShapeShift": { - "message": "$1 ETH-le ShapeShifti kaudu", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Luba" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index bc6299612..15ba69a13 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "تطبیق قرارداد" }, - "conversionProgress": { - "message": "تبادل در حال اجراء" - }, - "copiedButton": { - "message": "کاپی شد" - }, "copiedExclamation": { "message": "کپی شد!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "کپی در بریده‌دان" }, - "copyButton": { - "message": "کاپی" - }, "copyPrivateKey": { "message": "این کلید خصوصی شما است (برای کاپی نمودن کلیک کنید)" }, @@ -454,9 +445,6 @@ "from": { "message": "از" }, - "fromShapeShift": { - "message": "از ShapeShift" - }, "functionType": { "message": "نوعیت عملکرد" }, @@ -764,9 +752,6 @@ "noAddressForName": { "message": "هیچ آدرسی برای این نام تنظیم نشده است." }, - "noDeposits": { - "message": "هیچ پرداختی دریافت نشده است" - }, "noConversionRateAvailable": { "message": "هیچ نرخ تغییر موجود نمیباشد" }, @@ -1168,10 +1153,6 @@ "to": { "message": "به" }, - "toETHviaShapeShift": { - "message": "1$1 به ETH توسط ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "رمزیاب" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index fefce0a81..be5d42d85 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Sopimuksen käyttö" }, - "conversionProgress": { - "message": "Muuntaminen käynnissä" - }, - "copiedButton": { - "message": "Kopioitu" - }, "copiedExclamation": { "message": "Kopioitu" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Kopioi leikepöydälle" }, - "copyButton": { - "message": "Kopioi" - }, "copyPrivateKey": { "message": "Tämä on yksityinen avaimesi (kopioi napsauttamalla)" }, @@ -451,9 +442,6 @@ "from": { "message": "Alkaen" }, - "fromShapeShift": { - "message": "ShapeShiftistä" - }, "functionType": { "message": "Funktion tyyppi" }, @@ -761,9 +749,6 @@ "noAddressForName": { "message": "Tälle nimelle ei ole määritetty osoitetta." }, - "noDeposits": { - "message": "Ei vastaanotettuja talletuksia" - }, "noConversionRateAvailable": { "message": "Vaihtokurssi ei saatavilla" }, @@ -1165,10 +1150,6 @@ "to": { "message": "Kohde" }, - "toETHviaShapeShift": { - "message": "$1 ETH:hon ShapeShiftin kautta", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Poletti" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index 25a8c488b..a69789cf2 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -233,12 +233,6 @@ "contractDeployment": { "message": "Deployment ng Contract" }, - "conversionProgress": { - "message": "Kasalukuyang ipinapapalit" - }, - "copiedButton": { - "message": "Nakopya" - }, "copiedExclamation": { "message": "Nakopya!" }, @@ -254,9 +248,6 @@ "copyToClipboard": { "message": "Kopyahin sa clipboard" }, - "copyButton": { - "message": "Kopyahin " - }, "copyPrivateKey": { "message": "Ito ang iyong pribadong private key (i-click para kopyahin)" }, @@ -420,9 +411,6 @@ "from": { "message": "Mula sa" }, - "fromShapeShift": { - "message": "Mula sa ShapeShift" - }, "functionType": { "message": "Uri ng Function" }, @@ -698,9 +686,6 @@ "noAddressForName": { "message": "Walang address na na-set para sa pangalang ito." }, - "noDeposits": { - "message": "Walang mga depositong natanggap" - }, "noConversionRateAvailable": { "message": "Walang Presyo ng Palitan na Available" }, @@ -1071,10 +1056,6 @@ "to": { "message": "Para sa" }, - "toETHviaShapeShift": { - "message": "$1 sa ETH sa pamamagitan ng ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Naidagdag na ang token." }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 5a99ca09f..c24c6f088 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -245,12 +245,6 @@ "contractDeployment": { "message": "Déploiement de contrat" }, - "conversionProgress": { - "message": "Conversion en cours" - }, - "copiedButton": { - "message": "Copié" - }, "copiedExclamation": { "message": "Copié!" }, @@ -266,9 +260,6 @@ "copyToClipboard": { "message": "Copier dans le presse-papier" }, - "copyButton": { - "message": " Copier " - }, "copyPrivateKey": { "message": "Ceci est votre clé privée (cliquez pour copier)" }, @@ -442,9 +433,6 @@ "from": { "message": "de" }, - "fromShapeShift": { - "message": "de ShapeShift" - }, "functionType": { "message": "Type de fonction" }, @@ -746,9 +734,6 @@ "noAddressForName": { "message": "Aucune adresse n'a été définie pour ce nom." }, - "noDeposits": { - "message": "Aucun dépôt reçu" - }, "noConversionRateAvailable": { "message": "Aucun taux de conversion disponible" }, @@ -1150,10 +1135,6 @@ "to": { "message": "Destinataire" }, - "toETHviaShapeShift": { - "message": "$1 à ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Jeton" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 4f0b89c4e..cf6dcd7b8 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "שליחת חוזה (Contract Deployment)" }, - "conversionProgress": { - "message": "המרה מתבצעת" - }, - "copiedButton": { - "message": "הועתק" - }, "copiedExclamation": { "message": "הועתק!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "העתק ללוח" }, - "copyButton": { - "message": "העתק" - }, "copyPrivateKey": { "message": "זה המפתח הפרטי שלך (נא להקיש כדי להעתיק)" }, @@ -454,9 +445,6 @@ "from": { "message": "מאת" }, - "fromShapeShift": { - "message": "מ-ShapeShift" - }, "functionType": { "message": "סוג פונקציה" }, @@ -761,9 +749,6 @@ "noAddressForName": { "message": "לא הוגדרה כתובת עבור שם זה." }, - "noDeposits": { - "message": "לא התקבלו פיקדונות" - }, "noConversionRateAvailable": { "message": "אין שער המרה זמין" }, @@ -1162,10 +1147,6 @@ "to": { "message": "אל" }, - "toETHviaShapeShift": { - "message": "$1 ל-ETH באמצעות ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "טוקן" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index f3a2626d9..7af47defc 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "कॉन्ट्रैक्ट का परिनियोजन" }, - "conversionProgress": { - "message": "रुपांतरण प्रगति पर है" - }, - "copiedButton": { - "message": "कॉपी किया गया" - }, "copiedExclamation": { "message": "कॉपी की गई!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "क्लिपबोर्ड में कॉपी करें" }, - "copyButton": { - "message": "कॉपी" - }, "copyPrivateKey": { "message": "यह आपकी निजी कुंजी है (कॉपी करने के लिए क्लिक करें)" }, @@ -454,9 +445,6 @@ "from": { "message": "से\n" }, - "fromShapeShift": { - "message": "शेपशिफ्ट से" - }, "functionType": { "message": "कार्यप्रणाली प्रकार" }, @@ -761,9 +749,6 @@ "noAddressForName": { "message": "इस नाम के लिए कोई पता सेट नहीं किया गया है" }, - "noDeposits": { - "message": "कोई धनराशि प्राप्त नहीं हुई है" - }, "noConversionRateAvailable": { "message": "कोई रूपांतरण दर उपलब्ध नहीं है" }, @@ -1162,10 +1147,6 @@ "to": { "message": "सेवा में" }, - "toETHviaShapeShift": { - "message": "ShapeShift द्वारा ETH को $1", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "टोकन" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 95a0908e3..a2847d2dd 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -70,21 +70,12 @@ "contractDeployment": { "message": "अनुबंध परिनियोजन व तैनाती" }, - "conversionProgress": { - "message": "रूपांतरण प्रगति में हे।" - }, - "copiedButton": { - "message": "कॉपी किया गया" - }, "copiedExclamation": { "message": "कॉपी कर दिया गया!" }, "copyToClipboard": { "message": "क्लिपबोर्ड पर कॉपी करें" }, - "copyButton": { - "message": " कॉपी / प्रतिलिपि कर्रे [बत्तन] " - }, "copyPrivateKey": { "message": "यह आपकी निजी कुंजी है (कॉपी करने के लिए क्लिक करें)।" }, @@ -159,9 +150,6 @@ "from": { "message": "की तरफ से - संदेश" }, - "fromShapeShift": { - "message": "सेशशशफ्ट का" - }, "gasLimit": { "message": "गैस सीमा" }, @@ -301,9 +289,6 @@ "noAddressForName": { "message": "इस नाम के लिए कोई पता सेट नहीं किया गया है।" }, - "noDeposits": { - "message": "कोई जमा प्राप्त नहीं हुई" - }, "noTransactions": { "message": "कोई लेन-देन नहीं" }, @@ -420,10 +405,6 @@ "to": { "message": "के लिए" }, - "toETHviaShapeShift": { - "message": "शैपशैफ्ट द्वारा $1 से ETH में जमा", - "description": "संदेश की शुरुआत में जमा प्रकार भर जाएगा" - }, "tokenAlreadyAdded": { "message": "टोकन पहले ही जोड़ा जा चुका है।" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 6f055a9a6..82427724e 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Primjena ugovora" }, - "conversionProgress": { - "message": "Konverzija u tijeku" - }, - "copiedButton": { - "message": "Kopirano" - }, "copiedExclamation": { "message": "Kopirano!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopiraj u međuspremnik" }, - "copyButton": { - "message": "Kopiraj" - }, "copyPrivateKey": { "message": "Ovo je vaš privatni ključ (kliknite za kopiranje)" }, @@ -450,9 +441,6 @@ "from": { "message": "Pošiljatelj" }, - "fromShapeShift": { - "message": "Od usluge ShapeShift" - }, "functionType": { "message": "Vrsta funkcije" }, @@ -757,9 +745,6 @@ "noAddressForName": { "message": "Nijedna adresa nije postavljena za ovaj naziv." }, - "noDeposits": { - "message": "Nijedan polog nije primljen" - }, "noConversionRateAvailable": { "message": "Nijedan konverzijski tečaj nije dostupan" }, @@ -1161,10 +1146,6 @@ "to": { "message": "Primatelj" }, - "toETHviaShapeShift": { - "message": "$1 za ETH uslugom ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token je već dodan." }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index fca9460a6..ef26d522f 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -133,12 +133,6 @@ "contractDeployment": { "message": "Kontra Deplwaman" }, - "conversionProgress": { - "message": "Konvèsyon nan Pwogrè" - }, - "copiedButton": { - "message": "Kopye" - }, "copiedExclamation": { "message": "Kopye!" }, @@ -148,9 +142,6 @@ "copyToClipboard": { "message": "Kopi clipboard" }, - "copyButton": { - "message": " Kopi " - }, "copyPrivateKey": { "message": "Sa a se kle prive ou (klike pou ou kopye)" }, @@ -249,9 +240,6 @@ "from": { "message": "Soti nan" }, - "fromShapeShift": { - "message": "Soti nan ShapeShift" - }, "functionType": { "message": "Kalite Fonksyon" }, @@ -442,9 +430,6 @@ "noAddressForName": { "message": "Pa gen adrès ki etabli pou non sa a." }, - "noDeposits": { - "message": "Pa gen depo ou te resevwa" - }, "noConversionRateAvailable": { "message": "Pa gen okenn Konvèsyon Disponib" }, @@ -720,10 +705,6 @@ "to": { "message": "Pou" }, - "toETHviaShapeShift": { - "message": "$1 pou ETH pa ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Ou te deja ajoute token." }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 94a97b8a9..0a75b0739 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Szerződés alkalmazása" }, - "conversionProgress": { - "message": "Átváltás folyamatban" - }, - "copiedButton": { - "message": "Másolva" - }, "copiedExclamation": { "message": "Kimásolva!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Másolás a vágólapra" }, - "copyButton": { - "message": "Másolás" - }, "copyPrivateKey": { "message": "Ez a saját titkos kulcsod (kattints rá a másoláshoz)" }, @@ -450,9 +441,6 @@ "from": { "message": "Feladó" }, - "fromShapeShift": { - "message": "A ShapeShifttől" - }, "functionType": { "message": "Függvénytípus" }, @@ -757,9 +745,6 @@ "noAddressForName": { "message": "Nem lett cím beállítva ehhez a névhez." }, - "noDeposits": { - "message": "Nem érkezett letét" - }, "noConversionRateAvailable": { "message": "Nincs elérhető átváltási díj" }, @@ -1161,10 +1146,6 @@ "to": { "message": "Erre:" }, - "toETHviaShapeShift": { - "message": "$1 az ETH-hez a ShapeShift által", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "A tokent már hozzáadtuk. " }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index b8c046ce4..706e801da 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Penerapan Kontrak" }, - "conversionProgress": { - "message": "Konversi sedang berlangsung" - }, - "copiedButton": { - "message": "Tersalin" - }, "copiedExclamation": { "message": "Disalin!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Salin ke papan klip" }, - "copyButton": { - "message": "Salin" - }, "copyPrivateKey": { "message": "Ini adalah kunci pribadi Anda (klik untuk menyalin)" }, @@ -441,9 +432,6 @@ "from": { "message": "Dari" }, - "fromShapeShift": { - "message": "Dari ShapeShift" - }, "functionType": { "message": "Jenis Fungsi" }, @@ -745,9 +733,6 @@ "noAddressForName": { "message": "Belum ada alamat yang dipasang untuk nama ini." }, - "noDeposits": { - "message": "Belum ada setoran yang diterima" - }, "noConversionRateAvailable": { "message": "Kurs Konversi Tidak Tersedia" }, @@ -1149,10 +1134,6 @@ "to": { "message": "Ke" }, - "toETHviaShapeShift": { - "message": "$1 ke ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token sudah ditambahkan." }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index d974a82d2..36c624cca 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -315,12 +315,6 @@ "contractDeployment": { "message": "Distribuzione Contratto" }, - "conversionProgress": { - "message": "Conversione in corso" - }, - "copiedButton": { - "message": "Copiato" - }, "copiedExclamation": { "message": "Copiato!" }, @@ -336,9 +330,6 @@ "copyToClipboard": { "message": "Copia negli appunti" }, - "copyButton": { - "message": " Copia " - }, "copyPrivateKey": { "message": "Questa è la tua chiave privata (clicca per copiare)" }, @@ -575,9 +566,6 @@ "from": { "message": "Da" }, - "fromShapeShift": { - "message": "Da ShapeShift" - }, "functionApprove": { "message": "Funzione: Approve" }, @@ -927,9 +915,6 @@ "noAddressForName": { "message": "Nessun indirizzo è stato impostato per questo nome." }, - "noDeposits": { - "message": "Nessun deposito ricevuto" - }, "noConversionRateAvailable": { "message": "Tasso di conversione non disponibile" }, @@ -1389,10 +1374,6 @@ "toWithColon": { "message": "To:" }, - "toETHviaShapeShift": { - "message": "$1 a ETH con ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Token" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 840a450a3..5d7d77d6a 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -142,21 +142,12 @@ "contractDeployment": { "message": "コントラクトのデプロイ" }, - "conversionProgress": { - "message": "変換中" - }, - "copiedButton": { - "message": "コピー完了" - }, "copiedExclamation": { "message": "コピー完了!" }, "copyToClipboard": { "message": "クリップボードへコピー" }, - "copyButton": { - "message": " コピー " - }, "copyPrivateKey": { "message": "これはあなたの秘密鍵です(クリックでコピー)" }, @@ -228,9 +219,6 @@ "from": { "message": "送信元" }, - "fromShapeShift": { - "message": "ShapeShiftから" - }, "gasLimit": { "message": "ガスリミット" }, @@ -361,9 +349,6 @@ "noAddressForName": { "message": "この名前にはアドレスが設定されていません。" }, - "noDeposits": { - "message": "振込みがありません。" - }, "noTransactions": { "message": "トランザクションがありません。" }, @@ -468,10 +453,6 @@ "to": { "message": "送信先" }, - "toETHviaShapeShift": { - "message": "ShapeShiftで $1をETHにする", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "トークン" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 00a1456ad..0858c2c67 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "ಒಪ್ಪಂದದ ನಿಯೋಜನೆ" }, - "conversionProgress": { - "message": "ಪರಿವರ್ತನೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ" - }, - "copiedButton": { - "message": "ನಕಲಿಸಲಾಗಿದೆ" - }, "copiedExclamation": { "message": "ನಕಲಿಸಲಾಗಿದೆ!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿ" }, - "copyButton": { - "message": "ನಕಲಿಸು" - }, "copyPrivateKey": { "message": "ಇದು ನಿಮ್ಮ ಖಾಸಗಿ ಕೀ ಆಗಿದೆ (ನಕಲಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ)" }, @@ -454,9 +445,6 @@ "from": { "message": "ನಿಂದ" }, - "fromShapeShift": { - "message": "ShapeShift ನಿಂದ" - }, "functionType": { "message": "ಕಾರ್ಯದ ಪ್ರಕಾರ" }, @@ -764,9 +752,6 @@ "noAddressForName": { "message": "ಈ ಹೆಸರಿಗೆ ಯಾವುದೇ ವಿಳಾಸವನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ." }, - "noDeposits": { - "message": "ಯಾವುದೇ ಠೇವಣಿಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿಲ್ಲ" - }, "noConversionRateAvailable": { "message": "ಯಾವುದೇ ಪರಿವರ್ತನೆ ದರ ಲಭ್ಯವಿಲ್ಲ" }, @@ -1168,10 +1153,6 @@ "to": { "message": "ವರೆಗೆ" }, - "toETHviaShapeShift": { - "message": "ShapeShift ಮೂಲಕ ETH ಗೆ $1", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "ಟೋಕನ್" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 504ed9d27..81633cf59 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "컨트랙트 배포" }, - "conversionProgress": { - "message": "변환 진행 중" - }, - "copiedButton": { - "message": "복사됨" - }, "copiedExclamation": { "message": "복사됨!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "클립보드로 복사" }, - "copyButton": { - "message": " 복사 " - }, "copyPrivateKey": { "message": "비밀 키입니다 (클릭하여 복사)" }, @@ -451,9 +442,6 @@ "from": { "message": "보내는 이" }, - "fromShapeShift": { - "message": "ShapeShift로부터" - }, "functionType": { "message": "함수 유형" }, @@ -758,9 +746,6 @@ "noAddressForName": { "message": "이 이름에 대해 주소가 설정되어 있지 않습니다." }, - "noDeposits": { - "message": "입금 내역이 없습니다." - }, "noConversionRateAvailable": { "message": "변환 비율을 찾을 수 없습니다" }, @@ -1159,10 +1144,6 @@ "to": { "message": "받는이" }, - "toETHviaShapeShift": { - "message": "ShapeShift를 통해 $1를 ETH로 바꾸기", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "토큰" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 0e1a07e9a..1bb4d0b9a 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Sutarties išdėstymas" }, - "conversionProgress": { - "message": "Vyksta keitimas" - }, - "copiedButton": { - "message": "Nukopijuota" - }, "copiedExclamation": { "message": "Nukopijuota!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopijuoti į iškarpinę" }, - "copyButton": { - "message": "Kopijuoti" - }, "copyPrivateKey": { "message": "Tai yra jūsų asmeninis raktas (spustelėkite, kad nukopijuotumėte)" }, @@ -454,9 +445,6 @@ "from": { "message": "Nuo" }, - "fromShapeShift": { - "message": "Iš „ShapeShift“" - }, "functionType": { "message": "Funkcijos tipas" }, @@ -764,9 +752,6 @@ "noAddressForName": { "message": "Šiam pavadinimui nenurodytas adresas." }, - "noDeposits": { - "message": "Negauta jokių indėlių" - }, "noConversionRateAvailable": { "message": "Nėra keitimo kurso" }, @@ -1168,10 +1153,6 @@ "to": { "message": "Iki" }, - "toETHviaShapeShift": { - "message": "$1 į ETH per „ShapeShift“", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Žetonas" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index dfe92ee03..ffc0a8189 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Līgumu pielietošana" }, - "conversionProgress": { - "message": "Notiek konvertācija" - }, - "copiedButton": { - "message": "Nokopēts" - }, "copiedExclamation": { "message": "Nokopēts!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopēt starpliktuvē" }, - "copyButton": { - "message": "Kopēt" - }, "copyPrivateKey": { "message": "Šī ir jūsu privātā atslēga (noklikšķiniet, lai nokopētu)" }, @@ -450,9 +441,6 @@ "from": { "message": "No" }, - "fromShapeShift": { - "message": "No ShapeShift" - }, "functionType": { "message": "Funkcijas veids" }, @@ -760,9 +748,6 @@ "noAddressForName": { "message": "Šim vārdam nav iestatīta adrese." }, - "noDeposits": { - "message": "Nav saņemts neviens noguldījums" - }, "noConversionRateAvailable": { "message": "Konversijas kurss nav pieejams" }, @@ -1164,10 +1149,6 @@ "to": { "message": "Adresāts" }, - "toETHviaShapeShift": { - "message": "$1 uz ETH, izmantojot ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Marķieris" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index d5c81e319..01bc6789c 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Penyusunan Kontrak" }, - "conversionProgress": { - "message": "Penukaran sedang dilakukan" - }, - "copiedButton": { - "message": "Disalin" - }, "copiedExclamation": { "message": "Disalin!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Salin ke papan keratan" }, - "copyButton": { - "message": "Salin" - }, "copyPrivateKey": { "message": "Ini kunci persendirian anda (klik untuk menyalin)" }, @@ -438,9 +429,6 @@ "from": { "message": "Daripada" }, - "fromShapeShift": { - "message": "Daripada ShapeShift" - }, "functionType": { "message": "Jenis Fungsi" }, @@ -738,9 +726,6 @@ "noAddressForName": { "message": "Tiada alamat yang ditetapkan untuk nama ini." }, - "noDeposits": { - "message": "Tiada deposit diterima" - }, "noConversionRateAvailable": { "message": "Tiada Kadar Penukaran yang Tersedia" }, @@ -1142,10 +1127,6 @@ "to": { "message": "Kepada" }, - "toETHviaShapeShift": { - "message": "$1 kepada ETH melalui ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token telah pun ditambah." }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 2a79b16b0..422cc0a1e 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -67,21 +67,12 @@ "contractDeployment": { "message": "Contractimplementatie" }, - "conversionProgress": { - "message": "Bezig met conversie" - }, - "copiedButton": { - "message": "gekopieerde" - }, "copiedExclamation": { "message": "Gekopieerde!" }, "copyToClipboard": { "message": "Kopieer naar klembord" }, - "copyButton": { - "message": " Kopiëren " - }, "copyPrivateKey": { "message": "Dit is uw privésleutel (klik om te kopiëren)" }, @@ -153,9 +144,6 @@ "from": { "message": "Van" }, - "fromShapeShift": { - "message": "Van ShapeShift" - }, "gasLimit": { "message": "Gaslimiet" }, @@ -288,9 +276,6 @@ "noAddressForName": { "message": "Er is geen adres ingesteld voor deze naam." }, - "noDeposits": { - "message": "Geen aanbetalingen ontvangen" - }, "noTransactions": { "message": "Geen transacties" }, @@ -410,10 +395,6 @@ "to": { "message": "Naar" }, - "toETHviaShapeShift": { - "message": "$1 tot ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token is al toegevoegd." }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index a1ec637de..1823f8baf 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Distribusjon av kontrakten" }, - "conversionProgress": { - "message": "Konvertering pågår " - }, - "copiedButton": { - "message": "Kopiert" - }, "copiedExclamation": { "message": "Kopiert!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Kopiér til utklippstavlen" }, - "copyButton": { - "message": "Kopier" - }, "copyPrivateKey": { "message": "Dette er din private nøkkel (klikk for å kopiere)" }, @@ -447,9 +438,6 @@ "from": { "message": "Fra " }, - "fromShapeShift": { - "message": "Fra ShapeShift" - }, "functionType": { "message": "Funksjonstype " }, @@ -754,9 +742,6 @@ "noAddressForName": { "message": "Ingen adresse har blitt angitt for dette navnet. " }, - "noDeposits": { - "message": "Ingen mottatte innskudd" - }, "noConversionRateAvailable": { "message": "Ingen konverteringsrate tilgjengelig " }, @@ -1140,10 +1125,6 @@ "to": { "message": "Til " }, - "toETHviaShapeShift": { - "message": "$1 til ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Token " }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 80bafd85e..360faee3f 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -55,21 +55,12 @@ "contractDeployment": { "message": "Pag-deploy ng Contract" }, - "conversionProgress": { - "message": "Isinasagawa ang conversion" - }, - "copiedButton": { - "message": "Kinopya" - }, "copiedExclamation": { "message": "Kinopya!" }, "copyToClipboard": { "message": "Kinopya sa clipboard" }, - "copyButton": { - "message": " Kinopya " - }, "copyPrivateKey": { "message": "Ito ang iyong private key (i-click upang makopya)" }, @@ -129,9 +120,6 @@ "from": { "message": "Mula sa" }, - "fromShapeShift": { - "message": "Mula sa ShapeShift" - }, "gasLimitTooLow": { "message": "Ang gas limit ay hindi dabat bababa sa 21000" }, @@ -209,9 +197,6 @@ "noAddressForName": { "message": "Walang naka-set na address para sa pangalang ito." }, - "noDeposits": { - "message": "Walang natanggap na mga deposito" - }, "noTransactions": { "message": "Walang mga Transaksyon" }, @@ -261,10 +246,6 @@ "sigRequest": { "message": "Hiling na Signature" }, - "toETHviaShapeShift": { - "message": "$1 sa ETH sa pamamagitan ng ShapeShift", - "description": "Pupunan ng system ang deposit type sa simula ng mensahe" - }, "total": { "message": "Kabuuan" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 02476cf02..055edddf8 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Uruchomienie kontraktu" }, - "conversionProgress": { - "message": "Przeliczanie w toku" - }, - "copiedButton": { - "message": "Skopiowane" - }, "copiedExclamation": { "message": "Skopiowane!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Skopiuj do schowka" }, - "copyButton": { - "message": " Skopiuj " - }, "copyPrivateKey": { "message": "To jest Twój prywatny klucz (kliknij żeby skopiować)" }, @@ -451,9 +442,6 @@ "from": { "message": "Z" }, - "fromShapeShift": { - "message": "Z ShapeShift" - }, "functionType": { "message": "Typ funkcji" }, @@ -758,9 +746,6 @@ "noAddressForName": { "message": "Nie wybrano żadnego adresu dla tej nazwy." }, - "noDeposits": { - "message": "Brak otrzymanych depozytów" - }, "noConversionRateAvailable": { "message": "Brak kursu waluty" }, @@ -1159,10 +1144,6 @@ "to": { "message": "Do" }, - "toETHviaShapeShift": { - "message": "$1 na ETH przez ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token jest już dodany." }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 6d988077b..19e114775 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -70,21 +70,12 @@ "contractDeployment": { "message": "Distribuição do Contrato" }, - "conversionProgress": { - "message": "Conversão em progresso" - }, - "copiedButton": { - "message": "Copiado" - }, "copiedExclamation": { "message": "Copiado!" }, "copyToClipboard": { "message": "Copiar para o clipboard" }, - "copyButton": { - "message": " Copiar " - }, "copyPrivateKey": { "message": "Esta é a sua chave privada (carregue para copiar)" }, @@ -159,9 +150,6 @@ "from": { "message": "De" }, - "fromShapeShift": { - "message": "De ShapeShift" - }, "gasLimit": { "message": "Limite de Gas" }, @@ -298,9 +286,6 @@ "noAddressForName": { "message": "Nenhum endereço foi estabelecido para este nome." }, - "noDeposits": { - "message": "Sem depósitos recebidos" - }, "noTransactions": { "message": "Sem Transações" }, @@ -420,10 +405,6 @@ "to": { "message": "Para" }, - "toETHviaShapeShift": { - "message": "$1 para ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token já foi adicionado." }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 1b5888125..3464f21bf 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -251,12 +251,6 @@ "contractDeployment": { "message": "Implantação de Contrato" }, - "conversionProgress": { - "message": "Conversão em progresso" - }, - "copiedButton": { - "message": "Copiado" - }, "copiedExclamation": { "message": "Copiado!" }, @@ -272,9 +266,6 @@ "copyToClipboard": { "message": "Copiar para a área de transferência" }, - "copyButton": { - "message": "Copiar" - }, "copyPrivateKey": { "message": "Esta é sua chave particular (clique para copiar)" }, @@ -448,9 +439,6 @@ "from": { "message": "De" }, - "fromShapeShift": { - "message": "De ShapeShift" - }, "functionType": { "message": "Tipo de Função" }, @@ -752,9 +740,6 @@ "noAddressForName": { "message": "Nenhum endereço foi definido para este nome." }, - "noDeposits": { - "message": "Nenhum depósito recebido" - }, "noConversionRateAvailable": { "message": "Nenhuma Taxa de Conversão Disponível" }, @@ -1156,10 +1141,6 @@ "to": { "message": "Para" }, - "toETHviaShapeShift": { - "message": "$1 para ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "O token já foi adicionado." }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index da63bed5e..a1483ed12 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Implementarea contractului" }, - "conversionProgress": { - "message": "Conversie în desfășurare" - }, - "copiedButton": { - "message": "Copiat" - }, "copiedExclamation": { "message": "Copiat!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Copiați în clipboard" }, - "copyButton": { - "message": "Copiați" - }, "copyPrivateKey": { "message": "Aceasta este cheia dumneavoastră privată (clic pentru a copia)" }, @@ -450,9 +441,6 @@ "from": { "message": "De la" }, - "fromShapeShift": { - "message": "De la ShapeShift" - }, "functionType": { "message": "Tip funcție" }, @@ -751,9 +739,6 @@ "noAddressForName": { "message": "Nu a fost configurată nicio adresă pentru acest nume." }, - "noDeposits": { - "message": "Nicio depunere primită" - }, "noConversionRateAvailable": { "message": "Nici o rată de conversie disponibilă" }, @@ -1155,10 +1140,6 @@ "to": { "message": "Către" }, - "toETHviaShapeShift": { - "message": "$1 în ETH prin ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Indicativ" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 1a816afd9..ea8b16d55 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -91,21 +91,12 @@ "contractDeployment": { "message": "Развертывание контракта" }, - "conversionProgress": { - "message": "Выполняется конвертация" - }, - "copiedButton": { - "message": "Скопировано" - }, "copiedExclamation": { "message": "Скопировано!" }, "copyToClipboard": { "message": "Скопировать в буфер обмена" }, - "copyButton": { - "message": " Скопировать " - }, "copyPrivateKey": { "message": "Это ваш закрытый ключ (нажмите, чтобы скопировать)" }, @@ -189,9 +180,6 @@ "from": { "message": "Отправитель" }, - "fromShapeShift": { - "message": "Из ShapeShift" - }, "gasLimit": { "message": "Лимит газа" }, @@ -334,9 +322,6 @@ "noAddressForName": { "message": "Дла этого названия не установлен адрес." }, - "noDeposits": { - "message": "Пополнения не получены" - }, "noTransactions": { "message": "Нет транзакций" }, @@ -468,10 +453,6 @@ "to": { "message": "Получатель" }, - "toETHviaShapeShift": { - "message": "$1 в ETH через ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Токен уже был добавлен." }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 189086031..27caf1e4f 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -248,12 +248,6 @@ "contractDeployment": { "message": "Nasazení kontraktu" }, - "conversionProgress": { - "message": "Provádí se převod" - }, - "copiedButton": { - "message": "Zkopírováno" - }, "copiedExclamation": { "message": "Zkopírováno!" }, @@ -269,9 +263,6 @@ "copyToClipboard": { "message": "Kopírovat do schránky" }, - "copyButton": { - "message": " Kopírovat " - }, "copyPrivateKey": { "message": "Toto je váš privátní klíč (kliknutím zkopírujte)" }, @@ -445,9 +436,6 @@ "from": { "message": "Od" }, - "fromShapeShift": { - "message": "Z ShapeShift" - }, "functionType": { "message": "Typ funkcie" }, @@ -733,9 +721,6 @@ "noAddressForName": { "message": "Pro toto jméno nebyla nastavena žádná adresa." }, - "noDeposits": { - "message": "Žádný vklad" - }, "noConversionRateAvailable": { "message": "Nie je k dispozícii žiadna sadzba konverzie" }, @@ -1128,10 +1113,6 @@ "to": { "message": "Komu" }, - "toETHviaShapeShift": { - "message": "$1 na ETH přes ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token byl už přidán." }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 13cad75ff..cdfd35e40 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Ustvarjanje pogodbe" }, - "conversionProgress": { - "message": "Pretvorba v teku" - }, - "copiedButton": { - "message": "Kopirano" - }, "copiedExclamation": { "message": "Kopirano!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Kopiraj v odložišče" }, - "copyButton": { - "message": " Kopiraj " - }, "copyPrivateKey": { "message": "To je vaš zesebni ključ (kliknite za kopiranje)" }, @@ -454,9 +445,6 @@ "from": { "message": "Od" }, - "fromShapeShift": { - "message": "Od ShapeShift" - }, "functionType": { "message": "Vrsta funkcije" }, @@ -749,9 +737,6 @@ "noAddressForName": { "message": "Za to ime ni naslovov." }, - "noDeposits": { - "message": "Prejetih ni nič vplačil" - }, "noConversionRateAvailable": { "message": "Menjalni tečaj ni na voljo" }, @@ -1150,10 +1135,6 @@ "to": { "message": "Za" }, - "toETHviaShapeShift": { - "message": "$1 v ETH prek ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Žeton" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index aae8f1926..aaf95af9c 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "Primena ugovora" }, - "conversionProgress": { - "message": "U toku je konverzija" - }, - "copiedButton": { - "message": "Kopirano" - }, "copiedExclamation": { "message": "Kopirano!" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "Копирај у меморију" }, - "copyButton": { - "message": "Kopiraj" - }, "copyPrivateKey": { "message": "Ovo je vaš privatni ključ (kliknite kako biste ga kopirali)" }, @@ -451,9 +442,6 @@ "from": { "message": "Od" }, - "fromShapeShift": { - "message": "Od ShapeShift-a" - }, "functionType": { "message": "Tip funkcije" }, @@ -755,9 +743,6 @@ "noAddressForName": { "message": "Za ovo ime nije podešena adresa." }, - "noDeposits": { - "message": "Nisu primljeni nikakvi depoziti" - }, "noConversionRateAvailable": { "message": "Nije dostupan kurs za konverziju" }, @@ -1156,10 +1141,6 @@ "to": { "message": "Za" }, - "toETHviaShapeShift": { - "message": " $1 ka ETH preko ShapeShift-a", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token je već dodat." }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index b9b42d1ab..105cfa356 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -251,12 +251,6 @@ "contractDeployment": { "message": "Kontraktplacering" }, - "conversionProgress": { - "message": "Konvertering pågår" - }, - "copiedButton": { - "message": "Kopierat" - }, "copiedExclamation": { "message": "Kopierades!" }, @@ -272,9 +266,6 @@ "copyToClipboard": { "message": "Kopiera till Urklipp" }, - "copyButton": { - "message": "Kopiera" - }, "copyPrivateKey": { "message": "Det här är din privata nyckel (klicka för att kopiera)" }, @@ -444,9 +435,6 @@ "from": { "message": "Från" }, - "fromShapeShift": { - "message": "från ShapeShift" - }, "functionType": { "message": "Funktionstyp" }, @@ -748,9 +736,6 @@ "noAddressForName": { "message": "Inga adresser har angetts för detta namn." }, - "noDeposits": { - "message": "Ingen deposition mottagen" - }, "noConversionRateAvailable": { "message": "Ingen omräkningskurs tillgänglig" }, @@ -1149,10 +1134,6 @@ "to": { "message": "Till" }, - "toETHviaShapeShift": { - "message": "$1 till ETH via ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Token har redan lagts till." }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index ee168aee7..ef44de126 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -251,12 +251,6 @@ "contractDeployment": { "message": "Kutoa Mkataba" }, - "conversionProgress": { - "message": "Ubadilishaji unaendelea" - }, - "copiedButton": { - "message": "Imenakiliwa" - }, "copiedExclamation": { "message": "Imenakiliwa!" }, @@ -272,9 +266,6 @@ "copyToClipboard": { "message": "Nakili kwenye ubao wa kunakili" }, - "copyButton": { - "message": "Nakili" - }, "copyPrivateKey": { "message": "Huu ni ufunguo wako wa kibinafsi (bofya ili unakili)" }, @@ -444,9 +435,6 @@ "from": { "message": "Kutoka" }, - "fromShapeShift": { - "message": "Kutoka ShapeShift" - }, "functionType": { "message": "Aina ya Shughuli" }, @@ -742,9 +730,6 @@ "noAddressForName": { "message": "Hakuna anwani iliyoundwa kwa jina hili." }, - "noDeposits": { - "message": "Hakuna maingizo yaliyopokelewa" - }, "noConversionRateAvailable": { "message": "Hakuna Kiwango cha Ubadilishaji" }, @@ -1146,10 +1131,6 @@ "to": { "message": "Kwenda" }, - "toETHviaShapeShift": { - "message": "$1 kwenda ETH kupitia ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Kianzio" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index d22a48cb3..be1c23393 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -79,21 +79,12 @@ "contractDeployment": { "message": "ஒப்பந்த வரிசைப்படுத்தல்" }, - "conversionProgress": { - "message": "மாற்றம் முன்னேற்றம்" - }, - "copiedButton": { - "message": "நகலெடுக்கப்பட்டன" - }, "copiedExclamation": { "message": "நகலெடுக்கப்பட்டன!" }, "copyToClipboard": { "message": "கிளிப்போர்டுக்கு நகலெடு" }, - "copyButton": { - "message": " நகல் " - }, "copyPrivateKey": { "message": "இது உங்கள் தனிப்பட்ட விசை (நகலெடுக்க கிளிக் செய்யவும்)" }, @@ -180,9 +171,6 @@ "from": { "message": "இருந்து" }, - "fromShapeShift": { - "message": "ShapeShift இலிருந்து" - }, "gasLimit": { "message": "எரிவாயு வரம்பு" }, @@ -328,9 +316,6 @@ "noAddressForName": { "message": "இந்த பெயருக்கான முகவரி அமைக்கப்படவில்லை." }, - "noDeposits": { - "message": "எந்த வைப்புகளும் கிடைக்கவில்லை" - }, "noTransactions": { "message": "பரிவர்த்தனைகள் இல்லை" }, @@ -474,10 +459,6 @@ "to": { "message": "பெறுநர்" }, - "toETHviaShapeShift": { - "message": "$ 1 முதல் ETH வரை வடிவம்", - "description": "செய்தி தொடக்கத்தில் வைப்பு வகைகளில் நிரப்பப்படும்" - }, "tokenAlreadyAdded": { "message": "டோக்கன் ஏற்கனவே சேர்க்கப்பட்டது." }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index fc84f87de..b02950c3c 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -103,21 +103,12 @@ "contractDeployment": { "message": "การติดตั้งสัญญา" }, - "conversionProgress": { - "message": "กำลังดำเนินการแปลงหน่วย" - }, - "copiedButton": { - "message": "คัดลอกแล้ว" - }, "copiedExclamation": { "message": "คัดลอกแล้ว!" }, "copyToClipboard": { "message": "คัดลอกไปคลิปบอร์ด" }, - "copyButton": { - "message": " คัดลอก " - }, "copyPrivateKey": { "message": "นี่คือคีย์ส่วนตัวของคุณ(กดเพื่อคัดลอก)" }, @@ -231,9 +222,6 @@ "from": { "message": "จาก" }, - "fromShapeShift": { - "message": "จาก ShapeShift" - }, "gasLimit": { "message": "วงเงินแก็ส" }, @@ -388,9 +376,6 @@ "noAddressForName": { "message": "ยังไม่มีแอดแดรสไหนตั้งในชื่อนี้" }, - "noDeposits": { - "message": "ไม่มีเงินฝากเข้ามา" - }, "noTransactions": { "message": "ยังไม่มีรายการธุรกรรม" }, @@ -561,10 +546,6 @@ "to": { "message": "ถึง" }, - "toETHviaShapeShift": { - "message": "$1 เป็นอีเธอร์โดย ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "โทเคนได้ถูกเพิ่มไปแล้ว" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 71e77fac7..86899cf1c 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -91,21 +91,12 @@ "contractDeployment": { "message": "Sözleşme kurulumu" }, - "conversionProgress": { - "message": "Çevirim devam ediyor" - }, - "copiedButton": { - "message": "Kopyalandı" - }, "copiedExclamation": { "message": "Kopyalandı!" }, "copyToClipboard": { "message": "Panoya kopyala" }, - "copyButton": { - "message": " Kopyala " - }, "copyPrivateKey": { "message": "Bu sizin özel anahtarınız (kopyalamak için tıklayın)" }, @@ -186,9 +177,6 @@ "from": { "message": "Kimden" }, - "fromShapeShift": { - "message": "ShapeShift'den" - }, "gasLimit": { "message": "Gas Limiti" }, @@ -334,9 +322,6 @@ "noAddressForName": { "message": "Bu isim için bir adres tanımlanmamış." }, - "noDeposits": { - "message": "Yatırma alınmadı" - }, "noTransactions": { "message": "İşlem yok" }, @@ -474,10 +459,6 @@ "to": { "message": "Kime" }, - "toETHviaShapeShift": { - "message": "ShapeShift üstünden $1'dan ETH'e", - "description": "system will fill in deposit type in start of message" - }, "tokenAlreadyAdded": { "message": "Jeton çoktan eklenmiş." }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 60085ef0a..2a7ac2334 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "Розгортання контракту" }, - "conversionProgress": { - "message": "Конверсія триває" - }, - "copiedButton": { - "message": "Скопійовано" - }, "copiedExclamation": { "message": "Скопійовано!" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "Копіювати в буфер" }, - "copyButton": { - "message": "Копіювати" - }, "copyPrivateKey": { "message": "Це ваш закритий ключ (натисніть, щоб скопіювати)" }, @@ -454,9 +445,6 @@ "from": { "message": "Від" }, - "fromShapeShift": { - "message": "Від Ethereum" - }, "functionType": { "message": "Тип функції" }, @@ -764,9 +752,6 @@ "noAddressForName": { "message": "На це ім'я не встановлено адреси." }, - "noDeposits": { - "message": "Немає отриманих внесків" - }, "noConversionRateAvailable": { "message": "Немає доступного обмінного курсу" }, @@ -1168,10 +1153,6 @@ "to": { "message": "Кому" }, - "toETHviaShapeShift": { - "message": "$1 в ETH через ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "Токен" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index ab9598a35..b3f513528 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -58,21 +58,12 @@ "contractDeployment": { "message": "Triển khai hợp đồng" }, - "conversionProgress": { - "message": "Đang chuyển đổi" - }, - "copiedButton": { - "message": "Đã sao chép" - }, "copiedExclamation": { "message": "Đã sao chép!" }, "copyToClipboard": { "message": "Đã sao chép vào clipboard" }, - "copyButton": { - "message": "Sao chép" - }, "copyPrivateKey": { "message": "Đây là Khoá Bí Mật của bạn (nhấp vào để sao chép)" }, @@ -135,9 +126,6 @@ "from": { "message": "Từ" }, - "fromShapeShift": { - "message": "Từ ShapeShift" - }, "gasLimit": { "message": "Hạn mức ga" }, @@ -241,9 +229,6 @@ "noAddressForName": { "message": "Không có địa chỉ nào được ấn định cho tên này." }, - "noDeposits": { - "message": "Không có tiền ký gửi nào được nhận" - }, "noTransactions": { "message": "Không có giao dịch" }, @@ -312,10 +297,6 @@ "to": { "message": "Đến" }, - "toETHviaShapeShift": { - "message": "$1 thành ETH qua ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "total": { "message": "Tổng cộng" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 67a137260..93037dd9e 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -257,12 +257,6 @@ "contractDeployment": { "message": "合约部署" }, - "conversionProgress": { - "message": "正在进行转换" - }, - "copiedButton": { - "message": "已复制" - }, "copiedExclamation": { "message": "已复制" }, @@ -278,9 +272,6 @@ "copyToClipboard": { "message": "复制到剪贴板" }, - "copyButton": { - "message": " 复制 " - }, "copyPrivateKey": { "message": "这是你的私钥（点击复制）" }, @@ -454,9 +445,6 @@ "from": { "message": "来自" }, - "fromShapeShift": { - "message": "来自 ShapeShift" - }, "functionType": { "message": "功能类型" }, @@ -746,9 +734,6 @@ "noAddressForName": { "message": "此 ENS 名字还没有指定地址。" }, - "noDeposits": { - "message": "没有已收的存款" - }, "noConversionRateAvailable": { "message": "无可用兑换率" }, @@ -1150,10 +1135,6 @@ "to": { "message": "至" }, - "toETHviaShapeShift": { - "message": "$1 ETH 通过 ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "代币" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 14d083514..76ce86bda 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -254,12 +254,6 @@ "contractDeployment": { "message": "部署合約" }, - "conversionProgress": { - "message": "正在取得匯率" - }, - "copiedButton": { - "message": "已複製" - }, "copiedExclamation": { "message": "已複製！" }, @@ -275,9 +269,6 @@ "copyToClipboard": { "message": "複製到剪貼簿" }, - "copyButton": { - "message": " 複製 " - }, "copyPrivateKey": { "message": "這是您的私鑰（點擊複製）" }, @@ -451,9 +442,6 @@ "from": { "message": "來源帳戶" }, - "fromShapeShift": { - "message": "來自 ShapeShift" - }, "functionType": { "message": "功能類型" }, @@ -758,9 +746,6 @@ "noAddressForName": { "message": "此 ENS 尚未指定位址。" }, - "noDeposits": { - "message": "尚未有存款" - }, "noConversionRateAvailable": { "message": "尚未有匯率比較值" }, @@ -1147,10 +1132,6 @@ "to": { "message": "目的帳戶" }, - "toETHviaShapeShift": { - "message": "$1 ETH 透過 ShapeShift", - "description": "system will fill in deposit type in start of message" - }, "token": { "message": "代碼" }, diff --git a/app/scripts/background.js b/app/scripts/background.js index b4d37354a..fd020933e 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -140,7 +140,6 @@ initialize().catch(log.error) * @property {number} conversionDate - A unix epoch date (ms) for the time the current conversion rate was last retrieved. * @property {Object} infuraNetworkStatus - An object of infura network status checks. * @property {Block[]} recentBlocks - An array of recent blocks, used to calculate an effective but cheap gas price. - * @property {Array} shapeShiftTxList - An array of objects describing shapeshift exchange attempts. * @property {boolean} forgottenPassword - Returns true if the user has initiated the password recovery screen, is recovering from seed phrase. */ diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json index eb4902d50..580690147 100644 --- a/development/states/confirm-sig-requests.json +++ b/development/states/confirm-sig-requests.json @@ -136,7 +136,6 @@ "provider": { "type": "testnet" }, - "shapeShiftTxList": [], "send": { "gasLimit": "0xea60", "gasPrice": "0xba43b7400", diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json index f28fabe2c..358816bad 100644 --- a/development/states/currency-localization.json +++ b/development/states/currency-localization.json @@ -98,7 +98,6 @@ "provider": { "type": "testnet" }, - "shapeShiftTxList": [], "send": { "gasLimit": null, "gasPrice": null, diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json index 2581597b3..b4affd2b7 100644 --- a/development/states/tx-list-items.json +++ b/development/states/tx-list-items.json @@ -1055,7 +1055,6 @@ "provider": { "type": "testnet" }, - "shapeShiftTxList": [], "send": {}, "currentLocale": "en", "preferences": { diff --git a/test/data/2-state.json b/test/data/2-state.json index 345c485ca..61d50a0e8 100644 --- a/test/data/2-state.json +++ b/test/data/2-state.json @@ -62,7 +62,6 @@ "conversionDate": 1506444677, "nextUnreadNotice": null, "noActiveNotices": true, - "shapeShiftTxList": [], "infuraNetworkStatus": {}, "seedWords": "debris dizzy just program just float decrease vacant alarm reduce speak stadium", "forgottenPassword": null diff --git a/ui/app/components/app/shift-list-item/index.js b/ui/app/components/app/shift-list-item/index.js deleted file mode 100644 index fd6796983..000000000 --- a/ui/app/components/app/shift-list-item/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './shift-list-item.container' diff --git a/ui/app/components/app/shift-list-item/shift-list-item.component.js b/ui/app/components/app/shift-list-item/shift-list-item.component.js deleted file mode 100644 index bc360d237..000000000 --- a/ui/app/components/app/shift-list-item/shift-list-item.component.js +++ /dev/null @@ -1,222 +0,0 @@ -import PropTypes from 'prop-types' -import React, { Component } from 'react' -import { createExplorerLink as explorerLink } from '@metamask/etherscan-link' -import { formatDate, addressSummary } from '../../../helpers/utils/util' -import CopyButton from '../../ui/copyButton' -import EthBalance from '../../ui/eth-balance' - -export default class ShiftListItem extends Component { - static contextTypes = { - t: PropTypes.func, - } - - static defaultProps = { - conversionRate: undefined, - currentCurrency: undefined, - } - - static propTypes = { - depositType: PropTypes.string.isRequired, - depositAddress: PropTypes.string.isRequired, - conversionRate: PropTypes.any, - currentCurrency: PropTypes.any, - time: PropTypes.string.isRequired, - response: PropTypes.shape({ - outgoingCoin: PropTypes.number.isRequired, - status: PropTypes.string.isRequired, - transaction: PropTypes.string.isRequired, - }), - } - - renderUtilComponents () { - const { conversionRate, currentCurrency } = this.props - - switch (this.props.response.status) { - case 'no_deposits': - return ( -
- -
- ) - - case 'received': - return
- - case 'complete': - return ( -
- - -
- ) - - case 'failed': - return '' - - default: - return '' - } - } - - renderInfo () { - switch (this.props.response.status) { - case 'no_deposits': - return ( -
-
- {this.context.t('toETHviaShapeShift', [this.props.depositType])} -
-
- {this.context.t('noDeposits')} -
-
- {formatDate(this.props.time)} -
-
- ) - - case 'received': - return ( -
-
- {this.context.t('toETHviaShapeShift', [this.props.depositType])} -
-
- {this.context.t('conversionProgress')} -
-
- {formatDate(this.props.time)} -
-
- ) - - case 'complete': - const url = explorerLink(this.props.response.transaction, parseInt('1')) - return ( -
global.platform.openTab({ url })} - > -
- {this.context.t('fromShapeShift')} -
-
- {formatDate(this.props.time)} -
-
- {addressSummary(this.props.response.transaction)} -
-
- ) - - case 'failed': - return ( - - {`(${this.context.t('failed')})`} - - ) - - default: - return '' - } - } - - render () { - return ( -
-
- -
- {this.renderInfo()} - {this.renderUtilComponents()} -
- ) - } -} diff --git a/ui/app/components/app/shift-list-item/shift-list-item.container.js b/ui/app/components/app/shift-list-item/shift-list-item.container.js deleted file mode 100644 index 6dcfab844..000000000 --- a/ui/app/components/app/shift-list-item/shift-list-item.container.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from 'react-redux' -import ShiftListItem from './shift-list-item.component' - -function mapStateToProps (state) { - return { - selectedAddress: state.metamask.selectedAddress, - conversionRate: state.metamask.conversionRate, - currentCurrency: state.metamask.currentCurrency, - } -} - -export default connect(mapStateToProps)(ShiftListItem) diff --git a/ui/app/components/app/transaction-list/transaction-list.component.js b/ui/app/components/app/transaction-list/transaction-list.component.js index 39ca9ca69..6a1aa3f7f 100644 --- a/ui/app/components/app/transaction-list/transaction-list.component.js +++ b/ui/app/components/app/transaction-list/transaction-list.component.js @@ -1,8 +1,6 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import TransactionListItem from '../transaction-list-item' -import ShapeShiftTransactionListItem from '../shift-list-item' -import { TRANSACTION_TYPE_SHAPESHIFT } from '../../../helpers/constants/transactions' export default class TransactionList extends PureComponent { static contextTypes = { @@ -115,26 +113,19 @@ export default class TransactionList extends PureComponent { renderTransaction (transactionGroup, index, isPendingTx = false) { const { selectedToken, assetImages, firstPendingTransactionId } = this.props - const { transactions = [] } = transactionGroup - return transactions[0].key === TRANSACTION_TYPE_SHAPESHIFT - ? ( - - ) : ( - - ) + return ( + + ) } renderEmpty () { diff --git a/ui/app/components/ui/copyButton.js b/ui/app/components/ui/copyButton.js deleted file mode 100644 index e7439e7b2..000000000 --- a/ui/app/components/ui/copyButton.js +++ /dev/null @@ -1,63 +0,0 @@ -import React, { Component } from 'react' -import PropTypes from 'prop-types' - -import copyToClipboard from 'copy-to-clipboard' -import Tooltip from './tooltip' - -class CopyButton extends Component { - static contextTypes = { - t: PropTypes.func, - } - - static defaultProps = { - title: null, - } - - static propTypes = { - value: PropTypes.string.isRequired, - title: PropTypes.string, - } - - state = {} - - debounceRestore = () => { - this.setState({ copied: true }) - clearTimeout(this.timeout) - this.timeout = setTimeout(() => { - this.setState({ copied: false }) - }, 850) - } - - render () { - const { title, value } = this.props - const { copied } = this.state - const message = copied ? this.context.t('copiedButton') : title || this.context.t('copyButton') - - return ( -
- - { - event.preventDefault() - event.stopPropagation() - copyToClipboard(value) - this.debounceRestore() - }} - /> - -
- ) - } -} - -export default CopyButton diff --git a/ui/app/components/ui/eth-balance/eth-balance.component.js b/ui/app/components/ui/eth-balance/eth-balance.component.js deleted file mode 100644 index 305991611..000000000 --- a/ui/app/components/ui/eth-balance/eth-balance.component.js +++ /dev/null @@ -1,135 +0,0 @@ -import PropTypes from 'prop-types' -import React, { Component } from 'react' - -import { formatBalance, generateBalanceObject } from '../../../helpers/utils/util' -import Tooltip from '../tooltip.js' -import FiatValue from '../fiat-value.js' - -export default class EthBalance extends Component { - static defaultProps = { - style: null, - styleOverride: {}, - showFiat: true, - needsParse: true, - width: undefined, - shorten: false, - incoming: false, - } - - static propTypes = { - conversionRate: PropTypes.any.isRequired, - shorten: PropTypes.bool, - incoming: PropTypes.bool, - currentCurrency: PropTypes.string.isRequired, - hideTooltip: PropTypes.bool, - styleOverride: PropTypes.object, - showFiat: PropTypes.bool, - ticker: PropTypes.string.isRequired, - value: PropTypes.string.isRequired, - style: PropTypes.object, - width: PropTypes.string, - needsParse: PropTypes.bool, - } - - renderBalance (value) { - if (value === 'None') { - return value - } - if (value === '...') { - return value - } - - const { - conversionRate, - shorten, - incoming, - currentCurrency, - hideTooltip, - styleOverride = {}, - showFiat = true, - } = this.props - const { fontSize, color, fontFamily, lineHeight } = styleOverride - - const { shortBalance, balance, label } = generateBalanceObject(value, shorten ? 1 : 3) - const balanceToRender = shorten ? shortBalance : balance - - const [ethNumber, ethSuffix] = value.split(' ') - const containerProps = hideTooltip ? {} : { - position: 'bottom', - title: `${ethNumber} ${ethSuffix}`, - } - - const TooltipComponent = hideTooltip ? 'div' : Tooltip - - return ( - -
-
-
- { - incoming - ? `+${balanceToRender}` - : balanceToRender - } -
-
- {label} -
-
-
- { - showFiat - ? ( - - ) - : null - } - - ) - } - - render () { - const { ticker, value, style, width, needsParse } = this.props - const formattedValue = value - ? formatBalance(value, 6, needsParse, ticker) - : '...' - - return ( -
-
- {this.renderBalance(formattedValue)} -
-
- ) - } -} diff --git a/ui/app/components/ui/eth-balance/eth-balance.container.js b/ui/app/components/ui/eth-balance/eth-balance.container.js deleted file mode 100644 index 8e36b6f78..000000000 --- a/ui/app/components/ui/eth-balance/eth-balance.container.js +++ /dev/null @@ -1,10 +0,0 @@ -import { connect } from 'react-redux' -import EthBalance from './eth-balance.component' - -function mapStateToProps (state) { - return { - ticker: state.metamask.ticker, - } -} - -export default connect(mapStateToProps)(EthBalance) diff --git a/ui/app/components/ui/eth-balance/index.js b/ui/app/components/ui/eth-balance/index.js deleted file mode 100644 index f40991784..000000000 --- a/ui/app/components/ui/eth-balance/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './eth-balance.container' diff --git a/ui/app/components/ui/fiat-value.js b/ui/app/components/ui/fiat-value.js deleted file mode 100644 index a029b2559..000000000 --- a/ui/app/components/ui/fiat-value.js +++ /dev/null @@ -1,74 +0,0 @@ -import PropTypes from 'prop-types' -import React, { Component } from 'react' -import { formatBalance } from '../../helpers/utils/util' - -export default class FiatValue extends Component { - static propTypes = { - conversionRate: PropTypes.number.isRequired, - currentCurrency: PropTypes.string, - style: PropTypes.object, - value: PropTypes.string.isRequired, - } - - render () { - const { conversionRate, currentCurrency, style } = this.props - const renderedCurrency = currentCurrency || '' - - const value = formatBalance(this.props.value, 6) - - if (value === 'None') { - return value - } - let fiatDisplayNumber, fiatTooltipNumber - const splitBalance = value.split(' ') - - if (conversionRate !== 0) { - fiatTooltipNumber = Number(splitBalance[0]) * conversionRate - fiatDisplayNumber = fiatTooltipNumber.toFixed(2) - } else { - fiatDisplayNumber = 'N/A' - } - - return fiatDisplay(fiatDisplayNumber, renderedCurrency.toUpperCase(), style) - } -} - -function fiatDisplay (fiatDisplayNumber, fiatSuffix, styleOveride = {}) { - const { fontSize, color, fontFamily, lineHeight } = styleOveride - - if (fiatDisplayNumber !== 'N/A') { - return ( -
-
- {fiatDisplayNumber} -
-
- {fiatSuffix} -
-
- ) - } else { - return
- } -} diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index 185f1a0ce..a0b74bc8a 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -450,10 +450,6 @@ } } - &__shapeshift-logo { - height: 60px; - } - &__right { display: flex; } diff --git a/ui/app/css/itcss/components/sections.scss b/ui/app/css/itcss/components/sections.scss index ad51b0326..0d9cb1336 100644 --- a/ui/app/css/itcss/components/sections.scss +++ b/ui/app/css/itcss/components/sections.scss @@ -249,16 +249,6 @@ textarea.twelve-word-phrase { background: #faf6f0; } -/* Ether Balance Widget */ - -.ether-balance-amount { - color: #f7861c; -} - -.ether-balance-label { - color: #aba9aa; -} - /* Info screen */ .info-gray { font-family: Roboto; diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss index abb748d53..988d5b277 100644 --- a/ui/app/css/itcss/components/transaction-list.scss +++ b/ui/app/css/itcss/components/transaction-list.scss @@ -73,14 +73,6 @@ } } -.tx-list-clickable { - cursor: pointer; - - &:hover { - background: rgba($alto, .2); - } -} - .tx-list-pending-item-container { cursor: pointer; opacity: .5; diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss index 81eb18d06..d4ef92fb9 100644 --- a/ui/app/css/itcss/tools/utilities.scss +++ b/ui/app/css/itcss/tools/utilities.scss @@ -2,16 +2,6 @@ Utility Classes */ -/* color */ - -.color-orange { - color: #f7861c; // TODO: move to settings/variables -} - -.color-forest { - color: #0a5448; // TODO: move to settings/variables -} - /* lib */ .full-size { @@ -241,11 +231,6 @@ hr.horizontal-line { height: 15px; } -.ether-balance { - display: flex; - align-items: center; -} - .tabSection { min-width: 350px; } diff --git a/ui/app/helpers/constants/transactions.js b/ui/app/helpers/constants/transactions.js index e7e4c7fb2..36d952564 100644 --- a/ui/app/helpers/constants/transactions.js +++ b/ui/app/helpers/constants/transactions.js @@ -23,5 +23,3 @@ export const ENCRYPTION_PUBLIC_KEY_REQUEST_KEY = 'encryptionPublicKeyRequest' export const CONTRACT_INTERACTION_KEY = 'contractInteraction' export const CANCEL_ATTEMPT_ACTION_KEY = 'cancelAttempt' export const DEPOSIT_TRANSACTION_KEY = 'deposit' - -export const TRANSACTION_TYPE_SHAPESHIFT = 'shapeshift' diff --git a/ui/app/pages/send/tests/send-selectors-test-data.js b/ui/app/pages/send/tests/send-selectors-test-data.js index 5158f189c..72b2aa96b 100644 --- a/ui/app/pages/send/tests/send-selectors-test-data.js +++ b/ui/app/pages/send/tests/send-selectors-test-data.js @@ -162,11 +162,6 @@ export default { 'provider': { 'type': 'testnet', }, - 'shapeShiftTxList': [ - { id: 'shapeShiftTx1', 'time': 1675000000000 }, - { id: 'shapeShiftTx2', 'time': 1575000000000 }, - { id: 'shapeShiftTx3', 'time': 1475000000000 }, - ], 'send': { 'gasLimit': '0xFFFF', 'gasPrice': '0xaa', diff --git a/ui/app/selectors/tests/selectors-test-data.js b/ui/app/selectors/tests/selectors-test-data.js index 00c12773d..9ac3eb704 100644 --- a/ui/app/selectors/tests/selectors-test-data.js +++ b/ui/app/selectors/tests/selectors-test-data.js @@ -160,11 +160,6 @@ export default { 'provider': { 'type': 'testnet', }, - 'shapeShiftTxList': [ - { id: 'shapeShiftTx1', 'time': 1675000000000 }, - { id: 'shapeShiftTx2', 'time': 1575000000000 }, - { id: 'shapeShiftTx3', 'time': 1475000000000 }, - ], 'send': { 'gasLimit': '0xFFFF', 'gasPrice': '0xaa', diff --git a/ui/app/selectors/tests/transactions.test.js b/ui/app/selectors/tests/transactions.test.js index 74fa053b3..3f00c9e46 100644 --- a/ui/app/selectors/tests/transactions.test.js +++ b/ui/app/selectors/tests/transactions.test.js @@ -190,99 +190,6 @@ describe('Transaction Selectors', function () { assert(Array.isArray(selectedTx)) assert.deepEqual(selectedTx, orderedTxList) }) - - it('should return shapeshift transactions if current network is mainnet', function () { - - const state = { - metamask: { - provider: { - nickname: 'mainnet', - }, - featureFlags: { - showIncomingTransactions: false, - }, - selectedAddress: '0xAddress', - currentNetworkTxList: [ - { - id: 0, - time: 0, - txParams: { - from: '0xAddress', - to: '0xRecipient', - }, - }, - { - id: 1, - time: 2, - txParams: { - from: '0xAddress', - to: '0xRecipient', - }, - }, - ], - shapeShiftTxList: [ - { id: 'shapeShiftTx1', 'time': 1 }, - { id: 'shapeShiftTx2', 'time': 3 }, - { id: 'shapeShiftTx3', 'time': 4 }, - ], - }, - } - - const orderedTxList = state.metamask.currentNetworkTxList - .concat(state.metamask.shapeShiftTxList) - .sort((a, b) => b.time - a.time) - - const selectedTx = transactionsSelector(state) - - assert(Array.isArray(selectedTx)) - assert.deepEqual(selectedTx, orderedTxList) - }) - - it('should not return shapeshift transactions if current network is not mainnet', function () { - - const state = { - metamask: { - provider: { - nickname: 'rinkeby', - }, - featureFlags: { - showIncomingTransactions: false, - }, - selectedAddress: '0xAddress', - currentNetworkTxList: [ - { - id: 0, - time: 0, - txParams: { - from: '0xAddress', - to: '0xRecipient', - }, - }, - { - id: 1, - time: 2, - txParams: { - from: '0xAddress', - to: '0xRecipient', - }, - }, - ], - shapeShiftTxList: [ - { id: 'shapeShiftTx1', 'time': 1 }, - { id: 'shapeShiftTx2', 'time': 3 }, - { id: 'shapeShiftTx3', 'time': 4 }, - ], - }, - } - - const orderedTxList = state.metamask.currentNetworkTxList - .sort((a, b) => b.time - a.time) - - const selectedTx = transactionsSelector(state) - - assert(Array.isArray(selectedTx)) - assert.deepEqual(selectedTx, orderedTxList) - }) }) describe('nonceSortedTransactionsSelector', function () { diff --git a/ui/app/selectors/transactions.js b/ui/app/selectors/transactions.js index 11536f5ad..caa32f51b 100644 --- a/ui/app/selectors/transactions.js +++ b/ui/app/selectors/transactions.js @@ -13,19 +13,11 @@ import { hexToDecimal } from '../helpers/utils/conversions.util' import { selectedTokenAddressSelector } from './tokens' import { getFastPriceEstimateInHexWEI } from './custom-gas' import { - getIsMainnet, getSelectedToken, getSelectedAddress, } from './selectors' import txHelper from '../../lib/tx-helper' -export const shapeShiftTxListSelector = (state) => { - if (getIsMainnet(state)) { - return state.metamask.shapeShiftTxList - } - return [] -} - export const incomingTxListSelector = (state) => { const { showIncomingTransactions } = state.metamask.featureFlags if (!showIncomingTransactions) { @@ -93,10 +85,9 @@ const priorityStatusHash = { export const transactionSubSelector = createSelector( unapprovedMessagesSelector, - shapeShiftTxListSelector, incomingTxListSelector, - (unapprovedMessages = [], shapeShiftTxList = [], incomingTxList = []) => { - return unapprovedMessages.concat(shapeShiftTxList, incomingTxList) + (unapprovedMessages = [], incomingTxList = []) => { + return unapprovedMessages.concat(incomingTxList) } ) @@ -213,16 +204,15 @@ const insertTransactionGroupByTime = (transactionGroups, transactionGroup) => { * @name mergeNonNonceTransactionGroups * @private * @description Inserts (mutates) transactionGroups that are not to be ordered by nonce into an array - * of nonce-ordered transactionGroups by time. Shapeshift transactionGroups need to be sorted by time - * within the list of transactions as they do not have nonces. + * of nonce-ordered transactionGroups by time. * @param {transactionGroup[]} orderedTransactionGroups - Array of transactionGroups ordered by * nonce. * @param {transactionGroup[]} nonNonceTransactionGroups - Array of transactionGroups not intended to be ordered by nonce, * but intended to be ordered by timestamp */ const mergeNonNonceTransactionGroups = (orderedTransactionGroups, nonNonceTransactionGroups) => { - nonNonceTransactionGroups.forEach((shapeshiftGroup) => { - insertTransactionGroupByTime(orderedTransactionGroups, shapeshiftGroup) + nonNonceTransactionGroups.forEach((transactionGroup) => { + insertTransactionGroupByTime(orderedTransactionGroups, transactionGroup) }) } @@ -235,13 +225,12 @@ export const nonceSortedTransactionsSelector = createSelector( transactionsSelector, (transactions = []) => { const unapprovedTransactionGroups = [] - const shapeshiftTransactionGroups = [] const incomingTransactionGroups = [] const orderedNonces = [] const nonceToTransactionsMap = {} transactions.forEach((transaction) => { - const { txParams: { nonce } = {}, status, type, time: txTime, key, transactionCategory } = transaction + const { txParams: { nonce } = {}, status, type, time: txTime, transactionCategory } = transaction if (typeof nonce === 'undefined' || transactionCategory === 'incoming') { const transactionGroup = { @@ -252,9 +241,7 @@ export const nonceSortedTransactionsSelector = createSelector( hasCancelled: false, } - if (key === 'shapeshift') { - shapeshiftTransactionGroups.push(transactionGroup) - } else if (transactionCategory === 'incoming') { + if (transactionCategory === 'incoming') { incomingTransactionGroups.push(transactionGroup) } else { insertTransactionGroupByTime(unapprovedTransactionGroups, transactionGroup) @@ -301,7 +288,6 @@ export const nonceSortedTransactionsSelector = createSelector( }) const orderedTransactionGroups = orderedNonces.map((nonce) => nonceToTransactionsMap[nonce]) - mergeNonNonceTransactionGroups(orderedTransactionGroups, shapeshiftTransactionGroups) mergeNonNonceTransactionGroups(orderedTransactionGroups, incomingTransactionGroups) return unapprovedTransactionGroups.concat(orderedTransactionGroups) }