Adding fake token warning and replacing Add Token labels with Import Tokens (#11798)

app/_locales/am/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "ተለዋጭ ስም አክል"
   },
-  "addTokens": {
-    "message": "ተለዋጭ ስሞችን አክል"
-  },
   "advanced": {
     "message": "የላቀ"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "አዎ፣ እናደራጅ!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "እነዚህን ተለዋጭ ስሞች ለማከል ይፈልጋሉ?"
   },
   "links": {

app/_locales/ar/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "إضافة عملة رمزية"
   },
-  "addTokens": {
-    "message": "إضافة عملات رمزية"
-  },
   "advanced": {
     "message": "إعدادات متقدمة"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "نعم، دعنا نبدأ التثبيت!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "هل ترغب في إضافة هذه الرموز؟"
   },
   "links": {

app/_locales/bg/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Добавяне на жетон"
   },
-  "addTokens": {
-    "message": "Добавяне на жетони"
-  },
   "advanced": {
     "message": "Разширени"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "Да, нека да настроим нещата!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Искате ли да добавите тези жетони?"
   },
   "links": {

app/_locales/bn/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "টোকেন যোগ করুন"
   },
-  "addTokens": {
-    "message": "টোকেনগুলি যোগ করুন"
-  },
   "advanced": {
     "message": "উন্নত"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "হ্যাঁ, তাহলে সেট আপ করে নেওয়া যাক!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "আপনি কি এই টোকেনগুলি যোগ করতে চান?"
   },
   "links": {

app/_locales/ca/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Afegir Fitxa"
   },
-  "addTokens": {
-    "message": "Afegeix tokens"
-  },
   "advanced": {
     "message": "Configuració avançada"
   },
@@ -527,7 +524,7 @@
   "letsGoSetUp": {
     "message": "Sí, posem-nos en marxa!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "T'agradaria afegir aquestes fitxes?"
   },
   "links": {

app/_locales/cs/messages.json

@@ -11,9 +11,6 @@
   "addToken": {
     "message": "Přidat token"
   },
-  "addTokens": {
-    "message": "Přidat tokeny"
-  },
   "amount": {
     "message": "Částka"
   },
@@ -214,7 +211,7 @@
   "learnMore": {
     "message": "Zjistěte více."
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Chcete přidat tyto tokeny?"
   },
   "links": {

app/_locales/da/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Tilføj Polet"
   },
-  "addTokens": {
-    "message": "Tilføj tokens"
-  },
   "advanced": {
     "message": "Avanceret"
   },
@@ -533,7 +530,7 @@
   "letsGoSetUp": {
     "message": "Ja, lad os komme i gang!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Ønsker du at tilføje disse tokens?"
   },
   "loadMore": {

app/_locales/de/messages.json

@@ -47,9 +47,6 @@
   "addToken": {
     "message": "Token hinzufügen"
   },
-  "addTokens": {
-    "message": "Token hinzufügen"
-  },
   "advanced": {
     "message": "Erweitert"
   },
@@ -528,7 +525,7 @@
   "letsGoSetUp": {
     "message": "Ja, legen wir los!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Möchtest du diese Token hinzufügen?"
   },
   "loadMore": {

app/_locales/el/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Προσθήκη Token"
   },
-  "addTokens": {
-    "message": "Προσθήκη Token"
-  },
   "advanced": {
     "message": "Σύνθετες"
   },
@@ -537,7 +534,7 @@
   "letsGoSetUp": {
     "message": "Ναι, ας το εγκαταστήσουμε!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Θέλετε να προσθέσετε αυτά τα token;"
   },
   "links": {

app/_locales/en/messages.json

@@ -52,6 +52,9 @@
   "addContact": {
     "message": "Add contact"
   },
+  "addCustomToken": {
+    "message": "Add Custom Token"
+  },
   "addCustomTokenByContractAddress": {
     "message": "Can’t find a token? You can manually add any token by pasting its address. Token contract addresses can be found on $1.",
     "description": "$1 is a blockchain explorer for a specific network, e.g. Etherscan for Ethereum"
@@ -91,9 +94,6 @@
   "addToken": {
     "message": "Add Token"
   },
-  "addTokens": {
-    "message": "Add Tokens"
-  },
   "addressBookIcon": {
     "message": "Address book icon"
   },
@@ -884,6 +884,9 @@
   "failureMessage": {
     "message": "Something went wrong, and we were unable to complete the action"
   },
+  "fakeTokenWarning": {
+    "message": "Anyone can create a token, including creating fake versions of existing tokens. Learn more about $1"
+  },
   "fast": {
     "message": "Fast"
   },
@@ -1088,6 +1091,9 @@
   "importTokens": {
     "message": "import tokens"
   },
+  "importTokensCamelCase": {
+    "message": "Import Tokens"
+  },
   "importWallet": {
     "message": "Import wallet"
   },
@@ -1189,6 +1195,9 @@
   "learnMore": {
     "message": "Learn more"
   },
+  "learnScamRisk": {
+    "message": "scams and security risks."
+  },
   "ledgerAccountRestriction": {
     "message": "You need to make use your last account before you can add a new one."
   },
@@ -1222,8 +1231,8 @@
   "letsGoSetUp": {
     "message": "Yes, let’s get set up!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
-    "message": "Would you like to add these tokens?"
+    "message": "Would you like to import these tokens?"
   },
   "links": {
     "message": "Links"
@@ -1668,7 +1677,7 @@
     "message": "Queued"
   },
   "readdToken": {
-    "message": "You can add this token back in the future by going to “Add token” in your accounts options menu."
+    "message": "You can add this token back in the future by going to “Import token” in your accounts options menu."
   },
   "receive": {
     "message": "Receive"

app/_locales/es/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Agregar token"
   },
-  "addTokens": {
-    "message": "Agregar tokens"
-  },
   "advanced": {
     "message": "Avanzado"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Sí, vamos a establecer la configuración."
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "¿Le gustaría agregar estos tokens?"
   },
   "links": {

app/_locales/es_419/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Agregar token"
   },
-  "addTokens": {
-    "message": "Agregar tokens"
-  },
   "advanced": {
     "message": "Avanzado"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Sí, vamos a establecer la configuración."
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "¿Le gustaría agregar estos tokens?"
   },
   "links": {

app/_locales/et/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Lisage luba"
   },
-  "addTokens": {
-    "message": "Lisa lube"
-  },
   "advanced": {
     "message": "Täpsemad"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "Jah, hakkame pihta!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Kas soovite need load lisada?"
   },
   "links": {

app/_locales/fa/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "یک رمز یاب اضافه کنید"
   },
-  "addTokens": {
-    "message": "اضافه رمزیاب ها"
-  },
   "advanced": {
     "message": "پیشرفته"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "بلی، درست شد!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "آیا میخواهید این رمزیاب ها را اضافه نمایید؟"
   },
   "links": {

app/_locales/fi/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Lisää tietue"
   },
-  "addTokens": {
-    "message": "Lisää poletteja"
-  },
   "advanced": {
     "message": "Lisäasetukset"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "Kyllä, valmistaudutaan!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Haluaisitko lisätä nämä poletit?"
   },
   "links": {

app/_locales/fil/messages.json

@@ -47,9 +47,6 @@
   "addToken": {
     "message": "Magdagdag ng Token"
   },
-  "addTokens": {
-    "message": "Magdagdag ng Mga Token"
-  },
   "advancedOptions": {
     "message": "Mga Advanced na Opsyon"
   },
@@ -490,7 +487,7 @@
   "letsGoSetUp": {
     "message": "Oo, i-set up natin ito!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
   "links": {

app/_locales/fr/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Ajouter un jeton"
   },
-  "addTokens": {
-    "message": "Ajouter des jetons"
-  },
   "advanced": {
     "message": "Paramètres avancés"
   },
@@ -534,7 +531,7 @@
   "letsGoSetUp": {
     "message": "Oui, passons à la configuration !"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Souhaitez-vous ajouter ces jetons ?"
   },
   "links": {

app/_locales/he/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "הוסף/י אסימון"
   },
-  "addTokens": {
-    "message": "הוסף סמלים"
-  },
   "advanced": {
     "message": "מתקדם"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "כן, בוא נתקין!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "האם ברצונך להוסיף טוקנים אלה?"
   },
   "links": {

app/_locales/hi/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "टोकन जोड़ें"
   },
-  "addTokens": {
-    "message": "टोकन जोड़ें"
-  },
   "advanced": {
     "message": "उन्नत"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "हाँ, आइए सेट करते हैं!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "क्या आप इन टोकन को जोड़ना चाहते हैं?"
   },
   "links": {

app/_locales/hn/messages.json

@@ -11,9 +11,6 @@
   "addToken": {
     "message": "टोकन जोड़ें"
   },
-  "addTokens": {
-    "message": "टोकनों को जोड़ें"
-  },
   "amount": {
     "message": "राशि"
   },
@@ -194,7 +191,7 @@
   "kovan": {
     "message": "कोवान टेस्ट नेटवर्क"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "क्या आप इन टोकनों को जोड़ना चाहते हैं?"
   },
   "loading": {

app/_locales/hr/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Dodaj token"
   },
-  "addTokens": {
-    "message": "Dodaj tokene"
-  },
   "advanced": {
     "message": "Napredno"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "Da, obavimo postavljanje!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Želite li dodati ove tokene?"
   },
   "links": {

app/_locales/ht/messages.json

@@ -29,9 +29,6 @@
   "addToken": {
     "message": "Ajoute Token"
   },
-  "addTokens": {
-    "message": "Ajoute Token"
-  },
   "amount": {
     "message": "Kantite lajan"
   },
@@ -311,7 +308,7 @@
   "ledgerAccountRestriction": {
     "message": "Ou bezwen sèvi ak dènye kont ou anvan ou ka ajoute yon nouvo."
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Èske ou ta renmen ajoute sa nan tokens?"
   },
   "links": {

app/_locales/hu/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Token hozzáadása"
   },
-  "addTokens": {
-    "message": "Érmék hozzáadása"
-  },
   "advanced": {
     "message": "Speciális"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "Igen, hozzuk létre!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Hozzá szeretné adni ezeket az érméket?"
   },
   "links": {

app/_locales/id/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Tambahkan Token"
   },
-  "addTokens": {
-    "message": "Tambahkan Token"
-  },
   "advanced": {
     "message": "Tingkat Lanjut"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Ya, mari siap-siap!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Apakah Anda ingin menambahkan token ini?"
   },
   "links": {

app/_locales/it/messages.json

@@ -64,9 +64,6 @@
   "addToken": {
     "message": "Aggiungi Token"
   },
-  "addTokens": {
-    "message": "Aggiungi token"
-  },
   "advanced": {
     "message": "Avanzate"
   },
@@ -875,7 +872,7 @@
   "letsGoSetUp": {
     "message": "Si, iniziamo!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Vorresti aggiungere questi token?"
   },
   "links": {

app/_locales/ja/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "トークンの追加"
   },
-  "addTokens": {
-    "message": "トークンの追加"
-  },
   "advanced": {
     "message": "詳細"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "さあセットアップしましょう!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "これらのトークンを追加しますか?"
   },
   "links": {

app/_locales/kn/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "ಟೋಕನ್ ಸೇರಿಸಿ"
   },
-  "addTokens": {
-    "message": "ಟೋಕನ್‌ಗಳನ್ನು ಸೇರಿಸಿ"
-  },
   "advanced": {
     "message": "ಸುಧಾರಿತ"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "ಹೌದು, ಹೊಂದಿಸೋಣ!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "ನೀವು ಈ ಟೋಕನ್‌ಗಳನ್ನು ಸೇರಿಸಲು ಬಯಸುತ್ತೀರಾ?"
   },
   "links": {

app/_locales/ko/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "토큰 추가"
   },
-  "addTokens": {
-    "message": "토큰 추가"
-  },
   "advanced": {
     "message": "고급"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "설정을 시작하죠!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "이 토큰을 추가하시겠어요?"
   },
   "links": {

app/_locales/lt/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Pridėti žetoną"
   },
-  "addTokens": {
-    "message": "Pridėti žetonų"
-  },
   "advanced": {
     "message": "Išplėstiniai"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "Taip, pradėkime!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Ar norėtumėte pridėti šiuos žetonus?"
   },
   "links": {

app/_locales/lv/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Pievienot žetonu"
   },
-  "addTokens": {
-    "message": "Pievienot marķierus"
-  },
   "advanced": {
     "message": "Papildu"
   },
@@ -536,7 +533,7 @@
   "letsGoSetUp": {
     "message": "Jā, sāksim iestatīšanu!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Vai vēlaties pievienot šos marķierus?"
   },
   "links": {

app/_locales/ms/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Tambah Token"
   },
-  "addTokens": {
-    "message": "Tambah Token"
-  },
   "advanced": {
     "message": "Lanjutan"
   },
@@ -526,7 +523,7 @@
   "letsGoSetUp": {
     "message": "Ya, mari sediakannya!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Adakah anda ingin menambah token ini?"
   },
   "links": {

app/_locales/nl/messages.json

@@ -8,9 +8,6 @@
   "addToken": {
     "message": "Voeg token toe"
   },
-  "addTokens": {
-    "message": "Tokens toevoegen"
-  },
   "amount": {
     "message": "Bedrag"
   },
@@ -188,7 +185,7 @@
   "kovan": {
     "message": "Kovan-testnetwerk"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Wil je deze tokens toevoegen?"
   },
   "loading": {

app/_locales/no/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Legg til token "
   },
-  "addTokens": {
-    "message": "Legg til sjetonger"
-  },
   "advanced": {
     "message": "Avansert"
   },
@@ -527,7 +524,7 @@
   "letsGoSetUp": {
     "message": "Ja, la oss komme i gang!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Ønsker du å legge til disse tokenene"
   },
   "links": {

app/_locales/ph/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Magdagdag ng Token"
   },
-  "addTokens": {
-    "message": "Magdagdag ng Mga Token"
-  },
   "advanced": {
     "message": "Advanced"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Sige, simulan na nating mag-set up!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
   "links": {

app/_locales/pl/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Dodaj token"
   },
-  "addTokens": {
-    "message": "Dodaj tokeny"
-  },
   "advanced": {
     "message": "Zaawansowane"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "Tak, zacznijmy od początku!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Czy chcesz dodać te tokeny?"
   },
   "links": {

app/_locales/pt/messages.json

@@ -11,9 +11,6 @@
   "addToken": {
     "message": "Adicionar Token"
   },
-  "addTokens": {
-    "message": "Adicionar Tokens"
-  },
   "amount": {
     "message": "Valor"
   },
@@ -194,7 +191,7 @@
   "kovan": {
     "message": "Rede de Teste Kovan"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Gostaria de adicionar estes tokens?"
   },
   "loading": {

app/_locales/pt_BR/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Adicionar token"
   },
-  "addTokens": {
-    "message": "Adicionar tokens"
-  },
   "advanced": {
     "message": "Avançadas"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Sim, vamos fazer a configuração!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Você gostaria de adicionar esses tokens?"
   },
   "links": {

app/_locales/ro/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Adăugare simbol"
   },
-  "addTokens": {
-    "message": "Adăugați token-uri"
-  },
   "advanced": {
     "message": "Avansate"
   },
@@ -530,7 +527,7 @@
   "letsGoSetUp": {
     "message": "Da, hai să configurăm!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Adăugați aceste indicative?"
   },
   "links": {

app/_locales/ru/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Добавить токен"
   },
-  "addTokens": {
-    "message": "Добавить токены"
-  },
   "advanced": {
     "message": "Дополнительно"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Да, давайте настроим!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Вы хотели бы добавить эти токены?"
   },
   "links": {

app/_locales/sk/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Přidat token"
   },
-  "addTokens": {
-    "message": "Přidat tokeny"
-  },
   "advanced": {
     "message": "Rozšírené"
   },
@@ -524,7 +521,7 @@
   "letsGoSetUp": {
     "message": "Áno, poďme to nastaviť!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Chcete přidat tyto tokeny?"
   },
   "links": {

app/_locales/sl/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Dodaj žeton"
   },
-  "addTokens": {
-    "message": "Dodaj žetone"
-  },
   "advanced": {
     "message": "Napredno"
   },
@@ -534,7 +531,7 @@
   "letsGoSetUp": {
     "message": "Lotimo se nastavitev!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Želite dodati te žetone?"
   },
   "links": {

app/_locales/sr/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Dodaj token"
   },
-  "addTokens": {
-    "message": "Dodaj tokene"
-  },
   "advanced": {
     "message": "Напредне опције"
   },
@@ -537,7 +534,7 @@
   "letsGoSetUp": {
     "message": "Da, hajde da sve podesimo!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Želite li da dodate ove tokene?"
   },
   "links": {

app/_locales/sv/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Lägg till token"
   },
-  "addTokens": {
-    "message": "Lägg till tokens"
-  },
   "advanced": {
     "message": "Avancerat"
   },
@@ -530,7 +527,7 @@
   "letsGoSetUp": {
     "message": "Ja, kör igång!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Vill du lägga till dessa tokens?"
   },
   "links": {

app/_locales/sw/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Ongeza Kianzio"
   },
-  "addTokens": {
-    "message": "Ongeza Vianzio"
-  },
   "advanced": {
     "message": "Mipangilio ya kina"
   },
@@ -527,7 +524,7 @@
   "letsGoSetUp": {
     "message": "Ndiyo, hebu tuweke mipangilio!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Je, ungependa kuongeza vianzio hivi?"
   },
   "links": {

app/_locales/ta/messages.json

@@ -14,9 +14,6 @@
   "addToken": {
     "message": "டோக்கனைச் சேர்"
   },
-  "addTokens": {
-    "message": "டோக்கன்களைச் சேர்"
-  },
   "advanced": {
     "message": "மேம்பட்டவை"
   },
@@ -251,7 +248,7 @@
   "learnMore": {
     "message": "மேலும் அறிக"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "இந்த டோக்கன்களைச் சேர்க்க விரும்புகிறீர்களா?"
   },
   "links": {

app/_locales/th/messages.json

@@ -14,9 +14,6 @@
   "addToken": {
     "message": "เพิ่มโทเค็น"
   },
-  "addTokens": {
-    "message": "เพิ่มหลายโทเค็น"
-  },
   "amount": {
     "message": "จำนวน"
   },
@@ -269,7 +266,7 @@
   "learnMore": {
     "message": "เรียนรู้เพิ่มเติม"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "คุณต้องการเพิ่มโทเค็นเหล่านี้หรือไม่?"
   },
   "loading": {

app/_locales/tl/messages.json

@@ -64,9 +64,6 @@
   "addToken": {
     "message": "Magdagdag ng Token"
   },
-  "addTokens": {
-    "message": "Magdagdag ng Mga Token"
-  },
   "advanced": {
     "message": "Advanced"
   },
@@ -869,7 +866,7 @@
   "letsGoSetUp": {
     "message": "Sige, simulan na nating mag-set up!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
   "links": {

app/_locales/tr/messages.json

@@ -11,9 +11,6 @@
   "addToken": {
     "message": "Jeton ekle"
   },
-  "addTokens": {
-    "message": "Jetonlar ekle"
-  },
   "amount": {
     "message": "Tutar"
   },
@@ -221,7 +218,7 @@
   "learnMore": {
     "message": "Daha fazla bilgi."
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Bu jetonlara adres eklemek ister misiniz?"
   },
   "links": {

app/_locales/uk/messages.json

@@ -50,9 +50,6 @@
   "addToken": {
     "message": "Додати токен"
   },
-  "addTokens": {
-    "message": "Додати токени"
-  },
   "advanced": {
     "message": "Розширені"
   },
@@ -540,7 +537,7 @@
   "letsGoSetUp": {
     "message": "Так, давайте налаштуємо!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Ви б хотіли додати ці токени?"
   },
   "links": {

app/_locales/vi/messages.json

@@ -91,9 +91,6 @@
   "addToken": {
     "message": "Thêm token"
   },
-  "addTokens": {
-    "message": "Thêm token"
-  },
   "advanced": {
     "message": "Nâng cao"
   },
@@ -1025,7 +1022,7 @@
   "letsGoSetUp": {
     "message": "Có, hãy thiết lập!"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "Bạn có muốn thêm những token này không?"
   },
   "links": {

app/_locales/zh_CN/messages.json

@@ -64,9 +64,6 @@
   "addToken": {
     "message": "添加代币"
   },
-  "addTokens": {
-    "message": "添加代币"
-  },
   "advanced": {
     "message": "高级"
   },
@@ -872,7 +869,7 @@
   "letsGoSetUp": {
     "message": "第一次，立即开始设置！"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "您想添加这些代币吗？"
   },
   "links": {

app/_locales/zh_TW/messages.json

@@ -53,9 +53,6 @@
   "addToken": {
     "message": "加入代幣"
   },
-  "addTokens": {
-    "message": "加入代幣"
-  },
   "advanced": {
     "message": "進階"
   },
@@ -549,7 +546,7 @@
   "letsGoSetUp": {
     "message": "好，我們開始吧！"
   },
-  "likeToAddTokens": {
+  "likeToImportTokens": {
     "message": "確定要加入代幣？"
   },
   "links": {

test/e2e/metamask-ui.spec.js

@@ -517,10 +517,10 @@ describe('MetaMask', function () {
       await driver.fill('#custom-address', tokenAddress);
       await driver.delay(regularDelayMs);
 
-      await driver.clickElement({ text: 'Next', tag: 'button' });
+      await driver.clickElement({ text: 'Add Custom Token', tag: 'button' });
       await driver.delay(regularDelayMs);
 
-      await driver.clickElement({ text: 'Add Tokens', tag: 'button' });
+      await driver.clickElement({ text: 'Import Tokens', tag: 'button' });
       await driver.delay(regularDelayMs);
     });
 

test/e2e/tests/add-hide-token.spec.js

@@ -83,7 +83,7 @@ describe('Add existing token using search', function () {
         await driver.fill('#search-tokens', 'BAT');
         await driver.clickElement({ text: 'BAT', tag: 'span' });
         await driver.clickElement({ text: 'Next', tag: 'button' });
-        await driver.clickElement({ text: 'Add Tokens', tag: 'button' });
+        await driver.clickElement({ text: 'Import Tokens', tag: 'button' });
 
         await driver.waitForSelector({
           css: '.token-overview__primary-balance',

ui/components/app/asset-list/asset-list.js

@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import ImportTokenLink from '../import-token-link';
 import TokenList from '../token-list';
-import { ADD_TOKEN_ROUTE } from '../../../helpers/constants/routes';
+import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes';
 import AssetListItem from '../asset-list-item';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { useMetricEvent } from '../../../hooks/useMetricEvent';
@@ -107,7 +107,7 @@ const AssetList = ({ onClickAsset }) => {
         </Box>
         <ImportTokenLink
           onClick={() => {
-            history.push(ADD_TOKEN_ROUTE);
+            history.push(IMPORT_TOKEN_ROUTE);
             addTokenEvent();
           }}
         />

ui/components/app/import-token-link/import-token-link.component.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { useMetricEvent } from '../../../hooks/useMetricEvent';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { ADD_TOKEN_ROUTE } from '../../../helpers/constants/routes';
+import { IMPORT_TOKEN_ROUTE } from '../../../helpers/constants/routes';
 import Button from '../../ui/button';
 import Box from '../../ui/box/box';
 import { TEXT_ALIGN } from '../../../helpers/constants/design-system';
@@ -33,7 +33,7 @@ export default function ImportTokenLink() {
         className="import-token-link__link"
         type="link"
         onClick={() => {
-          history.push(ADD_TOKEN_ROUTE);
+          history.push(IMPORT_TOKEN_ROUTE);
           addTokenEvent();
         }}
       >

ui/components/ui/actionable-message/index.scss

@@ -17,6 +17,10 @@
     justify-content: normal;
   }
 
+  &--with-icon.actionable-message--with-right-button {
+    padding-left: 32px;
+  }
+
   svg {
     width: 16px;
     height: 16px;

ui/components/ui/page-container/page-container.component.js

@@ -5,6 +5,10 @@ import PageContainerHeader from './page-container-header';
 import PageContainerFooter from './page-container-footer';
 
 export default class PageContainer extends PureComponent {
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   static propTypes = {
     // PageContainerHeader props
     backButtonString: PropTypes.string,
@@ -86,6 +90,19 @@ export default class PageContainer extends PureComponent {
     return null;
   }
 
+  getTabSubmitText() {
+    const { tabsComponent } = this.props;
+    const { activeTabIndex } = this.state;
+    if (tabsComponent) {
+      let { children } = tabsComponent.props;
+      children = children.filter(Boolean);
+      if (children[activeTabIndex]?.key === 'custom-tab') {
+        return this.context.t('addCustomToken');
+      }
+    }
+    return null;
+  }
+
   render() {
     const {
       title,
@@ -103,7 +120,7 @@ export default class PageContainer extends PureComponent {
       headerCloseText,
       hideCancel,
     } = this.props;
-
+    const tabSubmitText = this.getTabSubmitText();
     return (
       <div className="page-container">
         <PageContainerHeader
@@ -124,8 +141,9 @@ export default class PageContainer extends PureComponent {
             cancelText={cancelText}
             hideCancel={hideCancel}
             onSubmit={onSubmit}
-            submitText={submitText}
+            submitText={tabSubmitText || submitText}
             disabled={disabled}
+            submitButtonType="primary"
           />
         </div>
       </div>

ui/helpers/constants/routes.js

@@ -17,8 +17,8 @@ const CONTACT_VIEW_ROUTE = '/settings/contact-list/view-contact';
 const REVEAL_SEED_ROUTE = '/seed';
 const MOBILE_SYNC_ROUTE = '/mobile-sync';
 const RESTORE_VAULT_ROUTE = '/restore-vault';
-const ADD_TOKEN_ROUTE = '/add-token';
+const IMPORT_TOKEN_ROUTE = '/import-token';
-const CONFIRM_ADD_TOKEN_ROUTE = '/confirm-add-token';
+const CONFIRM_IMPORT_TOKEN_ROUTE = '/confirm-import-token';
 const CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE = '/confirm-add-suggested-token';
 const NEW_ACCOUNT_ROUTE = '/new-account';
 const IMPORT_ACCOUNT_ROUTE = '/new-account/import';
@@ -85,8 +85,8 @@ const PATH_NAME_MAP = {
   [REVEAL_SEED_ROUTE]: 'Reveal Secret Recovery Phrase Page',
   [MOBILE_SYNC_ROUTE]: 'Sync With Mobile Page',
   [RESTORE_VAULT_ROUTE]: 'Restore Vault Page',
-  [ADD_TOKEN_ROUTE]: 'Add Token Page',
+  [IMPORT_TOKEN_ROUTE]: 'Import Token Page',
-  [CONFIRM_ADD_TOKEN_ROUTE]: 'Confirm Add Token Page',
+  [CONFIRM_IMPORT_TOKEN_ROUTE]: 'Confirm Import Token Page',
   [CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE]: 'Confirm Add Suggested Token Page',
   [NEW_ACCOUNT_ROUTE]: 'New Account Page',
   [IMPORT_ACCOUNT_ROUTE]: 'Import Account Page',
@@ -143,8 +143,8 @@ export {
   REVEAL_SEED_ROUTE,
   MOBILE_SYNC_ROUTE,
   RESTORE_VAULT_ROUTE,
-  ADD_TOKEN_ROUTE,
+  IMPORT_TOKEN_ROUTE,
-  CONFIRM_ADD_TOKEN_ROUTE,
+  CONFIRM_IMPORT_TOKEN_ROUTE,
   CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
   NEW_ACCOUNT_ROUTE,
   IMPORT_ACCOUNT_ROUTE,

ui/pages/add-token/add-token.stories.js

@@ -1,12 +0,0 @@
-import React from 'react';
-import { boolean } from '@storybook/addon-knobs';
-
-import AddToken from './add-token.component';
-
-export default {
-  title: 'Add Token',
-};
-
-export const AddTokenComponent = () => {
-  return <AddToken showSearchTab={boolean('Show Search Tab', false)} />;
-};

ui/pages/add-token/index.js

@@ -1,3 +0,0 @@
-import AddToken from './add-token.container';
-
-export default AddToken;

ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js

@@ -74,7 +74,7 @@ export default class ConfirmAddSuggestedToken extends Component {
             {this.context.t('addSuggestedTokens')}
           </div>
           <div className="page-container__subtitle">
-            {this.context.t('likeToAddTokens')}
+            {this.context.t('likeToImportTokens')}
           </div>
           {hasTokenDuplicates ? (
             <div className="warning">{this.context.t('knownTokenWarning')}</div>
@@ -86,34 +86,34 @@ export default class ConfirmAddSuggestedToken extends Component {
           ) : null}
         </div>
         <div className="page-container__content">
-          <div className="confirm-add-token">
+          <div className="confirm-import-token">
-            <div className="confirm-add-token__header">
+            <div className="confirm-import-token__header">
-              <div className="confirm-add-token__token">
+              <div className="confirm-import-token__token">
                 {this.context.t('token')}
               </div>
-              <div className="confirm-add-token__balance">
+              <div className="confirm-import-token__balance">
                 {this.context.t('balance')}
               </div>
             </div>
-            <div className="confirm-add-token__token-list">
+            <div className="confirm-import-token__token-list">
               {suggestedAssets.map(({ asset }) => {
                 return (
                   <div
-                    className="confirm-add-token__token-list-item"
+                    className="confirm-import-token__token-list-item"
                     key={asset.address}
                   >
-                    <div className="confirm-add-token__token confirm-add-token__data">
+                    <div className="confirm-import-token__token confirm-import-token__data">
                       <Identicon
-                        className="confirm-add-token__token-icon"
+                        className="confirm-import-token__token-icon"
                         diameter={48}
                         address={asset.address}
                         image={asset.image}
                       />
-                      <div className="confirm-add-token__name">
+                      <div className="confirm-import-token__name">
                         {this.getTokenName(asset.name, asset.symbol)}
                       </div>
                     </div>
-                    <div className="confirm-add-token__balance">
+                    <div className="confirm-import-token__balance">
                       <TokenBalance token={asset} />
                     </div>
                   </div>

ui/pages/confirm-add-token/index.js

@@ -1,3 +0,0 @@
-import ConfirmAddToken from './confirm-add-token.container';
-
-export default ConfirmAddToken;

ui/pages/confirm-import-token/confirm-import-token.component.js

@@ -1,11 +1,14 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { ASSET_ROUTE, ADD_TOKEN_ROUTE } from '../../helpers/constants/routes';
+import {
+  ASSET_ROUTE,
+  IMPORT_TOKEN_ROUTE,
+} from '../../helpers/constants/routes';
 import Button from '../../components/ui/button';
 import Identicon from '../../components/ui/identicon';
 import TokenBalance from '../../components/ui/token-balance';
 
-export default class ConfirmAddToken extends Component {
+export default class ConfirmImportToken extends Component {
   static contextTypes = {
     t: PropTypes.func,
     trackEvent: PropTypes.func,
@@ -44,42 +47,42 @@ export default class ConfirmAddToken extends Component {
       <div className="page-container">
         <div className="page-container__header">
           <div className="page-container__title">
-            {this.context.t('addTokens')}
+            {this.context.t('importTokensCamelCase')}
           </div>
           <div className="page-container__subtitle">
-            {this.context.t('likeToAddTokens')}
+            {this.context.t('likeToImportTokens')}
           </div>
         </div>
         <div className="page-container__content">
-          <div className="confirm-add-token">
+          <div className="confirm-import-token">
-            <div className="confirm-add-token__header">
+            <div className="confirm-import-token__header">
-              <div className="confirm-add-token__token">
+              <div className="confirm-import-token__token">
                 {this.context.t('token')}
               </div>
-              <div className="confirm-add-token__balance">
+              <div className="confirm-import-token__balance">
                 {this.context.t('balance')}
               </div>
             </div>
-            <div className="confirm-add-token__token-list">
+            <div className="confirm-import-token__token-list">
               {Object.entries(pendingTokens).map(([address, token]) => {
                 const { name, symbol } = token;
 
                 return (
                   <div
-                    className="confirm-add-token__token-list-item"
+                    className="confirm-import-token__token-list-item"
                     key={address}
                   >
-                    <div className="confirm-add-token__token confirm-add-token__data">
+                    <div className="confirm-import-token__token confirm-import-token__data">
                       <Identicon
-                        className="confirm-add-token__token-icon"
+                        className="confirm-import-token__token-icon"
                         diameter={48}
                         address={address}
                       />
-                      <div className="confirm-add-token__name">
+                      <div className="confirm-import-token__name">
                         {this.getTokenName(name, symbol)}
                       </div>
                     </div>
-                    <div className="confirm-add-token__balance">
+                    <div className="confirm-import-token__balance">
                       <TokenBalance token={token} />
                     </div>
                   </div>
@@ -94,7 +97,7 @@ export default class ConfirmAddToken extends Component {
               type="default"
               large
               className="page-container__footer-button"
-              onClick={() => history.push(ADD_TOKEN_ROUTE)}
+              onClick={() => history.push(IMPORT_TOKEN_ROUTE)}
             >
               {this.context.t('back')}
             </Button>
@@ -128,7 +131,7 @@ export default class ConfirmAddToken extends Component {
                 });
               }}
             >
-              {this.context.t('addTokens')}
+              {this.context.t('importTokensCamelCase')}
             </Button>
           </footer>
         </div>

ui/pages/confirm-import-token/confirm-import-token.container.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 
 import { addTokens, clearPendingTokens } from '../../store/actions';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
-import ConfirmAddToken from './confirm-add-token.component';
+import ConfirmImportToken from './confirm-import-token.component';
 
 const mapStateToProps = (state) => {
   const {
@@ -21,4 +21,4 @@ const mapDispatchToProps = (dispatch) => {
   };
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(ConfirmAddToken);
+export default connect(mapStateToProps, mapDispatchToProps)(ConfirmImportToken);

ui/pages/confirm-import-token/confirm-import-token.stories.js

@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
 
 import { createBrowserHistory } from 'history';
 import { text } from '@storybook/addon-knobs';
-import { store, getNewState } from '../../../.storybook/preview';
+import { store } from '../../../.storybook/preview';
 import { tokens } from '../../../.storybook/initial-states/approval-screens/add-token';
 import { updateMetamaskState } from '../../store/actions';
 import ConfirmAddToken from '.';
@@ -20,30 +20,16 @@ const PageSet = ({ children }) => {
   const pendingTokensState = state.metamask.pendingTokens;
   // only change the first token in the list
   useEffect(() => {
-    pendingTokensState[
+    const pendingTokens = { ...pendingTokensState };
-      '0x33f90dee07c6e8b9682dd20f73e6c358b2ed0f03'
+    pendingTokens['0x33f90dee07c6e8b9682dd20f73e6c358b2ed0f03'].symbol = symbol;
-    ].symbol = symbol;
+    store.dispatch(updateMetamaskState({ pendingTokens }));
-    store.dispatch(
+  }, [symbol, pendingTokensState]);
-      updateMetamaskState(
-        getNewState(state.metamask, {
-          pendingTokens: pendingTokensState,
-        }),
-      ),
-    );
-  }, [symbol, pendingTokensState, state.metamask]);
 
   return children;
 };
 
 export const AddToken = () => {
-  const state = store.getState();
+  store.dispatch(updateMetamaskState({ pendingTokens: tokens }));
-  store.dispatch(
-    updateMetamaskState(
-      getNewState(state.metamask, {
-        pendingTokens: tokens,
-      }),
-    ),
-  );
   return (
     <PageSet>
       <ConfirmAddToken history={history} />

ui/pages/confirm-import-token/index.js

@@ -0,0 +1,3 @@
+import ConfirmImportToken from './confirm-import-token.container';
+
+export default ConfirmImportToken;

ui/pages/confirm-import-token/index.scss

@@ -1,4 +1,4 @@
-.confirm-add-token {
+.confirm-import-token {
   padding: 16px;
 
   &__header {

ui/pages/import-token/import-token.component.js

@@ -6,7 +6,7 @@ import {
   getURLHostName,
 } from '../../helpers/utils/util';
 import { tokenInfoGetter } from '../../helpers/utils/token-util';
-import { CONFIRM_ADD_TOKEN_ROUTE } from '../../helpers/constants/routes';
+import { CONFIRM_IMPORT_TOKEN_ROUTE } from '../../helpers/constants/routes';
 import TextField from '../../components/ui/text-field';
 import PageContainer from '../../components/ui/page-container';
 import { Tabs, Tab } from '../../components/ui/tabs';
@@ -24,7 +24,7 @@ const emptyAddr = '0x0000000000000000000000000000000000000000';
 const MIN_DECIMAL_VALUE = 0;
 const MAX_DECIMAL_VALUE = 36;
 
-class AddToken extends Component {
+class ImportToken extends Component {
   static contextTypes = {
     t: PropTypes.func,
   };
@@ -163,7 +163,7 @@ class AddToken extends Component {
     };
 
     setPendingTokens({ customToken, selectedTokens, tokenAddressList });
-    history.push(CONFIRM_ADD_TOKEN_ROUTE);
+    history.push(CONFIRM_IMPORT_TOKEN_ROUTE);
   }
 
   async attemptToAutoFillTokenParams(address) {
@@ -281,7 +281,25 @@ class AddToken extends Component {
       : this.context.t('etherscan');
 
     return (
-      <div className="add-token__custom-token-form">
+      <div className="import-token__custom-token-form">
+        <ActionableMessage
+          message={this.context.t('fakeTokenWarning', [
+            <Button
+              type="link"
+              key="import-token-fake-token-warning"
+              className="import-token__link"
+              rel="noopener noreferrer"
+              target="_blank"
+              href="https://metamask.zendesk.com/hc/en-us/articles/4403988839451"
+            >
+              {this.context.t('learnScamRisk')}
+            </Button>,
+          ])}
+          type="warning"
+          withRightButton
+          useIcon
+          iconFillColor="#f8c000"
+        />
         <TextField
           id="custom-address"
           label={this.context.t('tokenContractAddress')}
@@ -296,13 +314,13 @@ class AddToken extends Component {
         <TextField
           id="custom-symbol"
           label={
-            <div className="add-token__custom-symbol__label-wrapper">
+            <div className="import-token__custom-symbol__label-wrapper">
-              <span className="add-token__custom-symbol__label">
+              <span className="import-token__custom-symbol__label">
                 {this.context.t('tokenSymbol')}
               </span>
               {symbolAutoFilled && !forceEditSymbol && (
                 <div
-                  className="add-token__custom-symbol__edit"
+                  className="import-token__custom-symbol__edit"
                   onClick={() => this.setState({ forceEditSymbol: true })}
                 >
                   {this.context.t('edit')}
@@ -348,8 +366,8 @@ class AddToken extends Component {
                   {this.context.t('verifyThisTokenDecimalOn', [
                     <Button
                       type="link"
-                      key="add-token-verify-token-decimal"
+                      key="import-token-verify-token-decimal"
-                      className="add-token__link"
+                      className="import-token__link"
                       rel="noopener noreferrer"
                       target="_blank"
                       href={blockExplorerTokenLink}
@@ -362,7 +380,7 @@ class AddToken extends Component {
             }
             type="warning"
             withRightButton
-            className="add-token__decimal-warning"
+            className="import-token__decimal-warning"
           />
         )}
       </div>
@@ -373,7 +391,7 @@ class AddToken extends Component {
     const { tokenList } = this.props;
     const { tokenSelectorError, selectedTokens, searchResults } = this.state;
     return (
-      <div className="add-token__search-token">
+      <div className="import-token__search-token">
         <TokenSearch
           onSearch={({ results = [] }) =>
             this.setState({ searchResults: results })
@@ -381,7 +399,7 @@ class AddToken extends Component {
           error={tokenSelectorError}
           tokenList={tokenList}
         />
-        <div className="add-token__token-list">
+        <div className="import-token__token-list">
           <TokenList
             results={searchResults}
             selectedTokens={selectedTokens}
@@ -417,11 +435,12 @@ class AddToken extends Component {
 
     return (
       <PageContainer
-        title={this.context.t('addTokens')}
+        title={this.context.t('importTokensCamelCase')}
         tabsComponent={this.renderTabs()}
         onSubmit={() => this.handleNext()}
+        hideCancel
         disabled={Boolean(this.hasError()) || !this.hasSelected()}
-        onCancel={() => {
+        onClose={() => {
           clearPendingTokens();
           history.push(mostRecentOverviewPage);
         }}
@@ -430,4 +449,4 @@ class AddToken extends Component {
   }
 }
 
-export default AddToken;
+export default ImportToken;

ui/pages/import-token/import-token.container.js

@@ -7,7 +7,7 @@ import {
   getRpcPrefsForCurrentProvider,
   getTokenList,
 } from '../../selectors/selectors';
-import AddToken from './add-token.component';
+import ImportToken from './import-token.component';
 
 const mapStateToProps = (state) => {
   const {
@@ -37,4 +37,4 @@ const mapDispatchToProps = (dispatch) => {
   };
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(AddToken);
+export default connect(mapStateToProps, mapDispatchToProps)(ImportToken);

ui/pages/import-token/import-token.stories.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import { boolean } from '@storybook/addon-knobs';
+
+import ImportToken from './import-token.component';
+
+export default {
+  title: 'Import Token',
+};
+
+export const ImportTokenComponent = () => {
+  return <ImportToken showSearchTab={boolean('Show Search Tab', false)} />;
+};

ui/pages/import-token/import-token.test.js

@@ -3,9 +3,9 @@ import { Provider } from 'react-redux';
 import sinon from 'sinon';
 import configureMockStore from 'redux-mock-store';
 import { mountWithRouter } from '../../../test/lib/render-helpers';
-import AddToken from './add-token.container';
+import ImportToken from './import-token.container';
 
-describe('Add Token', () => {
+describe('Import Token', () => {
   let wrapper;
 
   const state = {
@@ -29,11 +29,11 @@ describe('Add Token', () => {
     tokenList: {},
   };
 
-  describe('Add Token', () => {
+  describe('Import Token', () => {
     beforeAll(() => {
       wrapper = mountWithRouter(
         <Provider store={store}>
-          <AddToken.WrappedComponent {...props} />
+          <ImportToken.WrappedComponent {...props} />
         </Provider>,
         store,
       );
@@ -47,7 +47,7 @@ describe('Add Token', () => {
 
     it('next button is disabled when no fields are populated', () => {
       const nextButton = wrapper.find(
-        '.button.btn-secondary.page-container__footer-button',
+        '.button.btn-primary.page-container__footer-button',
       );
 
       expect(nextButton.props().disabled).toStrictEqual(true);
@@ -60,7 +60,7 @@ describe('Add Token', () => {
 
       customAddress.simulate('change', event);
       expect(
-        wrapper.find('AddToken').instance().state.customAddress,
+        wrapper.find('ImportToken').instance().state.customAddress,
       ).toStrictEqual(tokenAddress);
     });
 
@@ -71,7 +71,7 @@ describe('Add Token', () => {
       customAddress.last().simulate('change', event);
 
       expect(
-        wrapper.find('AddToken').instance().state.customSymbol,
+        wrapper.find('ImportToken').instance().state.customSymbol,
       ).toStrictEqual(tokenSymbol);
     });
 
@@ -82,27 +82,25 @@ describe('Add Token', () => {
       customAddress.last().simulate('change', event);
 
       expect(
-        wrapper.find('AddToken').instance().state.customDecimals,
+        wrapper.find('ImportToken').instance().state.customDecimals,
       ).toStrictEqual(Number(tokenPrecision));
     });
 
     it('next', () => {
       const nextButton = wrapper.find(
-        '.button.btn-secondary.page-container__footer-button',
+        '.button.btn-primary.page-container__footer-button',
       );
       nextButton.simulate('click');
 
       expect(props.setPendingTokens.calledOnce).toStrictEqual(true);
       expect(props.history.push.calledOnce).toStrictEqual(true);
       expect(props.history.push.getCall(0).args[0]).toStrictEqual(
-        '/confirm-add-token',
+        '/confirm-import-token',
       );
     });
 
     it('cancels', () => {
-      const cancelButton = wrapper.find(
+      const cancelButton = wrapper.find('.page-container__header-close');
-        'button.btn-default.page-container__footer-button',
-      );
       cancelButton.simulate('click');
 
       expect(props.clearPendingTokens.calledOnce).toStrictEqual(true);

ui/pages/import-token/index.js

@@ -0,0 +1,3 @@
+import ImportToken from './import-token.container';
+
+export default ImportToken;

ui/pages/import-token/index.scss

@@ -1,6 +1,6 @@
 @import 'token-list/index';
 
-.add-token {
+.import-token {
   $self: &;
 
   &__custom-token-form {

ui/pages/pages.scss

@@ -1,7 +1,7 @@
 /** Please import your files in alphabetical order **/
-@import 'add-token/index';
+@import 'import-token/index';
 @import 'asset/asset';
-@import 'confirm-add-token/index';
+@import 'confirm-import-token/index';
 @import 'confirm-approve/index';
 @import 'confirm-decrypt-message/confirm-decrypt-message';
 @import 'confirm-encryption-public-key/confirm-encryption-public-key';

ui/pages/routes/routes.component.js

@@ -17,8 +17,8 @@ import PermissionsConnect from '../permissions-connect';
 import RestoreVaultPage from '../keychains/restore-vault';
 import RevealSeedConfirmation from '../keychains/reveal-seed';
 import MobileSyncPage from '../mobile-sync';
-import AddTokenPage from '../add-token';
+import ImportTokenPage from '../import-token';
-import ConfirmAddTokenPage from '../confirm-add-token';
+import ConfirmImportTokenPage from '../confirm-import-token';
 import ConfirmAddSuggestedTokenPage from '../confirm-add-suggested-token';
 import CreateAccountPage from '../create-account';
 import Loading from '../../components/ui/loading-screen';
@@ -33,10 +33,9 @@ import Alerts from '../../components/app/alerts';
 import Asset from '../asset';
 
 import {
-  ADD_TOKEN_ROUTE,
+  IMPORT_TOKEN_ROUTE,
   ASSET_ROUTE,
   CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
-  CONFIRM_ADD_TOKEN_ROUTE,
   CONFIRM_TRANSACTION_ROUTE,
   CONNECT_ROUTE,
   DEFAULT_ROUTE,
@@ -53,6 +52,7 @@ import {
   UNLOCK_ROUTE,
   BUILD_QUOTE_ROUTE,
   CONFIRMATION_V_NEXT_ROUTE,
+  CONFIRM_IMPORT_TOKEN_ROUTE,
 } from '../../helpers/constants/routes';
 
 import {
@@ -146,10 +146,14 @@ export default class Routes extends Component {
           exact
         />
         <Authenticated path={SWAPS_ROUTE} component={Swaps} />
-        <Authenticated path={ADD_TOKEN_ROUTE} component={AddTokenPage} exact />
         <Authenticated
-          path={CONFIRM_ADD_TOKEN_ROUTE}
+          path={IMPORT_TOKEN_ROUTE}
-          component={ConfirmAddTokenPage}
+          component={ImportTokenPage}
+          exact
+        />
+        <Authenticated
+          path={CONFIRM_IMPORT_TOKEN_ROUTE}
+          component={ConfirmImportTokenPage}
           exact
         />
         <Authenticated