Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) #18228

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) #18228

merged 1 commit into from
Apr 28, 2023

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 25, 2023 •
edited by kjozwiak
Loading

Uplift of #18172
Resolves brave/brave-browser#29853

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team as a code owner April 25, 2023 15:44
@brave-builds brave-builds self-assigned this Apr 25, 2023
@brave-builds brave-builds added this to the 1.51.x - Beta milestone Apr 25, 2023
@github-actions github-actions bot added the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label Apr 25, 2023
@kjozwiak kjozwiak mentioned this pull request Apr 25, 2023
Closed
kjozwiak
kjozwiak approved these changes Apr 28, 2023
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.51.x approved 👍 QA has verified the PR on Nightly as per #18172 (comment).

@kjozwiak kjozwiak merged commit 6b1db58 into 1.51.x Apr 28, 2023
@kjozwiak kjozwiak deleted the pr18172_brave_29853_1.51.x branch April 28, 2023 07:47
muliswilliam added a commit that referenced this pull request Apr 28, 2023
@muliswilliam
Hide network icon
9435d74 
commit c98ff5e
Author: brave-builds <[email protected]>
Date:   Fri Apr 28 08:29:10 2023 +0000

    1.51.107

commit ce813ef
Author: Max <[email protected]>
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 brave/brave-browser#29823,
    but until then let's disable this test on MacOS.

    ---------

    Co-authored-by: brave-builds <[email protected]>

commit b18aeae
Author: brave-builds <[email protected]>
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 6b1db58
Author: brave-builds <[email protected]>
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 f7f8042
Author: brave-builds <[email protected]>
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 545fa57
Author: Max <[email protected]>
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 <[email protected]>

commit 0fbe592
Author: Arthur Edelstein <[email protected]>
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 e369d71
Author: Aleksey Khoroshilov <[email protected]>
Date:   Fri Apr 28 03:34:51 2023 +0700

    Disable flaky upstream tests. (Uplift to 1.51.x) (#18274)

Update nft-details.tsx
kjozwiak pushed a commit that referenced this pull request May 1, 2023
@muliswilliam
fix(wallet): Hide network icon in NFT Details (#18296)
3c8f885 
Hide network icon

commit c98ff5e
Author: brave-builds <[email protected]>
Date:   Fri Apr 28 08:29:10 2023 +0000

    1.51.107

commit ce813ef
Author: Max <[email protected]>
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 brave/brave-browser#29823,
    but until then let's disable this test on MacOS.

    ---------

    Co-authored-by: brave-builds <[email protected]>

commit b18aeae
Author: brave-builds <[email protected]>
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 6b1db58
Author: brave-builds <[email protected]>
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 f7f8042
Author: brave-builds <[email protected]>
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 545fa57
Author: Max <[email protected]>
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 <[email protected]>

commit 0fbe592
Author: Arthur Edelstein <[email protected]>
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 e369d71
Author: Aleksey Khoroshilov <[email protected]>
Date:   Fri Apr 28 03:34:51 2023 +0700

    Disable flaky upstream tests. (Uplift to 1.51.x) (#18274)

Update nft-details.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.51.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@brave-builds @kjozwiak