Update rewards panel onboarding
This commit fixes https://github.com/brave/brave-browser/issues/11113
This commit is contained in:
@@ -400,8 +400,7 @@ public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClic
|
||||
showShieldsMenu(mBraveShieldsButton);
|
||||
} else if (mBraveRewardsButton == v && mBraveRewardsButton != null) {
|
||||
Context context = getContext();
|
||||
if ((PackageUtils.isFirstInstall(context)
|
||||
|| (!PackageUtils.isFirstInstall(context) && !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedRegularProfile())))
|
||||
if ((checkForRewards())
|
||||
&& !OnboardingPrefManager.getInstance().isOnboardingShown()) {
|
||||
OnboardingPrefManager.getInstance().showOnboarding(context);
|
||||
} else {
|
||||
@@ -422,6 +421,11 @@ public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClic
|
||||
}
|
||||
}
|
||||
|
||||
private boolean checkForRewards() {
|
||||
return (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) && !BravePrefServiceBridge.getInstance().getBoolean(BravePref.BRAVE_REWARDS_ENABLED))
|
||||
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedRegularProfile());
|
||||
}
|
||||
|
||||
private void showShieldsMenu(View mBraveShieldsButton) {
|
||||
Tab currentTab = getToolbarDataProvider().getTab();
|
||||
if (currentTab == null) {
|
||||
@@ -851,11 +855,11 @@ public abstract class BraveToolbarLayout extends ToolbarLayout implements OnClic
|
||||
updateModernLocationBarColor(mCurrentToolbarColor);
|
||||
}
|
||||
|
||||
@Override
|
||||
View getMenuButtonWrapper() {
|
||||
if (this instanceof ToolbarPhone && BottomToolbarVariationManager.isMenuButtonOnBottom()) {
|
||||
return null;
|
||||
}
|
||||
return super.getMenuButtonWrapper();
|
||||
@Override
|
||||
View getMenuButtonWrapper() {
|
||||
if (this instanceof ToolbarPhone && BottomToolbarVariationManager.isMenuButtonOnBottom()) {
|
||||
return null;
|
||||
}
|
||||
return super.getMenuButtonWrapper();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user