diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 79e96dd73..99fcac95f 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Wählen Sie dies aus, um den Gaspreis und die Limitkontrollen direkt auf den Senden- und Bestätigen-Bildschirmen anzuzeigen." }, - "showCustomNetworkList": { - "message": "Benutzerdefinierte Netzwerkliste anzeigen" - }, - "showCustomNetworkListDescription": { - "message": "Diese Option zeigt eine Liste von Netzwerken mit vorausgefüllten Details an, sobald ein neues Netzwerk hinzugefügt wird." - }, "showFiatConversionInTestnets": { "message": "Umwandlung auf Testnets anzeigen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 75aaf780d..14f445d52 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Επιλέξτε αυτό για να εμφανίσετε τις τιμές αερίου και να περιορίσετε τα στοιχεία ελέγχου απευθείας στις οθόνες αποστολής και επιβεβαίωσης." }, - "showCustomNetworkList": { - "message": "Προβολή Λίστας Προσαρμοσμένων Δικτύων" - }, - "showCustomNetworkListDescription": { - "message": "Επιλέξτε αυτό για να εμφανιστεί μια λίστα δικτύων με προσυμπληρωμένα στοιχεία κατά την προσθήκη ενός νέου δικτύου." - }, "showFiatConversionInTestnets": { "message": "Εμφάνιση Μετατροπής σε Δοκιμαστικά Δίκτυα" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 2ffc886b6..6bbb7c5b9 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3147,12 +3147,6 @@ "showAdvancedGasInlineDescription": { "message": "Select this to show gas price and limit controls directly on the send and confirm screens." }, - "showCustomNetworkList": { - "message": "Show custom network list" - }, - "showCustomNetworkListDescription": { - "message": "Select this to show a list of networks with prefilled details when adding a new network." - }, "showFiatConversionInTestnets": { "message": "Show conversion on test networks" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 2ea0c51a5..9386a4fb6 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Seleccione esta opción para mostrar el precio del gas y limitar los controles directamente en las pantallas de envío y confirmación." }, - "showCustomNetworkList": { - "message": "Mostrar lista de redes personalizadas" - }, - "showCustomNetworkListDescription": { - "message": "Seleccione esto para mostrar una lista de redes con detalles precargados al agregar una red nueva." - }, "showFiatConversionInTestnets": { "message": "Mostrar conversión en redes de prueba" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 5818725c7..3a4954068 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Sélectionnez cette option pour afficher le prix du carburant et les contrôles des limites directement sur les écrans d’envoi et de confirmation." }, - "showCustomNetworkList": { - "message": "Afficher la liste des réseaux personnalisés" - }, - "showCustomNetworkListDescription": { - "message": "Sélectionnez cette option pour afficher une liste de réseaux dont l’adresse est préremplie lorsque vous ajoutez un nouveau réseau." - }, "showFiatConversionInTestnets": { "message": "Afficher la conversion sur les testnets" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 6753bacbc..57cb9f7e3 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "गैस मूल्य और सीमा नियंत्रण को सीधे भेजने और पुष्टि करने की स्क्रीन पर दिखाने के लिए इसका चयन करें।" }, - "showCustomNetworkList": { - "message": "कस्टम नेटवर्क की सूची दिखाएं" - }, - "showCustomNetworkListDescription": { - "message": "नया नेटवर्क जोड़ते समय पहले से भरे हुए विवरण वाले नेटवर्कों की सूची दिखाने के लिए इसे चुनें।" - }, "showFiatConversionInTestnets": { "message": "टेस्ट नेटवर्क पर रूपांतरण दिखाएं" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index dda622271..217b661c1 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Pilih ini untuk menampilkan biaya gas dan kontrol batas secara langsung di layar kirim dan konfirmasi." }, - "showCustomNetworkList": { - "message": "Tampilkan daftar jaringan khusus" - }, - "showCustomNetworkListDescription": { - "message": "Pilih opsi ini untuk menampilkan daftar jaringan dengan detail yang telah diisi saat menambahkan jaringan baru." - }, "showFiatConversionInTestnets": { "message": "Tampilkan konversi di jaringan uji" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 0e312f8ed..4728a7af1 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "これを選択すると、ガス代と限度額のコントロールが送金画面と確認画面に直接表示されます。" }, - "showCustomNetworkList": { - "message": "カスタムネットワークリストを表示" - }, - "showCustomNetworkListDescription": { - "message": "新規ネットワークの追加時に事前に情報が入力済みのネットワークのリストを表示するには、これを選択します。" - }, "showFiatConversionInTestnets": { "message": "テストネット上に変換を表示" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index deba05052..b7373b816 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "이 항목을 선택하면 보내기 및 확인 화면에서 바로 가스 가격과 한도 조절을 확인할 수 있습니다." }, - "showCustomNetworkList": { - "message": "커스텀 네트워크 표시" - }, - "showCustomNetworkListDescription": { - "message": "이를 선택하면 새로 네트워크를 추가할 때 네트워크 목록에 상세 설명이 함께 나타납니다." - }, "showFiatConversionInTestnets": { "message": "테스트넷에 전환 표시" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 2dcd260dd..571888981 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Selecione isso para mostrar o preço do gás e limitar os controles diretamente nas telas de envio e de confirmação." }, - "showCustomNetworkList": { - "message": "Exibir lista de redes personalizadas" - }, - "showCustomNetworkListDescription": { - "message": "Selecione esta opção para exibir uma lista de redes com as informações pré-preenchidas ao adicionar uma nova rede." - }, "showFiatConversionInTestnets": { "message": "Mostrar conversão nas redes de teste" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 7a177f367..418e1594c 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Выберите это, чтобы отображать цену газа и управление лимитами непосредственно на экранах отправки и подтверждения." }, - "showCustomNetworkList": { - "message": "Показать пользовательский список сетей" - }, - "showCustomNetworkListDescription": { - "message": "Выберите это, чтобы отобразить список сетей с предварительно заполненными данными при добавлении новой сети." - }, "showFiatConversionInTestnets": { "message": "Показывать конвертацию в тестовых сетях" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 8df1321b6..f6b9f9dbf 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Piliin ito para direktang maipakita ang presyo ng gas at mga kontrol sa limitasyon sa mga screen ng pagpapadala at pagkumpirma." }, - "showCustomNetworkList": { - "message": "Ipakita ang Listahan ng Custom na Network" - }, - "showCustomNetworkListDescription": { - "message": "Piliin ito para magpakita ng listahan ng mga network na may prefilled na mga detalye kapag nagdaragdag ng bagong network." - }, "showFiatConversionInTestnets": { "message": "Ipakita ang Conversion sa Testnets" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 9c6b8b051..d9fe54dd6 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Gaz fiyatı ve limit kontrollerini doğrudan gönder ve onayla ekranlarında göstermek için bunu seçin." }, - "showCustomNetworkList": { - "message": "Özel Ağ Listesini Göster" - }, - "showCustomNetworkListDescription": { - "message": "Yeni bir ağ eklerken önceden doldurulan bilgilerle ağ listesini görüntülenmesi için bunu seçin." - }, "showFiatConversionInTestnets": { "message": "Test ağlarında Dönüşümü göster" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 3c042f4e3..04e631801 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "Chọn tùy chọn này để hiển thị các quyền kiểm soát giá gas và giới hạn ngay trên màn hình gửi và xác nhận." }, - "showCustomNetworkList": { - "message": "Hiển thị danh sách mạng tùy chỉnh" - }, - "showCustomNetworkListDescription": { - "message": "Chọn tùy chọn này để hiển thị danh sách các mạng có thông tin được điền sẵn khi thêm mạng mới." - }, "showFiatConversionInTestnets": { "message": "Hiển thị tỷ lệ quy đổi trên các mạng thử nghiệm" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 472f3ec96..89ec54068 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3104,12 +3104,6 @@ "showAdvancedGasInlineDescription": { "message": "选择此项可直接在发送和确认界面显示燃料价格和上限控制。" }, - "showCustomNetworkList": { - "message": "显示自定义网络列表" - }, - "showCustomNetworkListDescription": { - "message": "选择此项，在添加新网络时就会显示附有预填详细信息的网络列表。" - }, "showFiatConversionInTestnets": { "message": "在测试网络上显示转换" }, diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index 520f49179..e2bb9045c 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -69,7 +69,6 @@ export default class PreferencesController { ? LEDGER_TRANSPORT_TYPES.WEBHID : LEDGER_TRANSPORT_TYPES.U2F, theme: 'light', - customNetworkListEnabled: false, ...opts.initState, }; @@ -188,17 +187,6 @@ export default class PreferencesController { this.store.updateState({ theme: val }); } - /** - * Setter for the `customNetworkListEnabled` property - * - * @param customNetworkListEnabled - */ - setCustomNetworkListEnabled(customNetworkListEnabled) { - this.store.updateState({ - customNetworkListEnabled, - }); - } - /** * Add new methodData to state, to avoid requesting this information again through Infura * diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index b5d3c259a..67380cb6c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1647,10 +1647,6 @@ export default class MetamaskController extends EventEmitter { preferencesController, ), setTheme: preferencesController.setTheme.bind(preferencesController), - setCustomNetworkListEnabled: - preferencesController.setCustomNetworkListEnabled.bind( - preferencesController, - ), // AssetsContractController getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this), diff --git a/test/e2e/fixtures/address-entry/state.json b/test/e2e/fixtures/address-entry/state.json index ac1a8ebe5..6cfdc82e6 100644 --- a/test/e2e/fixtures/address-entry/state.json +++ b/test/e2e/fixtures/address-entry/state.json @@ -76,9 +76,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/connected-state/state.json b/test/e2e/fixtures/connected-state/state.json index d2d00fb4a..4eebbb241 100644 --- a/test/e2e/fixtures/connected-state/state.json +++ b/test/e2e/fixtures/connected-state/state.json @@ -66,9 +66,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/custom-rpc/state.json b/test/e2e/fixtures/custom-rpc/state.json index 0019533a1..ef85b1d44 100644 --- a/test/e2e/fixtures/custom-rpc/state.json +++ b/test/e2e/fixtures/custom-rpc/state.json @@ -62,9 +62,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/custom-token/state.json b/test/e2e/fixtures/custom-token/state.json index 50dc7d9b0..c04eee9d4 100644 --- a/test/e2e/fixtures/custom-token/state.json +++ b/test/e2e/fixtures/custom-token/state.json @@ -78,9 +78,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/eip-1559-v2-dapp/state.json b/test/e2e/fixtures/eip-1559-v2-dapp/state.json index 5c6d28bed..4a2effda3 100644 --- a/test/e2e/fixtures/eip-1559-v2-dapp/state.json +++ b/test/e2e/fixtures/eip-1559-v2-dapp/state.json @@ -63,9 +63,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/eip-1559-v2/state.json b/test/e2e/fixtures/eip-1559-v2/state.json index c39d6bfdc..1777bbf9f 100644 --- a/test/e2e/fixtures/eip-1559-v2/state.json +++ b/test/e2e/fixtures/eip-1559-v2/state.json @@ -63,9 +63,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/import-ui/state.json b/test/e2e/fixtures/import-ui/state.json index 9de1f31ff..a055509ce 100644 --- a/test/e2e/fixtures/import-ui/state.json +++ b/test/e2e/fixtures/import-ui/state.json @@ -117,9 +117,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json index 260316da3..ebe94144b 100644 --- a/test/e2e/fixtures/imported-account/state.json +++ b/test/e2e/fixtures/imported-account/state.json @@ -62,9 +62,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/localization/state.json b/test/e2e/fixtures/localization/state.json index 632f3d6f1..d4c04bb0e 100644 --- a/test/e2e/fixtures/localization/state.json +++ b/test/e2e/fixtures/localization/state.json @@ -62,9 +62,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/metrics-enabled/state.json b/test/e2e/fixtures/metrics-enabled/state.json index 22f160220..bf8dae606 100644 --- a/test/e2e/fixtures/metrics-enabled/state.json +++ b/test/e2e/fixtures/metrics-enabled/state.json @@ -66,9 +66,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json index 6549e2de8..ab741e601 100644 --- a/test/e2e/fixtures/navigate-transactions/state.json +++ b/test/e2e/fixtures/navigate-transactions/state.json @@ -62,9 +62,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/onboarding/state.json b/test/e2e/fixtures/onboarding/state.json index 9bd17bc72..42b51a422 100644 --- a/test/e2e/fixtures/onboarding/state.json +++ b/test/e2e/fixtures/onboarding/state.json @@ -37,9 +37,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/send-edit-v2/state.json b/test/e2e/fixtures/send-edit-v2/state.json index c5ec33d51..76d21936f 100644 --- a/test/e2e/fixtures/send-edit-v2/state.json +++ b/test/e2e/fixtures/send-edit-v2/state.json @@ -63,9 +63,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/send-edit/state.json b/test/e2e/fixtures/send-edit/state.json index 14795e55e..0e17eb4a9 100644 --- a/test/e2e/fixtures/send-edit/state.json +++ b/test/e2e/fixtures/send-edit/state.json @@ -63,9 +63,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/special-settings/state.json b/test/e2e/fixtures/special-settings/state.json index f4fa15647..64e2d023e 100644 --- a/test/e2e/fixtures/special-settings/state.json +++ b/test/e2e/fixtures/special-settings/state.json @@ -62,9 +62,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/fixtures/threebox-enabled/state.json b/test/e2e/fixtures/threebox-enabled/state.json index ea1ab3b37..7b9027fcc 100644 --- a/test/e2e/fixtures/threebox-enabled/state.json +++ b/test/e2e/fixtures/threebox-enabled/state.json @@ -73,9 +73,6 @@ "12": { "isShown": true }, - "13": { - "isShown": true - }, "14": { "isShown": true }, diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js index 9907090d7..908fc2ad5 100644 --- a/test/e2e/tests/custom-rpc-history.spec.js +++ b/test/e2e/tests/custom-rpc-history.spec.js @@ -35,7 +35,14 @@ describe('Stores custom RPC history', function () { await driver.clickElement({ text: 'Add network', tag: 'button' }); - await driver.findElement('.networks-tab__sub-header-text'); + await driver.findElement('.add-network__networks-container'); + + await driver.clickElement({ + text: 'Add a network manually', + tag: 'h6', + }); + + await driver.findElement('.networks-tab__subheader'); const customRpcInputs = await driver.findElements('input[type="text"]'); const networkNameInput = customRpcInputs[1]; @@ -85,7 +92,14 @@ describe('Stores custom RPC history', function () { await driver.clickElement({ text: 'Add network', tag: 'button' }); - await driver.findElement('.networks-tab__sub-header-text'); + await driver.findElement('.add-network__networks-container'); + + await driver.clickElement({ + text: 'Add a network manually', + tag: 'h6', + }); + + await driver.findElement('.networks-tab__subheader'); const customRpcInputs = await driver.findElements('input[type="text"]'); const rpcUrlInput = customRpcInputs[2]; @@ -123,7 +137,14 @@ describe('Stores custom RPC history', function () { await driver.clickElement({ text: 'Add network', tag: 'button' }); - await driver.findElement('.networks-tab__sub-header-text'); + await driver.findElement('.add-network__networks-container'); + + await driver.clickElement({ + text: 'Add a network manually', + tag: 'h6', + }); + + await driver.findElement('.networks-tab__subheader'); const customRpcInputs = await driver.findElements('input[type="text"]'); const rpcUrlInput = customRpcInputs[2]; @@ -215,7 +236,13 @@ describe('Stores custom RPC history', function () { await driver.clickElement({ text: 'Add network', tag: 'button' }); - await driver.findVisibleElement('.settings-page__content'); + await driver.findElement('.add-network__networks-container'); + + await driver.clickElement({ + text: 'Add a network manually', + tag: 'h6', + }); + // // cancel new custom rpc await driver.clickElement( '.networks-tab__add-network-form-footer button.btn-secondary', diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js index b4ab5f448..ec457a3a1 100644 --- a/ui/components/app/add-network/add-network.js +++ b/ui/components/app/add-network/add-network.js @@ -258,6 +258,7 @@ const AddNetwork = () => { >