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.

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

Miscellaneous bitFlyer fixes (uplift to 1.24.x) #8710

Merged
merged 1 commit into from
May 7, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented May 5, 2021

Uplift of #8618 and #8700

Resolves brave/brave-browser#15424
Resolves brave/brave-browser#15420
Resolves brave/brave-browser#15426
Resolves brave/brave-browser#15427
Resolves brave/brave-browser#15549

Notes:

  • This PR also contains some required changes to components/brave_rewards/resources/shared/lib/locale_context.ts that were introduced in 1.25.x

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.

Required Translations

The following translations in Japanese are required for this uplift:

  • components/resources/brave_components_strings.grd
    • IDS_BRAVE_REWARDS_ONBOARDING_PANEL_BITFLYER_LEARN_MORE
  • components/brave_rewards/resources/extension/../messages.json
    • onboardingPanelBitflyerLearnMore

@brave-builds brave-builds requested a review from a team May 5, 2021 13:59
@brave-builds brave-builds self-assigned this May 5, 2021
@brave-builds brave-builds added this to the 1.24.x - Release #2 milestone May 5, 2021
@zenparsing zenparsing force-pushed the pr8618_ksmith-bitflyer-fixes_1.24.x branch from 8a79f33 to dce5712 Compare May 5, 2021 14:10
@kjozwiak
Copy link
Member

kjozwiak commented May 6, 2021

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr8618_ksmith-bitflyer-fixes_1.24.x-macos/3/testReport/. However, these are known intermittent issues and unrelated to this specific PR.

macos-x64 / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion062WithRewardsEnabled_ForSupportedLocale_ForNewlySupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
macos-x64 / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion062WithRewardsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
macos-x64 / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion070WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled
macos-x64 / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion072WithRewardsAndAdsEnabled_ForSupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeEnabled

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.24.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8618 (comment) & #8700 (comment).

@kjozwiak kjozwiak merged commit a24363a into 1.24.x May 7, 2021
@kjozwiak kjozwiak deleted the pr8618_ksmith-bitflyer-fixes_1.24.x branch May 7, 2021 04:15
kylehickinson pushed a commit that referenced this pull request Jan 29, 2024
* Move filters sheet modifier to outside of Portfolio `ScrollView` for Portfolio Assets list. Reduce nested `LazyVStack`s where not necessary.

* Move filters sheet modifier to outside of Portfolio `ScrollView` for Portfolio NFTs list.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants