From 3c8f8859ac59cd4b7a8bc0b876df0cdce1be7a36 Mon Sep 17 00:00:00 2001 From: William Muli <48117473+muliswilliam@users.noreply.github.com> Date: Mon, 1 May 2023 07:34:41 +0300 Subject: [PATCH] fix(wallet): Hide network icon in NFT Details (#18296) Hide network icon commit c98ff5ea7f8a7f1d09fdb8750d9d16da4a910da2 Author: brave-builds Date: Fri Apr 28 08:29:10 2023 +0000 1.51.107 commit ce813ef07247d9ce8fdf863deadb6e5fa3049c82 Author: Max <41635752+mkarolin@users.noreply.github.com> Date: Fri Apr 28 04:25:41 2023 -0400 Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 (1.51.x). (#18269) * Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 * Upgrade patches from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 * Update pins list timestamp * Temporarily disables WindowClosingConfirmBrowserTest.TestWithDownload on MacOS. The test fails because in Chromium Private/Incognito profiles now ignore the "Ask for download location" setting and always prompt for the location. We will fix that in https://github.com/brave/brave-browser/issues/29823, but until then let's disable this test on MacOS. --------- Co-authored-by: brave-builds commit b18aeaef3d6dd7b8dceb37bc0bce103b36098d64 Author: brave-builds <45370463+brave-builds@users.noreply.github.com> Date: Fri Apr 28 10:15:10 2023 +0200 Disable site affiliation fetcher (uplift to 1.51.x) (#18286) Uplift of #18153 (squashed) to release commit 6b1db5814f0e630688751a5f2bdbc35836eb0772 Author: brave-builds <45370463+brave-builds@users.noreply.github.com> Date: Fri Apr 28 09:47:20 2023 +0200 Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) (#18228) Uplift of #18172 (squashed) to beta commit f7f8042925e5eb70d9a2696cf759386af9562173 Author: brave-builds <45370463+brave-builds@users.noreply.github.com> Date: Fri Apr 28 09:42:41 2023 +0200 Send kUAModel and kUAPlatformVersion CHs when requested. (uplift to 1.51.x) (#18263) Uplift of #18154 (squashed) to beta commit 545fa57639d87f86fecfd58a7d5a9334dcb4355e Author: Max <41635752+mkarolin@users.noreply.github.com> Date: Fri Apr 28 03:07:51 2023 -0400 Don't call GetSessionRoute() when media router is disabled (#18245) (1.51.x). (#18264) Don't call GetSessionRoute() when media router is disabled (#18245) Otherwise, it would end in reaching NOTREACHED() Co-authored-by: Sangwoo Ko commit 0fbe5925dec95b65d33c14baba112017e34580d6 Author: Arthur Edelstein Date: Thu Apr 27 17:44:23 2023 -0700 Uplift HTTPS First Mode v2 Migration (#17856) and HTTP error code fallback (#18141) (#18179) * Migrate to HttpsFirstMode v2 (#17856) Migrate HTTPS by Default feature to use HttpsFirstMode v2 * Force HTTPS Upgrader to fall back to HTTP if we have an HTTP error code (#18141) commit e369d7190663d9aaafcfa89c613f278840bcb4bd Author: Aleksey Khoroshilov <5928869+goodov@users.noreply.github.com> Date: Fri Apr 28 03:34:51 2023 +0700 Disable flaky upstream tests. (Uplift to 1.51.x) (#18274) Update nft-details.tsx --- .../brave_wallet_ui/nft/components/nft-details/nft-details.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/brave_wallet_ui/nft/components/nft-details/nft-details.tsx b/components/brave_wallet_ui/nft/components/nft-details/nft-details.tsx index f5178919f833..ffb2f69f5ad3 100644 --- a/components/brave_wallet_ui/nft/components/nft-details/nft-details.tsx +++ b/components/brave_wallet_ui/nft/components/nft-details/nft-details.tsx @@ -51,7 +51,6 @@ import { } from './nft-details-styles' import { NftMultimedia } from '../nft-multimedia/nft-multimedia' import { MultimediaWrapper } from '../nft-content/nft-content-styles' -import { CreateNetworkIcon } from '../../../components/shared' import { Row } from '../../../components/shared/style' import CopyTooltip from '../../../components/shared/copy-tooltip/copy-tooltip' import { NftPinningStatus } from '../../../components/desktop/nft-pinning-status/nft-pinning-status' @@ -109,7 +108,6 @@ export const NftDetails = ({ selectedAsset, nftMetadata, nftMetadataError, {selectedAsset.isErc721 && - ERC-721 }