diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index d824f8cc942..40f6ca896d6 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -811,6 +811,12 @@ Or change later at $2brave://settings/ext IPFS + + Web3 + + + Web3 Domains + Learn more about IPFS and privacy diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp index bb1a74f5b23..82921e371eb 100644 --- a/app/brave_settings_strings.grdp +++ b/app/brave_settings_strings.grdp @@ -876,7 +876,7 @@ The number of minutes to wait until the Brave Wallet is automatically locked - Networks + Wallet Networks Clear wallet transaction and nonce information diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts index e510d087e8d..c0ca5a1d0e7 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.ts @@ -1,7 +1,7 @@ // Copyright (c) 2022 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at https://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. import {sendWithPromise} from 'chrome://resources/js/cr.m.js' import {loadTimeData} from '../i18n_setup.js'; @@ -15,10 +15,6 @@ export interface BraveDefaultExtensionsBrowserProxy { getRestartNeeded(): Promise wasSignInEnabledAtStartup(): boolean isMediaRouterEnabled(): boolean - getDecentralizedDnsResolveMethodList(): Promise // TODO(petemill): Define type - getEnsOffchainResolveMethodList(): Promise // TODO(petemill): Define type - isENSL2Enabled(): boolean - isSnsEnabled(): boolean } export class BraveDefaultExtensionsBrowserProxyImpl implements BraveDefaultExtensionsBrowserProxy { @@ -54,22 +50,6 @@ export class BraveDefaultExtensionsBrowserProxyImpl implements BraveDefaultExten return loadTimeData.getBoolean('isMediaRouterEnabled') } - getDecentralizedDnsResolveMethodList() { - return sendWithPromise('getDecentralizedDnsResolveMethodList') - } - - getEnsOffchainResolveMethodList() { - return sendWithPromise('getEnsOffchainResolveMethodList') - } - - isENSL2Enabled() { - return loadTimeData.getBoolean('isENSL2Enabled') - } - - isSnsEnabled() { - return loadTimeData.getBoolean('isSnsEnabled') - } - static getInstance(): BraveDefaultExtensionsBrowserProxy { return instance || (instance = new BraveDefaultExtensionsBrowserProxyImpl()) } diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html index 2ab37329190..36da14df890 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html @@ -84,40 +84,6 @@ -
-
-
$i18n{resolveUnstoppableDomainsDesc}
-
$i18nRaw{resolveUnstoppableDomainsSubDesc}
-
- -
-
-
$i18n{resolveENSDesc}
- -
- - { this.showRestartToast_ = needsRestart }) - this.browserProxy_.getRestartNeeded().then(show => { this.showRestartToast_ = show }) - this.browserProxy_.getDecentralizedDnsResolveMethodList().then(list => { - this.resolveMethod_ = list - }) - this.browserProxy_.getEnsOffchainResolveMethodList().then(list => { - this.ensOffchainResolveMethod_ = list - }) // PrefControlMixin checks for a pref being valid, so have to fake it, // same as upstream. @@ -137,12 +116,6 @@ export class SettingBraveDefaultExtensionsPageElement extends SettingBraveDefaul shouldShowRestartForMediaRouter_(value: boolean) { return this.browserProxy_.isMediaRouterEnabled() != value } - - computeShowEnsOffchainLookupRow_() { - if (!this.browserProxy_.isENSL2Enabled()) - return false - return !!this.prefs && this.getPref('brave.ens.resolve_method').value === 3 - } } customElements.define( diff --git a/browser/resources/settings/brave_icons.html b/browser/resources/settings/brave_icons.html index e7441f720c1..a0b6ee225a4 100644 --- a/browser/resources/settings/brave_icons.html +++ b/browser/resources/settings/brave_icons.html @@ -113,15 +113,6 @@ them to chrome://resources and having a common "icons" html - - - - - - - - diff --git a/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html b/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html index 7ed39fa312f..04b6ab24264 100644 --- a/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html +++ b/browser/resources/settings/brave_ipfs_page/brave_ipfs_page.html @@ -110,7 +110,7 @@ role-description="$i18n{subpageArrowRoleDescription}"> -