From 05a2dee456a7c9682edbf0183907716fe122048d Mon Sep 17 00:00:00 2001 From: Szilard Szaloki Date: Tue, 17 Oct 2023 12:47:25 -0500 Subject: [PATCH] Removes the ZebPay-specific userdrain tooltip. --- .../browser/BraveRewardsNativeWorker.java | 8 --- .../android/brave_rewards_native_worker.cc | 8 --- .../android/brave_rewards_native_worker.h | 2 - browser/extensions/api/brave_rewards_api.cc | 11 ---- browser/extensions/api/brave_rewards_api.h | 9 ---- .../webui/brave_rewards/rewards_panel_ui.cc | 1 - browser/ui/webui/brave_rewards_page_ui.cc | 15 ------ browser/ui/webui/brave_webui_source.cc | 2 - common/extensions/api/brave_rewards.json | 17 ------ .../brave_new_tab_ui/api/initialData.ts | 5 -- .../components/default/rewards/index.tsx | 2 - .../reducers/rewards_reducer.ts | 1 - .../storage/new_tab_storage.ts | 1 - .../brave_rewards/browser/rewards_service.h | 3 -- .../browser/rewards_service_impl.cc | 16 +++--- .../browser/rewards_service_impl.h | 2 - .../resources/page/actions/rewards_actions.ts | 5 -- .../resources/page/actions/rewards_types.ts | 2 - .../resources/page/brave_rewards_page.tsx | 5 -- .../resources/page/components/pageWallet.tsx | 2 - .../resources/page/components/settings.tsx | 1 - .../brave_rewards/resources/page/lib/types.ts | 1 - .../resources/page/reducers/default_state.ts | 1 - .../page/reducers/rewards_reducer.ts | 9 ---- .../resources/page/reducers/state_cache.ts | 1 - .../resources/page/stories/redux_state.ts | 1 - .../rewards_panel/components/panel.tsx | 3 -- .../lib/extension_api_adapter.ts | 8 --- .../rewards_panel/lib/extension_host.ts | 3 -- .../rewards_panel/lib/initial_state.ts | 1 - .../resources/rewards_panel/lib/interfaces.ts | 1 - .../resources/rewards_panel/stories/index.tsx | 1 - .../components/newtab/rewards_card.style.ts | 54 ------------------- .../shared/components/newtab/rewards_card.tsx | 17 ------ .../components/newtab/stories/index.tsx | 1 - .../newtab/stories/locale_strings.ts | 1 - .../components/wallet_card/stories/index.tsx | 1 - .../wallet_card/stories/locale_strings.ts | 1 - .../wallet_card/wallet_card.style.ts | 50 ----------------- .../components/wallet_card/wallet_card.tsx | 17 +----- components/definitions/chromel.d.ts | 1 - components/definitions/newTab.d.ts | 1 - components/resources/rewards_strings.grdp | 3 -- 43 files changed, 7 insertions(+), 288 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index 11855fe1df2..4b68b4a9d85 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -211,13 +211,6 @@ public class BraveRewardsNativeWorker { } } - public boolean isGrandfatheredUser() { - synchronized (lock) { - return BraveRewardsNativeWorkerJni.get().isGrandfatheredUser( - mNativeBraveRewardsNativeWorker); - } - } - public void fetchBalance() { synchronized (lock) { BraveRewardsNativeWorkerJni.get().fetchBalance(mNativeBraveRewardsNativeWorker); @@ -850,7 +843,6 @@ public class BraveRewardsNativeWorker { void getRewardsParameters(long nativeBraveRewardsNativeWorker); double getVbatDeadline(long nativeBraveRewardsNativeWorker); void getUserType(long nativeBraveRewardsNativeWorker); - boolean isGrandfatheredUser(long nativeBraveRewardsNativeWorker); void fetchBalance(long nativeBraveRewardsNativeWorker); void setAutoContributeEnabled( long nativeBraveRewardsNativeWorker, boolean isSetAutoContributeEnabled); diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index 363273b97a4..f5879ce73b6 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -187,14 +187,6 @@ void BraveRewardsNativeWorker::OnGetUserType( static_cast(user_type)); } -bool BraveRewardsNativeWorker::IsGrandfatheredUser(JNIEnv* env) { - bool is_grandfathered_user = false; - if (brave_rewards_service_) { - is_grandfathered_user = brave_rewards_service_->IsGrandfatheredUser(); - } - return is_grandfathered_user; -} - void BraveRewardsNativeWorker::FetchBalance(JNIEnv* env) { if (brave_rewards_service_) { brave_rewards_service_->FetchBalance(base::BindOnce( diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.h b/browser/brave_rewards/android/brave_rewards_native_worker.h index 1a6f0df498e..627766c7cfe 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.h +++ b/browser/brave_rewards/android/brave_rewards_native_worker.h @@ -63,8 +63,6 @@ class BraveRewardsNativeWorker void GetUserType(JNIEnv* env); - bool IsGrandfatheredUser(JNIEnv* env); - void FetchBalance(JNIEnv* env); void GetPublisherInfo(JNIEnv* env, diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index 2bc9f0c2bce..99686df60a7 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -755,17 +755,6 @@ BraveRewardsGetDeclaredCountryFunction::Run() { return RespondNow(WithArguments(std::move(country))); } -BraveRewardsIsGrandfatheredUserFunction:: - ~BraveRewardsIsGrandfatheredUserFunction() = default; - -ExtensionFunction::ResponseAction -BraveRewardsIsGrandfatheredUserFunction::Run() { - auto* profile = Profile::FromBrowserContext(browser_context()); - auto* rewards_service = RewardsServiceFactory::GetForProfile(profile); - return RespondNow(WithArguments( - rewards_service ? rewards_service->IsGrandfatheredUser() : false)); -} - BraveRewardsGetUserTypeFunction::~BraveRewardsGetUserTypeFunction() = default; ExtensionFunction::ResponseAction BraveRewardsGetUserTypeFunction::Run() { diff --git a/browser/extensions/api/brave_rewards_api.h b/browser/extensions/api/brave_rewards_api.h index 22f5e07fec4..41e3da7e59d 100644 --- a/browser/extensions/api/brave_rewards_api.h +++ b/browser/extensions/api/brave_rewards_api.h @@ -249,15 +249,6 @@ class BraveRewardsGetDeclaredCountryFunction : public ExtensionFunction { ResponseAction Run() override; }; -class BraveRewardsIsGrandfatheredUserFunction : public ExtensionFunction { - public: - DECLARE_EXTENSION_FUNCTION("braveRewards.isGrandfatheredUser", UNKNOWN) - - protected: - ~BraveRewardsIsGrandfatheredUserFunction() override; - ResponseAction Run() override; -}; - class BraveRewardsGetUserTypeFunction : public ExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("braveRewards.getUserType", UNKNOWN) diff --git a/browser/ui/webui/brave_rewards/rewards_panel_ui.cc b/browser/ui/webui/brave_rewards/rewards_panel_ui.cc index c6d443d17cc..8a9d96c1d97 100644 --- a/browser/ui/webui/brave_rewards/rewards_panel_ui.cc +++ b/browser/ui/webui/brave_rewards/rewards_panel_ui.cc @@ -153,7 +153,6 @@ static constexpr webui::LocalizedString kStrings[] = { {"verifiedCreator", IDS_REWARDS_PANEL_VERIFIED_CREATOR}, {"walletAccountLink", IDS_REWARDS_WALLET_ACCOUNT_LINK}, {"walletAutoContribute", IDS_REWARDS_WALLET_AUTO_CONTRIBUTE}, - {"walletBalanceInfoText", IDS_REWARDS_WIDGET_BALANCE_INFO_TEXT}, {"walletBalanceTitle", IDS_REWARDS_WALLET_BALANCE_TITLE}, {"walletDisconnected", IDS_REWARDS_WALLET_DISCONNECTED}, {"walletEarningInfoText", IDS_REWARDS_WIDGET_EARNING_INFO_TEXT}, diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc index a72dbde24d8..b34adf13ddd 100644 --- a/browser/ui/webui/brave_rewards_page_ui.cc +++ b/browser/ui/webui/brave_rewards_page_ui.cc @@ -109,7 +109,6 @@ class RewardsDOMHandler private: void RestartBrowser(const base::Value::List& args); void IsInitialized(const base::Value::List& args); - void IsGrandfatheredUser(const base::Value::List& args); void GetUserType(const base::Value::List& args); void OnGetUserType(brave_rewards::mojom::UserType user_type); void GetRewardsParameters(const base::Value::List& args); @@ -331,10 +330,6 @@ void RewardsDOMHandler::RegisterMessages() { "brave_rewards.isInitialized", base::BindRepeating(&RewardsDOMHandler::IsInitialized, base::Unretained(this))); - web_ui()->RegisterMessageCallback( - "brave_rewards.isGrandfatheredUser", - base::BindRepeating(&RewardsDOMHandler::IsGrandfatheredUser, - base::Unretained(this))); web_ui()->RegisterMessageCallback( "brave_rewards.getUserType", base::BindRepeating(&RewardsDOMHandler::GetUserType, @@ -613,16 +608,6 @@ void RewardsDOMHandler::IsInitialized(const base::Value::List& args) { } } -void RewardsDOMHandler::IsGrandfatheredUser(const base::Value::List&) { - if (!rewards_service_) { - return; - } - - AllowJavascript(); - CallJavascriptFunction("brave_rewards.onIsGrandfatheredUser", - base::Value(rewards_service_->IsGrandfatheredUser())); -} - void RewardsDOMHandler::GetUserType(const base::Value::List&) { if (!IsJavascriptAllowed() || !rewards_service_) { return; diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index 44582dc4e7e..3a62ec08d5c 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -309,7 +309,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "rewardsAboutRewards", IDS_REWARDS_WIDGET_ABOUT_REWARDS }, { "rewardsAdGrantAmount", IDS_REWARDS_WIDGET_AD_GRANT_AMOUNT }, { "rewardsAdGrantTitle", IDS_REWARDS_WIDGET_AD_GRANT_TITLE }, - { "rewardsBalanceInfoText", IDS_REWARDS_WIDGET_BALANCE_INFO_TEXT }, { "rewardsBraveRewards", IDS_REWARDS_WIDGET_BRAVE_REWARDS }, { "rewardsClaimRewards", IDS_REWARDS_WIDGET_CLAIM_REWARDS }, { "rewardsClaimTokens", IDS_REWARDS_WIDGET_CLAIM_TOKENS }, @@ -648,7 +647,6 @@ void CustomizeWebUIHTMLSource(content::WebUI* web_ui, { "walletUnverified", IDS_REWARDS_WALLET_UNVERIFIED }, { "walletViewStatement", IDS_REWARDS_WALLET_VIEW_STATEMENT }, { "walletVerified", IDS_REWARDS_WALLET_VERIFIED }, - { "walletBalanceInfoText", IDS_REWARDS_WIDGET_BALANCE_INFO_TEXT}, { "walletBalanceTitle", IDS_REWARDS_WALLET_BALANCE_TITLE }, { "walletEarningInfoText", IDS_REWARDS_WIDGET_EARNING_INFO_TEXT }, diff --git a/common/extensions/api/brave_rewards.json b/common/extensions/api/brave_rewards.json index 3b656aeb6f7..be121399abc 100644 --- a/common/extensions/api/brave_rewards.json +++ b/common/extensions/api/brave_rewards.json @@ -833,23 +833,6 @@ } ] }, - { - "name": "isGrandfatheredUser", - "type": "function", - "description": "Returns if the user is grandfathered", - "parameters": [ - { - "name": "callback", - "type": "function", - "parameters": [ - { - "name": "isGrandfatheredUser", - "type": "boolean" - } - ] - } - ] - }, { "name": "getUserType", "type": "function", diff --git a/components/brave_new_tab_ui/api/initialData.ts b/components/brave_new_tab_ui/api/initialData.ts index a8496913e8d..f8228a8c385 100644 --- a/components/brave_new_tab_ui/api/initialData.ts +++ b/components/brave_new_tab_ui/api/initialData.ts @@ -24,7 +24,6 @@ export type InitialData = { export type PreInitialRewardsData = { rewardsEnabled: boolean - isGrandfatheredUser: boolean userType: string isUnsupportedRegion: boolean declaredCountry: string @@ -106,7 +105,6 @@ export async function getInitialData (): Promise { export async function getRewardsPreInitialData (): Promise { const [ rewardsEnabled, - isGrandfatheredUser, userType, isUnsupportedRegion, declaredCountry, @@ -114,8 +112,6 @@ export async function getRewardsPreInitialData (): Promise( (resolve) => chrome.braveRewards.getRewardsEnabled(resolve)), - new Promise( - (resolve) => chrome.braveRewards.isGrandfatheredUser(resolve)), new Promise( (resolve) => chrome.braveRewards.getUserType(resolve)), new Promise( @@ -129,7 +125,6 @@ export async function getRewardsPreInitialData (): Promise { return ( = (state: NewTab.State, rewardsState: { ...state.rewardsState, rewardsEnabled: preInitialRewardsDataPayload.rewardsEnabled, - isGrandfatheredUser: preInitialRewardsDataPayload.isGrandfatheredUser, userType: preInitialRewardsDataPayload.userType, isUnsupportedRegion: preInitialRewardsDataPayload.isUnsupportedRegion, declaredCountry: preInitialRewardsDataPayload.declaredCountry, diff --git a/components/brave_new_tab_ui/storage/new_tab_storage.ts b/components/brave_new_tab_ui/storage/new_tab_storage.ts index 7052239d385..9f1c01cc7a7 100644 --- a/components/brave_new_tab_ui/storage/new_tab_storage.ts +++ b/components/brave_new_tab_ui/storage/new_tab_storage.ts @@ -63,7 +63,6 @@ export const defaultState: NewTab.State = { externalWalletProviders: [], dismissedNotifications: [], rewardsEnabled: false, - isGrandfatheredUser: false, userType: '', isUnsupportedRegion: false, declaredCountry: '', diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 74dc3f490a7..3fa7926aaf0 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -139,9 +139,6 @@ class RewardsService : public KeyedService { // Returns the country code associated with the user's Rewards profile. virtual std::string GetCountryCode() const = 0; - // Returns if the user is grandfathered. - virtual bool IsGrandfatheredUser() const = 0; - // Returns the Rewards user type for the current profile. virtual void GetUserType( base::OnceCallback callback) = 0; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 2d6227745d4..253706d9c6a 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -562,15 +562,6 @@ void RewardsServiceImpl::CreateRewardsWallet( StartEngineProcessIfNecessary(); } -bool RewardsServiceImpl::IsGrandfatheredUser() const { - base::Version version(profile_->GetPrefs()->GetString(prefs::kUserVersion)); - if (!version.IsValid()) { - version = base::Version({1}); - } - - return version.CompareTo(base::Version({2, 5})) < 0; -} - void RewardsServiceImpl::GetUserType( base::OnceCallback callback) { using mojom::UserType; @@ -595,8 +586,13 @@ void RewardsServiceImpl::GetUserType( } auto* prefs = self->profile_->GetPrefs(); + base::Version version(prefs->GetString(prefs::kUserVersion)); + if (!version.IsValid()) { + version = base::Version({1}); + } + if (!prefs->GetBoolean(prefs::kParametersVBatExpired) && - self->IsGrandfatheredUser()) { + version.CompareTo(base::Version({2, 5})) < 0) { std::move(callback).Run(UserType::kLegacyUnconnected); return; } diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 5fd1b72b152..2de50a42608 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -118,8 +118,6 @@ class RewardsServiceImpl : public RewardsService, void CreateRewardsWallet(const std::string& country, CreateRewardsWalletCallback callback) override; - bool IsGrandfatheredUser() const override; - void GetUserType(base::OnceCallback callback) override; std::string GetCountryCode() const override; diff --git a/components/brave_rewards/resources/page/actions/rewards_actions.ts b/components/brave_rewards/resources/page/actions/rewards_actions.ts index 9ac12f2eae8..7647f82be05 100644 --- a/components/brave_rewards/resources/page/actions/rewards_actions.ts +++ b/components/brave_rewards/resources/page/actions/rewards_actions.ts @@ -16,11 +16,6 @@ export const onSettingSave = (key: string, value: any, persist: boolean = true) persist }) -export const getIsGrandfatheredUser = () => action(types.GET_IS_GRANDFATHERED_USER) - -export const onIsGrandfatheredUser = (isGrandfatheredUser: boolean) => - action(types.ON_IS_GRANDFATHERED_USER, {isGrandfatheredUser}) - export const onUserType = (userType: number) => action(types.ON_USER_TYPE, { userType }) diff --git a/components/brave_rewards/resources/page/actions/rewards_types.ts b/components/brave_rewards/resources/page/actions/rewards_types.ts index be5f0164a1b..db38e47cec6 100644 --- a/components/brave_rewards/resources/page/actions/rewards_types.ts +++ b/components/brave_rewards/resources/page/actions/rewards_types.ts @@ -6,8 +6,6 @@ export const enum types { IS_INITIALIZED = '@@rewards/IS_INITIALIZED', ON_SETTING_SAVE = '@@rewards/ON_SETTING_SAVE', - GET_IS_GRANDFATHERED_USER = '@@rewards/GET_IS_GRANDFATHERED_USER', - ON_IS_GRANDFATHERED_USER = '@@rewards/ON_IS_GRANDFATHERED_USER', ON_USER_TYPE = '@@rewards/ON_USER_TYPE', GET_USER_TYPE = '@@rewards/GET_USER_TYPE', ON_REWARDS_PARAMETERS = '@@rewards/ON_REWARDS_PARAMETERS', diff --git a/components/brave_rewards/resources/page/brave_rewards_page.tsx b/components/brave_rewards/resources/page/brave_rewards_page.tsx index c23838e21dc..148484400cb 100644 --- a/components/brave_rewards/resources/page/brave_rewards_page.tsx +++ b/components/brave_rewards/resources/page/brave_rewards_page.tsx @@ -53,10 +53,6 @@ function initialize () { document.getElementById('root')) } -function onIsGrandfatheredUser (isGrandfatheredUser: boolean) { - actions.onIsGrandfatheredUser(isGrandfatheredUser) -} - function userType (userType: number) { actions.onUserType(userType) } @@ -261,7 +257,6 @@ function onIsUnsupportedRegion (isUnsupportedRegion: boolean) { Object.defineProperty(window, 'brave_rewards', { configurable: true, value: { - onIsGrandfatheredUser, userType, rewardsParameters, promotions, diff --git a/components/brave_rewards/resources/page/components/pageWallet.tsx b/components/brave_rewards/resources/page/components/pageWallet.tsx index 6925a197120..96069b01dda 100644 --- a/components/brave_rewards/resources/page/components/pageWallet.tsx +++ b/components/brave_rewards/resources/page/components/pageWallet.tsx @@ -519,7 +519,6 @@ class PageWallet extends React.Component { ui, externalWallet, parameters, - isGrandfatheredUser, userType } = this.props.rewardsData const { modalReset, modalConnect } = ui @@ -550,7 +549,6 @@ class PageWallet extends React.Component { { - actions.getIsGrandfatheredUser() actions.getUserType() actions.getIsUnsupportedRegion() const date = new Date() diff --git a/components/brave_rewards/resources/page/lib/types.ts b/components/brave_rewards/resources/page/lib/types.ts index a7533c33505..26f97efd2cf 100644 --- a/components/brave_rewards/resources/page/lib/types.ts +++ b/components/brave_rewards/resources/page/lib/types.ts @@ -30,7 +30,6 @@ export type AddressesType = 'BTC' | 'ETH' | 'BAT' | 'LTC' export type Address = { address: string, qr: string | null } export interface State { - isGrandfatheredUser: boolean userType: UserType adsData: AdsData adsHistory: AdsHistory[] diff --git a/components/brave_rewards/resources/page/reducers/default_state.ts b/components/brave_rewards/resources/page/reducers/default_state.ts index 7d94fcd3645..622df52f4b1 100644 --- a/components/brave_rewards/resources/page/reducers/default_state.ts +++ b/components/brave_rewards/resources/page/reducers/default_state.ts @@ -10,7 +10,6 @@ import * as Rewards from '../lib/types' export function defaultState (): Rewards.State { return { - isGrandfatheredUser: false, userType: 'unconnected', isAcSupported: false, enabledContribute: false, diff --git a/components/brave_rewards/resources/page/reducers/rewards_reducer.ts b/components/brave_rewards/resources/page/reducers/rewards_reducer.ts index bb80152ecd2..4a79676cfd3 100644 --- a/components/brave_rewards/resources/page/reducers/rewards_reducer.ts +++ b/components/brave_rewards/resources/page/reducers/rewards_reducer.ts @@ -19,15 +19,6 @@ const rewardsReducer: Reducer = (state: Rewards.State chrome.send('brave_rewards.isInitialized') break } - case types.GET_IS_GRANDFATHERED_USER: { - chrome.send('brave_rewards.isGrandfatheredUser') - break - } - case types.ON_IS_GRANDFATHERED_USER: { - state = { ...state } - state.isGrandfatheredUser = action.payload.isGrandfatheredUser - break - } case types.GET_USER_TYPE: { chrome.send('brave_rewards.getUserType') break diff --git a/components/brave_rewards/resources/page/reducers/state_cache.ts b/components/brave_rewards/resources/page/reducers/state_cache.ts index 0ff557e04fd..184ee60ed3c 100644 --- a/components/brave_rewards/resources/page/reducers/state_cache.ts +++ b/components/brave_rewards/resources/page/reducers/state_cache.ts @@ -32,7 +32,6 @@ function readCachedState (state: Rewards.State) { return { ...state, - isGrandfatheredUser: Boolean(cached.isGrandfatheredUser), userType: userTypeFromString(String(cached.userType || '')), isAcSupported: Boolean(cached.isAcSupported), enabledContribute: Boolean(cached.enabledContribute), diff --git a/components/brave_rewards/resources/page/stories/redux_state.ts b/components/brave_rewards/resources/page/stories/redux_state.ts index 9d397b4d9a5..1b4a0cb0689 100644 --- a/components/brave_rewards/resources/page/stories/redux_state.ts +++ b/components/brave_rewards/resources/page/stories/redux_state.ts @@ -161,7 +161,6 @@ export const reduxState: Rewards.ApplicationState = { }, initializing: false, showOnboarding: false, - isGrandfatheredUser: false, userType: 'unconnected' } } diff --git a/components/brave_rewards/resources/rewards_panel/components/panel.tsx b/components/brave_rewards/resources/rewards_panel/components/panel.tsx index b41073e71b6..5994a54d5f5 100644 --- a/components/brave_rewards/resources/rewards_panel/components/panel.tsx +++ b/components/brave_rewards/resources/rewards_panel/components/panel.tsx @@ -25,7 +25,6 @@ export function Panel () { const host = React.useContext(HostContext) const tabOpener = React.useContext(TabOpenerContext) - const [isGrandfatheredUser, setIsGrandfatheredUser] = React.useState(host.state.isGrandfatheredUser) const [userType, setUserType] = React.useState(host.state.userType) const [balance, setBalance] = React.useState(host.state.balance) const [settings, setSettings] = React.useState(host.state.settings) @@ -58,7 +57,6 @@ export function Panel () { React.useState(host.state.declaredCountry) useHostListener(host, (state) => { - setIsGrandfatheredUser(state.isGrandfatheredUser) setUserType(state.userType) setBalance(state.balance) setSettings(state.settings) @@ -118,7 +116,6 @@ export function Panel () { ((resolve) => { - chrome.braveRewards.isGrandfatheredUser((isGrandfatheredUser) => { - resolve(isGrandfatheredUser) - }) - }) -} - export function getUserType () { return new Promise((resolve) => { chrome.braveRewards.getUserType((userType) => { diff --git a/components/brave_rewards/resources/rewards_panel/lib/extension_host.ts b/components/brave_rewards/resources/rewards_panel/lib/extension_host.ts index 7ecb80d2895..00152d54392 100644 --- a/components/brave_rewards/resources/rewards_panel/lib/extension_host.ts +++ b/components/brave_rewards/resources/rewards_panel/lib/extension_host.ts @@ -337,9 +337,6 @@ export function createHost (): Host { apiAdapter.getRewardsEnabled().then((rewardsEnabled) => { stateManager.update({ rewardsEnabled }) }), - apiAdapter.isGrandfatheredUser().then((isGrandfatheredUser) => { - stateManager.update({ isGrandfatheredUser }) - }), apiAdapter.getUserType().then((userType) => { stateManager.update({ userType }) }), diff --git a/components/brave_rewards/resources/rewards_panel/lib/initial_state.ts b/components/brave_rewards/resources/rewards_panel/lib/initial_state.ts index 5e8a984686f..c3547d9c00b 100644 --- a/components/brave_rewards/resources/rewards_panel/lib/initial_state.ts +++ b/components/brave_rewards/resources/rewards_panel/lib/initial_state.ts @@ -51,7 +51,6 @@ export function getInitialState (): HostState { availableCountries: [], defaultCountry: '', declaredCountry: '', - isGrandfatheredUser: false, userType: 'unconnected', publishersVisitedCount: 0 } diff --git a/components/brave_rewards/resources/rewards_panel/lib/interfaces.ts b/components/brave_rewards/resources/rewards_panel/lib/interfaces.ts index 36da3bcf3b0..49554dd6a00 100644 --- a/components/brave_rewards/resources/rewards_panel/lib/interfaces.ts +++ b/components/brave_rewards/resources/rewards_panel/lib/interfaces.ts @@ -102,7 +102,6 @@ export interface HostState { availableCountries: string[] defaultCountry: string declaredCountry: string - isGrandfatheredUser: boolean userType: UserType publishersVisitedCount: number } diff --git a/components/brave_rewards/resources/rewards_panel/stories/index.tsx b/components/brave_rewards/resources/rewards_panel/stories/index.tsx index 3f27fe58eb4..93952c1e63c 100644 --- a/components/brave_rewards/resources/rewards_panel/stories/index.tsx +++ b/components/brave_rewards/resources/rewards_panel/stories/index.tsx @@ -121,7 +121,6 @@ function createHost (): Host { availableCountries: ['US'], defaultCountry: 'US', declaredCountry: 'US', - isGrandfatheredUser: false, userType: 'unconnected', publishersVisitedCount: 4 }) diff --git a/components/brave_rewards/resources/shared/components/newtab/rewards_card.style.ts b/components/brave_rewards/resources/shared/components/newtab/rewards_card.style.ts index 1cc709d25e0..37355a6a574 100644 --- a/components/brave_rewards/resources/shared/components/newtab/rewards_card.style.ts +++ b/components/brave_rewards/resources/shared/components/newtab/rewards_card.style.ts @@ -206,60 +206,6 @@ export const balanceAmount = styled.div` } ` -// TODO(sszaloki): -// replace color: #FFBC18; with color: ${leo.color.yellow[30]}; -// once the palette adjustments have been merged -export const balanceInfo = styled.div` - position: relative; - - --icon-size: 18px; - color: #FFBC18; - margin-top: 18px; - - .tooltip { - visibility: hidden; - transition: visibility 0s linear 300ms; - } - - .tooltip-arrow { - content: ''; - position: absolute; - top: 29px; - left: 4px; - background: ${leo.color.white}; - height: 15px; - width: 15px; - transform: rotate(45deg); - z-index: 2; - } - - .tooltip-bubble { - position: fixed; - right: 12px; - width: 260px; - padding-top: 8px; - z-index: 1; - } - - &:hover .tooltip { - visibility: initial; - } -` - -export const balanceTooltip = styled.div.attrs({ - 'data-theme': 'light' -})` - position: relative; - padding: 16px; - background: ${leo.color.white}; - box-shadow: 0px 0px 24px rgba(99, 105, 110, 0.36); - border-radius: 8px; - color: ${leo.color.text.primary}; - font-size: 12px; - line-height: 18px; - font-weight: 400; -` - export const balanceExchange = styled.div.attrs({ 'data-theme': 'dark' })` diff --git a/components/brave_rewards/resources/shared/components/newtab/rewards_card.tsx b/components/brave_rewards/resources/shared/components/newtab/rewards_card.tsx index be2d58c431c..108e727c685 100644 --- a/components/brave_rewards/resources/shared/components/newtab/rewards_card.tsx +++ b/components/brave_rewards/resources/shared/components/newtab/rewards_card.tsx @@ -29,7 +29,6 @@ import { UnsupportedRegionCard } from './unsupported_region_card' import { VBATNotice, shouldShowVBATNotice } from '../vbat_notice' import { LoadingIcon } from '../../../shared/components/icons/loading_icon' import { Optional } from '../../../shared/lib/optional' -import Icon from '@brave/leo/react/icon' import * as urls from '../../lib/rewards_urls' @@ -55,7 +54,6 @@ export function RewardsCardHeader () { interface Props { rewardsEnabled: boolean - isGrandfatheredUser: boolean userType: UserType vbatDeadline: number | undefined isUnsupportedRegion: boolean @@ -170,21 +168,6 @@ export function RewardsCard (props: Props) { : <> - { - props.externalWallet?.provider === 'zebpay' && - props.isGrandfatheredUser && - - -
-
-
- - {getString('rewardsBalanceInfoText')} - -
-
- - } diff --git a/components/brave_rewards/resources/shared/components/newtab/stories/index.tsx b/components/brave_rewards/resources/shared/components/newtab/stories/index.tsx index 3b7faadc2d1..373dde2b6b5 100644 --- a/components/brave_rewards/resources/shared/components/newtab/stories/index.tsx +++ b/components/brave_rewards/resources/shared/components/newtab/stories/index.tsx @@ -36,7 +36,6 @@ export function Card () {
- isGrandfatheredUser: boolean externalWallet: ExternalWallet | null providerPayoutStatus: ProviderPayoutStatus minEarningsThisMonth: number @@ -99,21 +98,7 @@ export function WalletCard (props: Props) { {getString('loading')} - : <> - - { - props.externalWallet?.provider === 'zebpay' && - props.isGrandfatheredUser && - - -
- - {getString('walletBalanceInfoText')} - -
- - } - + : } diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts index 5f9f05aca1a..ffd97a18159 100644 --- a/components/definitions/chromel.d.ts +++ b/components/definitions/chromel.d.ts @@ -85,7 +85,6 @@ declare namespace chrome.braveRewards { const getAvailableCountries: (callback: (countries: string[]) => void) => void const getDefaultCountry: (callback: (defaultCountry: string) => void) => void const getDeclaredCountry: (callback: (country: string) => void) => void - const isGrandfatheredUser: (callback: (isGrandfatheredUser: boolean) => void) => void const getUserType: (callback: (userType: string) => void) => void const getPublishersVisitedCount: (callback: (count: number) => void) => void const getRewardsParameters: (callback: (properties: RewardsExtension.RewardsParameters) => void) => {} diff --git a/components/definitions/newTab.d.ts b/components/definitions/newTab.d.ts index e725bafab35..422a1ca62f8 100644 --- a/components/definitions/newTab.d.ts +++ b/components/definitions/newTab.d.ts @@ -154,7 +154,6 @@ declare namespace NewTab { export interface RewardsWidgetState { rewardsEnabled: boolean - isGrandfatheredUser: boolean userType: string isUnsupportedRegion: boolean declaredCountry: string diff --git a/components/resources/rewards_strings.grdp b/components/resources/rewards_strings.grdp index df574248407..f2b837e1466 100644 --- a/components/resources/rewards_strings.grdp +++ b/components/resources/rewards_strings.grdp @@ -136,9 +136,6 @@ Start using Rewards - - Now that you're connected to ZebPay, any previous balance you had will be deposited into your ZebPay account as part of your next earnings payout. Once it arrives, you'll see your BAT reflected in your Rewards balance. - Balance